VED-755: refactoring record_processor

Author: Akol125

lambdas/id_sync/src/record_processor.py

@@ -6,10 +6,12 @@
 import ast
 
 
-def process_record(event_record) -> Dict[str, Any]:
+def process_record(event_record: Dict[str, Any]) -> Dict[str, Any]:
 
     logger.info("process_record. Processing record: %s", event_record)
     body_text = event_record.get('body', '')
+
+    # convert body to json (try JSON first, then fall back to Python literal)
     if isinstance(body_text, str):
         try:
             body = json.loads(body_text)
@@ -21,39 +23,41 @@ def process_record(event_record) -> Dict[str, Any]:
                 return {"status": "error", "message": "Invalid body format"}
     else:
         body = body_text
+
     nhs_number = body.get("subject")
     logger.info("process record NHS number: %s", nhs_number)
     if nhs_number:
-        if not _is_valid_nhs(nhs_number):
-            logger.error("Invalid NHS number format: %s", nhs_number)
-            return {"status": "error", "message": "Invalid NHS number format", "nhs_number": nhs_number}
         return process_nhs_number(nhs_number)
-    else:
-        logger.info("No NHS number found in event record")
-        return {"status": "error", "message": "No NHS number found in event record"}
+
+    logger.info("No NHS number found in event record")
+    return {"status": "error", "message": "No NHS number found in event record"}
 
 
 def process_nhs_number(nhs_number: str) -> Dict[str, Any]:
     # get patient details from PDS
     new_nhs_number = pds_get_patient_id(nhs_number)
 
-    base_log_data = {"nhs_number": nhs_number}
-    if new_nhs_number:
-        if new_nhs_number != nhs_number:
-            logger.info("process_nhs_number. Update patient ID from %s to %s", nhs_number, new_nhs_number)
-            if ieds_check_exist(nhs_number):
-                response = ieds_update_patient_id(nhs_number, new_nhs_number)
-            else:
-                logger.info("process_nhs_number. No ieds record found for: %s", nhs_number)
-                response = {"status": "success", "message": f"No records returned for ID: {nhs_number}"}
-        else:
-            response = {"status": "success", "message": "No update required"}
+    if not new_nhs_number:
+        return {
+            "status": "success",
+            "message": "No patient ID found for NHS number",
+            "nhs_number": nhs_number,
+        }
+
+    if new_nhs_number == nhs_number:
+        return {
+            "status": "success",
+            "message": "No update required",
+            "nhs_number": nhs_number,
+        }
+    
+    logger.info("Update patient ID from %s to %s", nhs_number, new_nhs_number)
+
+    if ieds_check_exist(nhs_number):
+        response = ieds_update_patient_id(nhs_number, new_nhs_number)
     else:
-        response = {"status": "success", "message": f"No patient ID found for NHS number: {nhs_number}"}
-    response.update(base_log_data)
-    return response
-
+        logger.info("No IEDS record found for: %s", nhs_number)
+        response = {"status": "success", "message": f"No records returned for ID: {nhs_number}"}
 
-def _is_valid_nhs(nhs: str) -> bool:
-    """Basic validation: NHS number must be 10 digits. (Optional: add MOD11 check later)"""
-    return isinstance(nhs, str) and nhs.isdigit() and len(nhs) == 10
+    response["nhs_number"] = nhs_number
+    return response

lambdas/id_sync/tests/test_record_processor.py

@@ -45,16 +45,16 @@ def test_process_record_success_no_update_required(self):
     def test_process_record_success_update_required(self):
         """Test successful processing when patient ID differs"""
         # Arrange
-        pds_id = "pds-id-1"
-        nhs_number = "nhs-number-1"
+        pds_id = "9000000008"
+        nhs_number = "9000000009"
 
         test_sqs_record = {"body": {"subject": nhs_number}}
         self.mock_pds_get_patient_id.return_value = pds_id
         success_response = {"status": "success"}
         self.mock_ieds_update_patient_id.return_value = success_response
         # Act
         result = process_record(test_sqs_record)
-
+        self.maxDiff = None
         # Assert
         expected_result = success_response
         self.assertEqual(result, expected_result)
@@ -89,7 +89,7 @@ def test_process_record_pds_returns_none_id(self):
         # Act & Assert
         result = process_record(test_record)
         self.assertEqual(result["status"], "success")
-        self.assertEqual(result["message"], f"No patient ID found for NHS number: {test_id}")
+        self.assertEqual(result["message"], f"No patient ID found for NHS number")
         self.mock_ieds_check_exist.assert_not_called()
         self.mock_ieds_update_patient_id.assert_not_called()