Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/239 add partij identificatoren on partij creation #321

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Feature/239 add partij identificatoren on partij creation #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cde9054
[#239] Fix createPartij endpoint
danielmursa-dev Jan 21, 2025
a7f4a61
[#239] Add required=False
danielmursa-dev Jan 21, 2025
80e0138
[#239] Fix updatePartij
danielmursa-dev Jan 22, 2025
8f46653
[#239] Formatting
danielmursa-dev Jan 22, 2025
14f0ae5
[#239] Fix case create without partij
danielmursa-dev Jan 22, 2025
9ca5e79
[#239] bin/generate_schema_for_component.sh
danielmursa-dev Jan 22, 2025
e64b901
[#239] Fix test empty_list for partijidentificatoren
danielmursa-dev Jan 22, 2025
7c30177
[#239] Fix test naming
danielmursa-dev Jan 23, 2025
91edb96
[#239] Add uuid as an allowed parameter
danielmursa-dev Jan 24, 2025
8d4b20f
[#239] Fix updatePartij and create tests
danielmursa-dev Jan 24, 2025
a28f3d2
[#239] Update schema
danielmursa-dev Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 79 additions & 17 deletions src/openklant/components/klantinteracties/api/serializers/partijen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,13 +370,13 @@ class PartijIdentificatorSerializer(
NestedGegevensGroepMixin, serializers.HyperlinkedModelSerializer
):
identificeerde_partij = PartijForeignKeySerializer(
required=True,
required=False,
allow_null=True,
help_text=_("Partij-identificator die hoorde bij een partij."),
source="partij",
)
partij_identificator = PartijIdentificatorGroepTypeSerializer(
required=True,
required=False,
allow_null=True,
help_text=_(
"Gegevens die een partij in een basisregistratie "
Expand All @@ -395,23 +395,25 @@ class Meta:
)

extra_kwargs = {
"uuid": {"read_only": True},
"uuid": {"required": False, "validators": [partij_identificator_exists]},
"url": {
"view_name": "klantinteracties:partijidentificator-detail",
"lookup_field": "uuid",
"help_text": "De unieke URL van deze partij indentificator binnen deze API.",
},
}

def validate(self, attrs):
partij_identificator = get_field_value(self, attrs, "partij_identificator")
PartijIdentificatorValidator(
code_register=partij_identificator["code_register"],
code_objecttype=partij_identificator["code_objecttype"],
code_soort_object_id=partij_identificator["code_soort_object_id"],
object_id=partij_identificator["object_id"],
).validate()
return super().validate(attrs)
def validate_partij_identificator(self, value):
if value:
PartijIdentificatorValidator(
code_register=get_field_value(self, value, "code_register"),
code_objecttype=get_field_value(self, value, "code_objecttype"),
code_soort_object_id=get_field_value(
self, value, "code_soort_object_id"
),
object_id=get_field_value(self, value, "object_id"),
).validate()
return value

@transaction.atomic
def update(self, instance, validated_data):
Expand All @@ -425,9 +427,14 @@ def update(self, instance, validated_data):

@transaction.atomic
def create(self, validated_data):
partij_uuid = str(validated_data.pop("partij").get("uuid"))
validated_data["partij"] = Partij.objects.get(uuid=partij_uuid)
partij = validated_data.pop("partij", None)
if not partij:
raise serializers.ValidationError(
{"identificeerde_partij": _("Dit veld is vereist.")},
code="required",
)

validated_data["partij"] = Partij.objects.get(uuid=str(partij.get("uuid")))
return super().create(validated_data)


Expand Down Expand Up @@ -492,9 +499,10 @@ class PartijSerializer(NestedGegevensGroepMixin, PolymorphicSerializer):
vertegenwoordigden = serializers.SerializerMethodField(
help_text=_("Partijen die een andere partijen vertegenwoordigden."),
)
partij_identificatoren = PartijIdentificatorForeignkeySerializer(
read_only=True,
partij_identificatoren = PartijIdentificatorSerializer(
many=True,
required=False,
allow_null=True,
source="partijidentificator_set",
help_text=_("Partij-identificatoren die hoorde bij deze partij."),
)
Expand Down Expand Up @@ -567,11 +575,27 @@ def get_vertegenwoordigden(self, obj):
if vertegenwoordigende
]

def validate_partij_identificatoren(self, value):
if not value:
return value

for identificator in value:
if {"uuid", "partij_identificator"} <= identificator.keys():
raise serializers.ValidationError(
{
"partij_identificatoren": _(
"Slechts één van deze twee sleutels `uuid` of `partij_identificator` is toegestaan."
)
}
)
return value

@transaction.atomic
def update(self, instance, validated_data):

method = self.context.get("request").method
partij_identificatie = validated_data.pop("partij_identificatie", None)

partij_identificatoren = validated_data.pop("partijidentificator_set", None)
if "digitaaladres_set" in validated_data:
existing_digitale_adressen = instance.digitaaladres_set.all()
digitaal_adres_uuids = [
Expand Down Expand Up @@ -717,6 +741,25 @@ def update(self, instance, validated_data):

partij = super().update(instance, validated_data)

if partij_identificatoren is not None:
danielmursa-dev marked this conversation as resolved.
Show resolved Hide resolved
partij.partijidentificator_set.all().delete()
for partij_identificator in partij_identificatoren:
partij_identificator["identificeerde_partij"] = {
"uuid": str(partij.uuid)
}
partij_identificator_serializer = PartijIdentificatorSerializer(
data=partij_identificator
)
partij_identificator_serializer.is_valid(raise_exception=True)
if "uuid" in partij_identificator:
PartijIdentificator.objects.filter(
uuid=partij_identificator["uuid"]
).update(partij=partij)
else:
partij_identificator_serializer.create(
partij_identificator_serializer.validated_data
)

if partij_identificatie:
serializer_class = self.discriminator.mapping[
validated_data.get("soort_partij")
Expand All @@ -737,6 +780,7 @@ def create(self, validated_data):
partij_identificatie = validated_data.pop("partij_identificatie", None)
digitale_adressen = validated_data.pop("digitaaladres_set")
rekeningnummers = validated_data.pop("rekeningnummer_set")
partij_identificatoren = validated_data.pop("partijidentificator_set", None)

if voorkeurs_digitaal_adres := validated_data.pop(
"voorkeurs_digitaal_adres", None
Expand Down Expand Up @@ -814,6 +858,24 @@ def create(self, validated_data):
rekeningnummer.partij = partij
rekeningnummer.save()

if partij_identificatoren is not None:
for partij_identificator in partij_identificatoren:
partij_identificator["identificeerde_partij"] = {
"uuid": str(partij.uuid)
}
partij_identificator_serializer = PartijIdentificatorSerializer(
data=partij_identificator
)
partij_identificator_serializer.is_valid(raise_exception=True)
if "uuid" in partij_identificator:
PartijIdentificator.objects.filter(
uuid=partij_identificator["uuid"]
).update(partij=partij)
else:
partij_identificator_serializer.create(
partij_identificator_serializer.validated_data
)

return partij


Expand Down
Loading
Loading