Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 10 insertions, 7 deletions

diff --git a/app/services/packages/pypi/create_package_service.rb b/app/services/packages/pypi/create_package_service.rb
index 1313fc80e33..c49efca0fc5 100644
--- a/app/services/packages/pypi/create_package_service.rb
+++ b/app/services/packages/pypi/create_package_service.rb
@@ -2,16 +2,22 @@
 
 module Packages
   module Pypi
-    class CreatePackageService < BaseService
+    class CreatePackageService < ::Packages::CreatePackageService
       include ::Gitlab::Utils::StrongMemoize
 
       def execute
         ::Packages::Package.transaction do
-          Packages::Pypi::Metadatum.upsert(
-            package_id: created_package.id,
+          meta = Packages::Pypi::Metadatum.new(
+            package: created_package,
             required_python: params[:requires_python]
           )
 
+          unless meta.valid?
+            raise ActiveRecord::RecordInvalid.new(meta)
+          end
+
+          Packages::Pypi::Metadatum.upsert(meta.attributes)
+
           ::Packages::CreatePackageFileService.new(created_package, file_params).execute
         end
       end
@@ -20,10 +26,7 @@ module Packages
 
       def created_package
         strong_memoize(:created_package) do
-          project
-            .packages
-            .pypi
-            .safe_find_or_create_by!(name: params[:name], version: params[:version])
+          find_or_create_package!(:pypi)
         end
       end