Taught advisory-upload to handle advisory-conflicts better.

CHANGES/7282.bugfix

@@ -0,0 +1 @@
+Fixed advisory upload-and-merge of already-existing advisories.

pulp_rpm/app/advisory.py

@@ -268,12 +268,24 @@ def merge_advisories(previous_advisory, added_advisory):
         # First thing to do is ensure collection-name-uniqueness
         # in the newly-merged advisory.
 
+        # If we've seen a collection-name already, create a new name
+        # by appending "_<suffix>" and rename the collection before
+        # merging.
+        # NOTE: keeping the collections separate is DELIBERATE:
+        # 1) after the fact, it's clear that an advisory merge happened, and that one set of
+        #    packages comes from one place, one from a different one
+        # 2) package-grouping can be *relevant* (e.g. base-rpms vs debuginfo-rpms)
+        # 3) package-grouping can be *required* (e.g., module-collections must be kept separate)
+
         # dictionary of collection-name:first-unused-suffix pairs
-        names_seen = {}
+        # if a collection has no name, we assign it the name "collection" and uniquify-it from there
+        names_seen = {"collection": 0}
         for collection in chain(previous_collections, added_collections):
-            # If we've seen a collection-name already, create a new name
-            # by appending "_<suffix>" and rename the collection before
-            # merging
+
+            # no-name? When merging, ILLEGAL! Give it a name
+            if not collection.name:
+                collection.name = "collection"
+
             if collection.name in names_seen.keys():
                 orig_name = collection.name
                 new_name = f"{orig_name}_{names_seen[orig_name]}"

pulp_rpm/app/serializers/advisory.py

@@ -119,6 +119,10 @@ def create(self, validated_data):
         """
         references = validated_data.pop("references", [])
         pkglist = validated_data.pop("pkglist", [])
+
+        # detach any specified repository; attach once the advisory exists
+        repository = validated_data.pop("repository", None)
+
         update_collection_packages_to_save = list()
         update_references_to_save = list()
         try:
@@ -168,6 +172,13 @@ def create(self, validated_data):
         update_record.digest = hash_update_record(cr_update_record)
         update_record.save()
 
+        # create new repo version with uploaded advisory
+        if repository:
+            repository.cast()
+            content_to_add = self.Meta.model.objects.filter(pk=update_record.pk)
+            with repository.new_version() as new_version:
+                new_version.add_content(content_to_add)
+
         return update_record
 
     def validate(self, data):