Skip to content

[PRMP-1433] Refactor file name handling in bulk upload SQS repository #1079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NogaNHS merged 3 commits into from
Feb 12, 2026
+13 −7
Merged

[PRMP-1433] Refactor file name handling in bulk upload SQS repository #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b444eb1
Refactor file name handling in bulk upload SQS repository and update …
NogaNHS Feb 11, 2026
c493153
[PRMP-1433] make format
NogaNHS Feb 12, 2026
9608fce
Merge branch 'main' into PRMP-1433
NogaNHS Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions lambdas/repositories/bulk_upload/bulk_upload_sqs_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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(
Expand All @@ -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,
Expand Down
12 changes: 8 additions & 4 deletions lambdas/tests/unit/repositories/bulk_upload/test_bulk_upload_sqs_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
),
Expand All @@ -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)
Expand Down Expand Up @@ -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,
Expand Down
Loading