Merge pull request #2582 from IFRCGo/fix/dref-related-field-translation

 Update dref related field translation

Author: szabozoltan69

api/serializers.py

@@ -2554,6 +2554,7 @@ def validate_pdf_file(self, pdf_file):
         return pdf_file
 
     def create(self, validated_data):
+        language = django_get_language()
         export_id = validated_data.get("export_id")
         export_type = validated_data.get("export_type")
         country_id = validated_data.get("per_country")
@@ -2586,7 +2587,7 @@ def create(self, validated_data):
             export.requested_at = timezone.now()
             export.save(update_fields=["status", "requested_at"])
 
-            transaction.on_commit(lambda: generate_url.delay(export.url, export.id, user.id, title))
+            transaction.on_commit(lambda: generate_url.delay(export.url, export.id, user.id, title, language))
         return export
 
     def update(self, instance, validated_data):

api/tasks.py

@@ -19,7 +19,7 @@
 from .utils import DebugPlaywright
 
 
-def build_storage_state(tmp_dir, user, token):
+def build_storage_state(tmp_dir, user, token, language="en"):
     temp_file = pathlib.Path(tmp_dir, "storage_state.json")
     temp_file.touch()
 
@@ -40,7 +40,7 @@ def build_storage_state(tmp_dir, user, token):
                             }
                         ),
                     },
-                    {"name": "language", "value": json.dumps("en")},  # enforce all export to English
+                    {"name": "language", "value": json.dumps(language)},
                 ],
             }
         ]
@@ -51,7 +51,7 @@ def build_storage_state(tmp_dir, user, token):
 
 
 @shared_task
-def generate_url(url, export_id, user, title):
+def generate_url(url, export_id, user, title, language):
     export = Export.objects.get(id=export_id)
     user = User.objects.get(id=user)
     token = Token.objects.filter(user=user).last()
@@ -88,11 +88,25 @@ def generate_url(url, export_id, user, title):
         with tempfile.TemporaryDirectory() as tmp_dir:
             with sync_playwright() as p:
                 browser = p.chromium.connect(settings.PLAYWRIGHT_SERVER_URL)
-                storage_state = build_storage_state(
-                    tmp_dir,
-                    user,
-                    token,
-                )
+                # NOTE: DREF Export use the language from request
+                if export.export_type in [
+                    Export.ExportType.DREF,
+                    Export.ExportType.OPS_UPDATE,
+                    Export.ExportType.FINAL_REPORT,
+                ]:
+                    storage_state = build_storage_state(
+                        tmp_dir,
+                        user,
+                        token,
+                        language,
+                    )
+                else:
+                    # NOTE: Other Export types use default language (en)
+                    storage_state = build_storage_state(
+                        tmp_dir,
+                        user,
+                        token,
+                    )
                 context = browser.new_context(storage_state=storage_state)
                 page = context.new_page()
                 if settings.DEBUG_PLAYWRIGHT:

dref/migrations/0085_dreffinalreport_main_donors_ar_and_more.py

@@ -0,0 +1,93 @@
+# Generated by Django 4.2.19 on 2025-11-12 08:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dref', '0084_remove_dref_is_published_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='dreffinalreport',
+            name='main_donors_ar',
+            field=models.TextField(blank=True, null=True, verbose_name='Main Donors'),
+        ),
+        migrations.AddField(
+            model_name='dreffinalreport',
+            name='main_donors_en',
+            field=models.TextField(blank=True, null=True, verbose_name='Main Donors'),
+        ),
+        migrations.AddField(
+            model_name='dreffinalreport',
+            name='main_donors_es',
+            field=models.TextField(blank=True, null=True, verbose_name='Main Donors'),
+        ),
+        migrations.AddField(
+            model_name='dreffinalreport',
+            name='main_donors_fr',
+            field=models.TextField(blank=True, null=True, verbose_name='Main Donors'),
+        ),
+        migrations.AddField(
+            model_name='dreffinalreport',
+            name='people_assisted_ar',
+            field=models.TextField(blank=True, null=True, verbose_name='people assisted'),
+        ),
+        migrations.AddField(
+            model_name='dreffinalreport',
+            name='people_assisted_en',
+            field=models.TextField(blank=True, null=True, verbose_name='people assisted'),
+        ),
+        migrations.AddField(
+            model_name='dreffinalreport',
+            name='people_assisted_es',
+            field=models.TextField(blank=True, null=True, verbose_name='people assisted'),
+        ),
+        migrations.AddField(
+            model_name='dreffinalreport',
+            name='people_assisted_fr',
+            field=models.TextField(blank=True, null=True, verbose_name='people assisted'),
+        ),
+        migrations.AddField(
+            model_name='drefoperationalupdate',
+            name='identified_gaps_ar',
+            field=models.TextField(blank=True, help_text='Any identified gaps/limitations in the assessment', null=True, verbose_name='identified gaps'),
+        ),
+        migrations.AddField(
+            model_name='drefoperationalupdate',
+            name='identified_gaps_en',
+            field=models.TextField(blank=True, help_text='Any identified gaps/limitations in the assessment', null=True, verbose_name='identified gaps'),
+        ),
+        migrations.AddField(
+            model_name='drefoperationalupdate',
+            name='identified_gaps_es',
+            field=models.TextField(blank=True, help_text='Any identified gaps/limitations in the assessment', null=True, verbose_name='identified gaps'),
+        ),
+        migrations.AddField(
+            model_name='drefoperationalupdate',
+            name='identified_gaps_fr',
+            field=models.TextField(blank=True, help_text='Any identified gaps/limitations in the assessment', null=True, verbose_name='identified gaps'),
+        ),
+        migrations.AddField(
+            model_name='drefoperationalupdate',
+            name='summary_of_change_ar',
+            field=models.TextField(blank=True, null=True, verbose_name='Summary of change'),
+        ),
+        migrations.AddField(
+            model_name='drefoperationalupdate',
+            name='summary_of_change_en',
+            field=models.TextField(blank=True, null=True, verbose_name='Summary of change'),
+        ),
+        migrations.AddField(
+            model_name='drefoperationalupdate',
+            name='summary_of_change_es',
+            field=models.TextField(blank=True, null=True, verbose_name='Summary of change'),
+        ),
+        migrations.AddField(
+            model_name='drefoperationalupdate',
+            name='summary_of_change_fr',
+            field=models.TextField(blank=True, null=True, verbose_name='Summary of change'),
+        ),
+    ]

dref/models.py

@@ -16,6 +16,9 @@
 from main.fields import SecureFileField
 
 
+# NOTE: The list `TRANSLATABLE_RELATED_MODELS` is in dref/tasks.py contains models directly related to Dref.
+# If you add a new related model that should be translated, make sure to include it in this list.
+# Keeping it up-to-date is important for correct translation handling while performing the finalize action.
 @reversion.register()
 class NationalSocietyAction(models.Model):
     class Title(models.TextChoices):
@@ -50,7 +53,7 @@ class Meta:
         verbose_name_plural = _("national society actions")
 
     def __str__(self) -> str:
-        desc = self.description_en.replace("-", "").strip()[:60] + "..."
+        desc = self.description.replace("-", "").strip()[:60] + "..."
         return "%d (%s) %s" % (self.id, self.title, desc)
 
     @staticmethod

dref/permissions.py

@@ -1,7 +1,7 @@
 from django.contrib.auth.models import Permission
 from rest_framework import permissions
 
-from dref.models import Dref, DrefFinalReport, DrefOperationalUpdate
+from dref.models import DrefFinalReport, DrefOperationalUpdate
 from dref.utils import get_dref_users
 
 
@@ -35,13 +35,24 @@ def has_object_permission(self, request, view, obj):
         return False
 
 
-class PublishDrefPermission(permissions.BasePermission):
-    message = "You need to be regional admin to publish dref"
+class ApproveDrefPermission(permissions.BasePermission):
+    message = "You need to be Superuser or Dref Regional admin to approve"
 
     def has_object_permission(self, request, view, obj):
-        region = obj.country.region.name
-        codename = f"dref_region_admin_{region}"
+
         user = request.user
-        if Permission.objects.filter(user=user, codename=codename).exists() and obj.status != Dref.Status.APPROVED:
+        region_id = obj.country.region_id
+
+        if user.is_superuser:
+            return True
+
+        dref_region_admins_ids = [
+            int(codename.replace("dref_region_admin_", ""))
+            for codename in Permission.objects.filter(
+                group__user=user,
+                codename__startswith="dref_region_admin_",
+            ).values_list("codename", flat=True)
+        ]
+        if region_id in dref_region_admins_ids:
             return True
         return False

dref/serializers.py

@@ -38,7 +38,7 @@
 from main.writable_nested_serializers import NestedCreateMixin, NestedUpdateMixin
 from utils.file_check import validate_file_type
 
-from .tasks import send_dref_email
+from .tasks import _translate_related_objects, send_dref_email
 
 
 class RiskSecuritySerializer(ModelSerializer):
@@ -1087,6 +1087,14 @@ def create(self, validated_data):
             operational_update.users.add(*dref_operational_update.users.all())
             operational_update.risk_security.add(*dref_operational_update.risk_security.all())
             operational_update.source_information.add(*dref_operational_update.source_information.all())
+
+        # NOTE: Sync related models with the starting language
+        if starting_langauge != "en":
+            _translate_related_objects(
+                instance=operational_update,
+                auto_translate=False,
+                language=starting_langauge,
+            )
         return operational_update
 
     def update(self, instance, validated_data):
@@ -1541,6 +1549,14 @@ def create(self, validated_data):
             # also update is_final_report_created for dref
             dref.is_final_report_created = True
             dref.save(update_fields=["is_final_report_created"])
+
+        # NOTE: Sync related models with the starting language
+        if starting_langauge != "en":
+            _translate_related_objects(
+                instance=dref_final_report,
+                auto_translate=False,
+                language=starting_langauge,
+            )
         return dref_final_report
 
     def update(self, instance, validated_data):

dref/tasks.py

@@ -6,9 +6,19 @@
 
 from api.utils import get_model_name
 from lang.tasks import translate_model_fields
+from main.translation import TRANSLATOR_ORIGINAL_LANGUAGE_FIELD_NAME
 from notifications.notification import send_notification
 
-from .models import Dref
+from .models import (
+    Dref,
+    DrefFile,
+    IdentifiedNeed,
+    NationalSocietyAction,
+    PlannedIntervention,
+    PlannedInterventionIndicators,
+    ProposedAction,
+    RiskSecurity,
+)
 from .utils import get_email_context
 
 logger = logging.getLogger(__name__)
@@ -29,6 +39,20 @@ def send_dref_email(dref_id, users_emails, new_or_updated=""):
     return email_context
 
 
+# NOTE: Only the models directly related to Dref are included here.
+# The task will translate the fields of these models and update
+# `translation_module_original_language` to "en".
+TRANSLATABLE_RELATED_MODELS = [
+    DrefFile,
+    NationalSocietyAction,
+    IdentifiedNeed,
+    PlannedIntervention,
+    RiskSecurity,
+    ProposedAction,
+    PlannedInterventionIndicators,
+]
+
+
 @shared_task
 def process_dref_translation(model_name, instance_pk):
     """
@@ -54,7 +78,25 @@ def process_dref_translation(model_name, instance_pk):
         return False
 
 
-def _translate_related_objects(instance, visited=None):
+def _translate_related_objects(
+    instance,
+    visited=None,
+    auto_translate=True,
+    language="en",
+):
+    """
+    Sync the relateable translation fields for the given model instance.
+    This function ensures that the translation fields are updated correctly
+    based on the current language settings.
+
+    Args:
+        instance: The model instance whose related objects need to be translated.
+        visited: A set to keep track of visited instances to avoid infinite recursion.
+        auto_translate: A boolean indicating whether to auto-translate related objects.
+        language: The language code to set for the original language field.
+
+    """
+
     if visited is None:
         visited = set()
 
@@ -67,26 +109,28 @@ def _translate_related_objects(instance, visited=None):
         if not field.is_relation or field.auto_created:
             continue
 
-        try:
-            related_value = getattr(instance, field.name, None)
-            if related_value is None:
-                continue
-
-            # Handle related objects
-            if not field.many_to_many:
-                if hasattr(related_value, "translation_module_original_language"):
-                    model_name = get_model_name(type(related_value))
-                    translate_model_fields(model_name, related_value.pk)
-                    _translate_related_objects(related_value, visited)
-
-            # Handle multiple related objects
-            else:
-                for related_obj in related_value.all():
-                    if hasattr(related_obj, "translation_module_original_language"):
-                        model_name = get_model_name(type(related_obj))
-                        translate_model_fields(model_name, related_obj.pk)
-                        _translate_related_objects(related_obj, visited)
-
-        except Exception as e:
-            logger.warning(f"Error processing field {field.name}: {e}")
+        related_model = field.related_model
+        if related_model not in TRANSLATABLE_RELATED_MODELS:
             continue
+
+        related_value = getattr(instance, field.name, None)
+        if related_value is None:
+            continue
+
+        if not field.many_to_many:
+            if hasattr(related_value, TRANSLATOR_ORIGINAL_LANGUAGE_FIELD_NAME):
+                model_name = get_model_name(type(related_value))
+                if auto_translate:
+                    translate_model_fields(model_name, related_value.id)
+                related_value.translation_module_original_language = language
+                related_value.save(update_fields=["translation_module_original_language"])
+                _translate_related_objects(related_value, visited, auto_translate, language)
+        else:
+            for related_obj in related_value.all():
+                if hasattr(related_obj, TRANSLATOR_ORIGINAL_LANGUAGE_FIELD_NAME):
+                    model_name = get_model_name(type(related_obj))
+                    if auto_translate:
+                        translate_model_fields(model_name, related_obj.id)
+                    related_obj.translation_module_original_language = language
+                    related_obj.save(update_fields=["translation_module_original_language"])
+                    _translate_related_objects(related_obj, visited, auto_translate, language)