diff options
Diffstat (limited to 'app/models/packages/package_file.rb')
| -rw-r--r-- | app/models/packages/package_file.rb | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/app/models/packages/package_file.rb b/app/models/packages/package_file.rb index 87c9f56cc41..072ff4a3a5f 100644 --- a/app/models/packages/package_file.rb +++ b/app/models/packages/package_file.rb @@ -2,12 +2,18 @@ class Packages::PackageFile < ApplicationRecord include UpdateProjectStatistics include FileStoreMounter + include Packages::Installable + include Packages::Destructible + + INSTALLABLE_STATUSES = [:default].freeze delegate :project, :project_id, to: :package delegate :conan_file_type, to: :conan_file_metadatum delegate :file_type, :dsc?, :component, :architecture, :fields, to: :debian_file_metadatum, prefix: :debian delegate :channel, :metadata, to: :helm_file_metadatum, prefix: :helm + enum status: { default: 0, pending_destruction: 1, processing: 2, error: 3 } + belongs_to :package # used to move the linked file within object storage @@ -48,9 +54,12 @@ class Packages::PackageFile < ApplicationRecord end scope :for_helm_with_channel, ->(project, channel) do - joins(:package).merge(project.packages.helm.installable) - .joins(:helm_file_metadatum) - .where(packages_helm_file_metadata: { channel: channel }) + result = joins(:package) + .merge(project.packages.helm.installable) + .joins(:helm_file_metadatum) + .where(packages_helm_file_metadata: { channel: channel }) + result = result.installable if Feature.enabled?(:packages_installable_package_files, default_enabled: :yaml) + result end scope :with_conan_file_type, ->(file_type) do @@ -94,14 +103,19 @@ class Packages::PackageFile < ApplicationRecord skip_callback :commit, :after, :remove_previously_stored_file, if: :execute_move_in_object_storage? after_commit :move_in_object_storage, if: :execute_move_in_object_storage? - # Returns the most recent package files for *each* of the given packages. + # Returns the most recent installable package file for *each* of the given packages. # The order is not guaranteed. def self.most_recent_for(packages, extra_join: nil, extra_where: nil) cte_name = :packages_cte cte = Gitlab::SQL::CTE.new(cte_name, packages.select(:id)) - package_files = ::Packages::PackageFile.limit_recent(1) - .where(arel_table[:package_id].eq(Arel.sql("#{cte_name}.id"))) + package_files = if Feature.enabled?(:packages_installable_package_files, default_enabled: :yaml) + ::Packages::PackageFile.installable.limit_recent(1) + .where(arel_table[:package_id].eq(Arel.sql("#{cte_name}.id"))) + else + ::Packages::PackageFile.limit_recent(1) + .where(arel_table[:package_id].eq(Arel.sql("#{cte_name}.id"))) + end package_files = package_files.joins(extra_join) if extra_join package_files = package_files.where(extra_where) if extra_where |