Add latest changes from gitlab-org/gitlab@master

2 files changed, 45 insertions, 2 deletions

diff --git a/app/graphql/mutations/packages/bulk_destroy.rb b/app/graphql/mutations/packages/bulk_destroy.rb
new file mode 100644
index 00000000000..a0756d0c3f9
--- /dev/null
+++ b/app/graphql/mutations/packages/bulk_destroy.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Mutations
+  module Packages
+    class BulkDestroy < ::Mutations::BaseMutation
+      graphql_name 'DestroyPackages'
+
+      MAX_PACKAGES = 20
+      TOO_MANY_IDS_ERROR = "Cannot delete more than #{MAX_PACKAGES} packages"
+
+      argument :ids,
+               [::Types::GlobalIDType[::Packages::Package]],
+               required: true,
+               description: "Global IDs of the Packages. Max #{MAX_PACKAGES}"
+
+      def resolve(ids:)
+        raise_resource_not_available_error!(TOO_MANY_IDS_ERROR) if ids.size > MAX_PACKAGES
+
+        ids = GitlabSchema.parse_gids(ids, expected_type: ::Packages::Package)
+                          .map(&:model_id)
+
+        service = ::Packages::MarkPackagesForDestructionService.new(
+          packages: packages_from(ids),
+          current_user: current_user
+        )
+        result = service.execute
+
+        raise_resource_not_available_error! if result.reason == :unauthorized
+
+        errors = result.error? ? Array.wrap(result[:message]) : []
+
+        { errors: errors }
+      end
+
+      private
+
+      def packages_from(ids)
+        ::Packages::Package.displayable
+                           .id_in(ids)
+      end
+    end
+  end
+end
diff --git a/app/graphql/mutations/packages/destroy_files.rb b/app/graphql/mutations/packages/destroy_files.rb
index 3900a2c46ae..60a21be20d8 100644
--- a/app/graphql/mutations/packages/destroy_files.rb
+++ b/app/graphql/mutations/packages/destroy_files.rb
@@ -25,7 +25,7 @@ module Mutations
         project = authorized_find!(project_path)
         raise_resource_not_available_error! "Cannot delete more than #{MAXIMUM_FILES} files" if ids.size > MAXIMUM_FILES
 
-        package_files = ::Packages::PackageFile.where(id: parse_gids(ids)) # rubocop:disable CodeReuse/ActiveRecord
+        package_files = ::Packages::PackageFile.id_in(parse_gids(ids))
 
         ensure_file_access!(project, package_files)
 
@@ -47,7 +47,7 @@ module Mutations
       end
 
       def parse_gids(gids)
-        gids.map { |gid| GitlabSchema.parse_gid(gid, expected_type: ::Packages::PackageFile).model_id }
+        GitlabSchema.parse_gids(gids, expected_type: ::Packages::PackageFile).map(&:model_id)
       end
     end
   end