fixup! feat(eap): update revise workflow with locked feature

Author: susilnem

eap/serializers.py

@@ -1005,6 +1005,13 @@ def _validate_status(self, validated_data: dict[str, typing.Any]) -> dict[str, t
 
             # Check latest EAP has NS Addressing Comments file uploaded
             if self.instance.get_eap_type_enum == EAPType.SIMPLIFIED_EAP:
+                # NOTE: If EAP is locked, NS has to revise the EAP to address the comments before resubmitting.
+                if self.instance.latest_simplified_eap.is_locked:
+                    raise serializers.ValidationError(
+                        gettext("Cannot change status to %s, Please revise the EAP to address the comments.")
+                        % EAPRegistration.Status(new_status).label
+                    )
+
                 if not (self.instance.latest_simplified_eap and self.instance.latest_simplified_eap.updated_checklist_file):
                     raise serializers.ValidationError(
                         {
@@ -1034,6 +1041,12 @@ def _validate_status(self, validated_data: dict[str, typing.Any]) -> dict[str, t
                 )
 
             else:
+                if self.instance.latest_full_eap.is_locked:
+                    raise serializers.ValidationError(
+                        gettext("Cannot change status to %s, Please revise the EAP to address the comments.")
+                        % EAPRegistration.Status(new_status).label
+                    )
+
                 if not (self.instance.latest_full_eap and self.instance.latest_full_eap.updated_checklist_file):
                     raise serializers.ValidationError(
                         {

eap/test_views.py

@@ -1324,6 +1324,13 @@ def test_status_transition(self):
                 self.eap_registration.latest_simplified_eap.review_checklist_file,
             )
 
+        # Fails, As NS has to revise the EAP before transitioning to UNDER_REVIEW.
+        status_data = {
+            "status": EAPStatus.UNDER_REVIEW,
+        }
+        response = self.client.post(self.url, status_data)
+        self.assertEqual(response.status_code, 400, response.data)
+
         # Fails, As User only can revise after NS_ADDRESSING_COMMENTS, cannot update directly as it's locked
         update_data["modified_at"] = datetime.now()
         response = self.client.patch(url, update_data, format="json")
@@ -1452,6 +1459,13 @@ def test_status_transition(self):
             self.assertEqual(response.status_code, 200, response.data)
             self.assertEqual(response.data["status"], EAPStatus.NS_ADDRESSING_COMMENTS)
 
+        # Fails, As NS has to revise the EAP before transitioning to UNDER_REVIEW.
+        status_data = {
+            "status": EAPStatus.UNDER_REVIEW,
+        }
+        response = self.client.post(self.url, status_data)
+        self.assertEqual(response.status_code, 400, response.data)
+
         # Cannot update as it is in NS_ADDRESSING_COMMENTS, only revise is allowed
         update_data["modified_at"] = datetime.now()
         response = self.client.patch(url, update_data, format="json")
@@ -1587,6 +1601,13 @@ def test_status_transition(self):
             self.assertEqual(response.status_code, 200, response.data)
             self.assertEqual(response.data["status"], EAPStatus.NS_ADDRESSING_COMMENTS)
 
+        # Fails, As NS has to revise the EAP before transitioning to UNDER_REVIEW.
+        status_data = {
+            "status": EAPStatus.UNDER_REVIEW,
+        }
+        response = self.client.post(self.url, status_data)
+        self.assertEqual(response.status_code, 400, response.data)
+
         revise_url = f"/api/v2/simplified-eap/{third_snapshot.id}/revise/"
         self.authenticate(self.country_admin)
         response = self.client.post(revise_url)
@@ -1737,7 +1758,7 @@ def test_status_transition(self):
         # FAILS As simplified EAP is in PENDING_PFA, cannot updated
         url = f"/api/v2/simplified-eap/{simplified_eap.id}/"
         response = self.client.patch(url, update_data, format="json")
-        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.status_code, 400, response.data)
 
         # NOTE: Transition to APPROVED
         # PENDING_PFA -> APPROVED
@@ -1767,7 +1788,7 @@ def test_status_transition(self):
         self.authenticate(self.country_admin)
         url = f"/api/v2/simplified-eap/{simplified_eap.id}/"
         response = self.client.patch(url, update_data, format="json")
-        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.status_code, 400, response.data)
 
     @mock.patch("eap.serializers.generate_export_eap_pdf")
     @mock.patch("eap.serializers.group")