[PRMP-1082] return different error body based on validation failure

Author: steph-torres-nhs

lambdas/handlers/post_document_review_handler.py

@@ -10,7 +10,7 @@
 from utils.decorators.ensure_env_var import ensure_environment_variables
 from utils.decorators.handle_lambda_exceptions import handle_lambda_exceptions
 from utils.decorators.set_audit_arg import set_request_context_for_logging
-from utils.exceptions import InvalidNhsNumberException, DocumentReviewException
+from utils.exceptions import InvalidNhsNumberException, DocumentReviewException, InvalidFileTypeException
 from utils.lambda_exceptions import DocumentReviewLambdaException
 from utils.lambda_response import ApiGatewayResponse
 
@@ -55,8 +55,13 @@ def validate_event_body(body):
         event_body = DocumentReviewUploadEvent.model_validate_json(body)
 
         return event_body
-    except (ValidationError, InvalidNhsNumberException, DocumentReviewException) as e:
+    except (ValidationError, InvalidNhsNumberException) as e:
         logger.error(e)
         raise DocumentReviewLambdaException(
             400, LambdaError.DocumentReviewUploadInvalidRequest
         )
+    except InvalidFileTypeException as e:
+        logger.error(e)
+        raise DocumentReviewLambdaException(
+            400, LambdaError.DocumentReviewUnsupportedFileType
+        )

lambdas/models/document_review.py

@@ -8,7 +8,7 @@
 from enums.snomed_codes import SnomedCodes
 from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator, ValidationError
 from pydantic.alias_generators import to_camel, to_pascal
-from utils.exceptions import InvalidNhsNumberException, ConfigNotFoundException, DocumentReviewException
+from utils.exceptions import InvalidNhsNumberException, ConfigNotFoundException, InvalidFileTypeException
 from utils import upload_file_configs
 from utils.utilities import validate_nhs_number
 
@@ -166,8 +166,8 @@ def validate_file_extension(self) -> Self:
 
             for file in self.documents:
                 if not is_file_type_allowed(file, accepted_file_types):
-                    raise DocumentReviewException("Invalid file extension.")
+                    raise InvalidFileTypeException("Invalid file extension.")
             return self
         except ConfigNotFoundException:
-            raise DocumentReviewException("Unable to find file configuration.")
+            raise InvalidFileTypeException("Unable to find file configuration.")
 

lambdas/tests/unit/handlers/test_post_document_review_handler.py

@@ -221,19 +221,19 @@ def test_validate_event_body_valid_event_returns_document_review_upload_event_mo
 
 
 def test_validate_event_body_throws_error_unsupported_snomed_code(invalid_event):
-    invalid_event["body"] = INVALID_EVENT_UNSUPPORTED_SNOMED_CODE
+    invalid_event["body"] = json.dumps(INVALID_EVENT_UNSUPPORTED_SNOMED_CODE)
     with pytest.raises(DocumentReviewLambdaException) as e:
         validate_event_body(invalid_event["body"])
     assert e.value.status_code == 400
     assert e.value.err_code == "UDR_4003"
 
 
 def test_validate_event_body_throws_error_unsupported_file_type(invalid_event):
-    invalid_event["body"] = INVALID_EVENT_UNSUPPORTED_SNOMED_CODE
+    invalid_event["body"] = json.dumps(INVALID_EVENT_INVALID_FILE_EXTENSION)
     with pytest.raises(DocumentReviewLambdaException) as e:
         validate_event_body(invalid_event["body"])
     assert e.value.status_code == 400
-    assert e.value.err_code == "UDR_4003"
+    assert e.value.err_code == "DRV_4006"
 
 
 def test_lambda_handler_calls_service_with_validated_event(

lambdas/utils/exceptions.py

@@ -218,3 +218,7 @@ class ReviewProcessCreateRecordException(Exception):
 
 class CorruptedFileException(Exception):
     pass
+
+
+class InvalidFileTypeException(Exception):
+    pass