sync tests pass locally

Author: nhsdevws

lambdas/id_sync/poetry.lock

@@ -25,6 +25,8 @@ moto = "~5.1.5"
 python-stdnum = "^2.1"
 coverage = "^7.8.0"
 redis = "^4.6.0"
+jwt = "^1.4.0"
+cache = "^1.0.3"
 
 [tool.poetry.group.dev.dependencies]
 coverage = "^7.8.0"

lambdas/id_sync/pyproject.toml

@@ -2,15 +2,15 @@
     record Processor
 '''
 from common.clients import logger, secrets_manager_client
+from common.cache import Cache
 from clients import pds_env
-from cache import Cache
 from common.pds_service import PdsService
 from common.authentication import AppRestrictedAuth, Service
 
 
-def get_pds_patient_details(id: str) -> dict:
+def get_pds_patient_details(nhs_number: str) -> dict:
     try:
-        logger.info(f"Get PDS patient details for {id}")
+        logger.info(f"Get PDS patient details for {nhs_number}")
 
         cache = Cache(directory="/tmp")
         authenticator = AppRestrictedAuth(
@@ -21,9 +21,14 @@ def get_pds_patient_details(id: str) -> dict:
         )
         pds_service = PdsService(authenticator, pds_env)
 
-        details = pds_service.get_patient_details(id)
+        patient = pds_service.get_patient_details(nhs_number)
 
-        return details.get("id")
+        if patient:
+            pds_nhs_number = patient["identifier"][0]["value"]
+            return pds_nhs_number
+        else:
+            logger.info(f"No patient details found for ID: {nhs_number}")
+            return None
     except Exception:
-        logger.exception(f"Error getting PDS patient details for {id}")
+        logger.exception(f"Error getting PDS patient details for {nhs_number}")
         return None

lambdas/id_sync/src/pds_details.py

@@ -3,6 +3,7 @@
 '''
 from common.aws_lambda_sqs_event_record import AwsLambdaSqsEventRecord
 from common.clients import logger
+from pds_details import get_pds_patient_details
 import json
 from typing import Optional
 
@@ -13,21 +14,26 @@ def process_record(event_record: AwsLambdaSqsEventRecord):
 
     id = get_id(event_record.body)
 
-    exists = check_records_exist(id)
+    if id:
+        exists = check_records_exist(id)
 
-    if exists:
-        # get patient details from PDS
-        patient_details = get_pds_patient_details(id)
+        if exists:
+            # get patient details from PDS
+            patient_details = get_pds_patient_details(id)
+            if not patient_details:
+                return {"status": "error", "message": f"No records returned for ID: {id}"}
 
-        patient_details_id = patient_details.get("id")
+            patient_details_id = patient_details.get("id")
 
-        # if patient NHS != id, update patient index of vax events to new number
-        if patient_details_id != id:
-            return update_patient_index(id, patient_details_id)
+            # if patient NHS != id, update patient index of vax events to new number
+            if patient_details_id != id:
+                return update_patient_index(id, patient_details_id)
+            else:
+                return {"status": "success", "message": "No update required"}
         else:
-            return {"status": "success", "message": "No update required"}
+            return {"status": "error", "message": f"No records found for ID: {id}"}
     else:
-        return {"status": "error", "message": f"No records found for ID: {id}"}
+        return {"status": "error", "message": "No ID found in event record"}
 
 
 def check_records_exist(id: str) -> bool:
@@ -36,22 +42,6 @@ def check_records_exist(id: str) -> bool:
     return False
 
 
-def get_pds_patient_details(id: str) -> dict:
-    # TODO: Implement logic to retrieve patient details from PDS
-    logger.info(f"TODO Get patient details for {id}")
-
-    authenticator = AppRestrictedAuth(
-        service=Service.PDS,
-        secret_manager_client=boto3.client("secretsmanager", config=boto_config),
-        environment=pds_env,
-        cache=cache,
-    )
-    pds_service = PdsService(authenticator, pds_env)
-
-
-    return {"id": id, "name": "Mr Man"}
-
-
 def update_patient_index(old_id: str, new_id: str):
     # TODO: Implement logic to update patient index in Redis or other data store
     logger.info(f"TODO Update patient index from {old_id} to {new_id}")

lambdas/id_sync/src/record_processor.py

@@ -1,6 +1,9 @@
 import unittest
 from unittest.mock import patch, MagicMock
-from id_sync import handler
+
+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
 
 
 class TestIdSyncHandler(unittest.TestCase):
@@ -18,9 +21,9 @@ def setUp(self):
         self.mock_logger = self.logger_patcher.start()
 
         # Patch the logging decorator to pass through
-        self.log_decorator_patcher = patch('id_sync.logging_decorator')
-        self.mock_log_decorator = self.log_decorator_patcher.start()
-        self.mock_log_decorator.return_value = lambda f: f  # Pass-through decorator
+        # self.log_decorator_patcher = patch('id_sync.logging_decorator')
+        # self.mock_log_decorator = self.log_decorator_patcher.start()
+        # self.mock_log_decorator.return_value = lambda f: f  # Pass-through decorator
 
         # Set up test data
         self.single_sqs_event = {
@@ -388,7 +391,3 @@ def test_handler_logs_correct_event_type(self):
 
         # Check that it specifically logs "SQS event"
         self.mock_logger.info.assert_any_call("id_sync processing event with %d records", 1)
-
-
-if __name__ == '__main__':
-    unittest.main()