unit tests

Author: nhsdevws

immunisation-fhir-api.code-workspace

@@ -1,44 +1,44 @@
 {
 	"folders": [
-		{
-			"path": "."
-		},
-		{
-			"path": "backend"
-		},
-		{
-			"path": "filenameprocessor"
-		},
-		{
-			"path": "recordprocessor"
-		},
-		{
-			"path": "delta_backend"
-		},
-		{
-			"path": "mesh_processor"
-		},
-		{
-			"path": "e2e"
-		},
-		{
-			"path": "e2e_batch"
-		},
-		{
-			"path": "lambdas/ack_backend"
-		},
+        {
+            "path": "."
+        },
+        {
+            "path": "backend"
+        },
+        {
+            "path": "filenameprocessor"
+        },
+        {
+            "path": "recordprocessor"
+        },
+        {
+            "path": "delta_backend"
+        },
+        {
+            "path": "mesh_processor"
+        },
+        {
+            "path": "e2e"
+        },
+        {
+            "path": "e2e_batch"
+        },
+        {
+            "path": "lambdas/ack_backend"
+        },
         {
             "path": "lambdas/redis_sync"
         },
-		{
-			"path": "lambdas/id_sync"
+        {
+            "path": "lambdas/id_sync"
         },
-		{
+        {
             "path": "lambdas/mns_subscription"
-		},
-		{
-			"path": "lambdas/shared"
-		}
-	],
+        },
+        {
+            "path": "lambdas/shared"
+        }
+    ],
 	"settings": {}
 }

lambdas/shared/Makefile

@@ -1,5 +1,10 @@
+TEST_ENV := @PYTHONPATH=src:tests:src/common
+
 test:
-	@PYTHONPATH=src:../ python -m unittest discover -s tests -p "test_*.py" -v
+	$(TEST_ENV) python -m unittest discover -s tests -p "test_*.py" -v
+
+testv:
+	$(TEST_ENV) python -m unittest discover -s tests/test_common/validator -p "test_*.py" -v
 
 test-list:
 	@PYTHONPATH=src:tests python -m unittest discover -s tests -p "test_*.py" --verbose | grep test_

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

@@ -5,6 +5,7 @@
 WARNING = 1
 NOTIFICATION = 2
 
+
 MESSAGES = {
     CRITICAL_ERROR: 'Critical Validation Error [%s]: %s',
     WARNING: 'Non-Critical Validation Error [%s]: %s',

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

@@ -1,3 +1,5 @@
+
+
 # all exceptions and messgaes
 UNEXPECTED_EXCEPTION = 0
 VALUE_CHECK_FAILED = 1

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

@@ -1,66 +1,14 @@
 # Root and base type expression checker functions
-import validator.enums.exception_messages as ExceptionMessages
+import common.validator.enums.exception_messages as ExceptionMessages
 import datetime
 import uuid
 import re
-from validator.lookup.lookup_data import LookUpData
-from validator.lookup.key_data import KeyData
-
-
-class ErrorReport():
-    def __init__(self, code: int, message: str, row: int = None, field: str = None, details: str = None,
-                 summarise: bool = False):
-        self.code = code
-        self.message = message
-        if not summarise:
-            self.row = row
-            self.field = field
-            self.details = details
-        self.summarise = summarise
-        # these are set when the error is added to the report
-        self.error_group = None
-        self.name = None
-        self.id = None
-        self.error_level = None
-
-    # function to return the object as a dictionary
-    def to_dict(self):
-        ret = {
-                'code': self.code,
-                'message': self.message
-            }
-        if not self.summarise:
-            ret.update({
-                'row': self.row,
-                'field': self.field,
-                'details': self.details
-            })
-        return ret
-
-
-# record exception capture
-class RecordError(Exception):
-
-    def __init__(self, code=None, message=None, details=None):
-        self.code = code
-        self.message = message
-        self.details = details
-
-    def __str__(self):
-        return repr((self.code, self.message, self.details))
-
-    def __repr__(self):
-        return repr((self.code, self.message, self.details))
-
-
-# main expressions checker
+from common.validator.lookup.lookup_data import LookUpData
+from common.validator.lookup.key_data import KeyData
+from common.validator.record_error import RecordError, ErrorReport
+
+
 class ExpressionChecker:
-    # validation settings
-    # summarise = False
-    # report_unexpected_exception = True
-    # dataParser = any
-    # dataLookUp = any
-    # keyData = any
 
     def __init__(self, data_parser, summarise, report_unexpected_exception):
         self.data_parser = data_parser  # FHIR data parser for additional functions
@@ -160,9 +108,26 @@ def _validate_uuid(self, expressionRule, field_name,  field_value, row):
 
     # Integer Validate
     def _validate_integer(self, expression_rule, field_name,
-                          field_value, row, summarise) -> ErrorReport:
+                          field_value, row, summarise=False) -> ErrorReport:
         try:
             int(field_value)
+            if expression_rule:
+                # TODO - code is incomplete here. It appears there should be a check
+                # against expression_rule but it's not implemented. eg max, min, equal etc
+                # eg "1" means value must be 1
+                # "1:10" means value must be between 1 to 10
+                # "1,10" means value must be either 1 or 10
+                # ":10" means value must be less than or equal to 10
+                # "1:" means value must be greater than or equal to 1
+                # ">10" means value must be greater than 10
+                # "<10" means value must be less than 10
+
+                check_value = int(expression_rule)
+                if field_value != check_value:
+                    raise RecordError(ExceptionMessages.RECORD_CHECK_FAILED,
+                                      "Value integer check failed",
+                                      "Value does not equal expected value, Expected- " + expression_rule
+                                      + " found- " + field_value)
         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/src/common/validator/enums/exception_messages.py

@@ -0,0 +1,46 @@
+
+
+class ErrorReport():
+    def __init__(self, code: int = None, message: str = None, row: int = None, field: str = None, details: str = None,
+                 summarise: bool = False, error_level: int = None):
+        self.code = code
+        self.message = message
+        if not summarise:
+            self.row = row
+            self.field = field
+            self.details = details
+        self.summarise = summarise
+        # these are set when the error is added to the report
+        self.error_group = None
+        self.name = None
+        self.id = None
+        self.error_level = error_level
+
+    # function to return the object as a dictionary
+    def to_dict(self):
+        ret = {
+                'code': self.code,
+                'message': self.message
+            }
+        if not self.summarise:
+            ret.update({
+                'row': self.row,
+                'field': self.field,
+                'details': self.details
+            })
+        return ret
+
+
+# record exception capture
+class RecordError(Exception):
+
+    def __init__(self, code=None, message=None, details=None):
+        self.code = code
+        self.message = message
+        self.details = details
+
+    def __str__(self):
+        return repr((self.code, self.message, self.details))
+
+    def __repr__(self):
+        return repr((self.code, self.message, self.details))