fix(dref): update finalize api and translation check logic

Author: sudip-khanal

dref/serializers.py

@@ -794,6 +794,7 @@ def create(self, validated_data):
         current_language = get_language()
         dref_operational_update = DrefOperationalUpdate.objects.filter(dref=dref).order_by("-operational_update_number").first()
         validated_data["created_by"] = self.context["request"].user
+        validated_data["original_language"] = current_language
         if not dref_operational_update:
             validated_data["title"] = dref.title
             validated_data["title_prefix"] = dref.title_prefix
@@ -915,7 +916,6 @@ def create(self, validated_data):
             validated_data["is_man_made_event"] = dref.is_man_made_event
             validated_data["event_text"] = dref.event_text
             validated_data["did_national_society"] = dref.did_national_society
-            validated_data["original_language"] = current_language
             operational_update = super().create(validated_data)
             # XXX: Copy files from DREF (Only nested serialized fields)
             nested_serialized_file_fields = [

dref/tasks.py

@@ -1,5 +1,3 @@
-import logging
-
 from celery import shared_task
 from django.template.loader import render_to_string
 
@@ -8,8 +6,6 @@
 from .models import Dref
 from .utils import get_email_context
 
-logger = logging.getLogger(__name__)
-
 
 @shared_task
 def send_dref_email(dref_id, users_emails, new_or_updated=""):

dref/utils.py

@@ -1,11 +1,15 @@
+import logging
+
 from django.conf import settings
 from django.contrib.postgres.aggregates import ArrayAgg
 from django.db import models
-from django.utils import translation
 from modeltranslation.translator import translator
+from modeltranslation.utils import build_localized_fieldname
 
 from dref.models import Dref, DrefFinalReport, DrefOperationalUpdate
 
+logger = logging.getLogger(__name__)
+
 
 def get_email_context(instance):
     from dref.serializers import DrefSerializer
@@ -67,17 +71,12 @@ def is_translation_complete(instance, target_lang="en"):
         return False
     try:
         opts = translator.get_options_for_model(type(instance))
-    except Exception:
-        return True
+    except Exception as e:
+        logger.warning(f"Failed to get translation options {e}", exc_info=True)
+        return False
     for field in getattr(opts, "fields", []):
-        with translation.override(original_lang):
-            original_value = getattr(instance, field, None)
-
-        with translation.override(target_lang):
-            translated_value = getattr(instance, field, None)
-        if not original_value:
-            continue
-        if not translated_value:
+        original_value = getattr(instance, build_localized_fieldname(field, original_lang), None)
+        translated_value = getattr(instance, build_localized_fieldname(field, target_lang), None)
+        if original_value and not translated_value:
             return False
-
     return True

dref/views.py

@@ -112,13 +112,12 @@ def finalize(self, request, pk=None, version=None):
 
         if not is_translation_complete(dref):
             raise serializers.ValidationError("Cannot be finalized because translation is not completed")
-
+        fields_to_update = ["status"]
         if dref.translation_module_original_language != "en":
             dref.translation_module_original_language = "en"
-            dref.status = Dref.Status.FINALIZED
-            dref.save(update_fields=["status", "translation_module_original_language"])
+            fields_to_update.append("translation_module_original_language")
         dref.status = Dref.Status.FINALIZED
-        dref.save(update_fields=["status"])
+        dref.save(update_fields=fields_to_update)
         serializer = DrefSerializer(dref, context={"request": request})
         return response.Response(serializer.data)
 
@@ -205,12 +204,12 @@ def finalize(self, request, pk=None, version=None):
             )
         if not is_translation_complete(operational_update):
             raise serializers.ValidationError("Cannot be finalized because translation is not completed")
+        fields_to_update = ["status"]
         if operational_update.translation_module_original_language != "en":
             operational_update.translation_module_original_language = "en"
-            operational_update.status = Dref.Status.FINALIZED
-            operational_update.save(update_fields=["status", "translation_module_original_language"])
+            fields_to_update.append("translation_module_original_language")
         operational_update.status = Dref.Status.FINALIZED
-        operational_update.save(update_fields=["status"])
+        operational_update.save(update_fields=fields_to_update)
         serializer = DrefOperationalUpdateSerializer(operational_update, context={"request": request})
         return response.Response(serializer.data)
 
@@ -267,13 +266,12 @@ def finalize(self, request, pk=None, version=None):
             )
         if not is_translation_complete(field_report):
             raise serializers.ValidationError("Cannot be finalized because translation is not completed")
-
+        fields_to_update = ["status"]
         if field_report.translation_module_original_language != "en":
             field_report.translation_module_original_language = "en"
-            field_report.status = Dref.Status.FINALIZED
-            field_report.save(update_fields=["status", "translation_module_original_language"])
+            fields_to_update.append("translation_module_original_language")
         field_report.status = Dref.Status.FINALIZED
-        field_report.save(update_fields=["status"])
+        field_report.save(update_fields=fields_to_update)
         serializer = DrefFinalReportSerializer(field_report, context={"request": request})
         return response.Response(serializer.data)