Refs #38856 - remove ForemanTasks patch for chaining

Author: ianballou

CLAUDE.md

@@ -221,6 +221,13 @@ Don't write unnecessary comments in tests. When writing a new test, look at surr
 - test length, where possible
 - length and quantity of comments (don't be too wordy)
 
+### Code Documentation Guidelines
+
+- **No YARD-style documentation** - Don't use `@param`, `@return`, or other YARD tags
+- **Keep method comments to one line** when possible
+- **Brief and direct** - Focus on what the method does, not implementation details
+- **Example**: `# Returns :scheduled, :running, or nil based on task status` not multi-line YARD docs
+
 ### Test Commands Reference
 
 **CRITICAL: Never use `bundle exec rake test TEST=...` for individual tests. Always use `ktest`.**

app/models/katello/content_view_version.rb

@@ -380,19 +380,18 @@ def auto_publish_composites!(component_task_id)
             Rails.logger.info("Composite CV #{composite_cv.name} publish running, scheduling event for retry")
             schedule_auto_publish_event(composite_cv, description)
             next
+          when nil
+            # No composite publish running or scheduled - trigger one now
+            sibling_task_ids = find_sibling_component_publish_tasks(composite_cv, component_task_id)
+            trigger_composite_publish(composite_cv, sibling_task_ids, description)
           end
-
-          sibling_task_ids = find_sibling_component_publish_tasks(composite_cv, component_task_id)
-          trigger_composite_publish(composite_cv, sibling_task_ids, description)
         end
       end
     end
 
     private
 
-    # Check if a composite publish task already exists (scheduled or running)
-    # @param composite_cv [Katello::ContentView] The composite content view
-    # @return [Symbol, nil] :scheduled if scheduled, :running if running, nil otherwise
+    # Returns :scheduled, :running, or nil based on composite CV publish task status
     def composite_publish_status(composite_cv)
       # Check scheduled tasks first (they don't have input populated yet)
       scheduled_tasks = ForemanTasks::Task::DynflowTask
@@ -404,38 +403,33 @@ def composite_publish_status(composite_cv)
       end
 
       # Check running tasks (these have input populated)
-      if find_composite_publish_tasks(composite_cv).any?
+      if find_active_composite_publish_tasks(composite_cv).any?
         return :running
       end
 
       nil
     end
 
     # Schedule an event to retry composite publish after current one finishes
-    # @param composite_cv [Katello::ContentView] The composite content view
-    # @param description [String] Description for the publish task
     def schedule_auto_publish_event(composite_cv, description)
       ::Katello::EventQueue.push_event(::Katello::Events::AutoPublishCompositeView::EVENT_TYPE, composite_cv.id) do |attrs|
         attrs[:metadata] = { description: description, version_id: self.id }
       end
     end
 
     # Check if a scheduled task is for the given composite CV by inspecting delayed plan args
-    # @param task [ForemanTasks::Task] The task to check
-    # @param composite_cv [Katello::ContentView] The composite content view
-    # @return [Boolean] true if task is for this composite CV
     def scheduled_task_for_composite?(task, composite_cv)
       delayed_plan = ForemanTasks.dynflow.world.persistence.load_delayed_plan(task.external_id)
+      return false if delayed_plan.nil?
+
       args = delayed_plan.args
       args.first.is_a?(::Katello::ContentView) && args.first.id == composite_cv.id
-    rescue StandardError
+    rescue NoMethodError, TypeError, Dynflow::Error
+      Rails.logger.error("Failed to check scheduled task for composite CV #{composite_cv.name}: #{e.message}")
       false
     end
 
     # Trigger a composite publish, either immediately or chained to sibling tasks
-    # @param composite_cv [Katello::ContentView] The composite content view
-    # @param sibling_task_ids [Array<String>] Task IDs to wait for
-    # @param description [String] Description for the publish task
     def trigger_composite_publish(composite_cv, sibling_task_ids, description)
       if sibling_task_ids.any?
         trigger_chained_composite_publish(composite_cv, sibling_task_ids, description)
@@ -453,7 +447,7 @@ def trigger_composite_publish(composite_cv, sibling_task_ids, description)
 
     # Trigger a chained composite publish that waits for sibling tasks
     def trigger_chained_composite_publish(composite_cv, sibling_task_ids, description)
-      ForemanTasks.chain(
+      ForemanTasks.dynflow.world.chain(
         sibling_task_ids,
         ::Actions::Katello::ContentView::Publish,
         composite_cv,
@@ -472,10 +466,7 @@ def trigger_immediate_composite_publish(composite_cv, description)
       )
     end
 
-    # Find all currently running publish tasks for component CVs that belong to the given composite CV
-    # @param composite_cv [Katello::ContentView] The composite content view
-    # @param current_task_id [String] The execution plan ID of the current component publish task
-    # @return [Array<String>] Array of execution plan IDs for all running component publish tasks
+    # Find sibling component publish tasks that should be waited for
     def find_sibling_component_publish_tasks(composite_cv, current_task_id)
       # Get all component CV IDs for this composite
       component_cv_ids = composite_cv.components.pluck(:content_view_id)
@@ -497,12 +488,8 @@ def find_sibling_component_publish_tasks(composite_cv, current_task_id)
       task_ids.reject { |id| id == current_task_id }
     end
 
-    # Find all currently running composite publish tasks for the given composite CV
-    # NOTE: This does NOT check for scheduled tasks - those are handled separately in auto_publish_composites!
-    # by inspecting delayed plan args, since scheduled tasks don't have input populated yet.
-    # @param composite_cv [Katello::ContentView] The composite content view
-    # @return [Array<String>] Array of execution plan IDs for all running composite publish tasks
-    def find_composite_publish_tasks(composite_cv)
+    # Find active (planning/planned/running) composite publish tasks (does NOT check scheduled tasks)
+    def find_active_composite_publish_tasks(composite_cv)
       relevant_tasks = ForemanTasks::Task::DynflowTask
         .for_action(::Actions::Katello::ContentView::Publish)
         .where(state: ['planning', 'planned', 'running'])