fixup! refactor(dref): refactor dref finalize logic

Author: sudip-khanal

dref/test_views.py

@@ -1009,10 +1009,10 @@ def test_dref_create_and_update_in_local_language(
         response = self.client.patch(url, data=data_en, format="json", HTTP_ACCEPT_LANGUAGE="es")
         self.assert_400(response)
 
-    @patch("dref.views.transaction.on_commit")
+    @patch("dref.views.transaction.on_commit", lambda func: func())
     @patch("dref.views.process_translation.delay")
     @patch("dref.views.is_translation_complete")
-    def test_update_and_finalize_dref(self, mock_on_commit, mock_is_translation_complete, mock_translation):
+    def test_update_and_finalize_dref(self, mock_is_translation_complete, mock_translation):
         dref = DrefFactory.create(
             title="Título original en español",
             type_of_dref=Dref.DrefType.IMMINENT,
@@ -1028,39 +1028,42 @@ def test_update_and_finalize_dref(self, mock_on_commit, mock_is_translation_comp
         response = self.client.patch(url, data=data_es, HTTP_ACCEPT_LANGUAGE="es")
         self.assert_200(response)
         self.assertEqual(response.data["title"], "en español")
-        # update in French
+
+        # Update in French
         data_fr = {"title": "Titre en français", "modified_at": datetime.now()}
         response = self.client.patch(url, data=data_fr, format="json", HTTP_ACCEPT_LANGUAGE="fr")
         self.assert_400(response)
-        # update in Arabic
+
+        # Update in Arabic
         data_ar = {"title": "العنوان بالعربية", "modified_at": datetime.now()}
         response = self.client.patch(url, data=data_ar, format="json", HTTP_ACCEPT_LANGUAGE="ar")
         self.assert_400(response)
-        # update in English
+        # Update in English before translation complete
         data_en = {"title": "Updated title in English", "modified_at": datetime.now()}
         response = self.client.patch(url, data=data_en, HTTP_ACCEPT_LANGUAGE="en")
         self.assert_400(response)
-
         finalize_url = f"/api/v2/dref/{dref.id}/finalize/"
-        # Test Finalize without Translation completion
         mock_is_translation_complete.return_value = False
         response = self.client.post(finalize_url)
         self.assert_400(response)
-        mock_on_commit.side_effect = lambda func: func()
+        dref.refresh_from_db()
+        self.assertEqual(dref.status, Dref.Status.FINALIZING)
+
         model_name = get_model_name(type(dref))
         mock_translation.assert_called_once_with(model_name, dref.pk)
-        # Test finalize with Translation completion
+
         mock_translation.reset_mock()
         mock_is_translation_complete.return_value = True
         response = self.client.post(finalize_url)
         self.assert_200(response)
-        mock_translation.assert_not_called()
-        self.assertEqual(response.data["status"], Dref.Status.FINALIZED)
-        self.assertEqual(response.data["translation_module_original_language"], "en")
 
-        # Update in English
-        finalized_dref_id = response.data["id"]
-        url = f"/api/v2/dref/{finalized_dref_id}/"
+        dref.refresh_from_db()
+        self.assertEqual(dref.status, Dref.Status.FINALIZED)
+        self.assertEqual(dref.translation_module_original_language, "en")
+        self.assertEqual(response.data["status"], Dref.Status.FINALIZED)
+        mock_translation.assert_not_called()
+        # Update in English after finalization
+        url = f"/api/v2/dref/{dref.id}/"
         response = self.client.patch(url, data=data_en, HTTP_ACCEPT_LANGUAGE="en")
         self.assert_200(response)
         self.assertEqual(response.data["title"], "Updated title in English")
@@ -1220,10 +1223,10 @@ def test_create_and_update_operational_update(self):
         response = self.client.patch(url, data=data, HTTP_ACCEPT_LANGUAGE="fr")
         self.assert_400(response)
 
-    @patch("dref.views.transaction.on_commit")
+    @patch("dref.views.transaction.on_commit", lambda func: func())
     @patch("dref.views.process_translation.delay")
     @patch("dref.views.is_translation_complete")
-    def test_dref_operational_update_finalize(self, mock_on_commit, mock_is_translation_complete, mock_translation):
+    def test_dref_operational_update_finalize(self, mock_is_translation_complete, mock_translation):
         # Create users
         user1, user2 = UserFactory.create_batch(2)
         dref = DrefFactory.create(
@@ -1240,7 +1243,6 @@ def test_dref_operational_update_finalize(self, mock_on_commit, mock_is_translat
             modified_at=datetime.now(),
             translation_module_original_language="ar",
         )
-
         url = f"/api/v2/dref-op-update/{op_update.id}/"
         self.client.force_authenticate(user1)
 
@@ -1257,20 +1259,20 @@ def test_dref_operational_update_finalize(self, mock_on_commit, mock_is_translat
 
         # Finalize Operational Update
         finalize_url = f"/api/v2/dref-op-update/{op_update.id}/finalize/"
-        # Test Finalize without Translation completion
         mock_is_translation_complete.return_value = False
         response = self.client.post(finalize_url)
         self.assert_400(response)
-        mock_translation.assert_called_once_with(get_model_name(type(op_update)), op_update.pk)
-        # Test Finalize with translation complete
+        model_name = get_model_name(type(op_update))
+        mock_translation.assert_called_once_with(model_name, op_update.pk)
+
         mock_translation.reset_mock()
         mock_is_translation_complete.return_value = True
         response = self.client.post(finalize_url)
         self.assert_200(response)
-        mock_on_commit.side_effect = lambda func: func()
+        op_update.refresh_from_db()
+        self.assertEqual(op_update.status, Dref.Status.FINALIZED)
+        self.assertEqual(op_update.translation_module_original_language, "en")
         mock_translation.assert_not_called()
-        self.assertEqual(response.data["status"], Dref.Status.FINALIZED)
-        self.assertEqual(response.data["translation_module_original_language"], "en")
         # Update in English
         finalized_op_update_id = response.data["id"]
         url = f"/api/v2/dref-op-update/{finalized_op_update_id}/"
@@ -2293,13 +2295,12 @@ def test_create_and_update_final_report(self):
         self.assertEqual(response.data["translation_module_original_language"], "es")
         self.assertEqual(response.data["title"], "Título en español")
 
-    @patch("dref.views.transaction.on_commit")
+    @patch("dref.views.transaction.on_commit", lambda func: func())
     @patch("dref.views.process_translation.delay")
     @patch("dref.views.is_translation_complete")
-    def test_dref_final_report_finalize(self, mock_on_commit, mock_is_translation_complete, mock_translation):
+    def test_dref_final_report_finalize(self, mock_is_translation_complete, mock_translation):
         region = Region.objects.create(name=RegionName.AFRICA)
         country = Country.objects.create(name="Test country12", region=region)
-        # Create users
         user1, user2 = UserFactory.create_batch(2)
         dref = DrefFactory.create(
             title="Test Title",
@@ -2323,7 +2324,6 @@ def test_dref_final_report_finalize(self, mock_on_commit, mock_is_translation_co
         data_ar = {"title": "العنوان بالعربية", "modified_at": datetime.now()}
         response = self.client.patch(url, data=data_ar, 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()}
         response = self.client.patch(url, data=data_es, HTTP_ACCEPT_LANGUAGE="es")
@@ -2337,22 +2337,25 @@ def test_dref_final_report_finalize(self, mock_on_commit, mock_is_translation_co
         mock_is_translation_complete.return_value = False
         response = self.client.post(finalize_url)
         self.assert_400(response)
-        mock_on_commit.side_effect = lambda func: func()
-        mock_translation.assert_called_once_with(get_model_name(type(final_report)), final_report.pk)
-        # Test finalize with Translation completion
+        model_name = get_model_name(type(final_report))
+        mock_translation.assert_called_once_with(model_name, final_report.pk)
         mock_translation.reset_mock()
+
+        # Test finalize with Translation completion
         mock_is_translation_complete.return_value = True
         response = self.client.post(finalize_url)
         self.assert_200(response)
-        mock_translation.assert_not_called()
-        self.assertEqual(response.data["status"], Dref.Status.FINALIZED)
-        self.assertEqual(response.data["translation_module_original_language"], "en")
+        final_report.refresh_from_db()
+        self.assertEqual(final_report.status, Dref.Status.FINALIZED)
+        self.assertEqual(final_report.translation_module_original_language, "en")
 
-        # Update in English
+        mock_translation.assert_not_called()
         finalized_final_report_id = response.data["id"]
         data_en = {"title": "Updated title in English", "modified_at": datetime.now()}
+        # Update in English
         url = f"/api/v2/dref-final-report/{finalized_final_report_id}/"
         response = self.client.patch(url, data=data_en, HTTP_ACCEPT_LANGUAGE="en")
+        self.assert_200(response)
         self.assertEqual(response.data["title"], "Updated title in English")