resolve comments on typing and list return

Author: Akol125

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

@@ -25,8 +25,8 @@ def __init__(self, fhir_data: dict):
     def get_data_format(self) -> str:
         return "fhir"
 
-    def extract_field_values(self, field_path) -> list[Any]:
-        fhir_value = self.fhir_parser.get_fhir_value_list(field_path)
+    def extract_field_values(self, field_path) -> Any:
+        fhir_value = self.fhir_parser.get_fhir_value(field_path)
         return fhir_value
 
 
@@ -38,6 +38,6 @@ def __init__(self, csv_row: dict[str, str]):
     def get_data_format(self) -> str:
         return "batch"
 
-    def extract_field_values(self, field_path) -> list[str]:
+    def extract_field_values(self, field_path) -> str:
         csv_value = self.csv_line_parser.get_key_value(field_path)
         return csv_value

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

@@ -24,6 +24,6 @@ def parse_csv_line(self, csv_row: dict[str, str]) -> None:
         self.csv_file_data = csv_row
 
     # Retrieves the value of a specific column name as a list.
-    def get_key_value(self, field_name: str) -> list[str]:
-        retrieve_column_value = [self.csv_file_data[field_name]]
+    def get_key_value(self, field_name: str) -> str:
+        retrieve_column_value = self.csv_file_data[field_name]
         return retrieve_column_value

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

@@ -5,6 +5,8 @@
 data_parser is the date parser object returned from the FetchParsers class which contains the data to be validated either fhir or csv
 """
 
+from typing import Optional
+
 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.error_report.record_error import ErrorReport
@@ -14,7 +16,7 @@
 
 
 class Validator:
-    def __init__(self, schema_file=""):
+    def __init__(self, schema_file: dict = {}):
         self.schema_file = schema_file
         self.schema_parser = SchemaParser()
 
@@ -26,7 +28,7 @@ def _validate_expression(
         data_parser: BaseParser,
         error_records: list[ErrorReport],
         inc_header_in_row_count: bool,
-    ) -> ErrorReport | int:
+    ) -> Optional[int]:
         row = 2 if inc_header_in_row_count else 1
 
         data_format = data_parser.get_data_format()
@@ -62,18 +64,17 @@ def _validate_expression(
             )
             return
 
-        for value in expression_values:
-            try:
-                error_record = expression_validator.validate_expression(
-                    expression_type, expression_rule, expression_fieldname, value, row
+        try:
+            error_record = expression_validator.validate_expression(
+                expression_type, expression_rule, expression_fieldname, expression_values, row
+            )
+            if error_record is not None:
+                add_error_record(
+                    error_records, error_record, expression_error_group, expression_name, expression_id, error_level
                 )
-                if error_record is not None:
-                    add_error_record(
-                        error_records, error_record, expression_error_group, expression_name, expression_id, error_level
-                    )
-            except Exception:
-                print(f"Exception validating expression {expression_id} on row {row}: {error_record}")
-            row += 1
+        except Exception:
+            print(f"Exception validating expression {expression_id} on row {row}: {error_record}")
+        row += 1
         return row
 
     def validate_fhir(

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

@@ -15,7 +15,7 @@ def test_parse_normal(self):
         csv_parsers = CSVLineParser()
         csv_parsers.parse_csv_line(CSV_VALUES)
         self.assertEqual(csv_parsers.csv_file_data, CSV_VALUES)
-        self.assertEqual(csv_parsers.get_key_value("NHS_NUMBER"), ["9000000009"])
+        self.assertEqual(csv_parsers.get_key_value("NHS_NUMBER"), "9000000009")
 
     def test_extra_values_ignored(self):
         """
@@ -27,7 +27,7 @@ def test_extra_values_ignored(self):
             csv_parsers.csv_file_data,
             {"NHS_NUMBER": "9000000009", "PERSON_FORENAME": "Alex", "": "Trent"},
         )
-        self.assertEqual(csv_parsers.get_key_value("PERSON_FORENAME"), ["Alex"])
+        self.assertEqual(csv_parsers.get_key_value("PERSON_FORENAME"), "Alex")
 
     def test_fewer_values_than_keys(self):
         """