Refs #38856 - use ForemanTasks chain method

Author: ianballou

app/services/katello/content_view_manager.rb

@@ -61,19 +61,19 @@ def self.trigger_auto_publish!(request:)
         description = _("Auto Publish - Triggered by '%s'") % request.content_view_version.name
 
         # Find running component CV publish tasks for chaining
-        sibling_task_ids = running_component_publish_task_ids(composite_cv)
+        sibling_tasks = running_component_publish_tasks(composite_cv)
 
-        if sibling_task_ids.any?
+        if sibling_tasks.any?
           # Chain composite publish to wait for running component CVs
-          ForemanTasks.dynflow.world.chain(
-            sibling_task_ids,
+          ForemanTasks.chain(
+            sibling_tasks,
             Actions::Katello::ContentView::Publish,
             composite_cv,
             description,
             auto_published: true,
             triggered_by_id: request.content_view_version_id
           )
-          auto_publish_log(request, "task chained to #{sibling_task_ids.size} component tasks")
+          auto_publish_log(request, "task chained to #{sibling_tasks.size} component tasks")
         else
           # No component CVs running, publish immediately
           ForemanTasks.async_task(Actions::Katello::ContentView::Publish, composite_cv, description, auto_published: true, triggered_by_id: request.content_view_version_id)
@@ -99,18 +99,17 @@ def self.scheduled_composite_publish?(composite_cv)
         end
     end
 
-    def self.running_component_publish_task_ids(composite_cv)
+    def self.running_component_publish_tasks(composite_cv)
       component_cv_ids = composite_cv.components.pluck(:content_view_id)
       return [] if component_cv_ids.empty?
 
-      tasks = ForemanTasks::Task::DynflowTask
+      ForemanTasks::Task::DynflowTask
         .for_action(::Actions::Katello::ContentView::Publish)
         .where(state: ['planning', 'planned', 'running'])
         .select do |task|
           task_input = task.input
           task_input && component_cv_ids.include?(task_input.dig('content_view', 'id'))
         end
-      tasks.map(&:external_id)
     end
   end
 end

test/services/katello/content_view_manager_test.rb

@@ -31,13 +31,9 @@ class ContentViewManagerTest < ActiveSupport::TestCase
       cvv = katello_content_view_versions(:composite_view_version_1)
 
       # Create a scheduled publish task for the composite CV
-      task = ForemanTasks::Task.create!(
-        type: 'ForemanTasks::Task::DynflowTask',
-        label: 'Actions::Katello::ContentView::Publish',
-        state: 'scheduled',
-        result: 'pending',
-        external_id: 'test-scheduled-publish-123'
-      )
+      task = FactoryBot.create(:dynflow_task, :scheduled,
+                                label: 'Actions::Katello::ContentView::Publish',
+                                external_id: 'test-scheduled-publish-123')
 
       # Mock the delayed plan to return our composite CV as first arg
       delayed_plan = mock('delayed_plan')
@@ -55,7 +51,7 @@ class ContentViewManagerTest < ActiveSupport::TestCase
 
       request.expects(:with_lock).yields
       request.expects(:destroy!)
-      Katello::ContentViewManager.expects(:running_component_publish_task_ids).returns([])
+      Katello::ContentViewManager.expects(:running_component_publish_tasks).returns([])
       ForemanTasks.expects(:async_task).with(
         ::Actions::Katello::ContentView::Publish,
         request.content_view,
@@ -69,15 +65,13 @@ class ContentViewManagerTest < ActiveSupport::TestCase
 
     test 'trigger_auto_publish with chaining' do
       request = build_stubbed(:katello_content_view_auto_publish_request)
-      sibling_task_ids = ['task-1', 'task-2']
-      mock_world = mock('world')
+      sibling_tasks = [mock('task1'), mock('task2')]
 
       request.expects(:with_lock).yields
       request.expects(:destroy!)
-      Katello::ContentViewManager.expects(:running_component_publish_task_ids).returns(sibling_task_ids)
-      ForemanTasks.dynflow.expects(:world).returns(mock_world)
-      mock_world.expects(:chain).with(
-        sibling_task_ids,
+      Katello::ContentViewManager.expects(:running_component_publish_tasks).returns(sibling_tasks)
+      ForemanTasks.expects(:chain).with(
+        sibling_tasks,
         Actions::Katello::ContentView::Publish,
         request.content_view,
         anything,
@@ -104,7 +98,7 @@ class ContentViewManagerTest < ActiveSupport::TestCase
 
       request.expects(:with_lock).yields
       request.expects(:destroy!).never
-      Katello::ContentViewManager.expects(:running_component_publish_task_ids).returns([])
+      Katello::ContentViewManager.expects(:running_component_publish_tasks).returns([])
       ForemanTasks.expects(:async_task).raises(ForemanTasks::Lock::LockConflict.new(mock, []))
 
       Katello::ContentViewManager.trigger_auto_publish!(request: request)
@@ -114,7 +108,7 @@ class ContentViewManagerTest < ActiveSupport::TestCase
       request = build_stubbed(:katello_content_view_auto_publish_request)
 
       request.expects(:with_lock).yields
-      Katello::ContentViewManager.expects(:running_component_publish_task_ids).returns([])
+      Katello::ContentViewManager.expects(:running_component_publish_tasks).returns([])
       ForemanTasks.expects(:async_task).raises(StandardError)
 
       assert_raises(StandardError) do