chore(eap): update eap validation checks and error messages

Author: susilnem

eap/serializers.py

@@ -218,7 +218,7 @@ class MiniFullEAPSerializer(
 
     class Meta:
         model = FullEAP
-        fields = [
+        fields = (
             "id",
             "total_budget",
             "readiness_budget",
@@ -232,7 +232,7 @@ class Meta:
             "updated_checklist_file_details",
             "created_at",
             "modified_at",
-        ]
+        )
 
 
 class MiniEAPSerializer(serializers.ModelSerializer):
@@ -574,6 +574,8 @@ class Meta:
         read_only_fields = [
             "version",
             "is_locked",
+            "created_by",
+            "modified_by",
         ]
         exclude = ("cover_image",)
 
@@ -626,6 +628,11 @@ def _validate_timeframe(self, data: dict[str, typing.Any]) -> None:
                     {"operational_timeframe": gettext("operational timeframe value is not valid for Months unit.")}
                 )
 
+    def validate_eap_registration(self, eap_registration: EAPRegistration) -> EAPRegistration:
+        if not self.instance and eap_registration.has_eap_application:
+            raise serializers.ValidationError("EAP for this registration has already been created.")
+        return eap_registration
+
     def validate(self, data: dict[str, typing.Any]) -> dict[str, typing.Any]:
         original_eap_registration = getattr(self.instance, "eap_registration", None) if self.instance else None
         eap_registration: EAPRegistration | None = data.get("eap_registration", original_eap_registration)
@@ -634,9 +641,6 @@ def validate(self, data: dict[str, typing.Any]) -> dict[str, typing.Any]:
         if self.instance and original_eap_registration != eap_registration:
             raise serializers.ValidationError("EAP Registration cannot be changed for existing EAP.")
 
-        if not self.instance and eap_registration.has_eap_application:
-            raise serializers.ValidationError("Simplified EAP for this EAP registration already exists.")
-
         if self.instance and eap_registration.get_status_enum not in [
             EAPRegistration.Status.UNDER_DEVELOPMENT,
             EAPRegistration.Status.NS_ADDRESSING_COMMENTS,
@@ -777,10 +781,12 @@ class FullEAPSerializer(
 
     class Meta:
         model = FullEAP
-        read_only_fields = (
+        read_only_fields = [
+            "version",
+            "is_locked",
             "created_by",
             "modified_by",
-        )
+        ]
         exclude = ("cover_image",)
 
     def _validate_timeframe(self, data: dict[str, typing.Any]) -> None:
@@ -794,11 +800,13 @@ def _validate_timeframe(self, data: dict[str, typing.Any]) -> None:
                 }
             )
 
-        if lead_unit is not None and lead_time_value is not None:
-            if lead_unit != TimeFrame.DAYS:
-                raise serializers.ValidationError(
-                    {"lead_timeframe_unit": gettext("lead timeframe unit must be Days for Full EAP.")}
-                )
+        if lead_unit is not None and lead_time_value is not None and lead_unit != TimeFrame.DAYS:
+            raise serializers.ValidationError({"lead_timeframe_unit": gettext("lead timeframe unit must be Days for Full EAP.")})
+
+    def validate_eap_registration(self, eap_registration: EAPRegistration) -> EAPRegistration:
+        if not self.instance and eap_registration.has_eap_application:
+            raise serializers.ValidationError("EAP for this registration has already been created.")
+        return eap_registration
 
     def validate(self, data: dict[str, typing.Any]) -> dict[str, typing.Any]:
         original_eap_registration = getattr(self.instance, "eap_registration", None) if self.instance else None
@@ -808,9 +816,6 @@ def validate(self, data: dict[str, typing.Any]) -> dict[str, typing.Any]:
         if self.instance and original_eap_registration != eap_registration:
             raise serializers.ValidationError("EAP Registration cannot be changed for existing EAP.")
 
-        if not self.instance and eap_registration.has_eap_application:
-            raise serializers.ValidationError("Full EAP for this EAP registration already exists.")
-
         if self.instance and eap_registration.get_status_enum not in [
             EAPRegistration.Status.UNDER_DEVELOPMENT,
             EAPRegistration.Status.NS_ADDRESSING_COMMENTS,

eap/test_views.py

@@ -716,7 +716,7 @@ def test_create_simplified_eap(self):
 
         # Cannot create Simplified EAP for the same EAP Registration again
         response = self.client.post(url, data, format="json")
-        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.status_code, 400, response.data)
 
     def test_update_simplified_eap(self):
         eap_registration = EAPRegistrationFactory.create(