improve coverage

Author: Akol125

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

@@ -17,10 +17,6 @@ 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):
@@ -34,13 +30,6 @@ 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):
@@ -53,10 +42,3 @@ 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/tests/test_common/validator/test_validation_csv_row.py

@@ -1,7 +1,10 @@
 # Test application file
+import time
 import unittest
 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 test_common.validator.testing_utils.constants import CSV_HEADER, CSV_VALUES
 from tests.test_common.validator.testing_utils.csv_fhir_utils import build_row, parse_test_file
@@ -21,23 +24,42 @@ def setUp(self):
 
     def test_run_validation_on_valid_csv_row(self):
         valid_rows = build_row(CSV_HEADER, CSV_VALUES)
-        error_report = self.validator.validate_csv_row(valid_rows, CSV_HEADER, True, True, True)
-        print(f"Error Report: {error_report}")
-        self.assertEqual(error_report, [])
+        error_list = self.validator.validate_csv_row(valid_rows, CSV_HEADER, True, True, True)
+        self.assertEqual(error_list, [])
 
     def test_run_validation_on_invalid_csv_row(self):
         invalid_rows = build_row(CSV_HEADER, {**CSV_VALUES, "NHS_NUMBER": ""})
-        error_report = self.validator.validate_csv_row(invalid_rows, CSV_HEADER, True, True, True)
-        print(f"Error Report: {error_report}")
-        self.assertTrue(len(error_report) > 0)
-        messages = [(e.name, e.message, e.details) for e in error_report]
+        error_list = self.validator.validate_csv_row(invalid_rows, CSV_HEADER, True, True, True)
+
+        self.assertTrue(len(error_list) > 0)
+        messages = [(e.name, e.message, e.details) for e in error_list]
         expected_error = (
             "NHS Number Not Empty Check",
             "Value not empty failure",
             "Value is empty, not as expected",
         )
-        self.maxDiff = None
-        print(f"Error Report: {error_report}")
-        print(f"Messages: {messages}")
-        print(f"Expected Error: {expected_error}")
         self.assertIn(expected_error, messages)
+
+        csv_parser = Mock()
+        csv_parser.extract_field_value.return_value = "2025-11-06T12:00:00Z"
+        error_report = build_error_report("25a8cc4d-1875-4191-ac6d-2d63a0ebc64b", csv_parser, error_list)
+
+        failed_validation = self.validator.has_validation_failed(error_list)
+
+        if len(error_list) > 0:
+            start = time.time()
+
+        if len(error_list) > 0:
+            print(error_list)
+        else:
+            print("Validated CSV Successfully")
+        print(error_report)
+
+        if failed_validation:
+            print("CSV Validation failed due to a critical validation failure...")
+        else:
+            print("CSV Validation Successful, see reports for details")
+
+        end = time.time()
+        print("Time Taken : ")
+        print(end - start)