lint & tests

Author: nhsdevws

lambdas/id_sync/src/models/__init__.py …mbdas/id_sync/src/exceptions/__init__.pylambdas/id_sync/src/models/__init__.py renamed to lambdas/id_sync/src/exceptions/__init__.py lambdas/id_sync/src/models/__init__.py renamed to lambdas/id_sync/src/exceptions/__init__.py

@@ -2,7 +2,7 @@
 from common.clients import STREAM_NAME
 from common.log_decorator import logging_decorator
 from common.aws_lambda_event import AwsLambdaEvent
-from models.id_sync_exception import IdSyncException
+from exceptions.id_sync_exception import IdSyncException
 from record_processor import process_record
 '''
 Lambda function handler for processing SQS events.Lambda for ID Sync. Fired by SQS

…/id_sync/src/models/id_sync_exception.py …sync/src/exceptions/id_sync_exception.pylambdas/id_sync/src/models/id_sync_exception.py renamed to lambdas/id_sync/src/exceptions/id_sync_exception.py lambdas/id_sync/src/models/id_sync_exception.py renamed to lambdas/id_sync/src/exceptions/id_sync_exception.py

@@ -2,6 +2,7 @@
 from os_vars import get_ieds_table_name
 from common.aws_dynamodb import get_dynamodb_table
 from common.clients import logger
+from exceptions.id_sync_exception import IdSyncException
 
 ieds_table = None
 
@@ -58,5 +59,9 @@ def ieds_update_patient_id(old_id: str, new_id: str) -> dict:
 
     except Exception as e:
         logger.exception("Error updating patient ID")
-        # Handle any exceptions that occur during the update
+        raise IdSyncException(
+            message=f"Error updating patient Id from :{old_id} to {new_id}",
+            nhs_numbers=[old_id, new_id],
+            exception=e
+        )
         raise e

lambdas/id_sync/src/id_sync.py

@@ -7,7 +7,7 @@
 from os_vars import get_pds_env
 from common.pds_service import PdsService
 from common.authentication import AppRestrictedAuth, Service
-from models.id_sync_exception import IdSyncException
+from exceptions.id_sync_exception import IdSyncException
 
 pds_env = get_pds_env()
 safe_tmp_dir = tempfile.mkdtemp(dir="/tmp")  # NOSONAR

lambdas/id_sync/src/ieds_db_operations.py

@@ -5,7 +5,7 @@
 with patch('common.log_decorator.logging_decorator') as mock_decorator:
     mock_decorator.return_value = lambda f: f  # Pass-through decorator
     from id_sync import handler
-    from models.id_sync_exception import IdSyncException
+    from exceptions.id_sync_exception import IdSyncException
 
 
 class TestIdSyncHandler(unittest.TestCase):

lambdas/id_sync/src/pds_details.py

@@ -1,6 +1,7 @@
 import unittest
 from unittest.mock import patch, MagicMock
 from boto3.dynamodb.conditions import Key
+from exceptions.id_sync_exception import IdSyncException
 
 import ieds_db_operations
 
@@ -261,6 +262,7 @@ def test_get_ieds_table_exception_handling(self):
         self.mock_get_ieds_table_name.assert_called_once()
         self.mock_get_dynamodb_table.assert_called_once()
 
+
 class TestIedsCheckExists(TestIedsDbOperations):
 
     def setUp(self):
@@ -662,20 +664,21 @@ def test_ieds_update_patient_id_update_exception(self):
         # Arrange
         old_id = "old-patient-error"
         new_id = "new-patient-error"
-        self.mock_table.update_item.side_effect = Exception("DynamoDB update failed")
+        test_exception = Exception("DynamoDB update failed")
+        self.mock_table.update_item.side_effect = test_exception
 
         # Act & Assert
         with self.assertRaises(Exception) as context:
             ieds_db_operations.ieds_update_patient_id(old_id, new_id)
 
-        self.assertEqual(str(context.exception), "DynamoDB update failed")
+        exception = context.exception
+
+        self.assertEqual(exception.message, "Error updating patient Id from :old-patient-error to new-patient-error")
+        self.assertEqual(exception.nhs_numbers, ["old-patient-error", "new-patient-error"])
+        self.assertEqual(exception.inner_exception, test_exception)
 
         # Verify update was attempted
-        self.mock_table.update_item.assert_called_once_with(
-            Key={"PK": f"Patient#{old_id}"},
-            UpdateExpression="SET PK = :new_id",
-            ExpressionAttributeValues={":new_id": f"Patient#{new_id}"}
-        )
+        self.mock_table.update_item.assert_called_once()
 
         # Verify logger exception was called
         self.mock_logger.exception.assert_called_once_with("Error updating patient ID")
@@ -685,13 +688,18 @@ def test_ieds_update_patient_id_get_table_exception(self):
         # Arrange
         old_id = "old-patient-123"
         new_id = "new-patient-456"
-        self.mock_get_ieds_table_patcher.side_effect = Exception("Failed to get IEDS table")
+        test_exception = Exception("Failed to get IEDS table")
+        self.mock_get_ieds_table_patcher.side_effect = test_exception
 
         # Act & Assert
         with self.assertRaises(Exception) as context:
             ieds_db_operations.ieds_update_patient_id(old_id, new_id)
 
-        self.assertEqual(str(context.exception), "Failed to get IEDS table")
+        exception = context.exception
+
+        self.assertEqual(exception.message, "Error updating patient Id from :old-patient-123 to new-patient-456")
+        self.assertEqual(exception.nhs_numbers, [old_id, new_id])
+        self.assertEqual(exception.inner_exception, test_exception)
 
         # Verify get_ieds_table was called
         self.mock_get_ieds_table_patcher.assert_called_once()
@@ -713,6 +721,11 @@ def test_ieds_update_patient_id_missing_response_metadata(self):
         with self.assertRaises(Exception) as context:
             ieds_db_operations.ieds_update_patient_id(old_id, new_id)
 
+        exception = context.exception
+        self.assertIsInstance(exception, IdSyncException)
+        self.assertEqual(exception.message, f"Error updating patient Id from :{old_id} to {new_id}")
+        self.assertEqual(exception.nhs_numbers, [old_id, new_id])
+
         # Verify update was attempted
         self.mock_table.update_item.assert_called_once()
 

lambdas/id_sync/tests/test_id_sync.py

@@ -1,7 +1,7 @@
 import unittest
 from unittest.mock import patch, MagicMock
 from pds_details import pds_get_patient_details, pds_get_patient_id
-from models.id_sync_exception import IdSyncException
+from exceptions.id_sync_exception import IdSyncException
 
 
 class TestGetPdsPatientDetails(unittest.TestCase):