clients/redis_client

Author: JamesW1-NHS

lambdas/recordforwarder/src/clients.py

@@ -9,7 +9,7 @@
 import simplejson as json
 
 from batch.batch_filename_to_events_mapper import BatchFilenameToEventsMapper
-from clients import sqs_client
+from common.clients import sqs_client
 from controller.fhir_batch_controller import (
     ImmunizationBatchController,
     make_batch_controller,

lambdas/recordforwarder/src/forwarding_batch_lambda.py

@@ -2,7 +2,7 @@
 
 import json
 
-from clients import redis_client
+from common.redis_client import get_redis_client
 from constants import Urls
 from models.constants import Constants
 from models.errors import MandatoryError
@@ -54,7 +54,7 @@ def convert_disease_codes_to_vaccine_type(
     otherwise raises a value error
     """
     key = ":".join(sorted(disease_codes_input))
-    vaccine_type = redis_client.hget(Constants.DISEASES_TO_VACCINE_TYPE_HASH_KEY, key)
+    vaccine_type = get_redis_client().hget(Constants.DISEASES_TO_VACCINE_TYPE_HASH_KEY, key)
 
     if not vaccine_type:
         raise ValueError(

lambdas/recordforwarder/src/models/utils/validation_utils.py

@@ -8,7 +8,7 @@
 import simplejson as json
 from boto3.dynamodb.conditions import Attr, Key
 
-from clients import logger
+from common.clients import logger
 from models.errors import (
     IdentifierDuplicationError,
     ResourceFoundError,

lambdas/recordforwarder/src/repository/fhir_batch_repository.py

@@ -1,6 +1,6 @@
 import os
 import unittest
-from unittest.mock import ANY, MagicMock, patch
+from unittest.mock import ANY, Mock, MagicMock, patch
 from uuid import uuid4
 
 import boto3
@@ -36,8 +36,9 @@ def setUp(self):
         self.table.query = MagicMock(return_value={})
         self.immunization = create_covid_immunization_dict(imms_id)
         self.table.update_item = MagicMock(return_value={"ResponseMetadata": {"HTTPStatusCode": 200}})
-        self.redis_patcher = patch("models.utils.validation_utils.redis_client")
-        self.mock_redis_client = self.redis_patcher.start()
+        self.mock_redis = Mock()
+        self.redis_getter_patcher = patch("models.utils.validation_utils.get_redis_client")
+        self.mock_redis_getter = self.redis_getter_patcher.start()
         self.logger_info_patcher = patch("logging.Logger.info")
         self.mock_logger_info = self.logger_info_patcher.start()
 
@@ -56,7 +57,8 @@ def modify_immunization(self, remove_nhs):
 
     def create_immunization_test_logic(self, is_present, remove_nhs):
         """Common logic for testing immunization creation."""
-        self.mock_redis_client.hget.side_effect = ["COVID"]
+        self.mock_redis.hget.side_effect = ["COVID"]
+        self.mock_redis_getter.return_value = self.mock_redis
         self.modify_immunization(remove_nhs)
 
         self.repository.create_immunization(self.immunization, "supplier", "vax-type", self.table, is_present)

lambdas/recordforwarder/tests/repository/test_fhir_batch_repository.py

@@ -15,13 +15,14 @@ class TestFhirBatchServiceBase(unittest.TestCase):
 
     def setUp(self):
         super().setUp()
-        self.redis_patcher = patch("models.utils.validation_utils.redis_client")
-        self.mock_redis_client = self.redis_patcher.start()
+        self.mock_redis = Mock()
+        self.redis_getter_patcher = patch("models.utils.validation_utils.get_redis_client")
+        self.mock_redis_getter = self.redis_getter_patcher.start()
         self.logger_info_patcher = patch("logging.Logger.info")
         self.mock_logger_info = self.logger_info_patcher.start()
 
     def tearDown(self):
-        self.redis_patcher.stop()
+        self.redis_getter_patcher.stop()
         self.logger_info_patcher.stop()
         super().tearDown()
 
@@ -83,7 +84,8 @@ def test_create_immunization_post_validation_error(self):
         bad_target_disease_imms = deepcopy(valid_imms)
         bad_target_disease_imms["protocolApplied"][0]["targetDisease"][0]["coding"][0]["code"] = "bad-code"
         expected_msg = "protocolApplied[0].targetDisease[*].coding[?(@.system=='http://snomed.info/sct')].code - ['bad-code'] is not a valid combination of disease codes for this service"
-        self.mock_redis_client.hget.return_value = None  # Reset mock for invalid cases
+        self.mock_redis.hget.return_value = None  # Reset mock for invalid cases
+        self.mock_redis_getter.return_value = self.mock_redis
         with self.assertRaises(CustomValidationError) as error:
             self.pre_validate_fhir_service.create_immunization(
                 immunization=bad_target_disease_imms,
@@ -149,7 +151,8 @@ def test_update_immunization_pre_validation_error(self):
     def test_update_immunization_post_validation_error(self):
         """it should return error since it got failed in initial validation"""
 
-        self.mock_redis_client.hget.return_value = None  # Reset mock for invalid cases
+        self.mock_redis.hget.return_value = None  # Reset mock for invalid cases
+        self.mock_redis_getter.return_value = self.mock_redis
 
         valid_imms = create_covid_immunization_dict_no_id()
         bad_target_disease_imms = deepcopy(valid_imms)

lambdas/recordforwarder/tests/service/test_fhir_batch_service.py

@@ -5,7 +5,7 @@
 import unittest
 from typing import Optional
 from unittest import TestCase
-from unittest.mock import ANY, MagicMock, patch
+from unittest.mock import ANY, Mock, MagicMock, patch
 
 from boto3 import resource as boto3_resource
 from moto import mock_aws
@@ -67,13 +67,16 @@ def setUp(self):
                 },
             ],
         )
-        self.redis_patcher = patch("models.utils.validation_utils.redis_client")
-        self.mock_redis_client = self.redis_patcher.start()
+
         self.logger_info_patcher = patch("logging.Logger.info")
         self.mock_logger_info = self.logger_info_patcher.start()
         self.logger_error_patcher = patch("logging.Logger.error")
         self.mock_logger_error = self.logger_error_patcher.start()
 
+        self.mock_redis = Mock()
+        self.redis_getter_patcher = patch("models.utils.validation_utils.get_redis_client")
+        self.mock_redis_getter = self.redis_getter_patcher.start()
+
     def tearDown(self):
         """Tear down after each test. This runs after every test"""
         patch.stopall()
@@ -208,7 +211,8 @@ 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 = "RSV"
+        self.mock_redis.hget.return_value = "RSV"
+        self.mock_redis_getter.return_value = self.mock_redis
 
         test_cases = [
             {
@@ -443,7 +447,9 @@ def test_forward_lambda_handler_multiple_scenarios(self, mock_send_message):
         mock_send_message.reset_mock()
         event = self.generate_event(test_cases)
 
-        self.mock_redis_client.hget.return_value = "RSV"
+        self.mock_redis.hget.return_value = "RSV"
+        self.mock_redis_getter.return_value = self.mock_redis
+
         forward_lambda_handler(event, {})
 
         self.assert_dynamo_item(table_item)
@@ -474,7 +480,9 @@ def test_forward_lambda_handler_groups_and_sends_events_by_filename(self, mock_s
             },
         ]
         mock_kinesis_event = self.generate_event(mock_records)
-        self.mock_redis_client.hget.return_value = "RSV"
+
+        self.mock_redis.hget.return_value = "RSV"
+        self.mock_redis_getter.return_value = self.mock_redis
 
         forward_lambda_handler(mock_kinesis_event, {})
 
@@ -532,7 +540,9 @@ def test_forward_lambda_handler_update_scenarios(self, mock_send_message):
             input: generates the kinesis row data for the event,
             expected_keys (list): expected output dictionary keys,
             expected_values (dict): expected output dictionary values"""
-        self.mock_redis_client.hget.return_value = "RSV"
+        self.mock_redis.hget.return_value = "RSV"
+        self.mock_redis_getter.return_value = self.mock_redis
+
         pk_test_update = "Immunization#4d2ac1eb-080f-4e54-9598-f2d53334687r"
         self.table.put_item(
             Item={