Resolve merge tests

Author: nhsdevws

backend/poetry.lock

@@ -40,4 +40,6 @@ class Constants:
 
     ALLOWED_CONTAINED_RESOURCES = {"Practitioner", "Patient"}
 
-    SUPPLIER_PERMISSIONS_KEY = "supplier_permissions"
+    SUPPLIER_PERMISSIONS_KEY = "supplier_permissions"
+    VACCINE_TYPE_TO_DISEASES_HASH_KEY = "vacc_to_diseases"
+    DISEASES_TO_VACCINE_TYPE_HASH_KEY = "diseases_to_vacc"

backend/src/models/constants.py

@@ -32,17 +32,35 @@
 from parameter_parser import patient_identifier_system, process_search_params
 from tests.utils.generic_utils import load_json_data
 from tests.utils.values_for_tests import ValidValues
+from utils.mock_redis import MOCK_REDIS_V2D_RESPONSE
 
-"test"
+class TestFhirControllerBase(unittest.TestCase):
+    """Base class for all tests to set up common fixtures"""
 
-
-class TestFhirController(unittest.TestCase):
     def setUp(self):
+        super().setUp()
+        self.redis_patcher = patch("parameter_parser.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()
+
+    def tearDown(self):
+        self.redis_patcher.stop()
+        self.logger_info_patcher.stop()
+        super().tearDown()
+
+class TestFhirController(TestFhirControllerBase):
+    def setUp(self):
+        super().setUp()
         self.service = create_autospec(FhirService)
         self.repository = create_autospec(ImmunizationRepository)
         self.authorizer = create_autospec(Authorization)
         self.controller = FhirController(self.authorizer, self.service)
 
+    def tearDown(self):
+        self.redis_patcher.stop()
+        super().tearDown()
+
     def test_create_response(self):
         """it should return application/fhir+json with correct status code"""
         body = {"message": "a body"}
@@ -1596,8 +1614,9 @@ def test_immunization_unhandled_error(self, mock_get_supplier_permissions):
         self.assertEqual(body["resourceType"], "OperationOutcome")
         self.assertEqual(body["issue"][0]["code"], "exception")
 
-class TestSearchImmunizations(unittest.TestCase):
+class TestSearchImmunizations(TestFhirControllerBase):
     def setUp(self):
+        super().setUp()
         self.service = create_autospec(FhirService)
         self.authorizer = create_autospec(Authorization)
         self.controller = FhirController(self.authorizer, self.service)
@@ -1607,11 +1626,15 @@ def setUp(self):
         self.date_to_key = "-date.to"
         self.nhs_number_valid_value = "9000000009"
         self.patient_identifier_valid_value = f"{patient_identifier_system}|{self.nhs_number_valid_value}"
+        self.mock_redis_client.hkeys.return_value = MOCK_REDIS_V2D_RESPONSE
+
+    def tearDown(self):
+        return super().tearDown()
 
     @patch("fhir_controller.get_supplier_permissions")
     def test_get_search_immunizations(self, mock_get_supplier_permissions):
         """it should search based on patient_identifier and immunization_target"""
-        
+
         mock_get_supplier_permissions.return_value = ["covid19.s"]
         search_result = Bundle.construct()
         self.service.search_immunizations.return_value = search_result
@@ -1906,6 +1929,7 @@ def test_post_search_immunizations_for_unauthorized_vaccine_type_search_403(self
 
     @patch("fhir_controller.process_search_params", wraps=process_search_params)
     def test_uses_parameter_parser(self, process_search_params: Mock):
+        self.mock_redis_client.hkeys.return_value = MOCK_REDIS_V2D_RESPONSE
         lambda_event = {
             "multiValueQueryStringParameters": {
                 self.patient_identifier_key: ["https://fhir.nhs.uk/Id/nhs-number|9000000009"],

backend/tests/test_fhir_controller.py

@@ -351,6 +351,7 @@ def test_create_patient_gsi(self):
 
     def test_create_patient_with_vaccine_type(self):
         """Patient record should have a sort-key based on vaccine-type"""
+        self.mock_redis_client.hget.return_value = VaccineTypes.flu
         imms = create_covid_19_immunization_dict("an-id")
 
         update_target_disease_code(imms, DiseaseCodes.flu)

backend/tests/test_fhir_repository.py

@@ -2,7 +2,6 @@
 import os
 from unittest import TestCase
 from unittest.mock import patch, MagicMock
-import boto3
 from boto3 import resource as boto3_resource
 from moto import mock_aws
 from models.errors import (
@@ -18,12 +17,9 @@
 import json
 
 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
-
-
 @mock_aws
 @patch.dict(os.environ, ForwarderValues.MOCK_ENVIRONMENT_DICT)
 class TestForwardLambdaHandler(TestCase):
@@ -61,7 +57,6 @@ 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 = MOCK_REDIS_D2V_RESPONSE
 
     def tearDown(self):
         """Tear down after each test. This runs after every test"""
@@ -155,6 +150,7 @@ def assert_values_in_sqs_messages(self, mock_send_message, test_cases):
                             assert message[key][sub_key] == sub_value
 
                     else:
+                        print(f"Asserting {key} {message[key]} == {value}")
                         assert message[key] == value
 
     def assert_dynamo_item(self, expected_dynamo_item):
@@ -188,7 +184,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 = MOCK_REDIS_D2V_RESPONSE
+        self.mock_redis_client.hget.return_value = "RSV"
 
         test_cases = [
             {
@@ -391,14 +387,17 @@ def test_forward_lambda_handler_multiple_scenarios(self, mock_send_message):
         self.table.put_item(
             Item={
                 "PK": "Immunization#4d2ac1eb-080f-4e54-9598-f2d53334681c",
-                "PatientPK": "Patient#9177036360",
+                "PatientPK": "Patient#9732928395",  # 9177036360",
+                "PatientSK": "RSV#4d2ac1eb-080f-4e54-9598-f2d53334681c",
                 "IdentifierPK": "https://www.ravs.england.nhs.uk/#RSV_002",
                 "Version": 1,
             }
         )
         mock_send_message.reset_mock()
         event = self.generate_event(test_cases)
 
+
+        self.mock_redis_client.hget.return_value = "RSV"
         forward_lambda_handler(event, {})
 
         self.assert_dynamo_item(table_item)
@@ -412,7 +411,7 @@ 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"
         pk_test_update = "Immunization#4d2ac1eb-080f-4e54-9598-f2d53334687r"
         self.table.put_item(
             Item={

backend/tests/test_forwarding_batch_lambda.py

@@ -1,6 +1,6 @@
 import json
 
-MOCK_REDIS_D2V_RESPONSE = json.dumps({
+MOCK_REDIS_D2V_RESPONSE = {
     "4740000": "SHINGLES",
     "6142004": "FLU",
     "16814004": "PCV13",
@@ -12,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)\"}]",
@@ -80,4 +80,4 @@ def mock_redis_hkeys(name):
     # return all keys
     if isinstance(ret, dict) and ret:
         return list(ret.keys())
-    return []
+    return []