Extend the call repository content modify to include DEB release components

This commit extends the repository content modify call to additional components such
as package_release_components release_components and release_architectures, with the final
goal of enabling batch uploading of DEB packages. This is done by:

1. Adding AptRepositoryAddRemoveContentSerializer for extending the parameters
allowed in the repository content modify call to:
- add_release_components
- add_release_architectures
- add_package_release_components
- remove_release_components
- remove_release_architectures
- remove_package_release_components

2. Updating the viewset AptModifyRepositoryActionMixin to include also package_release_components,
release_components and release_architectures as they also extend from Content.

Author: romeroalx

CHANGES/1398.feature

@@ -0,0 +1 @@
+Allow adding/removing package_release_components, release_components and release_architectures via the repository content modify API endpoint

pulp_deb/app/serializers/__init__.py

@@ -31,6 +31,7 @@
     AptRepositorySerializer,
     AptRepositorySyncURLSerializer,
     CopySerializer,
+    AptRepositoryAddRemoveContentSerializer,
 )
 
 from .acs_serializers import AptAlternateContentSourceSerializer

pulp_deb/app/serializers/repository_serializers.py

@@ -1,19 +1,27 @@
 from gettext import gettext as _
 from django.conf import settings
 from django.db import transaction
-from pulpcore.plugin.models import SigningService
+from pulpcore.plugin.models import (
+    SigningService,
+    RepositoryVersion,
+)
 from pulpcore.plugin.serializers import (
     RelatedField,
     RepositorySerializer,
     RepositorySyncURLSerializer,
     ValidateFieldsMixin,
+    RepositoryAddRemoveContentSerializer,
 )
 from pulpcore.plugin.util import get_url, get_domain
+from pulpcore.app.util import extract_pk, raise_for_unknown_content_units
 
 from pulp_deb.app.models import (
     AptRepositoryReleaseServiceOverride,
     AptReleaseSigningService,
     AptRepository,
+    ReleaseComponent,
+    ReleaseArchitecture,
+    PackageReleaseComponent,
 )
 
 from jsonschema import Draft7Validator
@@ -233,3 +241,96 @@ def check_cross_domain_config(cfg):
                 check_cross_domain_config(data["config"])
 
         return data
+
+
+class AptRepositoryAddRemoveContentSerializer(RepositoryAddRemoveContentSerializer):
+    """
+    Extends RepositoryAddRemoveContentSerializer to support adding/removing
+    - ReleaseComponents
+    - ReleaseArchitectures
+    - PackageReleaseComponents
+    """
+
+    add_release_components = serializers.ListField(
+        help_text=_("A list of ReleaseComponents to associate with a repository."),
+        child=serializers.CharField(error_messages={"invalid": "Not a valid URI of a resource."}),
+        required=False,
+    )
+
+    remove_release_components = serializers.ListField(
+        help_text=_("A list of ReleaseComponents to disassociate with a repository."),
+        child=serializers.CharField(error_messages={"invalid": "Not a valid URI of a resource."}),
+        required=False,
+    )
+
+    add_release_architectures = serializers.ListField(
+        help_text=_("A list of ReleaseArchitectures to associate with a repository."),
+        child=serializers.CharField(error_messages={"invalid": "Not a valid URI of a resource."}),
+        required=False,
+    )
+
+    remove_release_architectures = serializers.ListField(
+        help_text=_("A list of ReleaseArchitectures to disassociate with a repository."),
+        child=serializers.CharField(error_messages={"invalid": "Not a valid URI of a resource."}),
+        required=False,
+    )
+
+    add_package_release_components = serializers.ListField(
+        help_text=_("A list of PackageReleaseComponents to associate with a repository."),
+        child=serializers.CharField(error_messages={"invalid": "Not a valid URI of a resource."}),
+        required=False,
+    )
+
+    remove_package_release_components = serializers.ListField(
+        help_text=_("A list of PackageReleaseComponents to disassociate with a repository."),
+        child=serializers.CharField(error_messages={"invalid": "Not a valid URI of a resource."}),
+        required=False,
+    )
+
+    def validate_add_release_components(self, value):
+        return self._validate_content_hrefs(value, ReleaseComponent)
+
+    def validate_remove_release_components(self, value):
+        return self._validate_content_hrefs(value, ReleaseComponent)
+
+    def validate_add_release_architectures(self, value):
+        return self._validate_content_hrefs(value, ReleaseArchitecture)
+
+    def validate_remove_release_architectures(self, value):
+        return self._validate_content_hrefs(value, ReleaseArchitecture)
+
+    def validate_add_package_release_components(self, value):
+        return self._validate_content_hrefs(value, PackageReleaseComponent)
+
+    def validate_remove_package_release_components(self, value):
+        return self._validate_content_hrefs(value, PackageReleaseComponent)
+
+    def _validate_content_hrefs(self, value, model_class):
+        """
+        Validates that the requested Content exists.
+        Similar to the validation done in "pulpcore/app/serializers/repository.py"
+        for adding/removing content units
+        """
+        content_units = {}
+
+        for url in value:
+            content_units[extract_pk(url)] = url
+
+        content_units_pks = set(content_units.keys())
+        existing_content_units = model_class.objects.filter(pk__in=content_units_pks)
+        existing_content_units.touch()
+
+        raise_for_unknown_content_units(existing_content_units, content_units)
+
+        return list(content_units.keys())
+
+    class Meta:
+        model = RepositoryVersion
+        fields = RepositoryAddRemoveContentSerializer.Meta.fields + [
+            "add_release_components",
+            "remove_release_components",
+            "add_release_architectures",
+            "remove_release_architectures",
+            "add_package_release_components",
+            "remove_package_release_components",
+        ]

pulp_deb/app/viewsets/repository.py

@@ -7,13 +7,14 @@
 
 from pulp_deb.app.models.content.content import Package
 from pulp_deb.app.models.content.structure_content import PackageReleaseComponent
-from pulp_deb.app.serializers import AptRepositorySyncURLSerializer
-
+from pulp_deb.app.serializers import (
+    AptRepositorySyncURLSerializer,
+    AptRepositoryAddRemoveContentSerializer,
+)
 from pulpcore.plugin.util import extract_pk, get_url
 from pulpcore.plugin.actions import ModifyRepositoryActionMixin
 from pulpcore.plugin.serializers import (
     AsyncOperationResponseSerializer,
-    RepositoryAddRemoveContentSerializer,
 )
 from pulpcore.plugin.models import RepositoryVersion
 from pulpcore.plugin.tasking import dispatch
@@ -34,15 +35,30 @@ class AptModifyRepositoryActionMixin(ModifyRepositoryActionMixin):
         summary="Modify Repository Content",
         responses={202: AsyncOperationResponseSerializer},
     )
-    @action(detail=True, methods=["post"], serializer_class=RepositoryAddRemoveContentSerializer)
+    @action(detail=True, methods=["post"], serializer_class=AptRepositoryAddRemoveContentSerializer)
     def modify(self, request, pk):
-        remove_content_units = request.data.get("remove_content_units", [])
+        data = request.data
+        remove_content_units = data.get("remove_content_units", [])
         package_hrefs = [href for href in remove_content_units if "/packages/" in href]
 
         if package_hrefs:
             prc_hrefs = self._get_matching_prc_hrefs(package_hrefs)
             remove_content_units.extend(prc_hrefs)
-            request.data["remove_content_units"] = remove_content_units
+
+        # Merge also add/remove RC, RA and PRCs into add/remove content units
+        data["add_content_units"] = (
+            data.get("add_content_units", [])
+            + data.get("add_release_components", [])
+            + data.get("add_release_architectures", [])
+            + data.get("add_package_release_components", [])
+        )
+
+        data["remove_content_units"] = (
+            remove_content_units
+            + data.get("remove_release_components", [])
+            + data.get("remove_release_architectures", [])
+            + data.get("remove_package_release_components", [])
+        )
 
         return super().modify(request, pk)