♻️ [#593] refactor logic

Author: TimdeBeer1

src/openklant/components/klantinteracties/admin/partijen.py

@@ -1,5 +1,6 @@
 from django import forms
 from django.contrib import admin
+from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
 from openklant.components.klantinteracties.models.rekeningnummers import Rekeningnummer
@@ -89,6 +90,17 @@ class Meta:
 
     def clean(self):
         cleaned_data = super().clean()
+
+        values = [
+            cleaned_data.get("partij_identificator_code_objecttype"),
+            cleaned_data.get("partij_identificator_code_soort_object_id"),
+            cleaned_data.get("partij_identificator_object_id"),
+            cleaned_data.get("partij_identificator_code_register"),
+        ]
+
+        if not all(values):
+            raise ValidationError("PartijIdentificator moet volledig gevuld zijn.")
+
         PartijIdentificatorTypesValidator()(
             code_register=cleaned_data["partij_identificator_code_register"],
             code_objecttype=cleaned_data["partij_identificator_code_objecttype"],
@@ -307,6 +319,8 @@ class CategorieAdmin(admin.ModelAdmin):
 
 @admin.register(PartijIdentificator)
 class PartijIdentificatorAdmin(admin.ModelAdmin):
+    form = PartijIdentificatorAdminForm
+
     readonly_fields = ("uuid",)
     search_fields = (
         "uuid",

src/openklant/components/klantinteracties/api/serializers/partijen.py

@@ -386,21 +386,6 @@ class Meta:
         }
         validators = []
 
-    def validate(self, attrs):
-        values = [
-            attrs.get("code_objecttype"),
-            attrs.get("code_soort_object_id"),
-            attrs.get("object_id"),
-            attrs.get("code_register"),
-        ]
-
-        if not all(values):
-            raise serializers.ValidationError(
-                "PartijIdentificator mag geen lege waarden bevatten."
-            )
-
-        return attrs
-
 
 @extend_schema_serializer(deprecate_fields=["andere_partij_identificator"])
 class PartijIdentificatorSerializer(

src/openklant/components/klantinteracties/models/partijen.py

@@ -379,12 +379,6 @@ class PartijIdentificator(models.Model):
             "object_id": partij_identificator_object_id,
             "code_register": partij_identificator_code_register,
         },
-        optional=(
-            "code_objecttype",
-            "code_soort_object_id",
-            "object_id",
-            "code_register",
-        ),
     )
 
     class Meta: