snomed validation added

Author: Akol125

delta_backend/src/ConversionChecker.py

@@ -72,10 +72,18 @@ def convertData(self, expressionType, expressionRule, fieldName, fieldValue):
                 return self._convertToChangeTo(
                     expressionRule, fieldName, fieldValue, self.summarise, self.report_unexpected_exception
                 )
+            case "BOOLEAN":
+                return self._convertToBoolean(
+                    expressionRule, fieldName, fieldValue, self.summarise, self.report_unexpected_exception
+                )
             case "LOOKUP":
                 return self._convertToLookUp(
                     expressionRule, fieldName, fieldValue, self.summarise, self.report_unexpected_exception
                 )
+            case "SNOMED":
+                return self._convertToSnomed(
+                    expressionRule, fieldName, fieldValue, self.summarise, self.report_unexpected_exception
+                )
             case "DEFAULT":
                 return self._convertToDefaultTo(
                     expressionRule, fieldName, fieldValue, self.summarise, self.report_unexpected_exception
@@ -148,14 +156,17 @@ def _convertToDateTime(self, expressionRule, fieldName, fieldValue, summarise, r
     # Not Empty Validate - Returns exactly what is in the extracted fields no parsing or logic needed
     def _convertToNotEmpty(self, expressionRule, fieldName, fieldValue, summarise, report_unexpected_exception):
         try:
-            if len(str(fieldValue)) > 0:
+            if isinstance(fieldValue, (int, float)):
+                return ""  # Reject plain numbers
+            if isinstance(fieldValue, str) and fieldValue.strip():
                 return fieldValue
             return ""
         except Exception as e:
             if report_unexpected_exception:
                 message = ExceptionMessages.MESSAGES[ExceptionMessages.UNEXPECTED_EXCEPTION] % (e.__class__.__name__, e)
                 return message
 
+
     # NHSNumber Validate
     def _convertToNHSNumber(self, expressionRule, fieldName, fieldValue, summarise, report_unexpected_exception):
         """
@@ -266,3 +277,46 @@ def _convertToOnlyIfTo(self, expressionRule, fieldName, fieldValue, summarise, r
             if report_unexpected_exception:
                 message = ExceptionMessages.MESSAGES[ExceptionMessages.UNEXPECTED_EXCEPTION] % (e.__class__.__name__, e)
                 return message
+    
+    # Check if Snomed code is numeric and reject other forms
+    def _convertToSnomed(self, expressionRule, fieldName, fieldValue, summarise, report_unexpected_exception):
+        """
+        Validates that a SNOMED code is a non-empty string containing only digits.
+        """
+        try:
+            if not fieldValue or not isinstance(fieldValue, str) or not fieldValue.isdigit():
+                raise ValueError(f"Invalid SNOMED code: {fieldValue}")
+            return fieldValue
+        except Exception as e:
+            if report_unexpected_exception:
+                message = ExceptionMessages.MESSAGES[ExceptionMessages.UNEXPECTED_EXCEPTION] % (e.__class__.__name__, e)
+                self.errorRecords.append({
+                    "field": fieldName,
+                    "value": fieldValue,
+                    "message": message
+                })
+            return ""
+
+    # Check if Input is boolean or if input is a string with true or false, convert to Boolean
+    def _convertToBoolean(self, expressionRule, fieldName, fieldValue, summarise, report_unexpected_exception):
+        try:
+            if isinstance(fieldValue, bool):
+                return fieldValue
+
+            if isinstance(fieldValue, str):
+                lowered = fieldValue.strip().lower()
+                if lowered == "true":
+                    return True
+                elif lowered == "false":
+                    return False
+
+            return ""  # Invalid input
+        except Exception as e:
+            if report_unexpected_exception:
+                message = ExceptionMessages.MESSAGES[ExceptionMessages.UNEXPECTED_EXCEPTION] % (
+                    e.__class__.__name__, e
+                )
+                return message
+
+
+

delta_backend/src/ConversionLayout.py

@@ -148,7 +148,7 @@
       "fieldNameFlat": "PRIMARY_SOURCE",
       "expression": {
         "expressionName": "Not Empty",
-        "expressionType": "NOTEMPTY",
+        "expressionType": "BOOLEAN",
         "expressionRule": ""
       }
     },
@@ -157,7 +157,7 @@
       "fieldNameFlat": "VACCINATION_PROCEDURE_CODE",
       "expression": {
         "expressionName": "Not Empty",
-        "expressionType": "NOTEMPTY",
+        "expressionType": "SNOMED",
         "expressionRule": ""
       }
     },
@@ -184,7 +184,7 @@
       "fieldNameFlat": "VACCINE_PRODUCT_CODE",
       "expression": {
         "expressionName": "Not Empty",
-        "expressionType": "NOTEMPTY",
+        "expressionType": "SNOMED",
         "expressionRule": ""
       }
     },
@@ -229,7 +229,7 @@
       "fieldNameFlat": "SITE_OF_VACCINATION_CODE",
       "expression": {
         "expressionName": "Not Empty",
-        "expressionType": "NOTEMPTY",
+        "expressionType": "SNOMED",
         "expressionRule": ""
       }
     },
@@ -247,7 +247,7 @@
       "fieldNameFlat": "ROUTE_OF_VACCINATION_CODE",
       "expression": {
         "expressionName": "Not Empty",
-        "expressionType": "NOTEMPTY",
+        "expressionType": "SNOMED",
         "expressionRule": ""
       }
     },
@@ -292,7 +292,7 @@
       "fieldNameFlat": "INDICATION_CODE",
       "expression": {
         "expressionName": "Not Empty",
-        "expressionType": "NOTEMPTY",
+        "expressionType": "SNOMED",
         "expressionRule": ""
       }
     },

delta_backend/src/log_firehose.py

@@ -19,6 +19,10 @@ def __init__(
         self.delivery_stream_name = stream_name
 
     def send_log(self, log_message):
+        # if not self.delivery_stream_name:
+        #     logger.warning("No SPLUNK_FIREHOSE_NAME set — skipping Firehose log.")
+        #     return
+        
         log_to_splunk = log_message
         logger.info(f"Log sent to Firehose for save: {log_to_splunk}")
         encoded_log_data = json.dumps(log_to_splunk).encode("utf-8")

delta_backend/tests/sample_data/fhir_sample.json

@@ -46,7 +46,7 @@
         "coding": [
           {
             "system": "http://snomed.info/sct",
-            "code": "1324681000000101",
+            "code": "abletimes",
             "display": "Administration of first dose of severe acute respiratory syndrome coronavirus 2 vaccine (procedure)"
           }
         ]
@@ -131,7 +131,7 @@
     {
       "coding": [
         {
-          "code": "443684005",
+          "code": "nauthgy",
           "system": "http://snomed.info/sct"
         }
       ]

delta_backend/tests/test_delta.py

@@ -203,7 +203,7 @@ def test_handler_exception_intrusion_check_false(self, mock_boto_resource, mock_
         with self.assertRaises(Exception):
             handler(event, context)
 
-    @patch("delta.firehose_logger.send_log")  # Mock Firehose logger
+    @patch("delta.firehose_logger.send_log", return_value=None)  # Mock Firehose logger
     @patch("delta.logger.info")  # Mock logging
     def test_dps_record_skipped(self, mock_logger_info, mock_firehose_send_log):
         event = self.get_event(supplier="DPSFULL")
@@ -219,7 +219,7 @@ def test_dps_record_skipped(self, mock_logger_info, mock_firehose_send_log):
         mock_logger_info.assert_called_with("Record from DPS skipped for 12345")
 
     # TODO - amend test once error handling implemented
-    @patch("delta.firehose_logger.send_log")
+    @patch("delta.firehose_logger.send_log", return_value=None)
     @patch("delta.logger.info")
     @patch("Converter.Converter")
     @patch("delta.boto3.resource")