[PRMP-1088] Add Practice Directory to StoredFileName (#944)

Author: robg-test

lambdas/services/bulk_upload_metadata_processor_service.py

@@ -186,6 +186,9 @@ def process_metadata_row(
             return
 
         sqs_metadata = self.convert_to_sqs_metadata(file_metadata, correct_file_name)
+        sqs_metadata.stored_file_name = (self.practice_directory.rstrip("/")
+                                         + "/" +
+                                         sqs_metadata.stored_file_name.lstrip("/"))
         patients[(nhs_number, ods_code)].append(sqs_metadata)
 
     @staticmethod

lambdas/tests/unit/services/test_bulk_upload_metadata_processor_service.py

@@ -1,4 +1,5 @@
 import os
+import copy
 import tempfile
 import urllib
 import urllib.parse
@@ -380,7 +381,13 @@ def test_duplicates_csv_to_sqs_metadata(mocker, bulk_upload_service):
 
     actual = bulk_upload_service.csv_to_sqs_metadata("fake/path.csv")
 
-    expected = EXPECTED_PARSED_METADATA_2
+    expected = copy.deepcopy(EXPECTED_PARSED_METADATA_2)
+    for metadata in expected:
+        for file in metadata.files:
+            file.stored_file_name = (
+                f"test_practice_directory/{file.stored_file_name.lstrip('/')}"
+            )
+
     assert actual == expected
 
 
@@ -436,7 +443,7 @@ def test_clear_temp_storage(set_env, mocker, mock_tempfile, test_service):
 def test_process_metadata_row_success(mocker, test_service):
     patients = defaultdict(list)
     row = {
-        "FILEPATH": "/some/path/file.pdf",
+        "FILEPATH": "some/path/file.pdf",
         "GP-PRACTICE-CODE": "Y12345",
         "NHS-NO": "1234567890",
         "PAGE COUNT": "5",
@@ -466,11 +473,11 @@ def test_process_metadata_row_success(mocker, test_service):
 
     expected_sqs_metadata = BulkUploadQueueMetadata.model_validate(
         {
-            "file_path": "/some/path/file.pdf",
+            "file_path": "some/path/file.pdf",
             "nhs_number": "1234567890",
             "gp_practice_code": "Y12345",
             "scan_date": "01/01/2023",
-            "stored_file_name": "corrected.pdf",
+            "stored_file_name": "test_practice_directory/corrected.pdf",
         }
     )
 
@@ -485,7 +492,7 @@ def test_process_metadata_row_adds_to_existing_entry(mocker):
             "nhs_number": "1234567890",
             "gp_practice_code": "Y12345",
             "scan_date": "01/01/2023",
-            "stored_file_name": "/some/path/file1.pdf",
+            "stored_file_name": "test_practice_directory/some/path/file1.pdf",
         }
     )
     patients = {key: [mock_metadata_existing]}
@@ -524,7 +531,7 @@ def test_process_metadata_row_adds_to_existing_entry(mocker):
     assert patients[key][0] == mock_metadata_existing
     assert isinstance(patients[key][1], BulkUploadQueueMetadata)
     assert patients[key][1].file_path == "/some/path/file2.pdf"
-    assert patients[key][1].stored_file_name == "/some/path/file2.pdf"
+    assert patients[key][1].stored_file_name == "test_practice_directory/some/path/file2.pdf"
 
 
 def test_extract_patient_info(test_service, base_metadata_file):
@@ -871,7 +878,7 @@ def test_remapping_mandatory_fields(
                     file_path="/path/1.pdf",
                     gp_practice_code="Y12345",
                     scan_date="02/01/2023",
-                    stored_file_name="/path/1.pdf",
+                    stored_file_name="test_practice_directory/path/1.pdf",
                 )
             ],
             retries=0,
@@ -941,7 +948,7 @@ def test_no_remapping_logic(
                     file_path="/path/1.pdf",
                     gp_practice_code="Y12345",
                     scan_date="02/01/2023",
-                    stored_file_name="/path/1.pdf",
+                    stored_file_name="test_practice_directory/path/1.pdf",
                 )
             ],
             retries=0,