fix(dref): rename original_language field to starting_language

Author: sudip-khanal

dref/admin.py

@@ -98,7 +98,7 @@ class DrefAdmin(CompareVersionAdmin, TranslationAdmin, admin.ModelAdmin):
         "risk_security",
         "proposed_action",
     )
-    readonly_fields = ("original_language",)
+    readonly_fields = ("starting_language",)
 
     def get_queryset(self, request):
         return (
@@ -144,7 +144,7 @@ class DrefOperationalUpdateAdmin(CompareVersionAdmin, TranslationAdmin, admin.Mo
         "district",
         "risk_security",
     )
-    readonly_fields = ("original_language",)
+    readonly_fields = ("starting_language",)
     list_filter = ["dref"]
 
     def get_queryset(self, request):
@@ -201,7 +201,7 @@ class DrefFinalReportAdmin(CompareVersionAdmin, TranslationAdmin, admin.ModelAdm
         "national_society_actions",
         "source_information",
     )
-    readonly_fields = ("original_language",)
+    readonly_fields = ("starting_language",)
     list_filter = ["dref"]
     search_fields = ["title", "national_society__name", "appeal_code"]
 

dref/migrations/0087_remove_dref_original_language_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.19 on 2025-10-17 05:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dref', '0086_alter_dref_status_alter_dreffinalreport_status_and_more'),
+    ]
+
+    operations = [
+         migrations.RenameField(
+            model_name='dref',
+            old_name='original_language',
+            new_name='starting_language',
+        ),
+        migrations.RenameField(
+            model_name='dreffinalreport',
+            old_name='original_language',
+            new_name='starting_language',
+        ),
+        migrations.RenameField(
+            model_name='drefoperationalupdate',
+            old_name='original_language',
+            new_name='starting_language',
+        )
+    ]

dref/models.py

@@ -334,10 +334,10 @@ class Status(models.IntegerChoices):
         related_name="dref_targeting_strategy_support_file",
     )
     status = models.IntegerField(choices=Status.choices, verbose_name=_("status"), default=Status.DRAFT)
-    original_language = models.CharField(
+    starting_language = models.CharField(
         blank=True,
         null=True,
-        verbose_name=_("Original language"),
+        verbose_name=_("Starting language"),
         help_text="The language in which this record was first created.",
     )  # NOTE: This field is set at creation with the active language.
     num_assisted = models.IntegerField(verbose_name=_("number of assisted"), blank=True, null=True)
@@ -864,10 +864,10 @@ class DrefOperationalUpdate(models.Model):
         choices=Dref.DisasterCategory.choices, verbose_name=_("disaster category"), null=True, blank=True
     )
     status = models.IntegerField(choices=Dref.Status.choices, verbose_name=_("status"), default=Dref.Status.DRAFT)
-    original_language = models.CharField(
+    starting_language = models.CharField(
         blank=True,
         null=True,
-        verbose_name=_("Original language"),
+        verbose_name=_("Starting language"),
         help_text="The language in which this record was first created.",
     )  # NOTE: This field is set at creation with the active language.
     number_of_people_targeted = models.IntegerField(verbose_name=_("Number of people targeted"), blank=True, null=True)
@@ -1303,10 +1303,10 @@ class DrefFinalReport(models.Model):
         choices=Dref.DisasterCategory.choices, verbose_name=_("disaster category"), null=True, blank=True
     )
     status = models.IntegerField(choices=Dref.Status.choices, verbose_name=_("status"), default=Dref.Status.DRAFT)
-    original_language = models.CharField(
+    starting_language = models.CharField(
         blank=True,
         null=True,
-        verbose_name=_("Original language"),
+        verbose_name=_("Starting language"),
         help_text="The language in which this record was first created.",
     )  # NOTE: This field is set at creation with the active language.
     number_of_people_targeted = models.IntegerField(verbose_name=_("Number of people targeted"), blank=True, null=True)

dref/serializers.py

@@ -205,7 +205,7 @@ class MiniDrefSerializer(serializers.ModelSerializer):
     unpublished_final_report_count = serializers.SerializerMethodField()
     operational_update_details = serializers.SerializerMethodField()
     final_report_details = serializers.SerializerMethodField()
-    original_language = serializers.CharField(read_only=True)
+    starting_language = serializers.CharField(read_only=True)
 
     class Meta:
         model = Dref
@@ -236,7 +236,7 @@ class Meta:
             "status",
             "status_display",
             "date_of_approval",
-            "original_language",
+            "starting_language",
         ]
 
     @extend_schema_field(MiniOperationalUpdateActiveSerializer(many=True))
@@ -435,7 +435,7 @@ class Meta:
             "created_by",
             "budget_file_preview",
             "is_dref_imminent_v2",
-            "original_language",
+            "starting_language",
         )
         exclude = (
             "cover_image",
@@ -614,7 +614,7 @@ def validate_budget_file_preview(self, budget_file_preview):
 
     def create(self, validated_data):
         current_language = get_language()
-        validated_data["original_language"] = current_language
+        validated_data["starting_language"] = current_language
         validated_data["created_by"] = self.context["request"].user
         validated_data["is_active"] = True
         type_of_dref = validated_data.get("type_of_dref")
@@ -651,7 +651,6 @@ def create(self, validated_data):
             to = {u.email for u in validated_data["users"]}
         else:
             to = None
-        # set original language
         dref = super().create(validated_data)
         if to:
             transaction.on_commit(lambda: send_dref_email.delay(dref.id, list(to), "New"))
@@ -789,10 +788,18 @@ def validate_images_file(self, images):
 
     def create(self, validated_data):
         dref = validated_data["dref"]
-        language = validated_data.get("original_language")
-        if language != dref.original_language and language != dref.translation_module_original_language:
+        current_language = get_language()
+        valid_languages = [dref.starting_language, dref.translation_module_original_language]
+        # Check request language
+        if current_language not in valid_languages:
+            raise serializers.ValidationError(
+                gettext(f"Language must be either '{valid_languages[0]}' or '{valid_languages[1]}'.")
+            )
+        # Check payload language
+        language = validated_data.get("starting_language")
+        if language not in valid_languages:
             raise serializers.ValidationError(
-                gettext(f"Language must be either '{dref.original_language}' or '{dref.translation_module_original_language}'.")
+                gettext(f"Language must be either '{valid_languages[0]}' or '{valid_languages[1]}'.")
             )
         dref_operational_update = DrefOperationalUpdate.objects.filter(dref=dref).order_by("-operational_update_number").first()
         validated_data["created_by"] = self.context["request"].user
@@ -1240,10 +1247,19 @@ def create(self, validated_data):
         # if yes copy from the latest operational update
         # else copy from dref
         dref = validated_data["dref"]
-        language = validated_data.get("original_language")
-        if language != dref.original_language and language != dref.translation_module_original_language:
+        current_language = get_language()
+        valid_languages = [dref.starting_language, dref.translation_module_original_language]
+        # Check request language
+        if current_language not in valid_languages:
+            raise serializers.ValidationError(
+                gettext(f"Language must be either '{valid_languages[0]}' or '{valid_languages[1]}'.")
+            )
+
+        # Check payload language
+        language = validated_data.get("starting_language")
+        if language not in valid_languages:
             raise serializers.ValidationError(
-                gettext(f"Language must be either '{dref.original_language}' or '{dref.translation_module_original_language}'.")
+                gettext(f"Language must be either '{valid_languages[0]}' or '{valid_languages[1]}'.")
             )
         dref_operational_update = (
             DrefOperationalUpdate.objects.filter(dref=dref, status=Dref.Status.APPROVED)
@@ -1548,7 +1564,7 @@ class CompletedDrefOperationsSerializer(serializers.ModelSerializer):
     status_display = serializers.CharField(source="get_status_display", read_only=True)
     application_type = serializers.SerializerMethodField()
     application_type_display = serializers.SerializerMethodField()
-    original_language = serializers.CharField(read_only=True)
+    starting_language = serializers.CharField(read_only=True)
 
     class Meta:
         model = DrefFinalReport
@@ -1566,7 +1582,7 @@ class Meta:
             "dref",
             "status",
             "status_display",
-            "original_language",
+            "starting_language",
         )
 
     def get_application_type(self, obj) -> str:

dref/test_views.py

@@ -954,7 +954,7 @@ def test_dref_create_and_update_in_local_language(
             "national_society": national_society.id,
             "disaster_type": disaster_type.id,
             "needs_identified": [{"title": "shelter_housing_and_settlements", "description": "hola"}],
-            "original_language": "es",
+            "starting_language": "es",
             "planned_interventions": [
                 {
                     "title": "shelter_housing_and_settlements",
@@ -978,7 +978,7 @@ def test_dref_create_and_update_in_local_language(
         self.client.force_authenticate(self.user)
         response = self.client.post(url, data, format="json", HTTP_ACCEPT_LANGUAGE="es")
         self.assertEqual(response.status_code, 201)
-        self.assertEqual(response.data["original_language"], "es")
+        self.assertEqual(response.data["starting_language"], "es")
         self.assertEqual(response.data["translation_module_original_language"], "es")
         self.assertEqual(response.data["title"], "Prueba de título Dref")
         # Test update
@@ -1101,19 +1101,19 @@ def test_create_and_update_operational_update(self):
             title="Test Title",
             created_by=user1,
             status=Dref.Status.DRAFT,
-            original_language="en",
+            starting_language="en",
         )
         dref2 = DrefFactory.create(
             title="Título en español",
             created_by=user1,
             status=Dref.Status.APPROVED,
-            original_language="es",
+            starting_language="fr",
         )
         dref3 = DrefFactory.create(
             title="Titre en français",
             created_by=user1,
             status=Dref.Status.APPROVED,
-            original_language="fr",
+            starting_language="fr",
         )
         ops_update_data = {
             "dref": dref.id,
@@ -1124,13 +1124,13 @@ def test_create_and_update_operational_update(self):
             "dref": dref2.id,
             "country": self.country.id,
             "district": [self.district.id],
-            "original_language": "fr",
+            "starting_language": "es",
         }
         ops_update_data3 = {
             "dref": dref3.id,
             "country": self.country.id,
             "district": [self.district.id],
-            "original_language": "fr",
+            "starting_language": "fr",
         }
 
         self.authenticate(user1)
@@ -1154,15 +1154,15 @@ def test_create_and_update_operational_update(self):
         data_ar = {
             "title": "العنوان بالعربية",
             "modified_at": datetime.now(),
-            "original_language": "ar",
+            "starting_language": "ar",
         }
         response = self.client.patch(update_url, data=data_ar, HTTP_ACCEPT_LANGUAGE="ar")
         self.assert_400(response)
         # Update in Spanish
         data_es = {
             "title": "Título en español",
             "modified_at": datetime.now(),
-            "original_language": "es",
+            "starting_language": "es",
         }
         response = self.client.patch(update_url, data=data_es, HTTP_ACCEPT_LANGUAGE="es")
         self.assert_400(response)
@@ -1171,7 +1171,7 @@ def test_create_and_update_operational_update(self):
         data_en = {
             "title": "Updated title in English",
             "modified_at": datetime.now(),
-            "original_language": "en",
+            "starting_language": "en",
         }
         response = self.client.patch(update_url, data=data_en, HTTP_ACCEPT_LANGUAGE="en")
         self.assert_400(response)
@@ -1180,7 +1180,7 @@ def test_create_and_update_operational_update(self):
         data_fr = {
             "title": "Titre en français",
             "modified_at": datetime.now(),
-            "original_language": "fr",
+            "starting_language": "fr",
         }
         response = self.client.patch(update_url, data=data_fr, HTTP_ACCEPT_LANGUAGE="fr")
         self.assert_200(response)
@@ -2177,27 +2177,27 @@ def test_create_and_update_final_report(self):
             created_by=self.user,
             status=Dref.Status.DRAFT,
             type_of_dref=Dref.DrefType.ASSESSMENT,
-            original_language="en",
+            starting_language="en",
         )
         dref2 = DrefFactory.create(
             title="لعنوان بالعربية",
             created_by=self.user,
             status=Dref.Status.APPROVED,
             type_of_dref=Dref.DrefType.IMMINENT,
-            original_language="ar",
+            starting_language="ar",
         )
         dref3 = DrefFactory.create(
             title="Título en español",
             created_by=self.user,
             status=Dref.Status.APPROVED,
             type_of_dref=Dref.DrefType.IMMINENT,
-            original_language="es",
+            starting_language="es",
         )
         dref.users.add(user1)
         url = "/api/v2/dref-final-report/"
         data2 = {
             "dref": dref2.id,
-            "original_language": "fr",
+            "starting_language": "fr",
         }
 
         self.authenticate(self.user)
@@ -2206,40 +2206,40 @@ def test_create_and_update_final_report(self):
 
         url = "/api/v2/dref-final-report/"
         # Test create final report for draft dref status
-        data1 = {"dref": dref.id, "original_language": "en"}
+        data1 = {"dref": dref.id, "starting_language": "en"}
         response = self.client.post(url, data=data1)
         self.assert_400(response)
 
         # Test create final report with original language other than dref original language
-        data2 = {"dref": dref2.id, "original_language": "es"}
+        data2 = {"dref": dref2.id, "starting_language": "es"}
         response = self.client.post(url, data=data2)
         self.assert_400(response)
 
         # Test create final report with approved dref status and matching with dref original language
-        data3 = {"dref": dref3.id, "original_language": "es"}
+        data3 = {"dref": dref3.id, "starting_language": "es"}
         response = self.client.post(url, data=data3, HTTP_ACCEPT_LANGUAGE="es")
         self.assert_201(response)
         self.assertEqual(response.data["translation_module_original_language"], "es")
         final_report_id = response.data["id"]
 
         # Test Update
         update_url = f"/api/v2/dref-final-report/{final_report_id}/"
-        data_ar = {"title": "العنوان بالعربية", "modified_at": datetime.now(), "original_language": "ar"}
+        data_ar = {"title": "العنوان بالعربية", "modified_at": datetime.now(), "starting_language": "ar"}
         response = self.client.patch(update_url, data=data_ar, HTTP_ACCEPT_LANGUAGE="ar")
         self.assert_400(response)
 
         # Update in English
-        data_en = {"title": "Updated title in English", "modified_at": datetime.now(), "original_language": "en"}
+        data_en = {"title": "Updated title in English", "modified_at": datetime.now(), "starting_language": "en"}
         response = self.client.patch(update_url, data=data_en, HTTP_ACCEPT_LANGUAGE="en")
         self.assert_400(response)
 
         # Update in French
-        data_fr = {"title": "Titre en français", "modified_at": datetime.now(), "original_language": "ar"}
+        data_fr = {"title": "Titre en français", "modified_at": datetime.now(), "starting_language": "ar"}
         response = self.client.patch(update_url, data=data_fr, HTTP_ACCEPT_LANGUAGE="ar")
         self.assert_400(response)
 
         # Update in Spanish (original language)
-        data_es = {"title": "Título en español", "modified_at": datetime.now(), "original_language": "es"}
+        data_es = {"title": "Título en español", "modified_at": datetime.now(), "starting_language": "es"}
         response = self.client.patch(update_url, data=data_es, HTTP_ACCEPT_LANGUAGE="es")
         self.assert_200(response)
         self.assertEqual(response.data["translation_module_original_language"], "es")