Implement mapping validation and serializer

app/admin.py

@@ -7,11 +7,18 @@
 class AddressAdmin(admin.ModelAdmin):
     list_display = ("id", "__str__")
     list_display_links = ("id", "__str__")
-    search_fields = ("city", "country", "street", "zip_code")
+    search_fields = ("id", "city", "country", "street", "zip_code")
+
+
+@admin.register(models.Municipality)
+class MunicipalityAdmin(admin.ModelAdmin):
+    list_display = ("id", "__str__")
+    list_display_links = ("id", "__str__")
+    search_fields = ("id", "title")
 
 
 @admin.register(models.Person)
 class PersonAdmin(admin.ModelAdmin):
     list_display = ("id", "__str__", "email")
     list_display_links = ("id", "__str__")
-    search_fields = ("email", "firstname", "lastname")
+    search_fields = ("id", "email", "firstname", "lastname")

app/migrations/0003_add_model_municipality.py

@@ -0,0 +1,59 @@
+# Generated by Django 4.2.23 on 2025-10-09 08:55
+
+import django.db.models.deletion
+import django_extensions.db.fields
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("app", "0002_add_person_type_and_relation"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Municipality",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "created",
+                    django_extensions.db.fields.CreationDateTimeField(
+                        auto_now_add=True, verbose_name="created"
+                    ),
+                ),
+                (
+                    "modified",
+                    django_extensions.db.fields.ModificationDateTimeField(
+                        auto_now=True, verbose_name="modified"
+                    ),
+                ),
+                ("title", models.CharField(unique=True, verbose_name="title")),
+            ],
+            options={
+                "verbose_name": "Municipality",
+                "verbose_name_plural": "Municipalities",
+            },
+        ),
+        migrations.AddField(
+            model_name="person",
+            name="place_of_residence",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="persons",
+                to="app.municipality",
+                verbose_name="Place of residence",
+            ),
+        ),
+    ]

app/migrations/0004_add_external_uid_field.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.23 on 2025-10-09 10:54
+
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("app", "0003_add_model_municipality"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="address",
+            name="external_uid",
+            field=models.UUIDField(null=True, verbose_name="external uid"),
+        ),
+    ]

app/migrations/max_migration.txt

@@ -1 +1 @@
-0002_add_person_type_and_relation
+0004_add_external_uid_field

app/models/__init__.py

@@ -1,5 +1,6 @@
-__all__ = ["Address", "Person", "PersonType"]
+__all__ = ["Address", "Municipality", "Person", "PersonType"]
 
 from .address import Address
+from .municipality import Municipality
 from .person import Person
 from .person import PersonType

app/models/address.py

@@ -9,6 +9,7 @@ class Address(CustomFieldBaseModel):
     city = models.CharField(verbose_name="city", blank=True)
     country = models.CharField(verbose_name="country", blank=True)
     street = models.CharField(verbose_name="street", blank=True)
+    external_uid = models.UUIDField(verbose_name="external uid", null=True)
     zip_code = models.CharField(verbose_name="postal code", blank=True)
 
     target = GenericForeignKey("target_type", "target_id")

app/models/municipality.py

@@ -0,0 +1,13 @@
+from django.db import models
+from django_extensions.db.models import TimeStampedModel
+
+
+class Municipality(TimeStampedModel):
+    title = models.CharField(verbose_name="title", unique=True)
+
+    class Meta:
+        verbose_name = "Municipality"
+        verbose_name_plural = "Municipalities"
+
+    def __str__(self) -> str:
+        return self.title

app/models/person.py

@@ -27,6 +27,14 @@ class Person(CustomFieldBaseModel):
         on_delete=models.SET_NULL,
         verbose_name="Type",
     )
+    place_of_residence = models.ForeignKey(
+        "Municipality",
+        on_delete=models.PROTECT,
+        blank=True,
+        null=True,
+        verbose_name="Place of residence",
+        related_name="persons",
+    )
 
     class Meta:
         verbose_name = "Person"

app/serializers/__init__.py

@@ -0,0 +1,11 @@
+from typing import Any
+
+from constance import config
+
+from django_features.serializers import MappingSerializer
+
+
+class BaseMappingSerializer(MappingSerializer):
+    @property
+    def mapping(self) -> dict[str, dict[str, Any]]:
+        return config.MODEL_MAPPING_FIELD

app/serializers/person.py

@@ -1,4 +1,9 @@
+from typing import Any
+
+from constance import config
+
 from app.models import Person
+from app.serializers import BaseMappingSerializer
 from django_features.custom_fields.serializers import CustomFieldBaseModelSerializer
 
 
@@ -10,3 +15,13 @@ class Meta:
             "firstname",
             "lastname",
         ]
+
+
+class PersonMappingSerializer(BaseMappingSerializer):
+    class Meta:
+        model = Person
+        fields = "__all__"
+
+    @property
+    def mapping(self) -> dict[str, dict[str, Any]]:
+        return config.MODEL_MAPPING_FIELD

app/settings/base.py

@@ -126,19 +126,36 @@ def STATIC_URL(self) -> str:
 
     CONSTANCE_BACKEND = "constance.backends.database.DatabaseBackend"
 
+    @property
+    def CONSTANCE_ADDITIONAL_FIELDS(self) -> dict:
+        config = super().CONSTANCE_ADDITIONAL_FIELDS
+        return {**config}
+
     @property
     def CONSTANCE_CONFIG(self) -> dict:
         config = super().CONSTANCE_CONFIG
-        return {**config, "TEST": (False, "Test add addidional constances", bool)}
+        return {
+            **config,
+            "JSON_FIELD": (
+                {"key": {"nested_key": "value"}},
+                "Test formated field",
+                "json",
+            ),
+            "MODEL_MAPPING_FIELD": (
+                {},
+                "Test model field mapping",
+                "model_field_mapping",
+            ),
+        }
 
     @property
     def CONSTANCE_CONFIG_FIELDSETS(self) -> dict:
         config = super().CONSTANCE_CONFIG_FIELDSETS
         return {
             **config,
             "Miscellaneous": {
-                "fields": ("TEST",),
-                "collapse": True,
+                "fields": ("JSON_FIELD", "MODEL_MAPPING_FIELD"),
+                "collapse": False,
             },
         }
 

app/tests/custom_fields/test_custom_field_base_manager.py

@@ -132,10 +132,12 @@ def test_custom_field_base_manager_annotate_choice_value(self) -> None:
             field_type=CustomField.FIELD_TYPES.DATE,
             choice_field=True,
         )
-        choice_1 = CustomValueFactory(field=field, text_de="Choice 1", value="choice_1")
+        choice_1 = CustomValueFactory(
+            field=field, label_de="Choice 1", value="choice_1"
+        )
         self.person.custom_values.add(choice_1)
         self.assertEqual(
-            {"id": choice_1.id, "text": "Choice 1", "value": "choice_1"},
+            {"id": choice_1.id, "label": "Choice 1", "value": "choice_1"},
             Person.objects.first().choice_value,
         )
 
@@ -147,23 +149,23 @@ def test_custom_field_base_manager_annotate_multiple_date_choice_value(
             content_type=self.person_ct,
             field_type=CustomField.FIELD_TYPES.DATE,
             choice_field=True,
-            multiple_choice=True,
+            multiple=True,
         )
         choice_1 = CustomValueFactory(
-            field=field, text_de="Choice 1", value="2000-01-01"
+            field=field, label_de="Choice 1", value="2000-01-01"
         )
         choice_2 = CustomValueFactory(
-            field=field, text_de="Choice 2", value="2001-01-01"
+            field=field, label_de="Choice 2", value="2001-01-01"
         )
         choice_3 = CustomValueFactory(
-            field=field, text_de="Choice 3", value="2002-01-01"
+            field=field, label_de="Choice 3", value="2002-01-01"
         )
         self.person.custom_values.set([choice_1, choice_2, choice_3])
         self.assertEqual(
             [
-                {"id": choice_1.id, "text": "Choice 1", "value": "2000-01-01"},
-                {"id": choice_2.id, "text": "Choice 2", "value": "2001-01-01"},
-                {"id": choice_3.id, "text": "Choice 3", "value": "2002-01-01"},
+                {"id": choice_1.id, "label": "Choice 1", "value": "2000-01-01"},
+                {"id": choice_2.id, "label": "Choice 2", "value": "2001-01-01"},
+                {"id": choice_3.id, "label": "Choice 3", "value": "2002-01-01"},
             ],
             Person.objects.first().multiple_choice_value,
         )

app/tests/custom_fields/test_custom_field_base_model.py

@@ -244,7 +244,7 @@ def test_custom_field_base_model_set_choice_value(self) -> None:
             field_type=CustomField.FIELD_TYPES.CHAR,
             choice_field=True,
         )
-        choice_1 = CustomValueFactory(field=field, text="Choice 1", value="choice_1")
+        choice_1 = CustomValueFactory(field=field, label="Choice 1", value="choice_1")
 
         # we need to annotate the custom_field_keys manually or to fetch the person with the queryset again,
         # because we created a new field
@@ -263,7 +263,7 @@ def test_custom_field_base_model_set_choice_value(self) -> None:
 
         self.assertEqual(choice_1, self.person.choice_value)
         self.assertEqual(
-            {"id": choice_1.id, "text": "Choice 1", "value": "choice_1"},
+            {"id": choice_1.id, "label": "Choice 1", "value": "choice_1"},
             Person.objects.first().choice_value,
         )
 
@@ -275,7 +275,7 @@ def test_custom_field_base_model_set_multiple_choice_value(
             content_type=self.person_ct,
             field_type=CustomField.FIELD_TYPES.DATE,
             choice_field=True,
-            multiple_choice=True,
+            multiple=True,
         )
         choice_1 = CustomValueFactory(field=field, value="2000-01-01")
         choice_2 = CustomValueFactory(field=field, value="2001-01-01")
@@ -301,9 +301,9 @@ def test_custom_field_base_model_set_multiple_choice_value(
         )
         self.assertEqual(
             [
-                {"id": choice_1.id, "text": None, "value": "2000-01-01"},
-                {"id": choice_2.id, "text": None, "value": "2001-01-01"},
-                {"id": choice_3.id, "text": None, "value": "2002-01-01"},
+                {"id": choice_1.id, "label": None, "value": "2000-01-01"},
+                {"id": choice_2.id, "label": None, "value": "2001-01-01"},
+                {"id": choice_3.id, "label": None, "value": "2002-01-01"},
             ],
             Person.objects.first().multiple_choice_value,
         )