1 files changed, 12 insertions, 6 deletions
diff --git a/app/services/packages/maven/find_or_create_package_service.rb b/app/services/packages/maven/find_or_create_package_service.rb
index 8ee449cbfdc..6e0346058e8 100644
--- a/app/services/packages/maven/find_or_create_package_service.rb
+++ b/app/services/packages/maven/find_or_create_package_service.rb
@@ -11,12 +11,7 @@ module Packages
                                           .execute
 
         unless Namespace::PackageSetting.duplicates_allowed?(package)
-          files = package&.package_files || []
-          current_maven_files = files.map { |file| extname(file.file_name) }
-
-          if current_maven_files.compact.include?(extname(params[:file_name]))
-            return ServiceResponse.error(message: 'Duplicate package is not allowed')
-          end
+          return ServiceResponse.error(message: 'Duplicate package is not allowed') if target_package_is_duplicate?(package)
         end
 
         unless package
@@ -67,6 +62,17 @@ module Packages
 
         File.extname(filename)
       end
+
+      def target_package_is_duplicate?(package)
+        # duplicate metadata files can be uploaded multiple times
+        return false if package.version.nil?
+
+        package
+          .package_files
+          .map { |file| extname(file.file_name) }
+          .compact
+          .include?(extname(params[:file_name]))
+      end
     end
   end
 end