validation bump 2

Author: Akol125

lambdas/shared/src/common/validator/validator.py

@@ -91,8 +91,9 @@ def _validate_expression(
                     code=ExceptionLevels.PARENT_FAILED,
                     message=MESSAGES[ExceptionLevels.PARENT_FAILED] + ", Parent ID: " + parent_expression,
                 )
-                self._add_error_record(error_record, expression_error_group, expression_name, expression_id, error_level)
-                error_records.append(error_record)
+                self._add_error_record(
+                    error_records, error_record, expression_error_group, expression_name, expression_id, error_level
+                )
                 return
 
         try:
@@ -101,8 +102,10 @@ def _validate_expression(
             message = f"Data get values Unexpected exception [{e.__class__.__name__}]: {e}"
             error_record = ErrorReport(code=ExceptionLevels.PARSING_ERROR, message=message)
             # original code had self.CriticalErrorLevel. Replaced with error_level
-            self._add_error_record(error_record, expression_error_group, expression_name, expression_id, error_level)
-            return error_records.append(error_record)
+            self._add_error_record(
+                error_records, error_record, expression_error_group, expression_name, expression_id, error_level
+            )
+            return
 
         for value in expression_values:
             try:
@@ -111,7 +114,7 @@ def _validate_expression(
                 )
                 if error_record is not None:
                     self._add_error_record(
-                        error_record, expression_error_group, expression_name, expression_id, error_level
+                        error_records, error_record, expression_error_group, expression_name, expression_id, error_level
                     )
             except Exception:
                 print(f"Exception validating expression {expression_id} on row {row}: {error_record}")

lambdas/shared/tests/test_common/validator/test_application_fhir.py

@@ -2,6 +2,7 @@
 import time
 import unittest
 from pathlib import Path
+from unittest.mock import Mock
 
 from common.validator.validator import Validator
 from tests.test_common.validator.testing_utils.csv_fhir_utils import parse_test_file
@@ -17,17 +18,19 @@ def setUp(self):
     def test_validation(self):
         start = time.time()
 
-        # get the JSON of the schema, changed to cope with elasticache
         SchemaFile = parse_test_file(self.schemaFilePath)
-
         self.fhir_resources = parse_test_file(self.FHIRFilePath)
+        fhir_parser = Mock()
+        fhir_parser.get_fhir_value.return_value = "2025-11-06T12:00:00Z"
 
         validator = Validator(SchemaFile)  # FHIR File Path not needed
         print(f"FHIR Resources Loaded: {len(self.fhir_resources.get('entry', []))} entries")
         error_list = validator.validate_fhir(self.fhir_resources, True, True, True)
-        error_report = validator.build_error_report("25a8cc4d-1875-4191-ac6d-2d63a0ebc64b")  # include eventID if known
+        error_report = validator.build_error_report(
+            "25a8cc4d-1875-4191-ac6d-2d63a0ebc64b", fhir_parser, error_list
+        )  # include eventID if known
 
-        failed_validation = validator.has_validation_failed()
+        failed_validation = validator.has_validation_failed(error_list)
 
         if len(error_list) > 0:
             print(error_list)