IdSyncException

Author: nhsdevws

lambdas/id_sync/src/id_sync.py

@@ -3,11 +3,21 @@
 from common.log_decorator import logging_decorator
 from common.aws_lambda_event import AwsLambdaEvent
 from record_processor import process_record
+import json
 '''
 Lambda function handler for processing SQS events.Lambda for ID Sync. Fired by SQS
 '''
 
 
+class IdSyncException(Exception):
+    """Custom exception for ID Sync errors."""
+    def __init__(self, message: str, nhs_numbers: list = None, exception=None):
+        self.message = message
+        self.nhs_numbers = nhs_numbers
+        self.exception = exception
+        super().__init__(message)
+
+
 @logging_decorator(prefix="id_sync", stream_name=STREAM_NAME)
 def handler(event_data, _):
 
@@ -17,25 +27,28 @@ def handler(event_data, _):
         if record_count > 0:
             logger.info("id_sync processing event with %d records", record_count)
             error_count = 0
-            file_keys = []
+            nhs_numbers = []
             for record in event.records:
                 record_result = process_record(record, None)
-                file_keys.append(record_result["file_key"])
+                nhs_numbers.append(record_result["nhs_number"])
                 if record_result["status"] == "error":
                     error_count += 1
             if error_count > 0:
-                logger.error("id_sync processed %d records with %d errors", record_count, error_count)
-                return {"status": "error", "message": f"Processed {record_count} records with {error_count} errors",
-                        "file_keys": file_keys}
+                raise IdSyncException(message=f"Processed {record_count} records with {error_count} errors",
+                                      nhs_numbers=nhs_numbers)
+
             else:
-                logger.info("id_sync successfully processed all %d records", record_count)
-                return {"status": "success", "message": f"Successfully processed {record_count} records",
-                        "file_keys": file_keys}
+                msg = f"Successfully processed {record_count} records"
+                logger.info(msg)
+                return {"status": "success", "message": msg, "nhs_numbers": nhs_numbers}
         else:
             logger.info("No records found in event")
             return {"status": "success", "message": "No records found in event"}
 
-    except Exception:
+    except IdSyncException as e:
+        logger.exception(f"id_sync error: {e.message}")
+        raise e
+    except Exception as e:
         msg = "Error processing id_sync event"
         logger.exception(msg)
-        return {"status": "error", "message": msg}
+        raise IdSyncException(message=msg, exception=e)

lambdas/id_sync/src/record_processor.py

@@ -26,14 +26,17 @@ def process_nhs_number(nhs_number: str) -> Optional[str]:
 
     patient_details_id = patient_details.get("id")
 
+    base_log_data = {"nhs_number": nhs_number}
     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)
+                response = ieds_update_patient_id(patient_details_id, nhs_number)
             else:
-                return {"status": "error", "message": f"No records returned for ID: {nhs_number}"}
+                response = {"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}"}
+        response = {"status": "error", "message": f"No patient ID found for NHS number: {nhs_number}"}
+    response.update(base_log_data)
+    return response