IEDS update - tests pass

Author: nhsdevws

lambdas/id_sync/src/id_sync.py

@@ -2,7 +2,6 @@
 from common.clients import STREAM_NAME
 from common.log_decorator import logging_decorator
 from common.aws_lambda_event import AwsLambdaEvent
-from common.aws_lambda_sqs_event_record import AwsLambdaSqsEventRecord
 from record_processor import process_record
 '''
 Lambda function handler for processing SQS events.Lambda for ID Sync. Fired by SQS
@@ -20,7 +19,6 @@ def handler(event_data, _):
             error_count = 0
             file_keys = []
             for record in event.records:
-                record: AwsLambdaSqsEventRecord
                 record_result = process_record(record, None)
                 file_keys.append(record_result["file_key"])
                 if record_result["status"] == "error":

lambdas/id_sync/src/ieds_db_operations.py

@@ -1,6 +1,7 @@
 from boto3.dynamodb.conditions import Key
 from os_vars import get_ieds_table_name
-from common.clients import get_delta_table
+from common.aws_dynamodb import get_delta_table
+from common.clients import logger
 
 ieds_table = None
 
@@ -14,7 +15,7 @@ def get_ieds_table():
     return ieds_table
 
 
-def check_record_exist_in_IEDS(id: str) -> bool:
+def ieds_check_exist(id: str) -> bool:
     """Check if a record exists in the IEDS table for the given ID."""
     search_patient_pk = f"Patient#{id}"
 
@@ -26,16 +27,35 @@ def check_record_exist_in_IEDS(id: str) -> bool:
     return response.get("Count", 0) > 0
 
 
-def update_patient_id_in_IEDS(old_id: str, new_id: str) -> dict:
+def ieds_update_patient_id(old_id: str, new_id: str) -> dict:
     """Update the patient ID in the IEDS table."""
-    # check if old_id and new_id are not empty
-    if not old_id or not new_id:
+    if not old_id or not new_id or not old_id.strip() or not new_id.strip():
         return {"status": "error", "message": "Old ID and New ID cannot be empty"}
-    else:
-        # update the table with new id
-        get_ieds_table().update_item(
+
+    if old_id == new_id:
+        return {"status": "success", "message": f"No change in patient ID: {old_id}"}
+
+    try:
+        # Update the table with new id
+        response = get_ieds_table().update_item(
             Key={"PK": f"Patient#{old_id}"},
             UpdateExpression="SET PK = :new_id",
             ExpressionAttributeValues={":new_id": f"Patient#{new_id}"}
         )
-        return {"status": "success", "message": f"Updated IEDS, patient ID: {old_id} to {new_id}"}
+
+        # Check update successful
+        if response['ResponseMetadata']['HTTPStatusCode'] == 200:
+            return {
+                "status": "success",
+                "message": f"Updated IEDS, patient ID: {old_id} to {new_id}"
+            }
+        else:
+            return {
+                "status": "error",
+                "message": f"Failed to update patient ID: {old_id}"
+            }
+
+    except Exception as e:
+        logger.exception("Error updating patient ID")
+        # Handle any exceptions that occur during the update
+        raise e

lambdas/id_sync/src/nhs_number_processor.py

@@ -10,7 +10,7 @@
 pds_env = get_pds_env()
 
 
-def get_pds_patient_details(nhs_number: str) -> dict:
+def pds_get_patient_details(nhs_number: str) -> dict:
     try:
         logger.info(f"Get PDS patient details for {nhs_number}")
 

lambdas/id_sync/src/pds_details.py

@@ -2,34 +2,38 @@
     record Processor
 '''
 from common.clients import logger
-import json
 from typing import Optional
-from nhs_number_processor import process_nhs_number
+from pds_details import pds_get_patient_details
+from ieds_db_operations import ieds_check_exist, ieds_update_patient_id
 
 
 def process_record(event_record):
 
     logger.info("Processing record: %s", event_record)
     body = event_record.get('body', {})
-    nhs_number = get_id(body)
+    nhs_number = body.get("subject")
     if nhs_number:
         return process_nhs_number(nhs_number)
     else:
         return {"status": "error", "message": "No NHS number found in event record"}
 
 
-def get_id(event_body) -> Optional[str]:
-    """Extract subject identifier from FHIR Bundle notification event"""
-    try:
-        # Parse JSON if it's a string
-        if isinstance(event_body, str):
-            data = json.loads(event_body)
-        else:
-            data = event_body
-        # Navigate through the nested structure
-        subject = data.get("subject")
-        return subject
+def process_nhs_number(nhs_number: str) -> Optional[str]:
+    # get patient details from PDS
+    patient_details = pds_get_patient_details(nhs_number)
+    if not patient_details:
+        return {"status": "error", "message": f"No records returned for ID: {nhs_number}"}
+
+    patient_details_id = patient_details.get("id")
 
-    except (json.JSONDecodeError, KeyError, AttributeError) as e:
-        logger.error("Error extracting subject identifier: %s", e)
-        return None
+    if patient_details_id:
+        # if patient NHS != id, update patient index of vax events to new number
+        if patient_details_id != nhs_number and patient_details_id:
+            if ieds_check_exist(patient_details_id):
+                return ieds_update_patient_id(patient_details_id, nhs_number)
+            else:
+                return {"status": "error", "message": f"No records returned for ID: {nhs_number}"}
+        else:
+            return {"status": "success", "message": "No update required"}
+    else:
+        return {"status": "error", "message": f"No patient ID found for NHS number: {nhs_number}"}