convert error repors functions to a module

Author: Akol125

…rc/common/validator/reporter/__init__.py …ommon/validator/error_report/__init__.pylambdas/shared/src/common/validator/reporter/__init__.py renamed to lambdas/shared/src/common/validator/error_report/__init__.py lambdas/shared/src/common/validator/reporter/__init__.py renamed to lambdas/shared/src/common/validator/error_report/__init__.py

@@ -0,0 +1,38 @@
+from common.validator.error_report.dq_reporter import DQReporter
+from common.validator.record_error import ErrorReport
+from src.common.validator.constants.enums import ErrorLevels
+
+
+# Collect and add error record to the list
+def add_error_record(
+    error_records: list[ErrorReport],
+    error_record: ErrorReport,
+    expression_error_group: str,
+    expression_name: str,
+    expression_id: str,
+    error_level: ErrorLevels,
+) -> None:
+    if error_record is not None:
+        error_record.error_group = expression_error_group
+        error_record.name = expression_name
+        error_record.id = expression_id
+        error_record.error_level = error_level
+        error_records.append(error_record)
+
+
+# Function to help identify a parent failure in the error list
+def check_error_record_for_fail(expression_identifier: str, error_records: list[ErrorReport]) -> bool:
+    for error_record in error_records:
+        if error_record.id == expression_identifier:
+            return True
+    return False
+
+
+def build_error_report(event_id: str, data_parser: dict, error_records: list[ErrorReport]) -> dict:
+    occurrence_date_time = data_parser.get_fhir_value("occurrenceDateTime")
+    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)

…common/validator/reporter/dq_reporter.py …on/validator/error_report/dq_reporter.pylambdas/shared/src/common/validator/reporter/dq_reporter.py renamed to lambdas/shared/src/common/validator/error_report/dq_reporter.py lambdas/shared/src/common/validator/reporter/dq_reporter.py renamed to lambdas/shared/src/common/validator/error_report/dq_reporter.py

@@ -6,41 +6,17 @@
 """
 
 from common.validator.constants.enums import MESSAGES, DataType, ErrorLevels, ExceptionLevels
+from common.validator.error_report.error_reporter import add_error_record, check_error_record_for_fail
 from common.validator.expression_checker import ExpressionChecker
 from common.validator.parsers.fetch_parsers import FetchParsers
 from common.validator.record_error import ErrorReport
-from common.validator.reporter.dq_reporter import DQReporter
 
 
 class Validator:
     def __init__(self, schema_file=""):
         self.schema_file = schema_file
         self.get_data_from_parsers = FetchParsers()
 
-    # Collect and add error record to the list
-    def _add_error_record(
-        self,
-        error_records: list[ErrorReport],
-        error_record: ErrorReport,
-        expression_error_group: str,
-        expression_name: str,
-        expression_id: str,
-        error_level: ErrorLevels,
-    ) -> None:
-        if error_record is not None:
-            error_record.error_group = expression_error_group
-            error_record.name = expression_name
-            error_record.id = expression_id
-            error_record.error_level = error_level
-            error_records.append(error_record)
-
-    # Function to help identify a parent failure in the error list
-    def _check_error_record_for_fail(self, expression_identifier: str, error_records: list[ErrorReport]) -> bool:
-        for error_record in error_records:
-            if error_record.id == expression_identifier:
-                return True
-        return False
-
     #  validate a single expression against the data file
     def _validate_expression(
         self,
@@ -64,12 +40,12 @@ def _validate_expression(
         # Check to see if the expression has a parent, if so did the parent validate
         if "parentExpression" in expression:
             parent_expression = expression["parentExpression"]
-            if self._check_error_record_for_fail(parent_expression, error_records):
+            if check_error_record_for_fail(parent_expression, error_records):
                 error_record = ErrorReport(
                     code=ExceptionLevels.PARENT_FAILED,
                     message=MESSAGES[ExceptionLevels.PARENT_FAILED] + ", Parent ID: " + parent_expression,
                 )
-                self._add_error_record(
+                add_error_record(
                     error_records, error_record, expression_error_group, expression_name, expression_id, error_level
                 )
                 return
@@ -80,7 +56,7 @@ 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(
+            add_error_record(
                 error_records, error_record, expression_error_group, expression_name, expression_id, error_level
             )
             return
@@ -91,7 +67,7 @@ def _validate_expression(
                     expression_type, expression_rule, expression_fieldname, value, row
                 )
                 if error_record is not None:
-                    self._add_error_record(
+                    add_error_record(
                         error_records, error_record, expression_error_group, expression_name, expression_id, error_level
                     )
             except Exception:
@@ -185,11 +161,5 @@ def run_validation(
 
         return error_records
 
-    # Build the error Report
-    def build_error_report(self, event_id: str, data_parser: dict, error_records: list[ErrorReport]) -> dict:
-        occurrence_date_time = data_parser.get_fhir_value("occurrenceDateTime")
-        dq_reporter = DQReporter()
-        return dq_reporter.generate_error_report(event_id, occurrence_date_time, error_records)
-
     def has_validation_failed(self, error_records: list[ErrorReport]) -> bool:
         return any(er.error_level == ErrorLevels.CRITICAL_ERROR for er in error_records)

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

@@ -4,6 +4,7 @@
 from pathlib import Path
 from unittest.mock import Mock
 
+from common.validator.error_report.error_reporter import build_error_report
 from common.validator.validator import Validator
 from tests.test_common.validator.testing_utils.csv_fhir_utils import parse_test_file
 
@@ -25,7 +26,7 @@ def test_validation(self):
 
         validator = Validator(SchemaFile)  # FHIR File Path not needed
         error_list = validator.validate_fhir(self.fhir_resources, True, True, True)
-        error_report = validator.build_error_report(
+        error_report = build_error_report(
             "25a8cc4d-1875-4191-ac6d-2d63a0ebc64b", fhir_parser, error_list
         )  # include eventID if known