From fae50910e4cf3c02c7bba761f506fc3a0d7400d2 Mon Sep 17 00:00:00 2001 From: steph-torres-nhs <173282814+steph-torres-nhs@users.noreply.github.com> Date: Wed, 24 Dec 2025 10:18:44 +0000 Subject: [PATCH 1/2] [PRMP-1158] removew file location check --- .../staged_document_review_processing_service.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lambdas/services/staged_document_review_processing_service.py b/lambdas/services/staged_document_review_processing_service.py index 9da7cee06e..1a6d466fbf 100644 --- a/lambdas/services/staged_document_review_processing_service.py +++ b/lambdas/services/staged_document_review_processing_service.py @@ -32,9 +32,7 @@ def handle_upload_document_reference_request( document_reference = self._fetch_document_reference_by_id(upload_id) - if self._is_review_pending_upload( - document_reference - ) and self._is_file_at_expected_location(document_reference, object_key): + if self._is_review_pending_upload(document_reference): logger.info( f"Document {document_reference.id} is in pending upload state, processing" ) @@ -112,11 +110,11 @@ def _is_review_pending_upload( == DocumentReviewStatus.REVIEW_PENDING_UPLOAD ) - def _is_file_at_expected_location( - self, document_reference: DocumentUploadReviewReference, object_key: str - ) -> bool: - expected_file_location = document_reference.files[0].file_location - return expected_file_location.endswith(object_key) + # def _is_file_at_expected_location( + # self, document_reference: DocumentUploadReviewReference, object_key: str + # ) -> bool: + # expected_file_location = document_reference.files[0].file_location + # return expected_file_location.endswith(object_key) def _perform_virus_scan( self, document_reference: DocumentUploadReviewReference, object_key: str From d779822908c3cd3b96263741d64f08fcf988f8d7 Mon Sep 17 00:00:00 2001 From: steph-torres-nhs <173282814+steph-torres-nhs@users.noreply.github.com> Date: Wed, 24 Dec 2025 10:56:24 +0000 Subject: [PATCH 2/2] [PRMP-1158] ignore test for now --- ...aged_document_review_processing_service.py | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lambdas/tests/unit/services/test_staged_document_review_processing_service.py b/lambdas/tests/unit/services/test_staged_document_review_processing_service.py index aa3b8a52ae..925882e594 100644 --- a/lambdas/tests/unit/services/test_staged_document_review_processing_service.py +++ b/lambdas/tests/unit/services/test_staged_document_review_processing_service.py @@ -251,23 +251,23 @@ def test_fetch_document_reference_by_id( ) -def test_handle_upload_document_reference_request_with_mismatched_object_key_and_file_location( - mock_service, - mock_review_document_service, - mock_virus_scan_service, - sample_document_reference, -): - object_key = "test-upload-id/test-document.pdf" - sample_document_reference.files[0].file_location = "s3://other-bucket/other-key.pdf" - mock_review_document_service.fetch_documents_from_table.return_value = [ - sample_document_reference - ] - mock_virus_scan_service.scan_file.return_value = VirusScanResult.CLEAN.value - mock_service.handle_upload_document_reference_request(object_key) - - mock_virus_scan_service.scan_file.assert_not_called() - mock_service.s3_service.copy_across_bucket.assert_not_called() - mock_service.s3_service.delete_object.assert_called() +# def test_handle_upload_document_reference_request_with_mismatched_object_key_and_file_location( +# mock_service, +# mock_review_document_service, +# mock_virus_scan_service, +# sample_document_reference, +# ): +# object_key = "test-upload-id/test-document.pdf" +# sample_document_reference.files[0].file_location = "s3://other-bucket/other-key.pdf" +# mock_review_document_service.fetch_documents_from_table.return_value = [ +# sample_document_reference +# ] +# mock_virus_scan_service.scan_file.return_value = VirusScanResult.CLEAN.value +# mock_service.handle_upload_document_reference_request(object_key) +# +# mock_virus_scan_service.scan_file.assert_not_called() +# mock_service.s3_service.copy_across_bucket.assert_not_called() +# mock_service.s3_service.delete_object.assert_called() @pytest.mark.parametrize(