♻️ [#427] Refactor choices to make them consistent

Author: SilviaAmAm

backend/src/openarchiefbeheer/zaken/api/serializers.py

@@ -61,35 +61,12 @@ class Meta:
 class ChoiceSerializer(serializers.Serializer):
     label = serializers.CharField(help_text=_("The description field of the choice."))
     value = serializers.CharField(help_text=_("The URL of the choice."))
-    extra = serializers.CharField(
+    extra_data = serializers.JSONField(
         help_text=_("Any extra information about this choice."),
         required=False,
     )
 
 
-class ZaaktypeChoiceSerializer(serializers.Serializer):
-    label = serializers.CharField(help_text=_("The description field of the zaaktype."))
-    value = serializers.CharField(help_text=_("The URL field of the zaaktype."))
-    extra = serializers.CharField(
-        help_text=_(
-            "A combination of the identification and the date on which "
-            "the zaaktype will no longer be valid (if present)."
-        ),
-        required=False,
-    )
-
-
-class SelectielijstklasseChoicesSerializer(serializers.Serializer):
-    label = serializers.CharField(
-        help_text=_(
-            "The description field of the resultaat from the selectielijst API."
-        )
-    )
-    value = serializers.CharField(
-        help_text=_("The URL field of the resultaat from the selectielijst API.")
-    )
-
-
 class SelectielijstklasseChoicesQueryParamSerializer(serializers.Serializer):
     zaak = serializers.URLField(
         required=False,

backend/src/openarchiefbeheer/zaken/api/views.py

@@ -25,8 +25,6 @@
 from .serializers import (
     ChoiceSerializer,
     SelectielijstklasseChoicesQueryParamSerializer,
-    SelectielijstklasseChoicesSerializer,
-    ZaaktypeChoiceSerializer,
 )
 
 
@@ -63,7 +61,7 @@ def get_queryset(self):
         ),
         tags=["private"],
         responses={
-            200: ZaaktypeChoiceSerializer(many=True),
+            200: ChoiceSerializer(many=True),
         },
     )
     @method_decorator(cache_page(60 * 15))
@@ -78,7 +76,7 @@ def get(self, request, *args, **kwargs):
         )
         zaaktypen_choices = format_zaaktype_choices(zaaktypen)
 
-        serializer = ZaaktypeChoiceSerializer(data=zaaktypen_choices, many=True)
+        serializer = ChoiceSerializer(data=zaaktypen_choices, many=True)
         serializer.is_valid(raise_exception=True)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
@@ -93,7 +91,7 @@ class SelectielijstklasseChoicesView(APIView):
         ),
         tags=["private"],
         responses={
-            200: SelectielijstklasseChoicesSerializer,
+            200: ChoiceSerializer(many=True),
         },
         parameters=[SelectielijstklasseChoicesQueryParamSerializer],
     )

backend/src/openarchiefbeheer/zaken/types.py

@@ -6,4 +6,4 @@
 class DropDownChoice:
     label: str
     value: str
-    extra_data: Optional[int] = None
+    extra_data: Optional[dict] = None

backend/src/openarchiefbeheer/zaken/utils.py

@@ -120,7 +120,7 @@ def format_selectielijstklasse_choice(resultaat: Resultaat) -> DropDownChoice:
     return {
         "label": description,
         "value": resultaat["url"],
-        "detail": {
+        "extra_data": {
             "bewaartermijn": resultaat.get("bewaartermijn"),
         },
     }