tidy

Author: nhsdevws

backend/tests/test_forwarding_batch_lambda.py

@@ -17,8 +17,8 @@
 import copy
 import json
 
-from tests.utils.test_utils_for_batch import ForwarderValues, MockFhirImmsResources
-
+from utils.test_utils_for_batch import ForwarderValues, MockFhirImmsResources
+from utils.mock_redis import MOCK_REDIS_D2V_RESPONSE
 
 with patch.dict("os.environ", ForwarderValues.MOCK_ENVIRONMENT_DICT):
     from forwarding_batch_lambda import forward_lambda_handler, create_diagnostics_dictionary, forward_request_to_dynamo
@@ -28,21 +28,6 @@
 @patch.dict(os.environ, ForwarderValues.MOCK_ENVIRONMENT_DICT)
 class TestForwardLambdaHandler(TestCase):
 
-    MOCK_REDIS_D2V_RESPONSE = json.dumps({
-        "4740000": "SHINGLES",
-        "6142004": "FLU",
-        "16814004": "PCV13",
-        "23511006": "MENACWY",
-        "27836007": "PERTUSSIS",
-        "55735004": "RSV",
-        "240532009": "HPV",
-        "840539006": "COVID19",
-        "14189004:36653000:36989005": "MMR",
-        "14189004:36653000:36989005:38907003": "MMRV",
-        "397430003:398102009:76902006": "3in1"
-    })
-
-
     def setUp(self):
         """Set up dynamodb table test values to be used for the tests"""
         self.dynamodb_resource = boto3_resource("dynamodb", "eu-west-2")
@@ -76,7 +61,7 @@ def setUp(self):
         )
         self.redis_patcher = patch("models.utils.validation_utils.redis_client")
         self.mock_redis_client = self.redis_patcher.start()
-        self.mock_redis_client.hget.return_value = self.MOCK_REDIS_D2V_RESPONSE
+        self.mock_redis_client.hget.return_value = MOCK_REDIS_D2V_RESPONSE
 
     def tearDown(self):
         """Tear down after each test. This runs after every test"""
@@ -203,7 +188,7 @@ def test_forward_lambda_handler_single_operations(self, mock_send_message):
                 "PatientSK": "RSV#4d2ac1eb-080f-4e54-9598-f2d53334681c",
             }
         )
-        self.mock_redis_client.hget.return_value = self.MOCK_REDIS_D2V_RESPONSE
+        self.mock_redis_client.hget.return_value = MOCK_REDIS_D2V_RESPONSE
 
         test_cases = [
             {

backend/tests/utils/mock_redis.py

@@ -1,4 +1,6 @@
-MOCK_REDIS_D2V_RESPONSE = {
+import json
+
+MOCK_REDIS_D2V_RESPONSE = json.dumps({
     "4740000": "SHINGLES",
     "6142004": "FLU",
     "16814004": "PCV13",
@@ -10,7 +12,7 @@
     "14189004:36653000:36989005": "MMR",
     "14189004:36653000:36989005:38907003": "MMRV",
     "397430003:398102009:76902006": "3in1"
-}
+})
 
 MOCK_REDIS_V2D_RESPONSE = {
     "PERTUSSIS": "[{\"code\": \"27836007\", \"term\": \"Pertussis (disorder)\"}]",

recordprocessor/tests/test_process_row.py

@@ -20,8 +20,6 @@
 from tests.utils_for_recordprocessor_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT
 
 with patch("os.environ", MOCK_ENVIRONMENT_DICT):
-    # Do not attempt 'from mappings import Vaccine' as this imports a different instance of Vaccine
-    # and tests will break
     from clients import REGION_NAME
     from process_row import process_row