resolve error report

Author: Akol125

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

@@ -1,6 +1,7 @@
 from common.validator.error_report.dq_reporter import DQReporter
 from src.common.validator.constants.enums import ErrorLevels
 from src.common.validator.error_report.record_error import ErrorReport
+from src.common.validator.parsers.paser_interface import PaserInterface
 
 
 # Collect and add error record to the list
@@ -28,7 +29,15 @@ def check_error_record_for_fail(expression_identifier: str, error_records: list[
     return False
 
 
-def build_error_report(event_id: str, data_parser: dict, error_records: list[ErrorReport]) -> dict:
-    occurrence_date_time = data_parser.extract_field_value("occurrenceDateTime")
+def build_error_report(event_id: str, data_parser: PaserInterface, error_records: list[ErrorReport]) -> dict:
+    if data_parser.get_data_format() == "fhir":
+        occurrence_date_time = data_parser.extract_field_value("occurrenceDateTime")
+    else:
+        occurrence_date_time = data_parser.extract_field_value("DATE_AND_TIME")
+
     dq_reporter = DQReporter()
     return dq_reporter.generate_error_report(event_id, occurrence_date_time, error_records)
+
+
+def has_validation_failed(error_records: list[ErrorReport]) -> bool:
+    return any(er.error_level == ErrorLevels.CRITICAL_ERROR for er in error_records)

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

@@ -17,6 +17,10 @@ def extract_field_values(self, field_path: str) -> dict:
     def get_data_format(self) -> str:
         pass
 
+    @abstractmethod
+    def _get_field_path_from_schema(self, schema_expressions: list[dict], common_key: str, data_format: str) -> str:
+        pass
+
 
 class FHIRInterface(PaserInterface):
     def __init__(self, fhir_data: dict):
@@ -30,6 +34,13 @@ def extract_field_values(self, field_path) -> list[str]:
         fhir_value = self.fhir_parser.get_fhir_value_list(field_path)
         return fhir_value
 
+    def _get_field_path_from_schema(self, schema_expressions: list[dict], common_key: str, data_format: str) -> str:
+        data_format = data_format.lower()
+        for expr in schema_expressions:
+            if expr.get("fieldNameFlat") == common_key or expr.get("fieldNameFHIR") == common_key:
+                return expr.get("fieldNameFlat") if data_format == "batch" else expr.get("fieldNameFHIR")
+        return ""
+
 
 class BatchInterface(PaserInterface):
     def __init__(self, csv_row: str, csv_header: str):
@@ -42,3 +53,10 @@ def get_data_format(self) -> str:
     def extract_field_values(self, field_path) -> list[str]:
         csv_value = self.csv_line_parser.get_key_value(field_path)
         return csv_value
+
+    def _get_field_path_from_schema(self, schema_expressions: list[dict], common_key: str, data_format: str) -> str:
+        data_format = data_format.lower()
+        for expression in schema_expressions:
+            if expression.get("fieldNameFlat") == common_key or expression.get("fieldNameFHIR") == common_key:
+                return expression.get("fieldNameFlat") if data_format == "batch" else expression.get("fieldNameFHIR")
+        return ""

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

@@ -135,7 +135,13 @@ def run_validation(
                 message = f"Data Parser Unexpected exception [{e.__class__.__name__}]: {e}"
                 return [ErrorReport(code=0, message=message)]
 
-        schema_parser = self.schema_parser.parse_schema(self.schema_file)
+        try:
+            schema_parser = self.schema_parser.parse_schema(self.schema_file)
+        except Exception as e:
+            if report_unexpected_exception:
+                message = f"Schema Parser Unexpected exception [{e.__class__.__name__}]: {e}"
+                return [ErrorReport(code=0, message=message)]
+
         expression_validator = ExpressionChecker(data_parser, summarise, report_unexpected_exception)
         expressions_in_schema = schema_parser.get_expressions()
 

lambdas/shared/tests/test_common/validator/sample_data/vaccination2.json

@@ -12,7 +12,7 @@
 class TestApplication(unittest.TestCase):
     def setUp(self):
         validation_folder = Path(__file__).resolve().parent
-        self.FHIRFilePath = validation_folder / "sample_data/vaccination2.json"
+        self.FHIRFilePath = validation_folder / "sample_data/vaccination.json"
         self.schemaFilePath = validation_folder / "test_schemas/test_schema.json"
 
     def test_validation(self):