Merge branch 'mo-refactor-artifactable' into 'master'

Refactor artifactable concern [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!57409

app/models/ci/job_artifact.rb

@@ -131,8 +131,6 @@ module Ci
     update_project_statistics project_statistics_name: :build_artifacts_size
 
     scope :not_expired, -> { where('expire_at IS NULL OR expire_at > ?', Time.current) }
-    scope :with_files_stored_locally, -> { where(file_store: ::JobArtifactUploader::Store::LOCAL) }
-    scope :with_files_stored_remotely, -> { where(file_store: ::JobArtifactUploader::Store::REMOTE) }
     scope :for_sha, ->(sha, project_id) { joins(job: :pipeline).where(ci_pipelines: { sha: sha, project_id: project_id }) }
     scope :for_job_name, ->(name) { joins(:job).where(ci_builds: { name: name }) }
 

app/models/concerns/ci/artifactable.rb

@@ -4,8 +4,10 @@ module Ci
   module Artifactable
     extend ActiveSupport::Concern
 
-    NotSupportedAdapterError = Class.new(StandardError)
+    include ObjectStorable
 
+    STORE_COLUMN = :file_store
+    NotSupportedAdapterError = Class.new(StandardError)
     FILE_FORMAT_ADAPTERS = {
       gzip: Gitlab::Ci::Build::Artifacts::Adapters::GzipStream,
       raw: Gitlab::Ci::Build::Artifacts::Adapters::RawStream
@@ -20,6 +22,7 @@ module Ci
 
       scope :expired_before, -> (timestamp) { where(arel_table[:expire_at].lt(timestamp)) }
       scope :expired, -> (limit) { expired_before(Time.current).limit(limit) }
+      scope :project_id_in, ->(ids) { where(project_id: ids) }
     end
 
     def each_blob(&blk)

ee/app/models/ee/ci/job_artifact.rb

@@ -23,9 +23,6 @@ module EE
       API_FUZZING_REPORT_TYPES = %w[api_fuzzing].freeze
       BROWSER_PERFORMANCE_REPORT_FILE_TYPES = %w[browser_performance performance].freeze
 
-      scope :project_id_in, ->(ids) { where(project_id: ids) }
-      scope :with_files_stored_remotely, -> { where(file_store: ::JobArtifactUploader::Store::REMOTE) }
-
       scope :security_reports, -> (file_types: SECURITY_REPORT_FILE_TYPES) do
         requested_file_types = *file_types
 

spec/models/concerns/ci/artifactable_spec.rb

@@ -72,5 +72,33 @@ RSpec.describe Ci::Artifactable do
         expect(Ci::JobArtifact.expired(1).order_id_asc).to eq([recently_expired_artifact])
       end
     end
+
+    describe '.with_files_stored_locally' do
+      it 'returns artifacts stored locally' do
+        expect(Ci::JobArtifact.with_files_stored_locally).to contain_exactly(recently_expired_artifact, later_expired_artifact, not_expired_artifact)
+      end
+    end
+
+    describe '.with_files_stored_remotely' do
+      let(:remote_artifact) { create(:ci_job_artifact, :remote_store) }
+
+      before do
+        stub_artifacts_object_storage
+      end
+
+      it 'returns artifacts stored remotely' do
+        expect(Ci::JobArtifact.with_files_stored_remotely).to contain_exactly(remote_artifact)
+      end
+    end
+
+    describe '.project_id_in' do
+      context 'when artifacts belongs to projects' do
+        let(:project_ids) { [recently_expired_artifact.project.id, not_expired_artifact.project.id, non_existing_record_id] }
+
+        it 'returns artifacts belonging to projects' do
+          expect(Ci::JobArtifact.project_id_in(project_ids)).to contain_exactly(recently_expired_artifact, not_expired_artifact)
+        end
+      end
+    end
   end
 end