From b444eb106393a9e8cf8ac5b36b7064fb7705f315 Mon Sep 17 00:00:00 2001 From: NogaNHS <127490765+NogaNHS@users.noreply.github.com> Date: Wed, 11 Feb 2026 13:55:57 +0000 Subject: [PATCH 1/2] Refactor file name handling in bulk upload SQS repository and update test cases --- .../bulk_upload/bulk_upload_sqs_repository.py | 6 +++--- .../bulk_upload/test_bulk_upload_sqs_repository.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lambdas/repositories/bulk_upload/bulk_upload_sqs_repository.py b/lambdas/repositories/bulk_upload/bulk_upload_sqs_repository.py index 9bdba35e4..a6f49fef2 100644 --- a/lambdas/repositories/bulk_upload/bulk_upload_sqs_repository.py +++ b/lambdas/repositories/bulk_upload/bulk_upload_sqs_repository.py @@ -38,7 +38,7 @@ def send_message_to_review_queue( request_context.patient_nhs_no = staging_metadata.nhs_number review_files = [ ReviewMessageFile( - file_name=file.stored_file_name.split("/")[-1], + file_name=file.file_path.split("/")[-1], file_path=file.file_path.lstrip("/"), ) for file in staging_metadata.files @@ -56,7 +56,7 @@ def send_message_to_review_queue( logger.info( f"Sending message to review queue for NHS number {staging_metadata.nhs_number} " - f"with failure reason: {failure_reason}" + f"with failure reason: {failure_reason}", ) self.sqs_repository.send_message_standard( @@ -80,7 +80,7 @@ def put_sqs_message_back_to_queue(self, sqs_message: dict): ) def send_message_to_pdf_stitching_queue( - self, queue_url: str, message: PdfStitchingSqsMessage + self, queue_url: str, message: PdfStitchingSqsMessage, ): self.sqs_repository.send_message_standard( queue_url=queue_url, diff --git a/lambdas/tests/unit/repositories/bulk_upload/test_bulk_upload_sqs_repository.py b/lambdas/tests/unit/repositories/bulk_upload/test_bulk_upload_sqs_repository.py index fa7698140..27782eadb 100644 --- a/lambdas/tests/unit/repositories/bulk_upload/test_bulk_upload_sqs_repository.py +++ b/lambdas/tests/unit/repositories/bulk_upload/test_bulk_upload_sqs_repository.py @@ -32,13 +32,13 @@ def sample_staging_metadata(): files=[ BulkUploadQueueMetadata( file_path="staging/9000000009/test1.pdf", - stored_file_name="test1.pdf", + stored_file_name="lg_test1.pdf", gp_practice_code="Y12345", scan_date="2024-01-01", ), BulkUploadQueueMetadata( file_path="staging/9000000009/test2.pdf", - stored_file_name="test2.pdf", + stored_file_name="lg_test2.pdf", gp_practice_code="Y12345", scan_date="2024-01-01", ), @@ -48,7 +48,7 @@ def sample_staging_metadata(): def test_put_staging_metadata_back_to_queue_and_increases_retries( - set_env, mock_uuid, repo_under_test + set_env, mock_uuid, repo_under_test, ): TEST_STAGING_METADATA.retries = 2 metadata_copy = copy.deepcopy(TEST_STAGING_METADATA) @@ -88,7 +88,7 @@ def test_send_message_to_pdf_stitching_queue(set_env, repo_under_test): def test_sends_message_to_review_queue_with_correct_structure_and_fields( - set_env, repo_under_test, mock_uuid + set_env, repo_under_test, mock_uuid, ): repo_under_test.send_message_to_review_queue( staging_metadata=TEST_STAGING_METADATA, From c49315370e060589a5fbc9db1f6c13dd07cfb316 Mon Sep 17 00:00:00 2001 From: NogaNHS <127490765+NogaNHS@users.noreply.github.com> Date: Thu, 12 Feb 2026 10:07:49 +0000 Subject: [PATCH 2/2] [PRMP-1433] make format --- .../bulk_upload/bulk_upload_sqs_repository.py | 4 +++- .../bulk_upload/test_bulk_upload_sqs_repository.py | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lambdas/repositories/bulk_upload/bulk_upload_sqs_repository.py b/lambdas/repositories/bulk_upload/bulk_upload_sqs_repository.py index a6f49fef2..2837f6e15 100644 --- a/lambdas/repositories/bulk_upload/bulk_upload_sqs_repository.py +++ b/lambdas/repositories/bulk_upload/bulk_upload_sqs_repository.py @@ -80,7 +80,9 @@ def put_sqs_message_back_to_queue(self, sqs_message: dict): ) def send_message_to_pdf_stitching_queue( - self, queue_url: str, message: PdfStitchingSqsMessage, + self, + queue_url: str, + message: PdfStitchingSqsMessage, ): self.sqs_repository.send_message_standard( queue_url=queue_url, diff --git a/lambdas/tests/unit/repositories/bulk_upload/test_bulk_upload_sqs_repository.py b/lambdas/tests/unit/repositories/bulk_upload/test_bulk_upload_sqs_repository.py index 27782eadb..5d0a3dbf3 100644 --- a/lambdas/tests/unit/repositories/bulk_upload/test_bulk_upload_sqs_repository.py +++ b/lambdas/tests/unit/repositories/bulk_upload/test_bulk_upload_sqs_repository.py @@ -48,7 +48,9 @@ def sample_staging_metadata(): def test_put_staging_metadata_back_to_queue_and_increases_retries( - set_env, mock_uuid, repo_under_test, + set_env, + mock_uuid, + repo_under_test, ): TEST_STAGING_METADATA.retries = 2 metadata_copy = copy.deepcopy(TEST_STAGING_METADATA) @@ -88,7 +90,9 @@ def test_send_message_to_pdf_stitching_queue(set_env, repo_under_test): def test_sends_message_to_review_queue_with_correct_structure_and_fields( - set_env, repo_under_test, mock_uuid, + set_env, + repo_under_test, + mock_uuid, ): repo_under_test.send_message_to_review_queue( staging_metadata=TEST_STAGING_METADATA,