[PRMP-386] Allow bulk upload to have parallel executions (#892)

Co-authored-by: Robert Gaskin <[email protected]>

Author: PedroSoaresNHS

lambdas/services/bulk_upload_metadata_processor_service.py

@@ -2,7 +2,6 @@
 import os
 import shutil
 import tempfile
-import uuid
 from collections import defaultdict
 from datetime import datetime
 
@@ -217,16 +216,14 @@ def send_metadata_to_fifo_sqs(
         self, staging_sqs_metadata_list: list[StagingSqsMetadata]
     ) -> None:
         """Send validated metadata entries to SQS FIFO queue."""
-        sqs_group_id = f"bulk_upload_{uuid.uuid4()}"
-
         for staging_sqs_metadata in staging_sqs_metadata_list:
             nhs_number = staging_sqs_metadata.nhs_number
             logger.info(f"Sending metadata for patientId: {nhs_number}")
             self.sqs_service.send_message_with_nhs_number_attr_fifo(
                 queue_url=self.metadata_queue_url,
                 message_body=staging_sqs_metadata.model_dump_json(by_alias=True),
                 nhs_number=nhs_number,
-                group_id=sqs_group_id,
+                group_id=f"bulk_upload_{nhs_number}",
             )
 
     def copy_metadata_to_dated_folder(self):

lambdas/tests/unit/services/test_bulk_upload_metadata_processor_service.py

@@ -126,15 +126,13 @@ def test_process_metadata_send_metadata_to_sqs_queue(
     mock_download_metadata_from_s3,
 ):
     fake_csv_path = "fake/path/metadata.csv"
-    fake_uuid = "123412342"
 
     mock_download_metadata_from_s3.return_value = fake_csv_path
 
     mocker.patch.object(
         test_service.s3_service, "copy_across_bucket", return_value=None
     )
     mocker.patch.object(test_service.s3_service, "delete_object", return_value=None)
-    mocker.patch("uuid.uuid4", return_value=fake_uuid)
 
     fake_metadata = [
         {"nhs_number": "1234567890", "some_data": "value1"},
@@ -365,19 +363,18 @@ def test_duplicates_csv_to_sqs_metadata(mocker, bulk_upload_service):
 
 
 def test_send_metadata_to_sqs(set_env, mocker, mock_sqs_service, test_service):
-    mocker.patch("uuid.uuid4", return_value="123412342")
     expected_calls = [
         call(
             queue_url=MOCK_LG_METADATA_SQS_QUEUE,
             message_body=EXPECTED_SQS_MSG_FOR_PATIENT_1234567890,
             nhs_number="1234567890",
-            group_id="bulk_upload_123412342",
+            group_id="bulk_upload_1234567890",
         ),
         call(
             queue_url=MOCK_LG_METADATA_SQS_QUEUE,
             message_body=EXPECTED_SQS_MSG_FOR_PATIENT_123456789,
             nhs_number="123456789",
-            group_id="bulk_upload_123412342",
+            group_id="bulk_upload_123456789",
         ),
     ]