Use has_expiring_archive_artifacts in BuildArtifactEntity

Move has_expiring_artifacts to be private.

app/models/ci/build.rb

@@ -717,10 +717,6 @@ module Ci
         end
     end
 
-    def has_expiring_artifacts?
-      artifacts_expire_at.present? && artifacts_expire_at > Time.now
-    end
-
     def has_expiring_archive_artifacts?
       has_expiring_artifacts? && artifacts_file&.exists?
     end
@@ -929,6 +925,10 @@ module Ci
         value.with_indifferent_access
       end
     end
+
+    def has_expiring_artifacts?
+      artifacts_expire_at.present? && artifacts_expire_at > Time.now
+    end
   end
 end
 

app/serializers/build_artifact_entity.rb

@@ -14,7 +14,7 @@ class BuildArtifactEntity < Grape::Entity
     download_project_job_artifacts_path(project, job)
   end
 
-  expose :keep_path, if: -> (*) { job.has_expiring_artifacts? } do |job|
+  expose :keep_path, if: -> (*) { job.has_expiring_archive_artifacts? } do |job|
     keep_project_job_artifacts_path(project, job)
   end
 

spec/models/ci/build_spec.rb

@@ -2224,28 +2224,6 @@ describe Ci::Build do
     end
   end
 
-  describe '#has_expiring_artifacts?' do
-    context 'when artifacts have expiration date set' do
-      before do
-        build.update(artifacts_expire_at: 1.day.from_now)
-      end
-
-      it 'has expiring artifacts' do
-        expect(build).to have_expiring_artifacts
-      end
-    end
-
-    context 'when artifacts do not have expiration date set' do
-      before do
-        build.update(artifacts_expire_at: nil)
-      end
-
-      it 'does not have expiring artifacts' do
-        expect(build).not_to have_expiring_artifacts
-      end
-    end
-  end
-
   describe '#has_expiring_archive_artifacts?' do
     context 'when artifacts have expiration date set' do
       before do

spec/serializers/build_artifact_entity_spec.rb

@@ -4,6 +4,8 @@ require 'spec_helper'
 
 describe BuildArtifactEntity do
   let(:job) { create(:ci_build, name: 'test:job', artifacts_expire_at: 1.hour.from_now) }
+  let!(:archive) { create(:ci_job_artifact, :archive, job: job) }
+  let!(:metadata) { create(:ci_job_artifact, :metadata, job: job) }
 
   let(:entity) do
     described_class.new(job, request: double)