katello 4.14.1 → 4.15.0.rc1

data/app/models/katello/content_view.rb

@@ -38,8 +38,6 @@ module Katello
 
     has_many :filters, :dependent => :destroy, :class_name => "Katello::ContentViewFilter"
 
-    has_many :activation_keys, :class_name => "Katello::ActivationKey", :dependent => :restrict_with_exception
-
     has_many :content_view_environment_content_facets, :class_name => "Katello::ContentViewEnvironmentContentFacet",
              :through => :content_view_environments
     has_many :content_facets, :class_name => "Katello::Host::ContentFacet", :through => :content_view_environment_content_facets,
@@ -47,6 +45,11 @@ module Katello
     has_many :hosts, :class_name => "::Host::Managed", :through => :content_facets,
              :inverse_of => :content_views
 
+    has_many :content_view_environment_activation_keys, :class_name => "Katello::ContentViewEnvironmentActivationKey",
+             :through => :content_view_environments
+    has_many :activation_keys, :class_name => "Katello::ActivationKey", :through => :content_view_environment_activation_keys,
+             :inverse_of => :content_views
+
     has_many :hostgroup_content_facets, :class_name => "Katello::Hostgroup::ContentFacet",
              :inverse_of => :content_view, :dependent => :nullify
     has_many :hostgroups, :class_name => "::Hostgroup", :through => :hostgroup_content_facets,
@@ -121,7 +124,7 @@ module Katello
       kcv = Katello::ContentView.table_name
       kcvc = Katello::ContentViewComponent.table_name
       { :conditions => "#{kcv}.composite = 't' AND #{kcv}.id IN (SELECT #{kcvc}.composite_content_view_id FROM #{kcvc} WHERE #{kcvc}.content_view_id IN (SELECT #{kcv}.id FROM #{kcv} WHERE #{kcv}.name #{operator} ?))",
-        :parameter => [value]
+        :parameter => [value],
       }
     end
 
@@ -141,7 +144,7 @@ module Katello
       library_import: 3,
       repository_import: 4,
       library_export_syncable: 5,
-      repository_export_syncable: 6
+      repository_export_syncable: 6,
     }, _prefix: true
 
     set_crud_hooks :content_view
@@ -298,7 +301,7 @@ module Katello
         {
           :version => v.version,
           :published => v.created_at.to_s,
-          :environments => v.environments.map { |e| e.name }
+          :environments => v.environments.map { |e| e.name },
         }
       end
 
@@ -448,10 +451,7 @@ module Katello
       # update errata applicability counts for all hosts in the CV & LE
       Location.no_taxonomy_scope do
         User.as_anonymous_admin do
-          ::Katello::Host::ContentFacet.in_content_views_and_environments(
-            content_views: [self],
-            lifecycle_environments: [environment]
-          ).each do |facet|
+          ::Katello::Host::ContentFacet.with_content_views(self).with_environments(environment).each do |facet|
             facet.update_applicability_counts
             facet.update_errata_status
           rescue NoMethodError
@@ -699,10 +699,7 @@ module Katello
     def check_orphaned_content_facets!(environments: [])
       Location.no_taxonomy_scope do
         User.as_anonymous_admin do
-          ::Katello::Host::ContentFacet.in_content_views_and_environments(
-            content_views: [self],
-            lifecycle_environments: environments
-          ).each do |facet|
+          ::Katello::Host::ContentFacet.with_content_views(self).with_environments(environments).each do |facet|
             unless facet.host
               fail _("Orphaned content facets for deleted hosts exist for the content view and environment. Please run rake task : katello:clean_orphaned_facets and try again!")
             end
@@ -716,11 +713,11 @@ module Katello
       errors = []
 
       dependencies = { hosts: _("hosts"),
-                       activation_keys: _("activation keys")
+                       activation_keys: _("activation keys"),
       }
 
       dependencies.each do |key, name|
-        if (models = self.association(key).scope.in_environment(env)).any?
+        if (models = self.association(key).scope.in_environments(env)).any?
           errors << _("Cannot remove '%{view}' from environment '%{env}' due to associated %{dependent}: %{names}.") %
             { view: self.name, env: env.name, dependent: name, names: models.map(&:name).join(", ") }
         end
@@ -736,7 +733,7 @@ module Katello
 
       dependencies = { environments: _("environments"),
                        hosts: _("hosts"),
-                       activation_keys: _("activation keys")
+                       activation_keys: _("activation keys"),
       }
 
       dependencies.each do |key, name|
@@ -778,7 +775,7 @@ module Katello
         content_views.push(
           {
             id: cv_id,
-            name: cv_name
+            name: cv_name,
           }
         )
       end
@@ -893,7 +890,7 @@ module Katello
 
     def blocking_task
       blocking_task_labels = [
-        ::Actions::Katello::ContentView::Publish.name
+        ::Actions::Katello::ContentView::Publish.name,
       ]
       ForemanTasks::Task::DynflowTask.where(:label => blocking_task_labels)
                                      .where.not(state: 'stopped')

data/app/models/katello/content_view_environment.rb

@@ -15,6 +15,9 @@ module Katello
     has_many :content_view_environment_content_facets, :class_name => "Katello::ContentViewEnvironmentContentFacet", :dependent => :destroy, :inverse_of => :content_view_environment
     has_many :content_facets, through: :content_view_environment_content_facets, :class_name => "::Katello::Host::ContentFacet", :inverse_of => :content_view_environments
 
+    has_many :content_view_environment_activation_keys, :class_name => "Katello::ContentViewEnvironmentActivationKey", :dependent => :destroy, :inverse_of => :content_view_environment
+    has_many :activation_keys, through: :content_view_environment_activation_keys, :class_name => "::Katello::ActivationKey", :inverse_of => :content_view_environments
+
     validates_lengths_from_database
     validates :environment_id, uniqueness: {scope: :content_view_id}, presence: true
     validates :content_view_id, presence: true
@@ -25,20 +28,24 @@ module Katello
 
     scope :non_default, -> { joins(:content_view).where("katello_content_views.default" => false) }
     scope :default, -> { joins(:content_view).where("katello_content_views.default" => true) }
+    scope :non_generated, -> { where(content_view: ::Katello::ContentView.ignore_generated) }
+
+    scoped_search :on => :id, :complete_value => true
+
     alias :lifecycle_environment :environment
+    has_one :organization, :through => :environment
+
+    def self.in_organization(org)
+      where(environment_id: org.kt_environments)
+    end
 
     def self.for_content_facets(content_facets)
-      joins(:content_view_environment_content_facets, :content_facets).where("#{Katello::ContentViewEnvironmentContentFacet.table_name}.content_facet_id" => content_facets).uniq
+      joins(:content_facets).
+        where("#{Katello::ContentViewEnvironmentContentFacet.table_name}.content_facet_id" => content_facets)
     end
 
-    def self.with_candlepin_name(cp_name, organization: Organization.current)
-      lce_name, cv_name = cp_name.split('/')
-      if cv_name.blank? && lce_name == 'Library'
-        return default.find_by(
-          environment: ::Katello::KTEnvironment.library.where(organization: organization)&.first
-        )
-      end
-      joins(:environment, :content_view).where("#{Katello::KTEnvironment.table_name}.label" => lce_name, "#{Katello::ContentView.table_name}.label" => cv_name).first
+    def self.with_label_and_org(label, organization: Organization.current)
+      joins(:environment, :content_view).where("#{Katello::KTEnvironment.table_name}.organization_id" => organization, label: label).first
     end
 
     # retrieve the owning environment for this content view environment.
@@ -51,20 +58,54 @@ module Katello
     end
 
     def activation_keys
-      content_view.activation_keys.in_environment(environment)
+      ::Katello::ActivationKey.with_content_views(self.content_view).with_environments(self.environment)
     end
 
     def default_environment?
       content_view.default? && environment.library?
     end
 
-    def candlepin_name
-      return environment.label if default_environment?
-      "#{environment.label}/#{content_view.label}"
+    def priority(content_object)
+      case content_object
+      when Katello::ActivationKey
+        content_view_environment_activation_keys.find_by(:activation_key_id => content_object.id).try(:priority)
+      when Katello::Host::ContentFacet
+        content_view_environment_content_facets.find_by(:content_facet_id => content_object.id).try(:priority)
+      end
     end
 
-    def priority(content_facet)
-      content_view_environment_content_facets.find_by(:content_facet_id => content_facet.id).try(:priority)
+    def self.fetch_content_view_environments(organization:, labels: [], ids: [])
+      # Must ensure CVEs remain in the same order.
+      # Using ActiveRecord .where will return them in a different order.
+      id_errors = []
+      label_errors = []
+      cves = []
+      if ids.present?
+        ids.each do |id|
+          cve = ::Katello::ContentViewEnvironment.find_by(id: id)
+          if cve.blank?
+            id_errors << id
+          else
+            cves << cve
+          end
+        end
+      elsif labels.present?
+        environment_names = labels.map(&:strip)
+        environment_names.each do |name|
+          cve = with_label_and_org(name, organization: organization)
+          if cve.blank?
+            label_errors << name
+          else
+            cves << cve
+          end
+        end
+      end
+      if labels.present? && labels.length != cves.length
+        fail HttpErrors::UnprocessableEntity, _("No content view environments found with names: %{names}") % {names: label_errors.join(', ')} if label_errors.present?
+      elsif ids.present? && ids.length != cves.length
+        fail HttpErrors::UnprocessableEntity, _("No content view environments found with ids: %{ids}") % {ids: id_errors.join(', ')} if id_errors.present?
+      end
+      cves
     end
 
     private

data/app/models/katello/content_view_environment_activation_key.rb

@@ -0,0 +1,20 @@
+module Katello
+  class ContentViewEnvironmentActivationKey < Katello::Model
+    belongs_to :content_view_environment, :class_name => "::Katello::ContentViewEnvironment", :inverse_of => :content_view_environment_activation_keys
+    belongs_to :activation_key, :class_name => "::Katello::ActivationKey", :inverse_of => :content_view_environment_activation_keys
+
+    default_scope { order(:priority => :asc) }
+
+    validates :content_view_environment_id, presence: true
+    validates :activation_key_id, presence: true, unless: :new_record?
+
+    def self.reprioritize_for_activation_key(activation_key, new_cves)
+      new_order = new_cves.map do |cve|
+        activation_key.content_view_environment_activation_keys.find_by(:content_view_environment_id => cve.id)
+      end
+      new_order.compact.each_with_index do |cveak, index|
+        cveak.update_column(:priority, index)
+      end
+    end
+  end
+end

data/app/models/katello/content_view_erratum_filter_rule.rb

@@ -23,7 +23,7 @@ module Katello
       :inclusion => {
         :in => DATE_TYPES,
         :allow_blank => false,
-        :message => (_("must be one of the following: %s") % DATE_TYPES.join(', '))
+        :message => (_("must be one of the following: %s") % DATE_TYPES.join(', ')),
       }
 
     def self.in_content_views(content_view_ids)

data/app/models/katello/content_view_filter.rb

@@ -41,7 +41,7 @@ module Katello
     def self.yum(include_module_streams = true)
       types = [::Katello::ContentViewPackageGroupFilter.name,
                ::Katello::ContentViewErratumFilter.name,
-               ::Katello::ContentViewPackageFilter.name
+               ::Katello::ContentViewPackageFilter.name,
               ]
       types << ::Katello::ContentViewModuleStreamFilter.name if include_module_streams
       where(:type => types)
@@ -74,7 +74,7 @@ module Katello
         ContentViewErratumFilter => ERRATA,
         ContentViewPackageGroupFilter => PACKAGE_GROUP,
         ContentViewDockerFilter => DOCKER,
-        ContentViewModuleStreamFilter => MODULE_STREAM
+        ContentViewModuleStreamFilter => MODULE_STREAM,
       }[self.class]
     end
 

data/app/models/katello/content_view_history.rb

@@ -33,7 +33,7 @@ module Katello
       promotion: 2,
       removal: 3,
       export: 4,
-      importing: 5
+      importing: 5,
     }
 
     def content_view

data/app/models/katello/content_view_repository.rb

@@ -6,7 +6,7 @@ module Katello
                                 Repository::FILE_TYPE,
                                 Repository::DEB_TYPE,
                                 Repository::ANSIBLE_COLLECTION_TYPE,
-                                Katello::RepositoryTypeManager.generic_repository_types(false).keys.flatten
+                                Katello::RepositoryTypeManager.generic_repository_types(false).keys.flatten,
                                ].flatten.freeze
 
     ALLOWED_IMPORT_REPOSITORY_TYPES = Repository::EXPORTABLE_TYPES

data/app/models/katello/content_view_version.rb

@@ -357,7 +357,7 @@ module Katello
     def auto_publish_composites!
       metadata = {
         description: _("Auto Publish - Triggered by '%s'") % self.name,
-        triggered_by: self.id
+        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|
@@ -443,12 +443,12 @@ module Katello
             repo.slice(:id, :name, :label, :arch, :major, :minor,
                        :content_type, :os_versions, :url, :content_id).merge(redhat: repo.redhat?, root: repo.root.id,
                                                                              product: repo.product.slice(:id, :label))
-          end
+          end,
         }
       end
       self.applied_filters = {
         applied_filters: applied_filters_and_rules,
-        dependency_solving: content_view.solve_dependencies
+        dependency_solving: content_view.solve_dependencies,
       }
       save!
     end

data/app/models/katello/content_view_version_export_history.rb

@@ -18,7 +18,7 @@ module Katello
     validates :export_type, :presence => true,
               :inclusion => { :in => EXPORT_TYPES,
                               :allow_blank => false,
-                              :message => _("must be one of the following: %s" % EXPORT_TYPES.join(', '))
+                              :message => _("must be one of the following: %s" % EXPORT_TYPES.join(', ')),
                             }
     validates :metadata, :presence => true
     serialize :metadata, Hash
@@ -51,7 +51,7 @@ module Katello
       self.export_type ||= self.class.export_type_from_metadata(metadata)
     end
 
-    def self.generate_audit_comment(user:, content_view_version:, from_version: nil, metadata:)
+    def self.generate_audit_comment(user:, content_view_version:, metadata:, from_version: nil)
       export_type = export_type_from_metadata(metadata)
       if content_view_version.content_view.generated_for_library?
         export_descriptor = "library export"

data/app/models/katello/content_view_version_import_history.rb

@@ -35,7 +35,7 @@ module Katello
     def self.generate_audit_comment(user:, content_view_name:)
       truncate_audit_comment(_("Content imported by %{user} into content view '%{name}'") % {
         user: user.to_label,
-        name: content_view_name
+        name: content_view_name,
       })
     end
   end

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

@@ -33,7 +33,7 @@ module Katello
       private
 
       def deliver_failure_notification
-        ::Katello::UINotifications::ContentView::DelelteLatestVersionFailure.deliver!(content_view)
+        ::Katello::UINotifications::ContentView::DeleteLatestVersionFailure.deliver!(content_view)
       end
     end
   end

data/app/models/katello/flatpak_remote.rb

@@ -0,0 +1,11 @@
+module Katello
+  class FlatpakRemote < Katello::Model
+    has_many :remote_repositories, dependent: :destroy, class_name: 'Katello::FlatpakRemoteRepository'
+    has_many :remote_repository_manifests, through: :remote_repositories, source: :remote_repository_manifests
+    belongs_to :organization, inverse_of: :flatpak_remotes
+
+    validates :name, presence: true
+    validates :url, presence: true
+    validates :organization_id, presence: true
+  end
+end

data/app/models/katello/flatpak_remote_repository.rb

@@ -0,0 +1,12 @@
+module Katello
+  class FlatpakRemoteRepository < Katello::Model
+    belongs_to :flatpak_remote, inverse_of: :remote_repositories
+    has_many :remote_repository_manifests, dependent: :destroy, class_name: 'Katello::FlatpakRemoteRepositoryManifest'
+
+    validates :flatpak_remote_id, presence: true
+    validates :name, presence: true
+    validates :label, presence: true
+
+    alias_attribute :manifests, :remote_repository_manifests
+  end
+end

data/app/models/katello/flatpak_remote_repository_manifest.rb

@@ -0,0 +1,10 @@
+module Katello
+  class FlatpakRemoteRepositoryManifest < Katello::Model
+    belongs_to :remote_repository,
+               class_name: 'Katello::FlatpakRemoteRepository',
+               foreign_key: 'flatpak_remote_repository_id',
+               inverse_of: :remote_repository_manifests
+    validates :flatpak_remote_repository_id, presence: true
+    validates :name, presence: true
+  end
+end

data/app/models/katello/glue/candlepin/activation_key.rb

@@ -31,7 +31,7 @@ module Katello
         key_pools.map do |key_pool|
           {
             :amount => (key_pool[:quantity] || 0),
-            :id => key_pool[:poolId]
+            :id => key_pool[:poolId],
           }.with_indifferent_access
         end
       end

data/app/models/katello/glue/candlepin/candlepin_object.rb

@@ -21,7 +21,7 @@ module Katello
       def import_candlepin_record(record:, organization:)
         db_attrs = {
           cp_id: record['id'],
-          organization: organization
+          organization: organization,
         }
 
         yield(db_attrs) if block_given?

data/app/models/katello/glue/candlepin/pool.rb

@@ -74,7 +74,7 @@ module Katello
         end
       end
 
-      def determine_subscription(product_id: nil, source_stack_id: nil, organization:)
+      def determine_subscription(organization:, product_id: nil, source_stack_id: nil)
         if source_stack_id
           self.stacking_subscription(organization, source_stack_id)
           # isn't it an error if we have a sourceStackID but no stacking subscription?

data/app/models/katello/glue/pulp/repos.rb

@@ -95,7 +95,7 @@ module Katello
           :canceled,
           :error,
           :paused,
-          :running
+          :running,
         ]
 
         presented.each do |_repoid, task|

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

@@ -1,5 +1,6 @@
 module Katello
   module Host
+    # rubocop:disable Metrics/ClassLength
     class ContentFacet < Katello::Model
       audited :associated_with => :host
       self.table_name = 'katello_content_facets'
@@ -46,6 +47,23 @@ module Katello
       validates_with Katello::Validators::GeneratedContentViewValidator
       validates_associated :content_view_environment_content_facets, :message => _("invalid: The content source must sync the lifecycle environment assigned to the host. See the logs for more information.")
       validates :host, :presence => true, :allow_blank => false
+      validates :bootc_booted_digest, :bootc_available_digest, :bootc_staged_digest, :bootc_rollback_digest,
+                format: { with: /\Asha256:[A-Fa-f0-9]{64}\z/, message: "must be a valid sha256 digest", allow_nil: true }
+
+      scope :with_environments, ->(lifecycle_environments) do
+        joins(:content_view_environment_content_facets => :content_view_environment).
+          where("#{::Katello::ContentViewEnvironment.table_name}.environment_id" => lifecycle_environments)
+      end
+
+      scope :with_content_views, ->(content_views) do
+        joins(:content_view_environment_content_facets => :content_view_environment).
+          where("#{::Katello::ContentViewEnvironment.table_name}.content_view_id" => content_views)
+      end
+
+      scope :with_content_view_environments, ->(content_view_environments) do
+        joins(:content_view_environment_content_facets => :content_view_environment).
+          where("#{::Katello::ContentViewEnvironment.table_name}.id" => content_view_environments)
+      end
 
       attr_accessor :cves_changed
 
@@ -72,6 +90,10 @@ module Katello
         self.cves_changed = false
       end
 
+      def image_mode_host?
+        bootc_booted_image.present?
+      end
+
       def cves_changed?
         cves_changed
       end
@@ -111,6 +133,10 @@ module Katello
         self.host&.update_candlepin_associations unless self.host&.new_record?
       end
 
+      def content_view_environment_labels
+        content_view_environments.map(&:label).join(',')
+      end
+
       # rubocop:disable Metrics/CyclomaticComplexity
       def assign_single_environment(
         content_view_id: nil, lifecycle_environment_id: nil, environment_id: nil,
@@ -148,10 +174,12 @@ module Katello
         prefixes = %w(/pulp/deb/ /pulp/repos/ /pulp/content/)
         relative_paths = []
 
-        # paths == ["/pulp/content/Default_Organization/Library/custom/Test_product/test2"]
+        # paths == ["/pulp/content/Default_Organization/Library/custom/Test_product/test2",
+        #           "/pulp/content/Org/Library/custom/Test_product/test2/%3Fcomp%3Dmain%26rel%3Dstable"]
         paths.each do |path|
           if (prefix = prefixes.find { |pre| path.start_with?(pre) })
-            relative_paths << path.gsub(prefix, '')
+            # strip prefix and structured_apt postfix before adding to relative_paths
+            relative_paths << path.sub(prefix, '').sub(%r{/?(%3F|\?).*}, '')
           else
             Rails.logger.warn("System #{self.host.name} (#{self.host.id}) requested binding to repo with unknown prefix. #{path}")
           end
@@ -193,7 +221,7 @@ module Katello
         installable_hash = {
           :security => installable_security_errata_count,
           :bugfix => installable_bugfix_errata_count,
-          :enhancement => installable_enhancement_errata_count
+          :enhancement => installable_enhancement_errata_count,
         }
         installable_hash[:total] = installable_hash.values.inject(:+)
         # same for applicable, but we need to get the counts from the db
@@ -201,13 +229,13 @@ module Katello
         applicable_hash = {
           :bugfix => applicable_errata_counts.values_at(*Katello::Erratum::BUGZILLA).compact.sum,
           :security => applicable_errata_counts.values_at(*Katello::Erratum::SECURITY).compact.sum,
-          :enhancement => applicable_errata_counts.values_at(*Katello::Erratum::ENHANCEMENT).compact.sum
+          :enhancement => applicable_errata_counts.values_at(*Katello::Erratum::ENHANCEMENT).compact.sum,
         }
         applicable_hash[:total] = applicable_errata_counts.values.sum
 
         # keeping installable at the top level for backward compatibility
         installable_hash.merge({
-                                 :applicable => applicable_hash
+                                 :applicable => applicable_hash,
                                })
       end
 
@@ -257,13 +285,6 @@ module Katello
         relation.where(queries.join(" OR "))
       end
 
-      def self.in_content_views_and_environments(content_views: nil, lifecycle_environments: nil)
-        relation = self.joins(:content_view_environment_content_facets => :content_view_environment)
-        relation = relation.where("#{::Katello::ContentViewEnvironment.table_name}.content_view_id" => content_views) if content_views
-        relation = relation.where("#{::Katello::ContentViewEnvironment.table_name}.environment_id" => lifecycle_environments) if lifecycle_environments
-        relation
-      end
-
       def self.with_non_installable_errata(errata, hosts = nil)
         content_facets = Katello::Host::ContentFacet.select(:id).where(:host_id => hosts)
         reachable_repos = ::Katello::ContentFacetRepository.where(content_facet_id: content_facets).distinct.pluck(:repository_id)
@@ -348,11 +369,6 @@ module Katello
         host.refresh_global_status!
       end
 
-      # TODO: uncomment when we need to display multiple CVE names in the UI
-      # def content_view_environment_names
-      #   content_view_environments.map(&:candlepin_name).join(', ')
-      # end
-
       def self.joins_installable_relation(content_model, facet_join_model)
         facet_repository = Katello::ContentFacetRepository.table_name
         content_table = content_model.table_name

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

@@ -1,12 +1,10 @@
-require 'host_info'
-
 module Katello
   module Host
     class InfoProvider < ::HostInfo::Provider
       def host_info
         info = {}
         info['parameters'] = {
-          'foreman_host_collections' => host.host_collections.map(&:name)
+          'foreman_host_collections' => host.host_collections.map(&:name),
         }
 
         if host.content_facet.present?
@@ -45,7 +43,7 @@ module Katello
           'latest-version' => content_view.try(:latest_version),
           'version' => content_version(content_view_environment).try(:version),
           'published' => content_version(content_view_environment).try(:created_at).try(:time).to_s,
-          'components' => content_view_components(content_view_environment)
+          'components' => content_view_components(content_view_environment),
         }
       end
 

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

@@ -146,7 +146,7 @@ module Katello
           :releaseVer => release_version,
           :environments => self.candlepin_environments,
           :installedProducts => self.installed_products.map(&:consumer_attributes),
-          :guestIds => virtual_guest_uuids
+          :guestIds => virtual_guest_uuids,
         }
         attrs[:facts] = facts if facts
         HashWithIndifferentAccess.new(attrs)
@@ -305,7 +305,7 @@ module Katello
         # might make you think it was converted2rhel but not with satellite, that is why I have the tenary below.
         facet = host.subscription_facet || host.build_subscription_facet
         facet.attributes = {
-          convert2rhel_through_foreman: has_convert2rhel ? ::Foreman::Cast.to_bool(parser.facts['conversions.env.CONVERT2RHEL_THROUGH_FOREMAN']) : nil
+          convert2rhel_through_foreman: has_convert2rhel ? ::Foreman::Cast.to_bool(parser.facts['conversions.env.CONVERT2RHEL_THROUGH_FOREMAN']) : nil,
         }.compact
         facet.save unless facet.new_record?
       end

data/app/models/katello/host_available_module_stream.rb

@@ -22,7 +22,7 @@ module Katello
       DISABLED => :disabled,
       UNKNOWN => :unknown,
       INSTALLED => :installed,
-      UPGRADABLE => :upgradable
+      UPGRADABLE => :upgradable,
     }.with_indifferent_access
 
     scoped_search :on => :name, :relation => :available_module_stream, :complete_value => true

data/app/models/katello/installed_product.rb

@@ -11,7 +11,7 @@ module Katello
         :arch => consumer_attributes['arch'],
         :version => consumer_attributes['version'],
         :name => consumer_attributes['productName'],
-        :cp_product_id => consumer_attributes['productId']
+        :cp_product_id => consumer_attributes['productId'],
       }
       Katello::Util::Support.active_record_retry do
         unless self.where(attributes).exists?
@@ -26,7 +26,7 @@ module Katello
         :arch => arch,
         :version => version,
         :productName => name,
-        :productId => cp_product_id
+        :productId => cp_product_id,
       }
     end
   end

data/app/models/katello/kt_environment.rb

@@ -8,8 +8,6 @@ module Katello
     include Ext::LabelFromName
 
     belongs_to :organization, :class_name => "Organization", :inverse_of => :kt_environments
-    has_many :activation_keys, :class_name => "Katello::ActivationKey",
-                               :dependent => :restrict_with_exception, :foreign_key => :environment_id
 
     has_many :env_priors, :class_name => "Katello::EnvironmentPrior", :foreign_key => :environment_id, :dependent => :destroy
     has_many :priors, :class_name => "Katello::KTEnvironment", :through => :env_priors, :source => :env_prior
@@ -30,14 +28,21 @@ module Katello
     has_many :content_view_environments, :class_name => "Katello::ContentViewEnvironment",
              :foreign_key => :environment_id, :inverse_of => :environment, :dependent => :destroy
     has_many :content_view_environment_content_facets, :through => :content_view_environments,
-                          :class_name => "Katello::ContentViewEnvironmentContentFacet",
-                          :inverse_of => :lifecycle_environment
+                          :class_name => "Katello::ContentViewEnvironmentContentFacet"
+
     has_many :content_facets, :through => :content_view_environment_content_facets,
-                          :class_name => "Katello::Host::ContentFacet",
-                          :inverse_of => :lifecycle_environments
+                          :class_name => "Katello::Host::ContentFacet"
+
     has_many :content_views, :through => :content_view_environments
     has_many :content_view_versions, :through => :content_view_environments, :inverse_of => :environments
 
+    has_many :content_view_environment_activation_keys, :through => :content_view_environments,
+                          :class_name => "Katello::ContentViewEnvironmentActivationKey",
+                          :dependent => :restrict_with_exception
+
+    has_many :activation_keys, :through => :content_view_environment_activation_keys,
+                          :class_name => "Katello::ActivationKey"
+
     has_many :hosts,      :class_name => "::Host::Managed", :through => :content_facets,
                           :inverse_of => :lifecycle_environments
     has_many :hostgroup_content_facets, :class_name => "Katello::Hostgroup::ContentFacet", :foreign_key => :lifecycle_environment_id,