Merge branch...

Merge branch '208678-packages-project-and-group-api-will-return-processing-nuget-packages' into 'master'

Prevent NuGet processing packages being returned by the API

See merge request gitlab-org/gitlab!26270

changelogs/unreleased/208678-packages-project-and-group-api-will-return-processing-nuget-packag.yml

+---
+title: Fixed bug where processing NuGet packages are returned from the Packages API
+merge_request: 26270
+author:
+type: fixed

ee/app/finders/packages/group_packages_finder.rb

@@ -21,6 +21,7 @@ module Packages
     def packages_for_group_projects
       packages = ::Packages::Package
         .for_projects(group_projects_visible_to_current_user)
+        .processed
         .sort_by_attribute("#{params[:order_by]}_#{params[:sort]}")
 
       return packages unless package_type

ee/app/finders/packages/package_finder.rb

@@ -7,7 +7,10 @@ module Packages
     end
 
     def execute
-      @project.packages.find(@package_id)
+      @project
+        .packages
+        .processed
+        .find(@package_id)
     end
   end
 end

ee/app/finders/packages/packages_finder.rb

@@ -13,7 +13,7 @@ module Packages
     end
 
     def execute
-      packages = project.packages
+      packages = project.packages.processed
       packages = filter_by_package_type(packages)
       packages = filter_by_package_name(packages)
       packages = order_packages(packages)

ee/spec/finders/packages/group_packages_finder_spec.rb

@@ -46,6 +46,12 @@ describe Packages::GroupPackagesFinder do
           it { is_expected.to match_array([package1, package2]) }
         end
       end
+
+      context 'when there are processing packages' do
+        let!(:package4) { create(:nuget_package, project: project, name: Packages::Nuget::CreatePackageService::TEMPORARY_PACKAGE_NAME) }
+
+        it { is_expected.to match_array([package1, package2]) }
+      end
     end
 
     context 'group has package of all types' do

ee/spec/finders/packages/package_finder_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ::Packages::PackageFinder do
+  let_it_be(:project) { create(:project) }
+  let_it_be(:maven_package) { create(:maven_package, project: project) }
+
+  describe '#execute' do
+    let(:package_id) { maven_package.id }
+
+    subject { described_class.new(project, package_id).execute }
+
+    it { is_expected.to eq(maven_package) }
+
+    context 'processing packages' do
+      let_it_be(:nuget_package) { create(:nuget_package, project: project, name: Packages::Nuget::CreatePackageService::TEMPORARY_PACKAGE_NAME) }
+      let(:package_id) { nuget_package.id }
+
+      it 'are not returned' do
+        expect { subject }.to raise_exception(ActiveRecord::RecordNotFound)
+      end
+    end
+  end
+end

ee/spec/finders/packages/packages_finder_spec.rb

@@ -74,5 +74,11 @@ describe ::Packages::PackagesFinder do
     context 'with nil params' do
       it { is_expected.to match_array([conan_package, maven_package]) }
     end
+
+    context 'with processing packages' do
+      let_it_be(:nuget_package) { create(:nuget_package, project: project, name: Packages::Nuget::CreatePackageService::TEMPORARY_PACKAGE_NAME) }
+
+      it { is_expected.to match_array([conan_package, maven_package]) }
+    end
   end
 end