remove redundant imports

Author: Akol125

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

@@ -54,3 +54,10 @@ class ExceptionLevels(IntEnum):
     ExceptionLevels.PARENT_FAILED: "Parent Failed [%s]: %s",
     ExceptionLevels.KEY_CHECK_FAILED: "Key Check Failed [%s]: %s",
 }
+
+
+class DataType(StrEnum):
+    FHIR = "FHIR"
+    FHIRJSON = "FHIRJSON"
+    CSV = "CSV"
+    CSVROW = "CSVROW"

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

@@ -2,23 +2,19 @@
 import datetime
 import re
 import uuid
-from enum import StrEnum
 
 from common.validator.constants.enums import MESSAGES
 from common.validator.constants.enums import ExceptionLevels
+from common.validator.constants.enums import MessageLabel
 from common.validator.lookup_expressions.key_data import KeyData
 from common.validator.lookup_expressions.lookup_data import LookUpData
 from common.validator.record_error import ErrorReport
 from common.validator.record_error import RecordError
 
 
-class MessageLabel(StrEnum):
-    EXPECTED_LABEL = "Expected- "
-    FOUND_LABEL = "Found- "
-    VALUE_MISMATCH_MSG = "Value does not equal expected value, "
-
-
 class ExpressionChecker:
+    """ """
+
     def __init__(self, data_parser, summarise, report_unexpected_exception):
         self.data_parser = data_parser  # FHIR data parser for additional functions
         self.data_look_up = LookUpData()  # used for generic look up

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

@@ -4,9 +4,8 @@
 3. Collects all error records and builds the final error report
 """
 
-from enum import Enum
-
 from common.validator.constants.enums import MESSAGES
+from common.validator.constants.enums import DataType
 from common.validator.constants.enums import ErrorLevels
 from common.validator.constants.enums import ExceptionLevels
 from common.validator.expression_checker import ExpressionChecker
@@ -18,13 +17,6 @@
 from common.validator.reporter.dq_reporter import DQReporter
 
 
-class DataType(Enum):
-    FHIR = "FHIR"
-    FHIRJSON = "FHIRJSON"
-    CSV = "CSV"
-    CSVROW = "CSVROW"
-
-
 class Validator:
     def __init__(self, schema_file="", data_type: DataType = None, filepath=""):
         self.filepath = filepath
@@ -171,7 +163,7 @@ def run_validation(
         try:
             self.error_records.clear()
 
-            match self.data_type:  # 'FHIR', 'FHIRJSON', 'CSV', 'CSVROW'
+            match self.data_type:
                 case DataType.FHIR:
                     self.data_parser = self._get_fhir_parser(self.filepath)
                     self.is_csv = False
@@ -217,7 +209,6 @@ def run_validation(
 
         return self.error_records
 
-    # Report Generation
     # Build the error Report
     def build_error_report(self, event_id):
         occurrence_date_time = self.data_parser.get_fhir_value("occurrenceDateTime")