Track origial language in Field Report

TODO: Migrate FR from manual save to serializer

Author: thenav56

api/drf_views.py

@@ -1002,7 +1002,9 @@ def save_meta(self, fieldreport, meta, is_update=False):
             for action_taken in meta["actions_taken"]:
                 actions = action_taken["actions"]
                 del action_taken["actions"]
+                action_taken[TRANSLATOR_ORIGINAL_LANGUAGE_FIELD_NAME] = django_get_language()
                 actions_taken = ActionsTaken.objects.create(field_report=fieldreport, **action_taken)
+                CreateFieldReportSerializer.trigger_field_translation(actions_taken)
                 actions_taken.actions.add(*actions)
 
         if "contacts" in meta:
@@ -1032,7 +1034,9 @@ def create_event(self, report):
             auto_generated=True,
             auto_generated_source=SOURCES["new_report"],
             visibility=report.visibility,
+            **{TRANSLATOR_ORIGINAL_LANGUAGE_FIELD_NAME: django_get_language()},
         )
+        CreateFieldReportSerializer.trigger_field_translation(event)
         report.event = event
         report.save()
         return event

api/serializers.py

@@ -1151,6 +1151,7 @@ class Meta:
             'disaster_start_date', 'created_at', 'appeals',
         )
 
+
 class CountryOfFieldReportToReviewSerializer(ModelSerializer):
     class Meta:
         model = CountryOfFieldReportToReview

lang/serializers.py

@@ -119,31 +119,20 @@ def trigger_field_translation(cls, instance):
         if getattr(instance, TRANSLATOR_SKIP_FIELD_NAME):
             # Skip translation
             return
-        if not settings.TESTING:
-            transaction.on_commit(
-                lambda: translate_model_fields.delay(get_model_name(type(instance)), instance.pk)
-            )
-        else:
-            # NOTE: For test case run the process directly (Translator will mock the generated text)
-            transaction.on_commit(
-                lambda: translate_model_fields(get_model_name(type(instance)), instance.pk)
-            )
+        transaction.on_commit(
+            lambda: translate_model_fields.delay(get_model_name(type(instance)), instance.pk)
+        )
 
     @classmethod
     def trigger_field_translation_in_bulk(cls, model, instances):
         pks = [
             instance.pk for instance in instances
             if not getattr(instance, TRANSLATOR_SKIP_FIELD_NAME)
         ]
-        if not settings.TESTING:
+        if pks:
             transaction.on_commit(
                 lambda: translate_model_fields_in_bulk.delay(get_model_name(model), pks)
             )
-        else:
-            # NOTE: For test case run the process directly (Translator will mock the generated text)
-            transaction.on_commit(
-                lambda: translate_model_fields_in_bulk(get_model_name(model), pks)
-            )
 
     @classmethod
     def reset_and_trigger_translation_fields(cls, instance, created=False):

main/test_case.py

@@ -156,6 +156,7 @@ def capture_on_commit_callbacks(cls, *, using=DEFAULT_DB_ALIAS, execute=False):
     SUSPEND_SIGNALS=True,
     HAYSTACK_CONNECTIONS=TEST_HAYSTACK_CONNECTIONS,
     CACHES=TEST_CACHES,
+    AUTO_TRANSLATION_TRANSLATOR='lang.translation.DummyTranslator',
 )
 class APITestCase(GoAPITestMixin, test.APITestCase):
     def setUp(self):
@@ -172,6 +173,7 @@ def tearDown(self):
     SUSPEND_SIGNALS=True,
     HAYSTACK_CONNECTIONS=TEST_HAYSTACK_CONNECTIONS,
     CACHES=TEST_CACHES,
+    AUTO_TRANSLATION_TRANSLATOR='lang.translation.DummyTranslator',
 )
 class SnapshotTestCase(GoAPITestMixin, django_snapshottest.TestCase):
     maxDiff = None