Remove and replace multiple choice with choice field

Author: Joel-Luca

app/tests/custom_fields/test_custom_field_base_manager.py

@@ -147,7 +147,7 @@ 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"

app/tests/custom_fields/test_custom_field_base_model.py

@@ -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")

app/tests/custom_fields/test_custom_field_model_base_serializer.py

@@ -69,7 +69,7 @@ def setUp(self) -> None:
             content_type=self.person_ct,
             field_type=CustomField.FIELD_TYPES.DATE,
             choice_field=True,
-            multiple_choice=True,
+            multiple=True,
         )
         self.choice_1 = CustomValueFactory(field=self.choice_field, value="2000-01-01")
         self.choice_2 = CustomValueFactory(field=self.choice_field, value="2001-01-01")

app/tests/custom_fields/test_custom_field_serializer.py

@@ -31,7 +31,6 @@ def test_custom_base_field_serializer(self) -> None:
                 "label": "Custom Field Label",
                 "modified": ANY,
                 "multiple": False,
-                "multiple_choice": False,
                 "order": 0,
             },
             data,
@@ -90,7 +89,6 @@ def test_custom_choice_field_serializer(self) -> None:
                 "label": "Custom Field Label",
                 "modified": ANY,
                 "multiple": False,
-                "multiple_choice": False,
                 "order": 0,
             },
             data,

app/tests/test_mapping_serializer.py

@@ -89,7 +89,7 @@ def setUp(self) -> None:
             content_type=self.person_ct,
             field_type=CustomField.FIELD_TYPES.DATE,
             choice_field=True,
-            multiple_choice=True,
+            multiple=True,
         )
 
         self.choice_1 = CustomValueFactory(field=self.choice_field, value="2000-01-01")

django_features/custom_fields/fields.py

@@ -38,7 +38,7 @@ def get_queryset(self) -> CustomValueQuerySet:
     def to_representation(
         self, value: CustomValue | CustomValueQuerySet
     ) -> int | list[int]:
-        return CustomChoiceSerializer(value, many=self.field.multiple_choice).data
+        return CustomChoiceSerializer(value, many=self.field.multiple).data
 
     def _choice_field(self, data: int | str | dict) -> CustomValue:
         if isinstance(data, dict):
@@ -66,7 +66,7 @@ def _multiple_choice(self, data: list[int | str | dict]) -> CustomValueQuerySet:
         return values
 
     def to_internal_value(self, data: Any) -> CustomValue | CustomValueQuerySet:
-        if self.field.multiple_choice and isinstance(data, list):
+        if self.field.multiple and isinstance(data, list):
             return self._multiple_choice(data)
         elif self.field.choice_field and isinstance(data, (int, str, dict)):
             return self._choice_field(data)

django_features/custom_fields/migrations/0004_remove_mutiple_choice_field.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.23 on 2025-10-22 11:59
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("custom_fields", "0003_add_type_filter_to_fields"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="customfield",
+            name="multiple_choice",
+        ),
+    ]

django_features/custom_fields/migrations/max_migration.txt

@@ -1 +1 @@
-0003_add_type_filter_to_fields
+0004_remove_mutiple_choice_field

django_features/custom_fields/models/base.py

@@ -65,7 +65,7 @@ def _subquery(self, field: CustomField) -> Subquery:
                 ).values_list("formated", flat=True)
             )
         else:
-            sq = ArraySubquery if field.multiple_choice else Subquery
+            sq = ArraySubquery if field.multiple else Subquery
             return sq(
                 custom_values_queryset.annotate(
                     formated=JSONObject(id="id", text="text", value="value")
@@ -161,7 +161,7 @@ def _create_or_update_custom_value(self, field: str, value: Any) -> None:
 
     def _set_choice_value(self, field: CustomField, value: Any) -> None:
         self._custom_values_to_remove.extend(CustomValue.objects.filter(field=field))
-        if field.multiple_choice:
+        if field.multiple:
             # We expect a list for multiple choice fields, so we must extend the list with the items of the list
             self._custom_values_to_save.extend(value)
         else:

django_features/custom_fields/models/field.py

@@ -93,9 +93,6 @@ class CustomField(TimeStampedModel):
     identifier = models.SlugField(max_length=64, unique=True, db_index=True)
     label = models.CharField(verbose_name=_("Name"))
     multiple = models.BooleanField(verbose_name=_("Liste"), default=False)
-    multiple_choice = models.BooleanField(
-        verbose_name=_("Mehrfachauswahlfeld"), default=False
-    )
     order = models.PositiveSmallIntegerField(verbose_name=_("Reihenfolge"), default=0)
     required = models.BooleanField(verbose_name=_("Erforderlich"), default=False)