Refs #38856 - skip auto publish request if already scheduled

Author: ianballou

app/lib/actions/helpers/content_view_auto_publisher.rb

@@ -21,13 +21,6 @@ def auto_publish_views(_execution_plan)
       end
 
       def auto_publish_view(_execution_plan)
-        # Skip for auto-published composite CVs to prevent race condition.
-        # When a chained composite publish finishes, its :stopped hook could find
-        # requests created by concurrent component CVs, causing duplicate publishes.
-        # Manual publishes and promotions should still check for pending requests.
-        content_view = ::Katello::ContentView.find_by(id: input[:auto_publish_content_view_id])
-        return if content_view&.composite? && input[:auto_published]
-
         request = ::Katello::ContentViewAutoPublishRequest.find_by(content_view_id: input[:auto_publish_content_view_id])
         return unless request
 

app/services/katello/content_view_manager.rb

@@ -22,6 +22,11 @@ def self.create_candlepin_environment(content_view_environment:)
     end
 
     def self.request_auto_publish(content_view:, content_view_version:)
+      if scheduled_composite_publish?(content_view)
+        auto_publish_log(nil, "composite publish already scheduled for ID #{content_view.id}, skipping")
+        return
+      end
+
       request = content_view.create_auto_publish_request!(
         content_view_version: content_view_version
       )
@@ -48,14 +53,6 @@ def self.trigger_auto_publish!(request:)
       request.with_lock do
         composite_cv = request.content_view
 
-        # Check if composite publish is already scheduled (chained to component CVs)
-        # If so, skip - the scheduled publish will use latest component versions
-        if scheduled_composite_publish?(composite_cv)
-          auto_publish_log(request, "composite publish already scheduled, skipping")
-          request.destroy!
-          return
-        end
-
         if content_view_locks(content_view: composite_cv).any?
           auto_publish_log(request, "locks found")
           return