[PRMP-1082] move validation into model

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
+from utils.exceptions import InvalidNhsNumberException, DocumentReviewException
 from utils.lambda_exceptions import DocumentReviewLambdaException
 from utils.lambda_response import ApiGatewayResponse
 
@@ -55,7 +55,7 @@ def validate_event_body(body):
         event_body = DocumentReviewUploadEvent.model_validate_json(body)
 
         return event_body
-    except (ValidationError, InvalidNhsNumberException) as e:
+    except (ValidationError, InvalidNhsNumberException, DocumentReviewException) as e:
         logger.error(e)
         raise DocumentReviewLambdaException(
             400, LambdaError.DocumentReviewUploadInvalidRequest

lambdas/models/document_review.py

@@ -1,12 +1,15 @@
 import uuid
 from datetime import datetime, timezone
+from typing import Self
 
 from enums.document_review_status import DocumentReviewStatus
 from enums.metadata_field_names import DocumentReferenceMetadataFields
+from enums.upload_forbidden_file_extensions import is_file_type_allowed
 from enums.snomed_codes import SnomedCodes
-from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
+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
+from utils.exceptions import InvalidNhsNumberException, ConfigNotFoundException, DocumentReviewException
+from utils import upload_file_configs
 from utils.utilities import validate_nhs_number
 
 
@@ -155,3 +158,16 @@ def check_snomed_code(cls, value) -> SnomedCodes | None:
     def verify_nhs_number(cls, value) -> str | None:
         if validate_nhs_number(value):
             return value
+
+    @model_validator(mode="after")
+    def validate_file_extension(self) -> Self:
+        try:
+            accepted_file_types = upload_file_configs.get_config_by_snomed_code(self.snomed_code.code).accepted_file_types
+
+            for file in self.documents:
+                if not is_file_type_allowed(file, accepted_file_types):
+                    raise DocumentReviewException("Invalid file extension.")
+            return self
+        except ConfigNotFoundException:
+            raise DocumentReviewException("Unable to find file configuration.")
+

lambdas/services/post_document_review_service.py

@@ -6,7 +6,6 @@
 from enums.document_review_status import DocumentReviewReason, DocumentReviewStatus
 from enums.lambda_error import LambdaError
 from enums.patient_ods_inactive_status import PatientOdsInactiveStatus
-from enums.upload_forbidden_file_extensions import is_file_type_allowed
 from models.document_review import (
     DocumentReviewFileDetails,
     DocumentReviewUploadEvent,
@@ -15,10 +14,8 @@
 from pydantic import ValidationError
 from services.base.s3_service import S3Service
 from services.document_upload_review_service import DocumentUploadReviewService
-from utils import upload_file_configs
 from utils.audit_logging_setup import LoggingService
 from utils.exceptions import (
-    ConfigNotFoundException,
     DocumentReviewException,
     OdsErrorException,
     PatientNotFoundException,
@@ -54,8 +51,6 @@ def process_event(self, event: DocumentReviewUploadEvent) -> dict:
                     403, LambdaError.DocumentReviewUploadForbidden
                 )
 
-            self.validate_document_file_type(event)
-
             document_review_reference = self.create_review_reference_from_event(
                 event=event, author=author, patient_details=patient_details
             )
@@ -89,26 +84,6 @@ def process_event(self, event: DocumentReviewUploadEvent) -> dict:
         except ClientError:
             raise DocumentReviewLambdaException(500, LambdaError.DocumentReviewDB)
 
-    def validate_document_file_type(self, event: DocumentReviewUploadEvent) -> None:
-        snomed_code = event.snomed_code.code
-        accepted_file_types = self.get_accepted_file_types(
-            snomed_code, upload_file_configs
-        )
-
-        if not is_file_type_allowed(event.documents[0], accepted_file_types):
-            logger.info("File type is not supported.")
-            raise DocumentReviewLambdaException(
-                400, LambdaError.DocumentReviewUnsupportedFileType
-            )
-
-    def get_accepted_file_types(self, snomed_code, upload_file_configs):
-        try:
-            return upload_file_configs.get_config_by_snomed_code(
-                snomed_code
-            ).accepted_file_types
-        except ConfigNotFoundException:
-            logger.error(f"Unable to find config for snomed code: {snomed_code}")
-            raise DocumentReviewLambdaException(400, LambdaError.DocRefInvalidType)
 
     def create_response(
         self, document_review_reference: DocumentUploadReviewReference

lambdas/tests/unit/handlers/test_post_document_review_handler.py

@@ -38,6 +38,12 @@
     "documents": [],
 }
 
+INVALID_EVENT_INVALID_FILE_EXTENSION = {
+    "nhsNumber": TEST_NHS_NUMBER,
+    "snomedCode": SnomedCodes.LLOYD_GEORGE.value.code,
+    "documents": ["testFile.job"],
+}
+
 TEST_PRESIGNED_URL_1 = "https://s3.amazonaws.com/presigned1?signature=abc123"
 
 
@@ -222,6 +228,14 @@ def test_validate_event_body_throws_error_unsupported_snomed_code(invalid_event)
     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
+    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_lambda_handler_calls_service_with_validated_event(
     mock_service, context, mock_upload_document_iteration_3_enabled, valid_event
 ):

lambdas/tests/unit/services/test_post_document_review_service.py

@@ -293,40 +293,4 @@ def test_create_response(mock_service):
             nhs_number=TEST_NHS_NUMBER,
         )
     )
-    assert actual == expected
-
-
-@freeze_time("2024-01-01 12:00:00")
-def test_validate_file_type_with_invalid_file_type(mock_extract_ods, mock_service):
-    mock_extract_ods.return_value = TEST_CURRENT_GP_ODS
-    mock_service.pds_service.fetch_patient_details.return_value = (
-        EXPECTED_PARSED_PATIENT_BASE_CASE
-    )
-    invalid_event = deepcopy(VALID_EVENT)
-    invalid_event.documents = ["testFile.exe"]
-
-    with pytest.raises(DocumentReviewLambdaException) as e:
-        mock_service.process_event(invalid_event)
-
-    assert e.value.status_code == 400
-    assert e.value.err_code == "DRV_4006"
-
-    mock_service.review_document_service.create_dynamo_entry.assert_not_called()
-
-
-@freeze_time("2024-01-01 12:00:00")
-def test_validate_file_type_with_invalid_snomed_code(mock_extract_ods, mock_service):
-    mock_extract_ods.return_value = TEST_CURRENT_GP_ODS
-    mock_service.pds_service.fetch_patient_details.return_value = (
-        EXPECTED_PARSED_PATIENT_BASE_CASE
-    )
-    invalid_event = deepcopy(VALID_EVENT)
-    invalid_event.snomed_code.code = "INVALID_SNOMED_CODE"
-
-    with pytest.raises(DocumentReviewLambdaException) as e:
-        mock_service.process_event(invalid_event)
-
-    assert e.value.status_code == 400
-    assert e.value.err_code == "DR_4007"
-
-    mock_service.review_document_service.create_dynamo_entry.assert_not_called()
+    assert actual == expected