[#267] Improvements

Author: danielmursa-dev

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

@@ -39,19 +39,11 @@ def clean(self):
             "code_register": cleaned_data["partij_identificator_code_register"],
         }
 
-        PartijIdentificatorTypesValidator(
-            partij_identificator=partij_identificator
-        ).validate()
-
-        queryset = PartijIdentificator.objects.exclude()
-        if self.instance:
-            queryset = queryset.exclude(pk=self.instance.pk)
+        PartijIdentificatorTypesValidator()(partij_identificator)
 
         PartijIdentificatorUniquenessValidator(
-            instance=self.instance,
-            partij_identificator=partij_identificator,
+            code_soort_object_id=partij_identificator["code_soort_object_id"],
             sub_identificator_van=cleaned_data["sub_identificator_van"],
-            partij=cleaned_data["partij"],
         )()
 
         return cleaned_data

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

@@ -46,6 +46,7 @@
     PartijIdentificatorTypesValidator,
     PartijIdentificatorUniquenessValidator,
 )
+from openklant.utils.decorators import handle_db_exceptions
 from openklant.utils.serializers import get_field_instance_by_uuid, get_field_value
 
 
@@ -371,10 +372,7 @@ class Meta:
             "code_soort_object_id": {"required": True},
             "object_id": {"required": True},
         }
-
-    def validate(self, attrs):
-        PartijIdentificatorTypesValidator(partij_identificator=attrs)()
-        return super().validate(attrs)
+        validators = []
 
 
 class PartijIdentificatorSerializer(
@@ -420,26 +418,40 @@ class Meta:
         }
 
     def validate(self, attrs):
-        instance = getattr(self, "instance", None)
         partij_identificator = get_field_value(self, attrs, "partij_identificator")
-
         sub_identificator_van = get_field_instance_by_uuid(
             self, attrs, "sub_identificator_van", PartijIdentificator
         )
-        partij = get_field_instance_by_uuid(self, attrs, "partij", Partij)
-
+        PartijIdentificatorTypesValidator()(partij_identificator)
         PartijIdentificatorUniquenessValidator(
-            instance=instance,
-            partij_identificator=partij_identificator,
+            code_soort_object_id=partij_identificator["code_soort_object_id"],
             sub_identificator_van=sub_identificator_van,
-            partij=partij,
         )()
+        return super().validate(attrs)
 
-        attrs["sub_identificator_van"] = get_field_instance_by_uuid(
-            self, attrs, "sub_identificator_van", PartijIdentificator
+    @handle_db_exceptions
+    @transaction.atomic
+    def update(self, instance, validated_data):
+        validated_data["sub_identificator_van"] = get_field_instance_by_uuid(
+            self, validated_data, "sub_identificator_van", PartijIdentificator
         )
-        attrs["partij"] = get_field_instance_by_uuid(self, attrs, "partij", Partij)
-        return super().validate(attrs)
+        validated_data["partij"] = get_field_instance_by_uuid(
+            self, validated_data, "partij", Partij
+        )
+
+        return super().update(instance, validated_data)
+
+    @handle_db_exceptions
+    @transaction.atomic
+    def create(self, validated_data):
+        validated_data["sub_identificator_van"] = get_field_instance_by_uuid(
+            self, validated_data, "sub_identificator_van", PartijIdentificator
+        )
+        validated_data["partij"] = get_field_instance_by_uuid(
+            self, validated_data, "partij", Partij
+        )
+
+        return super().create(validated_data)
 
 
 class PartijSerializer(NestedGegevensGroepMixin, PolymorphicSerializer):