[PRMP-1155] Fix Bulk Upload NHS Number missing for USB ingestions (#968)

robg-test · web-flow · commit 4682e0f17e19 · 2025-12-24T11:01:07.000Z
diff --git a/lambdas/services/bulk_upload_metadata_processor_service.py b/lambdas/services/bulk_upload_metadata_processor_service.py
@@ -244,7 +244,8 @@ def validate_and_correct_filename(self, file_metadata: MetadataFile) -> str:
             return file_metadata.file_path
         except LGInvalidFilesException:
             return self.metadata_formatter_service.validate_record_filename(
-                file_metadata.file_path
+                file_metadata.file_path,
+                file_metadata.nhs_number
             )
 
     def validate_expedite_file(self, s3_object_key: str):
diff --git a/lambdas/tests/unit/services/test_bulk_upload_metadata_processor_service.py b/lambdas/tests/unit/services/test_bulk_upload_metadata_processor_service.py
@@ -618,7 +618,7 @@ def test_validate_and_correct_filename_sad_path(
     result = test_service.validate_and_correct_filename(base_metadata_file)
 
     mocked_validate_record_filename.assert_called_once_with(
-        base_metadata_file.file_path
+        base_metadata_file.file_path, base_metadata_file.nhs_number
     )
     assert result == "corrected/path/file_corrected.pdf"
 

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,8 @@ def validate_and_correct_filename(self, file_metadata: MetadataFile) -> str:`
`244`	`244`	`return file_metadata.file_path`
`245`	`245`	`except LGInvalidFilesException:`
`246`	`246`	`return self.metadata_formatter_service.validate_record_filename(`
`247`		`- file_metadata.file_path`
	`247`	`+ file_metadata.file_path,`
	`248`	`+ file_metadata.nhs_number`
`248`	`249`	`)`
`249`	`250`
`250`	`251`	`def validate_expedite_file(self, s3_object_key: str):`
Original file line number	Diff line number	Diff line change
`@@ -618,7 +618,7 @@ def test_validate_and_correct_filename_sad_path(`
`618`	`618`	`result = test_service.validate_and_correct_filename(base_metadata_file)`
`619`	`619`
`620`	`620`	`mocked_validate_record_filename.assert_called_once_with(`
`621`		`- base_metadata_file.file_path`
	`621`	`+ base_metadata_file.file_path, base_metadata_file.nhs_number`
`622`	`622`	`)`
`623`	`623`	`assert result == "corrected/path/file_corrected.pdf"`
`624`	`624`