dynamodb_client.transact_write_items

Author: nhsdevws

lambdas/id_sync/src/ieds_db_operations.py

@@ -1,7 +1,7 @@
 from boto3.dynamodb.conditions import Key
 from os_vars import get_ieds_table_name
 from common.aws_dynamodb import get_dynamodb_table
-from common.clients import logger
+from common.clients import logger, dynamodb_client
 from exceptions.id_sync_exception import IdSyncException
 
 ieds_table = None
@@ -52,7 +52,7 @@ def ieds_update_patient_id(old_id: str, new_id: str) -> dict:
         old_patient_pk = f"Patient#{old_id}"
 
         logger.info("Getting items to update in IEDS table...")
-        items_to_update = get_items_to_update(old_patient_pk)
+        items_to_update = get_items_from_patient_pk(old_patient_pk)
 
         if not items_to_update:
             logger.warning(f"No items found to update for patient ID: {old_id}")
@@ -65,12 +65,13 @@ def ieds_update_patient_id(old_id: str, new_id: str) -> dict:
 
         logger.info("loop through items to update...")
         logger.info(f"Items to update: {len(items_to_update)}")
+        ieds_table_name = get_ieds_table_name()
         for item in items_to_update:
             logger.info("Update item")
             logger.info(f"Updating item: {item['PatientPK']}")
             transact_items.append({
                 'Update': {
-                    'TableName': get_ieds_table_name(),
+                    'TableName': ieds_table_name,
                     'Key': {
                         'PK': {'S': item['PK']},
                     },
@@ -92,7 +93,7 @@ def ieds_update_patient_id(old_id: str, new_id: str) -> dict:
             total_batches += 1
             logger.info(f"Transacting batch {total_batches} of size: {len(batch)}")
 
-            response = ieds_table.transact_write_items(TransactItems=batch)
+            response = dynamodb_client.transact_write_items(TransactItems=batch)
             logger.info("Batch update complete. Response: %s", response)
 
             # Check each batch response
@@ -119,13 +120,12 @@ def ieds_update_patient_id(old_id: str, new_id: str) -> dict:
 
     except Exception as e:
         logger.exception("Error updating patient ID")
+        logger.info("Error details: %s", e)
         raise IdSyncException(
             message=f"Error updating patient Id from :{old_id} to {new_id}",
             nhs_numbers=[old_id, new_id],
             exception=e
         )
-    # ✅ Fix: Remove duplicate raise
-    # raise e  # Remove this line
 
 # def test_ieds_insert_patient(patient_id: str) -> dict:  # NOSONAR
 #     """Test function for inserting patient ID."""
@@ -147,25 +147,25 @@ def ieds_update_patient_id(old_id: str, new_id: str) -> dict:
 #     return result
 
 
-def get_items_to_update(old_patient_pk: str) -> list:
-    """Get items that need to be updated in the IEDS table."""
-    logger.info(f"Getting items to update for old patient PK: {old_patient_pk}")
+def get_items_from_patient_pk(patient_pk: str) -> list:
+    """Get all items for patient PK."""
+    logger.info(f"Getting items for patient PK: {patient_pk}")
     try:
         response = get_ieds_table().query(
             IndexName='PatientGSI',  # query the GSI
-            KeyConditionExpression=Key('PatientPK').eq(old_patient_pk),
+            KeyConditionExpression=Key('PatientPK').eq(patient_pk),
             Limit=BATCH_SIZE
         )
 
         if 'Items' not in response or not response['Items']:
-            logger.warning(f"No items found for old patient PK: {old_patient_pk}")
+            logger.warning(f"No items found for patient PK: {patient_pk}")
             return []
 
         return response['Items']
     except Exception as e:
-        logger.exception(f"Error querying items for old patient PK: {old_patient_pk}")
+        logger.exception(f"Error querying items for patient PK: {patient_pk}")
         raise IdSyncException(
-            message=f"Error querying items for old patient PK: {old_patient_pk}",
-            nhs_numbers=[old_patient_pk],
+            message=f"Error querying items for patient PK: {patient_pk}",
+            nhs_numbers=[patient_pk],
             exception=e
         )

lambdas/id_sync/tests/test_ieds_db_operations.py

@@ -415,12 +415,15 @@ def setUp(self):
         self.mock_table = MagicMock()
         self.mock_get_ieds_table_patcher.return_value = self.mock_table
 
+        self.mock_dynamodb_client = patch('ieds_db_operations.dynamodb_client')
+        self.mock_dynamodb_client_patcher = self.mock_dynamodb_client.start()
+
         # Mock transact_write_items (not update_item)
-        self.mock_table.transact_write_items = MagicMock()
+        self.mock_dynamodb_client_patcher.transact_write_items = MagicMock()
 
-        # Mock get_items_to_update
-        self.get_items_to_update_patcher = patch('ieds_db_operations.get_items_to_update')
-        self.mock_get_items_to_update = self.get_items_to_update_patcher.start()
+        # Mock get_items_from_patient_pk
+        self.get_items_from_patient_pk_patcher = patch('ieds_db_operations.get_items_from_patient_pk')
+        self.mock_get_items_from_patient_pk = self.get_items_from_patient_pk_patcher.start()
 
         # Mock get_ieds_table_name
         self.get_ieds_table_name_patcher = patch('ieds_db_operations.get_ieds_table_name')
@@ -438,27 +441,27 @@ def test_ieds_update_patient_id_success(self):
             {'PK': 'Patient#old-patient-123', 'PatientPK': 'Patient#old-patient-123'},
             {'PK': 'Patient#old-patient-123#record1', 'PatientPK': 'Patient#old-patient-123'}
         ]
-        self.mock_get_items_to_update.return_value = mock_items
+        self.mock_get_items_from_patient_pk.return_value = mock_items
 
         # Mock successful transact_write_items response
         mock_transact_response = {'ResponseMetadata': {'HTTPStatusCode': 200}}
-        self.mock_table.transact_write_items.return_value = mock_transact_response
+        self.mock_dynamodb_client_patcher.transact_write_items.return_value = mock_transact_response
 
         # Act
         result = ieds_db_operations.ieds_update_patient_id(old_id, new_id)
 
-        # Assert - ✅ Fix: Update expected message to match actual implementation
+        # Assert - Update expected message to match actual implementation
         expected_result = {
             "status": "success",
             "message": f"IEDS update, patient ID: {old_id}=>{new_id}. {len(mock_items)} updated 1."
         }
         self.assertEqual(result, expected_result)
 
-        # Verify get_items_to_update was called
-        self.mock_get_items_to_update.assert_called_once_with(f"Patient#{old_id}")
+        # Verify get_items_from_patient_pk was called
+        self.mock_get_items_from_patient_pk.assert_called_once_with(f"Patient#{old_id}")
 
         # Verify transact_write_items was called
-        self.mock_table.transact_write_items.assert_called_once()
+        self.mock_dynamodb_client_patcher.transact_write_items.assert_called_once()
 
         # Verify table was retrieved
         self.mock_get_ieds_table_patcher.assert_called_once()
@@ -471,11 +474,11 @@ def test_ieds_update_patient_id_non_200_response(self):
 
         # Mock items to update
         mock_items = [{'PK': 'Patient#old-patient-123', 'PatientPK': 'Patient#old-patient-123'}]
-        self.mock_get_items_to_update.return_value = mock_items
+        self.mock_get_items_from_patient_pk.return_value = mock_items
 
         # ✅ Fix: Mock failed transact_write_items response (not update_item)
         mock_transact_response = {'ResponseMetadata': {'HTTPStatusCode': 400}}
-        self.mock_table.transact_write_items.return_value = mock_transact_response
+        self.mock_dynamodb_client_patcher.transact_write_items.return_value = mock_transact_response
 
         # Act
         result = ieds_db_operations.ieds_update_patient_id(old_id, new_id)
@@ -488,7 +491,7 @@ def test_ieds_update_patient_id_non_200_response(self):
         self.assertEqual(result, expected_result)
 
         # ✅ Fix: Verify transact_write_items was called (not update_item)
-        self.mock_table.transact_write_items.assert_called_once()
+        self.mock_dynamodb_client_patcher.transact_write_items.assert_called_once()
 
     def test_ieds_update_patient_id_no_items_found(self):
         """Test when no items are found to update"""
@@ -497,7 +500,7 @@ def test_ieds_update_patient_id_no_items_found(self):
         new_id = "new-patient-456"
 
         # Mock empty items list
-        self.mock_get_items_to_update.return_value = []
+        self.mock_get_items_from_patient_pk.return_value = []
 
         # Act
         result = ieds_db_operations.ieds_update_patient_id(old_id, new_id)
@@ -509,8 +512,8 @@ def test_ieds_update_patient_id_no_items_found(self):
         }
         self.assertEqual(result, expected_result)
 
-        # Verify get_items_to_update was called
-        self.mock_get_items_to_update.assert_called_once_with(f"Patient#{old_id}")
+        # Verify get_items_from_patient_pk was called
+        self.mock_get_items_from_patient_pk.assert_called_once_with(f"Patient#{old_id}")
 
         # Verify no transact operation was attempted
         self.mock_table.transact_write_items.assert_not_called()
@@ -582,10 +585,10 @@ def test_ieds_update_patient_id_update_exception(self):
 
         # Mock items to update
         mock_items = [{'PK': 'Patient#old-patient-error', 'PatientPK': 'Patient#old-patient-error'}]
-        self.mock_get_items_to_update.return_value = mock_items
+        self.mock_get_items_from_patient_pk.return_value = mock_items
 
         test_exception = Exception("DynamoDB transact failed")
-        self.mock_table.transact_write_items.side_effect = test_exception
+        self.mock_dynamodb_client_patcher.transact_write_items.side_effect = test_exception
 
         # Act & Assert
         with self.assertRaises(Exception) as context:
@@ -598,7 +601,7 @@ def test_ieds_update_patient_id_update_exception(self):
         self.assertEqual(exception.inner_exception, test_exception)
 
         # Verify transact was attempted
-        self.mock_table.transact_write_items.assert_called_once()
+        self.mock_dynamodb_client_patcher.transact_write_items.assert_called_once()
 
         # Verify logger exception was called
         self.mock_logger.exception.assert_called_once_with("Error updating patient ID")
@@ -611,10 +614,10 @@ def test_ieds_update_patient_id_special_characters(self):
 
         # Mock items to update
         mock_items = [{'PK': f'Patient#{old_id}', 'PatientPK': f'Patient#{old_id}'}]
-        self.mock_get_items_to_update.return_value = mock_items
+        self.mock_get_items_from_patient_pk.return_value = mock_items
 
         mock_transact_response = {'ResponseMetadata': {'HTTPStatusCode': 200}}
-        self.mock_table.transact_write_items.return_value = mock_transact_response
+        self.mock_dynamodb_client_patcher.transact_write_items.return_value = mock_transact_response
 
         # Act
         result = ieds_db_operations.ieds_update_patient_id(old_id, new_id)
@@ -624,7 +627,7 @@ def test_ieds_update_patient_id_special_characters(self):
         self.assertEqual(result["message"], f"IEDS update, patient ID: {old_id}=>{new_id}. {len(mock_items)} updated 1.")
 
         # Verify transact_write_items was called with special characters
-        self.mock_table.transact_write_items.assert_called_once()
+        self.mock_dynamodb_client_patcher.transact_write_items.assert_called_once()
 
 
 class TestGetItemsToUpdate(TestIedsDbOperations):
@@ -640,7 +643,7 @@ def setUp(self):
     def tearDown(self):
         patch.stopall()
 
-    def test_get_items_to_update_success(self):
+    def test_get_items_from_patient_pk_success(self):
         """Test successful retrieval of items to update"""
         # Arrange
         patient_id = "test-patient-123"
@@ -654,15 +657,15 @@ def test_get_items_to_update_success(self):
         }
 
         # Act
-        result = ieds_db_operations.get_items_to_update(f"Patient#{patient_id}")
+        result = ieds_db_operations.get_items_from_patient_pk(f"Patient#{patient_id}")
 
         # Assert
         self.assertEqual(result, expected_items)
 
         # Verify query was called with correct parameters
         self.mock_table.query.assert_called_once()
 
-    def test_get_items_to_update_no_records(self):
+    def test_get_items_from_patient_pk_no_records(self):
         """Test when no records are found for the patient ID"""
         # Arrange
         patient_id = "test-patient-no-records"
@@ -672,7 +675,7 @@ def test_get_items_to_update_no_records(self):
         }
 
         # Act
-        result = ieds_db_operations.get_items_to_update(f"Patient#{patient_id}")
+        result = ieds_db_operations.get_items_from_patient_pk(f"Patient#{patient_id}")
 
         # Assert
         self.assertEqual(result, [])

lambdas/shared/src/common/clients.py

@@ -19,3 +19,4 @@
 # secretsmanager_client = boto3_client("secretsmanager", config=boto_config)
 secrets_manager_client = boto3_client("secretsmanager", region_name=REGION_NAME)
 dynamodb_resource = boto3.resource("dynamodb", region_name=REGION_NAME)
+dynamodb_client = boto3_client("dynamodb", region_name=REGION_NAME)