Fixes #36857 - Run content count update on smart proxy after orphan c…

…leanup (#10775)
Katello · Oct 27, 2023 · f07f474 · f07f474
1 parent 586f2fe
commit f07f474
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/lib/actions/katello/orphan_cleanup/remove_orphans.rb b/app/lib/actions/katello/orphan_cleanup/remove_orphans.rb
@@ -15,9 +15,17 @@ def plan(proxy)
               plan_action(
                 Actions::Pulp3::Orchestration::OrphanCleanup::RemoveOrphans,
                 proxy)
+              plan_self(:smart_proxy_id => proxy.id)
             end
           end
         end
+
+        def finalize
+          smart_proxy = ::SmartProxy.unscoped.find(input[:smart_proxy_id])
+          if smart_proxy.pulp_mirror?
+            ::ForemanTasks.async_task(::Actions::Katello::CapsuleContent::UpdateContentCounts, smart_proxy)
+          end
+        end
       end
     end
   end

diff --git a/app/models/katello/concerns/smart_proxy_extensions.rb b/app/models/katello/concerns/smart_proxy_extensions.rb
@@ -126,9 +126,8 @@ def update_content_counts!
         new_content_counts = { content_view_versions: {} }
         smart_proxy_helper = ::Katello::SmartProxyHelper.new(self)
         repos = smart_proxy_helper.repositories_available_to_capsule
-        return new_content_counts if repos.empty?
 
-        repos.each do |repo|
+        repos&.each do |repo|
           repo_mirror_service = repo.backend_service(self).with_mirror_adapter
           repo_content_counts = repo_mirror_service.latest_content_counts
           translated_counts = {metadata: {}, counts: {}}