tidy

Author: nhsdevws

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

@@ -78,6 +78,10 @@ def validateExpression(self, expression_type, rule, field_name,  field_value, ro
     def _validate_datetime(self, rule, field_name,  field_value, row):
         try:
             datetime.date.fromisoformat(field_value)
+            # TODO - rule is not used - could be date only, date time, past, future etc
+            if rule:
+                pass
+
         except RecordError as e:
             code = e.code if e.code is not None else ExceptionMessages.RECORD_CHECK_FAILED
             message = (e.message if e.message is not None

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

@@ -0,0 +1,49 @@
+# Test application file
+from pathlib import Path
+from common.validator.validator import Validator
+import json
+import time
+import unittest
+
+
+class TestApplication(unittest.TestCase):
+    def setUp(self):
+
+        fhir_data_folder = Path("./data")
+        self.FHIRFilePath = fhir_data_folder / "vaccination.json"
+
+        self.schema_data_folder = Path("./schemas")
+        self.schemaFilePath = self.schema_data_folder / "schema.json"
+
+    def test_validation(self):
+
+        DATA_TYPE = 'FHIR'
+
+        start = time.time()
+
+        # get the JSON of the schema, changed to cope with elasticache
+        with open(self.schemaFilePath, 'r') as JSON:
+            SchemaFile = json.load(JSON)
+
+        # get the FHIR Data as JSON
+        with open(self.FHIRFilePath, 'r') as JSON:
+            FHIRData = json.load(JSON)
+
+        validator = Validator(self.FHIRFilePath, FHIRData, SchemaFile, '', '',
+                              DATA_TYPE)  # FHIR File Path not needed
+        error_list = validator.run_validation(True, True, True)
+        error_report = validator.build_error_report(
+            '25a8cc4d-1875-4191-ac6d-2d63a0ebc64b')  # include eventID if known
+
+        failed_validation = validator.has_validation_failed()
+
+        self.assertTrue(len(error_list) == 0,
+                        f"Validation failed. Errors: {error_list}")
+        self.assertTrue(len(error_report['errors']) == 0,
+                        f"Validation failed. Errors: {error_report['errors']}")
+
+        self.assertFalse(failed_validation, 'Validation failed')
+
+        end = time.time()
+        print('Time Taken : ')
+        print(end - start)

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

@@ -6,12 +6,26 @@
 
 
 class TestParse(unittest.TestCase):
-    def test_parse_fhir_file(self):
 
-        fhir_data_folder = Path("./data")
-        fhirFilePath = fhir_data_folder / "vaccination.json"
+    def setUp(self):
+        self.fhir_data_folder = Path("./data")
+
+    def test_parse_fhir_key_exists(self):
+
+        fhirFilePath = self.fhir_data_folder / "vaccination.json"
 
         fhir_parser = FHIRParser()
         fhir_parser.parse_fhir_file(fhirFilePath)
         my_value = fhir_parser.get_key_value('vaccineCode|coding|0|code')
         self.assertEqual(my_value, ['42223111000001107'])
+
+    def test_parse_fhir_key_not_exists(self):
+
+        fhirFilePath = self.fhir_data_folder / "vaccination.json"
+
+        fhir_parser = FHIRParser()
+        fhir_parser.parse_fhir_file(fhirFilePath)
+        my_value = fhir_parser.get_key_value('vaccineCode|coding|1')
+        self.assertEqual(my_value, [''])
+        my_value = fhir_parser.get_key_value('vaccineCode|coding|1|codes')
+        self.assertEqual(my_value, [''])