add test for validation and resolve reviews

Author: Akol125

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

@@ -4,8 +4,8 @@
 from dateutil import parser
 
 from common.validator.constants.enums import ErrorLevels
-from src.common.validator.constants.error_schema import error_report
-from src.common.validator.error_report.record_error import ErrorReport
+from common.validator.constants.error_schema import error_report
+from common.validator.error_report.record_error import ErrorReport
 
 
 class DQReporter:

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

@@ -1,7 +1,7 @@
+from common.validator.constants.enums import ErrorLevels
 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
+from common.validator.error_report.record_error import ErrorReport
+from src.common.validator.parsers.base_parser import BaseParser
 
 
 # Collect and add error record to the list
@@ -29,7 +29,7 @@ def check_error_record_for_fail(expression_identifier: str, error_records: list[
     return False
 
 
-def build_error_report(event_id: str, data_parser: PaserInterface, error_records: list[ErrorReport]) -> dict:
+def build_error_report(event_id: str, data_parser: BaseParser, error_records: list[ErrorReport]) -> dict:
     if data_parser.get_data_format() == "fhir":
         occurrence_date_time = data_parser.extract_field_value("occurrenceDateTime")
     else:

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

@@ -1,4 +1,3 @@
-# Root and base type expression checker functions
 import datetime
 import re
 import uuid

…mon/validator/parsers/paser_interface.py …/common/validator/parsers/base_parser.pylambdas/shared/src/common/validator/parsers/paser_interface.py renamed to lambdas/shared/src/common/validator/parsers/base_parser.py lambdas/shared/src/common/validator/parsers/paser_interface.py renamed to lambdas/shared/src/common/validator/parsers/base_parser.py

@@ -1,12 +1,11 @@
-# validation_engine/sources/source_definitions.py
-
 from abc import ABC, abstractmethod
+from typing import Any
 
 from common.validator.parsers.csv_line_parser import CSVLineParser
 from common.validator.parsers.fhir_parser import FHIRParser
 
 
-class PaserInterface(ABC):
+class BaseParser(ABC):
     """Defines a common interface for all data extractors."""
 
     @abstractmethod
@@ -18,20 +17,20 @@ def get_data_format(self) -> str:
         pass
 
 
-class FHIRInterface(PaserInterface):
+class FHIRInterface(BaseParser):
     def __init__(self, fhir_data: dict):
         self.fhir_parser = FHIRParser()
         self.fhir_parser.parse_fhir_data(fhir_data)
 
     def get_data_format(self) -> str:
         return "fhir"
 
-    def extract_field_values(self, field_path) -> list[str]:
+    def extract_field_values(self, field_path) -> list[Any]:
         fhir_value = self.fhir_parser.get_fhir_value_list(field_path)
         return fhir_value
 
 
-class BatchInterface(PaserInterface):
+class BatchInterface(BaseParser):
     def __init__(self, csv_row: dict[str, str]):
         self.csv_line_parser = CSVLineParser()
         self.csv_line_parser.parse_csv_line(csv_row)

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

@@ -25,7 +25,7 @@ def __init__(self) -> None:
         self.schema_file = {}
         self.expressions = {}
 
-    def parse_schema(self, schema_file: dict) -> None:
+    def parse_schema(self, schema_file: dict) -> dict:
         """
         Loads a schema definition (JSON/dict) and extracts expressions.
         """

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

@@ -10,7 +10,7 @@
 from common.validator.error_report.record_error import ErrorReport
 from common.validator.expression_checker import ExpressionChecker
 from common.validator.parsers.schema_parser import SchemaParser
-from src.common.validator.parsers.paser_interface import BatchInterface, FHIRInterface, PaserInterface
+from src.common.validator.parsers.base_parser import BaseParser, BatchInterface, FHIRInterface
 
 
 class Validator:
@@ -23,7 +23,7 @@ def _validate_expression(
         self,
         expression_validator: ExpressionChecker,
         expression: dict,
-        data_parser: PaserInterface,
+        data_parser: BaseParser,
         error_records: list[ErrorReport],
         inc_header_in_row_count: bool,
     ) -> ErrorReport | int:
@@ -54,11 +54,9 @@ def _validate_expression(
 
         try:
             expression_values = data_parser.extract_field_values(expression_fieldname)
-            print(f"Extracted values for field {expression_fieldname}: {expression_values}")
         except Exception as e:
             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
             add_error_record(
                 error_records, error_record, expression_error_group, expression_name, expression_id, error_level
             )

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

@@ -15,7 +15,7 @@ def setUp(self):
         self.FHIRFilePath = validation_folder / "sample_data/vaccination.json"
         self.schemaFilePath = validation_folder / "test_schemas/test_schema.json"
 
-    def test_validation(self):
+    def test_fhir_validation(self):
         start = time.time()
 
         SchemaFile = parse_test_file(self.schemaFilePath)