katello 4.4.1 → 4.5.0

data/app/models/katello/concerns/organization_extensions.rb

@@ -90,8 +90,10 @@ module Katello
           self.providers.anonymous.first
         end
 
-        def manifest_imported?
-          owner_details['upstreamConsumer'].present?
+        def manifest_imported?(cached: false)
+          Rails.cache.fetch("#{self.label}_manifest_imported?", expires_in: 1.minute, force: !cached) do
+            owner_details['upstreamConsumer'].present?
+          end
         end
 
         def manifest_expired?

data/app/models/katello/concerns/setting_extensions.rb

@@ -6,8 +6,11 @@ module Katello
       included do
         validates :value, inclusion: { in: ::Katello::RootRepository::DOWNLOAD_POLICIES },
           if: ->(setting) { setting.name == 'default_download_policy' }
+        validates_with ::Katello::Validators::ContentDefaultHttpProxySettingValidator,
+        if: proc { |s| s.name == 'content_default_http_proxy' && HttpProxy.table_exists? }
 
         after_save :recalculate_errata_status
+        after_save :add_organizations_and_locations_if_global_http_proxy
         after_commit :update_global_proxies
       end
 
@@ -27,6 +30,17 @@ module Katello
           end
         end
       end
+
+      def add_organizations_and_locations_if_global_http_proxy
+        if name == 'content_default_http_proxy' && (::HttpProxy.table_exists? rescue(false))
+          proxy = HttpProxy.where(name: value).first
+
+          if proxy
+            proxy.update_attribute(:organizations, Organization.unscoped.all)
+            proxy.update_attribute(:locations, Location.unscoped.all)
+          end
+        end
+      end
     end
   end
 end

data/app/models/katello/concerns/smart_proxy_extensions.rb

@@ -22,7 +22,8 @@ module Katello
       CONTAINER_GATEWAY_FEATURE = "Container_Gateway".freeze
 
       DOWNLOAD_INHERIT = 'inherit'.freeze
-      DOWNLOAD_POLICIES = [::Katello::RootRepository::DOWNLOAD_ON_DEMAND, ::Katello::RootRepository::DOWNLOAD_IMMEDIATE, DOWNLOAD_INHERIT].freeze
+      DOWNLOAD_STREAMED = 'streamed'.freeze
+      DOWNLOAD_POLICIES = [::Katello::RootRepository::DOWNLOAD_ON_DEMAND, ::Katello::RootRepository::DOWNLOAD_IMMEDIATE, DOWNLOAD_INHERIT, DOWNLOAD_STREAMED].freeze
 
       included do
         include ForemanTasks::Concerns::ActionSubject

data/app/models/katello/content.rb

@@ -10,6 +10,7 @@ module Katello
     scoped_search :on => :label, :complete_value => true
     scoped_search :relation => :products, :on => :name, :rename => :product_name, :complete_value => true
     scoped_search :on => :label, :rename => :content_label, :complete_value => true
+    scoped_search :on => :cp_content_id, :complete_value => true
 
     after_update :update_repository_names, :if => :propagate_name_change?
 

data/app/models/katello/content_credential.rb

@@ -29,6 +29,12 @@ module Katello
                                 :inverse_of => :ssl_client_cert, :dependent => :nullify
     has_many :ssl_key_root_repos, :class_name => "Katello::RootRepository", :foreign_key => "ssl_client_key_id",
                              :inverse_of => :ssl_client_key, :dependent => :nullify
+    has_many :ssl_ca_alternate_content_sources, :class_name => "Katello::AlternateContentSource", :foreign_key => "ssl_ca_cert_id",
+                                :inverse_of => :ssl_ca_cert, :dependent => :nullify
+    has_many :ssl_client_alternate_content_sources, :class_name => "Katello::AlternateContentSource", :foreign_key => "ssl_client_cert_id",
+                                :inverse_of => :ssl_client_cert, :dependent => :nullify
+    has_many :ssl_key_alternate_content_sources, :class_name => "Katello::AlternateContentSource", :foreign_key => "ssl_client_key_id",
+                                :inverse_of => :ssl_client_key, :dependent => :nullify
     belongs_to :organization, :inverse_of => :gpg_keys
 
     validates_lengths_from_database

data/app/models/katello/content_override.rb

@@ -43,9 +43,13 @@ module Katello
     end
 
     def ==(other)
-      self.content_label == other.content_label &&
-        self.name == other.name &&
-        self.value == other.value
+      if self.class == other.class
+        self.content_label == other.content_label &&
+          self.name == other.name &&
+          self.value == other.value
+      else
+        super
+      end
     end
 
     def to_hash

data/app/models/katello/content_view.rb

@@ -11,7 +11,6 @@ module Katello
     CONTENT_DIR = "content_views".freeze
     IMPORT_LIBRARY = "Import-Library".freeze
     EXPORT_LIBRARY = "Export-Library".freeze
-
     belongs_to :organization, :inverse_of => :content_views, :class_name => "::Organization"
 
     has_many :content_view_environments, :class_name => "Katello::ContentViewEnvironment", :dependent => :destroy
@@ -19,7 +18,6 @@ module Katello
 
     has_many :content_view_versions, :class_name => "Katello::ContentViewVersion", :dependent => :destroy
     alias_method :versions, :content_view_versions
-
     # Note the difference between content_view_components and component_composites both refer to
     # ContentViewComponent but mean different things.
     # content_view_components -> Topdown, given I am a composite CV get the associated components belonging to me
@@ -73,6 +71,12 @@ module Katello
               inclusion: { in: [false], message: "Import-only Content Views can not solve dependencies"},
               if: :solve_dependencies
     validate :import_only_immutable
+    validates :generated_for,
+              exclusion: { in: [:none], message: "Generated Content Views can not be Composite"},
+              if: :composite
+    validates :generated_for,
+              exclusion: { in: [:none], message: "Generated Content Views can not solve dependencies"},
+              if: :solve_dependencies
 
     validates_with Validators::KatelloNameFormatValidator, :attributes => :name
     validates_with Validators::KatelloLabelFormatValidator, :attributes => :label
@@ -81,11 +85,26 @@ module Katello
     scope :non_default, -> { where(:default => false) }
     scope :composite, -> { where(:composite => true) }
     scope :non_composite, -> { where(:composite => [nil, false]) }
+    scope :generated, -> { where.not(:generated_for => :none) }
+    scope :generated_for_repository, -> { where(:generated_for => [:repository_export, :repository_import]) }
+    scope :not_generated_for_repository, -> { where.not(id: generated_for_repository) }
+
+    scope :generated_for_library, -> { where(:generated_for => [:library_export, :library_import]) }
 
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :label, :complete_value => true
     scoped_search :on => :composite, :complete_value => true
+    scoped_search :on => :generated_for, :complete_value => true
+    scoped_search :on => :default # just for ordering
+
+    enum generated_for: {
+      none: 0,
+      library_export: 1,
+      repository_export: 2,
+      library_import: 3,
+      repository_import: 4
+    }, _prefix: true
 
     set_crud_hooks :content_view
 
@@ -123,6 +142,14 @@ module Katello
       name.start_with? EXPORT_LIBRARY
     end
 
+    def generated_for_repository?
+      generated_for_repository_export? || generated_for_repository_import?
+    end
+
+    def generated_for_library?
+      generated_for_library_export? || generated_for_library_import?
+    end
+
     def content_host_count
       hosts.count
     end
@@ -211,6 +238,10 @@ module Katello
       self.environments.many?
     end
 
+    def generated?
+      !generated_for_none?
+    end
+
     #NOTE: this function will most likely become obsolete once we drop api v1
     def as_json(options = {})
       result = self.attributes

data/app/models/katello/content_view_erratum_filter.rb

@@ -26,21 +26,33 @@ module Katello
       end
     end
 
-    def content_unit_pulp_ids(repo)
+    def content_unit_pulp_ids(repo, additional_included_errata = [])
       return [] if erratum_rules.blank?
 
       if filter_by_id?
         errata_ids = erratum_rules.map(&:errata_id)
-        errata_pulp_ids = errata_package_pulp_ids_from_errata_ids(repo, errata_ids)
-        errata_pulp_ids += errata_module_stream_pulp_ids_from_errata_ids(errata_ids)
+        # additional_included_errata and inclusion filters don't work together (since it only applies when excluding)
+        if self.inclusion?
+          errata_pulp_ids = errata_package_pulp_ids_from_errata_ids(repo, errata_ids, [])
+          errata_pulp_ids += errata_module_stream_pulp_ids_from_errata_ids(errata_ids, [])
+        else
+          errata_pulp_ids = errata_package_pulp_ids_from_errata_ids(repo, errata_ids, additional_included_errata)
+          errata_pulp_ids += errata_module_stream_pulp_ids_from_errata_ids(errata_ids, additional_included_errata)
+        end
       else
         clauses = []
         clauses << errata_from
         clauses << errata_to
         clauses << types_clause
-        package_filenames = Erratum.list_filenames_by_clauses(repo, clauses.compact)
-        errata_pulp_ids = errata_package_pulp_ids_from_package_filenames(repo, package_filenames)
-        errata_pulp_ids += errata_module_stream_pulp_ids_from_clauses(repo, clauses.compact)
+        if self.inclusion?
+          package_filenames = Erratum.list_filenames_by_clauses(repo, clauses.compact, [])
+          errata_pulp_ids = errata_package_pulp_ids_from_package_filenames(repo, package_filenames)
+          errata_pulp_ids += errata_module_stream_pulp_ids_from_clauses(repo, clauses.compact, [])
+        else
+          package_filenames = Erratum.list_filenames_by_clauses(repo, clauses.compact, additional_included_errata)
+          errata_pulp_ids = errata_package_pulp_ids_from_package_filenames(repo, package_filenames)
+          errata_pulp_ids += errata_module_stream_pulp_ids_from_clauses(repo, clauses.compact, additional_included_errata)
+        end
       end
 
       errata_pulp_ids
@@ -53,8 +65,8 @@ module Katello
       repo.rpms.where("filename ILIKE ANY ( array[?] )", query_params)
     end
 
-    def errata_module_stream_pulp_ids_from_clauses(repo, clauses)
-      module_streams = Erratum.list_modular_streams_by_clauses(repo, clauses)
+    def errata_module_stream_pulp_ids_from_clauses(repo, clauses, additional_included_errata)
+      module_streams = Erratum.list_modular_streams_by_clauses(repo, clauses, additional_included_errata)
       module_streams.pluck(:pulp_id)
     end
 
@@ -62,13 +74,15 @@ module Katello
       rpms_by_filename(repo, package_filenames).pluck(:pulp_id)
     end
 
-    def errata_module_stream_pulp_ids_from_errata_ids(errata_ids)
-      module_streams = Katello::Erratum.where(:errata_id => errata_ids).map(&:module_streams).compact.flatten
+    def errata_module_stream_pulp_ids_from_errata_ids(errata_ids, additional_included_errata)
+      module_streams = Katello::Erratum.where(:errata_id => errata_ids).map(&:module_streams).compact.flatten -
+        Katello::Erratum.where(:errata_id => additional_included_errata.pluck(:errata_id)).map(&:module_streams).compact.flatten
       module_streams.pluck(:pulp_id)
     end
 
-    def errata_package_pulp_ids_from_errata_ids(repo, errata_ids)
-      package_filenames = Katello::ErratumPackage.joins(:erratum).where("#{Erratum.table_name}.errata_id" => errata_ids).pluck(:filename)
+    def errata_package_pulp_ids_from_errata_ids(repo, errata_ids, additional_included_errata)
+      package_filenames = Katello::ErratumPackage.joins(:erratum).where("#{Erratum.table_name}.errata_id" => errata_ids).pluck(:filename) -
+        Katello::ErratumPackage.joins(:erratum).where("#{Erratum.table_name}.errata_id" => additional_included_errata.pluck(:errata_id)).pluck(:filename)
       rpms_by_filename(repo, package_filenames).pluck(:pulp_id)
     end
 

data/app/models/katello/content_view_filter.rb

@@ -162,6 +162,10 @@ module Katello
       if self.content_view.import_only?
         errors.add(:base, _("cannot add filter to import-only view"))
       end
+
+      if self.content_view.generated?
+        errors.add(:base, _("cannot add filter to generated content views"))
+      end
     end
 
     def validate_filter_repos(errors, content_view)

data/app/models/katello/content_view_version.rb

@@ -344,6 +344,18 @@ module Katello
       save!
     end
 
+    def auto_publish_composites!
+      metadata = {
+        description: _("Auto Publish - Triggered by '%s'") % self.name,
+        triggered_by: self.id
+      }
+      self.content_view.auto_publish_components.pluck(:composite_content_view_id).each do |composite_id|
+        ::Katello::EventQueue.push_event(::Katello::Events::AutoPublishCompositeView::EVENT_TYPE, composite_id) do |attrs|
+          attrs[:metadata] = metadata
+        end
+      end
+    end
+
     def repository_type_counts_map
       counts = {}
       Katello::RepositoryTypeManager.enabled_repository_types.keys.each do |repo_type|

data/app/models/katello/content_view_version_export_history.rb

@@ -53,8 +53,10 @@ module Katello
 
     def self.generate_audit_comment(user:, content_view_version:, from_version: nil, metadata:)
       export_type = export_type_from_metadata(metadata)
-      if content_view_version.content_view.library_export?
+      if content_view_version.content_view.generated_for_library?
         export_descriptor = "library export"
+      elsif content_view_version.content_view.generated_for_repository?
+        export_descriptor = "repository export"
       else
         export_descriptor = "export of content view '#{content_view_version.content_view.name}' version #{content_view_version.version}"
         export_descriptor += " from #{from_version.name}" if from_version

data/app/models/katello/erratum.rb

@@ -108,25 +108,29 @@ module Katello
       installable_for_hosts(hosts).select(:id)
     end
 
-    def self.list_filenames_by_clauses(repo, clauses)
+    def self.list_filenames_by_clauses(repo, clauses, additional_included_errata)
       query_clauses = clauses.map do |clause|
         "(#{clause.to_sql})"
       end
       statement = query_clauses.join(" AND ")
 
       Katello::ErratumPackage.joins(:erratum => :repository_errata).
-          where("#{RepositoryErratum.table_name}.repository_id" => repo.id).
-          where(statement).pluck(:filename)
+        where("#{RepositoryErratum.table_name}.repository_id" => repo.id).where(statement).pluck(:filename) -
+        Katello::ErratumPackage.joins(:erratum => :repository_errata).where("#{RepositoryErratum.table_name}.repository_id" => repo.id).
+          where("#{Erratum.table_name}.errata_id" => additional_included_errata.pluck(:errata_id)).pluck(:filename)
     end
 
-    def self.list_modular_streams_by_clauses(repo, clauses)
+    def self.list_modular_streams_by_clauses(repo, clauses, additional_included_errata)
       query_clauses = clauses.map do |clause|
         "(#{clause.to_sql})"
       end
       statement = query_clauses.join(" AND ")
       ModuleStream.where(:id => ModuleStreamErratumPackage.joins(:erratum_package => {:erratum => :repository_errata}).
           where("#{RepositoryErratum.table_name}.repository_id" => repo.id).
-          where(statement).select("#{ModuleStreamErratumPackage.table_name}.module_stream_id"))
+          where(statement).select("#{ModuleStreamErratumPackage.table_name}.module_stream_id")) -
+      ModuleStream.where(:id => ModuleStreamErratumPackage.joins(:erratum_package => {:erratum => :repository_errata}).
+          where("#{RepositoryErratum.table_name}.repository_id" => repo.id).
+          where(statement).where("#{Erratum.table_name}.errata_id" => additional_included_errata.pluck(:errata_id)).select("#{ModuleStreamErratumPackage.table_name}.module_stream_id"))
     end
 
     def module_streams

data/app/models/katello/events/delete_latest_content_view_version.rb

@@ -0,0 +1,40 @@
+module Katello
+  module Events
+    class DeleteLatestContentViewVersion
+      EVENT_TYPE = 'delete_latest_content_view_version'.freeze
+
+      attr_reader :content_view
+      attr_accessor :metadata, :retry
+
+      def self.retry_seconds
+        18
+      end
+
+      def initialize(content_view_id)
+        @content_view = ::Katello::ContentView.find_by_id(content_view_id)
+        Rails.logger.warn "Content View not found for ID #{object_id}" if @content_view.nil?
+        yield(self) if block_given?
+      end
+
+      def run
+        return unless content_view
+
+        begin
+          ForemanTasks.async_task(::Actions::Katello::ContentView::Remove, content_view,
+                        content_view_versions: [content_view.latest_version_object],
+                        content_view_environments: content_view.latest_version_object.content_view_environments)
+        rescue => e
+          self.retry = true if e.is_a?(ForemanTasks::Lock::LockConflict)
+          deliver_failure_notification
+          raise e
+        end
+      end
+
+      private
+
+      def deliver_failure_notification
+        ::Katello::UINotifications::ContentView::DelelteLatestVersionFailure.deliver!(content_view)
+      end
+    end
+  end
+end

data/app/models/katello/host/content_facet.rb

@@ -19,6 +19,8 @@ module Katello
 
       has_many :content_facet_repositories, :class_name => "Katello::ContentFacetRepository", :dependent => :destroy, :inverse_of => :content_facet
       has_many :bound_repositories, :through => :content_facet_repositories, :class_name => "Katello::Repository", :source => :repository
+      has_many :bound_content, :through => :bound_repositories, :class_name => "Katello::Content", :source => :content
+      has_many :bound_root_repositories, :through => :bound_repositories, :class_name => "Katello::RootRepository", :source => :root
 
       has_many :content_facet_applicable_debs, :class_name => "Katello::ContentFacetApplicableDeb", :dependent => :delete_all, :inverse_of => :content_facet
       has_many :applicable_debs, :through => :content_facet_applicable_debs, :class_name => "Katello::Deb", :source => :deb
@@ -178,6 +180,18 @@ module Katello
         joins_installable_relation(Katello::Rpm, Katello::ContentFacetApplicableRpm)
       end
 
+      def self.joins_repositories
+        facet_repository = Katello::ContentFacetRepository.table_name
+        root_repository = Katello::RootRepository.table_name
+        repository = Katello::Repository.table_name
+
+        self.joins("INNER JOIN #{facet_repository} on #{facet_repository}.content_facet_id = #{table_name}.id",
+                   "INNER JOIN #{repository} on #{repository}.id = #{facet_repository}.repository_id",
+                   "INNER JOIN #{root_repository} on #{root_repository}.id = #{repository}.root_id",
+                   "INNER JOIN #{Katello::Content.table_name} on #{Katello::Content.table_name}.cp_content_id = #{root_repository}.content_id").
+             where("#{facet_repository}.content_facet_id = #{self.table_name}.id")
+      end
+
       def content_view_version
         content_view.version(lifecycle_environment)
       end

data/app/models/katello/host_available_module_stream.rb

@@ -27,6 +27,7 @@ module Katello
 
     scoped_search :on => :name, :relation => :available_module_stream, :complete_value => true
     scoped_search :on => :stream, :relation => :available_module_stream, :complete_value => false
+    scoped_search :on => :installed_profiles
     scoped_search :on => :status, :complete_value => STATUS
 
     def upgradable?
@@ -47,6 +48,17 @@ module Katello
       end
     end
 
+    def self.installed_status(status, host)
+      case status
+      when 'not installed'
+        where(installed_profiles: [])
+      when 'upgradable'
+        where(id: upgradable(host).pluck(:id))
+      when 'up to date'
+        where(status: 'enabled').where.not(installed_profiles: []).where.not(id: upgradable(host).pluck(:id))
+      end
+    end
+
     def self.upgradable(host)
       upgradable_module_name_streams = ModuleStream.installable_for_hosts([host]).select(:name, :stream)
 

data/app/models/katello/product_content.rb

@@ -16,6 +16,7 @@ module Katello
     }
 
     scoped_search :on => :name, :relation => :content
+    scoped_search :relation => :product, :on => :name, :rename => :product
     scoped_search :on => :content_type, :relation => :content, :complete_value => true
     scoped_search :on => :label, :relation => :content
     scoped_search :on => :content_url, :relation => :content, :rename => :path

data/app/models/katello/purpose_sla_status.rb

@@ -2,7 +2,7 @@ module Katello
   class PurposeSlaStatus < HostStatus::Status
     UNKNOWN = Katello::PurposeStatus::UNKNOWN
     def self.status_name
-      N_('Service Level')
+      N_('Service level')
     end
 
     def self.humanized_name

data/app/models/katello/purpose_status.rb

@@ -17,7 +17,7 @@ module Katello
     end
 
     def self.status_name
-      N_('System Purpose')
+      N_('System purpose')
     end
 
     def self.humanized_name
@@ -31,7 +31,7 @@ module Katello
       when MISMATCHED
         N_('Mismatched')
       when NOT_SPECIFIED
-        N_('Not Specified')
+        N_('Not specified')
       else
         N_('Unknown')
       end

data/app/models/katello/repository.rb

@@ -307,7 +307,7 @@ module Katello
     end
 
     def immediate?
-      root.download_policy == ::Katello::RootRepository::DOWNLOAD_ON_IMMEDIATE
+      root.download_policy == ::Katello::RootRepository::DOWNLOAD_IMMEDIATE
     end
 
     def yum_gpg_key_url
@@ -338,7 +338,8 @@ module Katello
     end
 
     def published_in_versions
-      Katello::ContentViewVersion.with_repositories(self.library_instances_inverse).distinct
+      Katello::ContentViewVersion.with_repositories(self.library_instances_inverse)
+                                 .where(content_view_id: Katello::ContentView.not_generated_for_repository).distinct
     end
 
     def self.errata_with_package_counts(repo)
@@ -664,7 +665,9 @@ module Katello
     end
 
     def self.smart_proxy_syncable
-      where.not(:environment_id => nil)
+      joins(:content_view_version => :content_view).
+        merge(ContentView.not_generated_for_repository).
+        where.not(environment_id: nil)
     end
 
     def exist_for_environment?(environment, content_view, attribute = nil)
@@ -965,7 +968,7 @@ module Katello
       property :docker_upstream_name, String, desc: 'Returns name of the upstream docker repository'
     end
     class Jail < ::Safemode::Jail
-      allow :name, :label, :docker_upstream_name
+      allow :name, :label, :docker_upstream_name, :content_counts
     end
   end
 end

data/app/models/katello/root_repository.rb

@@ -63,7 +63,7 @@ module Katello
     validates_with Validators::KatelloLabelFormatValidator, :attributes => :label
     validates_with Validators::KatelloNameFormatValidator, :attributes => :name
     validates_with Validators::KatelloUrlFormatValidator, :attributes => :url,
-                   :nil_allowed => proc { |repo| repo.custom? || repo.organization.cdn_configuration.airgapped? },
+                   :nil_allowed => proc { |repo| repo.custom? || repo.organization.cdn_configuration.export_sync? },
                    :field_name => :url
     validates_with Validators::RootRepositoryUniqueAttributeValidator, :attributes => :name
     validates_with Validators::RootRepositoryUniqueAttributeValidator, :attributes => :label

data/app/models/katello/smart_proxy_alternate_content_source.rb

@@ -0,0 +1,8 @@
+module Katello
+  class SmartProxyAlternateContentSource < Katello::Model
+    # Do not use active record callbacks in this join model.  Direct INSERTs and DELETEs are done
+    self.table_name = :katello_smart_proxy_alternate_content_sources
+    belongs_to :smart_proxy, :inverse_of => :smart_proxy_alternate_content_sources, :class_name => 'SmartProxy'
+    belongs_to :alternate_content_source, :inverse_of => :smart_proxy_alternate_content_sources, :class_name => 'Katello::AlternateContentSource'
+  end
+end

data/app/models/katello/sync_plan.rb

@@ -83,7 +83,7 @@ module Katello
           ::Katello::Util::Support.active_record_retry do
             self.save!
           end
-          old_rec_logic.cancel
+          old_rec_logic.reload.cancel
           start_recurring_logic
         end
         toggle_enabled(params[:enabled]) if (params.key?(:enabled) && params[:enabled] != self.enabled?)

data/app/presenters/katello/product_content_presenter.rb

@@ -23,5 +23,20 @@ module Katello
       return [] if overrides.blank?
       overrides.select { |pc| pc.content_label == content.label }
     end
+
+    def status
+      overidden_value = enabled_content_override&.computed_value
+      if overidden_value.nil?
+        {
+          status: enabled ? "enabled" : "disabled",
+          overridden: false
+        }
+      else
+        {
+          status: overidden_value ? "enabled" : "disabled",
+          overridden: true
+        }
+      end
+    end
   end
 end

data/app/services/katello/applicable_host_queue.rb

@@ -1,7 +1,7 @@
 module Katello
   class ApplicableHostQueue
     def self.batch_size
-      ::Setting::Content.find_by(name: "applicability_batch_size").value
+      Setting["applicability_batch_size"]
     end
 
     def self.queue_depth

data/app/services/katello/product_content_finder.rb

@@ -30,8 +30,18 @@ module Katello
       consumable.organization.enabled_product_content_for(roots)
     end
 
-    def self.wrap_with_overrides(product_contents:, overrides:)
-      product_contents.map { |pc| ProductContentPresenter.new(pc, overrides) }
+    def self.wrap_with_overrides(product_contents:, overrides:, status: nil)
+      pc_with_overrides = product_contents.map { |pc| ProductContentPresenter.new(pc, overrides) }
+      if status
+        pc_with_overrides.keep_if do |pc|
+          if status == "overridden"
+            pc.status[:overridden]
+          else
+            pc.status[:status] == status
+          end
+        end
+      end
+      pc_with_overrides
     end
 
     def presenter_with_overrides(overrides)