20 errors

Author: nhsdevws

backend/src/models/utils/validation_utils.py

@@ -1,7 +1,7 @@
 """Utils for backend folder"""
 
 import json
-
+import inspect
 
 from typing import Union
 from .generic_utils import create_diagnostics_error
@@ -54,13 +54,7 @@ def convert_disease_codes_to_vaccine_type(disease_codes_input: list) -> Union[st
     otherwise raises a value error
     """
     key = ":".join(sorted(disease_codes_input))
-    # vaccine_type = redis_client.hget("diseases_to_vacc", key)
-    
-    
-    if isinstance(redis_client.hget, Mock):
-        vaccine_type = redis_client.hget("diseases_to_vacc", key)
-    else:
-        print("XXXXXX   ------>>>  redis_client.hget is mocked")
+    vaccine_type = redis_client.hget("diseases_to_vacc", key)
 
     if not vaccine_type:
         raise ValueError(

backend/tests/test_fhir_batch_service.py

@@ -1,16 +1,36 @@
 import unittest
 import uuid
 from copy import deepcopy
-from unittest.mock import Mock, create_autospec
+from unittest.mock import Mock, create_autospec, patch
 from tests.utils.immunization_utils import  create_covid_19_immunization_dict_no_id
 from models.errors import CustomValidationError
 from models.fhir_immunization import ImmunizationValidator
 from fhir_batch_repository import ImmunizationBatchRepository
 from fhir_batch_service import ImmunizationBatchService
+from sample_data.mock_redis_cache import fake_hget
 
-class TestCreateImmunizationBatchService(unittest.TestCase):
+
+class TestFhirBatchServiceBase(unittest.TestCase):
+    """Base class for all tests to set up common fixtures"""
+
+    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_client.hget.side_effect = fake_hget
+        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 TestCreateImmunizationBatchService(TestFhirBatchServiceBase):
 
     def setUp(self):
+        super().setUp()
         self.mock_repo = create_autospec(ImmunizationBatchRepository)
         self.mock_validator = create_autospec(ImmunizationValidator)
         self.mock_table = Mock()
@@ -19,6 +39,14 @@ def setUp(self):
             self.mock_repo, ImmunizationValidator(add_post_validators=False)
         )
 
+    def tearDown(self):
+        super().tearDown()
+        self.mock_repo.reset_mock()
+        self.mock_validator.reset_mock()
+        self.mock_table.reset_mock()
+        self.service = None
+        self.pre_validate_fhir_service = None
+
     def test_create_immunization_valid(self):
         """it should create Immunization and return imms id location"""
 
@@ -69,9 +97,10 @@ def test_create_immunization_post_validation_error(self):
         self.mock_repo.create_immunization.assert_not_called() 
 
 
-class TestUpdateImmunizationBatchService(unittest.TestCase):
+class TestUpdateImmunizationBatchService(TestFhirBatchServiceBase):
 
     def setUp(self):
+        super().setUp()
         self.mock_repo = create_autospec(ImmunizationBatchRepository)
         self.mock_validator = create_autospec(ImmunizationValidator)
         self.mock_table = Mock()
@@ -80,6 +109,14 @@ def setUp(self):
             self.mock_repo, ImmunizationValidator(add_post_validators=False)
         )
 
+    def tearDown(self):
+        super().tearDown()
+        self.mock_repo.reset_mock()
+        self.mock_validator.reset_mock()
+        self.mock_table.reset_mock()
+        self.service = None
+        self.pre_validate_fhir_service = None
+
     def test_update_immunization_valid(self):
         """it should update Immunization and return imms id"""
 

backend/tests/test_fhir_repository.py

@@ -6,8 +6,8 @@
 
 import botocore.exceptions
 from boto3.dynamodb.conditions import Attr, Key
-from src.fhir_repository import ImmunizationRepository
-from src.models.utils.validation_utils import get_vaccine_type
+from fhir_repository import ImmunizationRepository
+from models.utils.validation_utils import get_vaccine_type
 from models.errors import (
     ResourceNotFoundError,
     UnhandledResponseError,
@@ -16,9 +16,7 @@
 )
 from tests.utils.generic_utils import update_target_disease_code
 from tests.utils.immunization_utils import create_covid_19_immunization_dict
-
-"test"
-
+from sample_data.mock_redis_cache import fake_hget
 
 def _make_immunization_pk(_id):
     return f"Immunization#{_id}"
@@ -27,12 +25,33 @@ def _make_immunization_pk(_id):
 def _make_patient_pk(_id):
     return f"Patient#{_id}"
 
+class TestFhirRepositoryBase(unittest.TestCase):
+    """Base class for all tests to set up common fixtures"""
+
+    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_client.hget.side_effect = fake_hget
+        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 TestGetImmunizationByIdentifier(unittest.TestCase):
+
+class TestGetImmunizationByIdentifier(TestFhirRepository):
     def setUp(self):
+        super().setUp()
         self.table = MagicMock()
         self.repository = ImmunizationRepository(table=self.table)
 
+    def tearDown(self):
+        self.redis_patcher.stop()
+        super().tearDown()
+
     def test_get_immunization_by_identifier(self):
         """it should find an Immunization by id"""
         imms_id = "a-id#an-id"
@@ -280,14 +299,18 @@ def test_create_throws_error_when_identifier_already_in_dynamodb(self):
         self.assertEqual(str(e.exception), f"The provided identifier: {identifier} is duplicated")
 
 
-class TestCreateImmunizationPatientIndex(unittest.TestCase):
+class TestCreateImmunizationPatientIndex(TestFhirRepositoryBase):
     """create_immunization should create a patient record with vaccine type"""
 
     def setUp(self):
+        super().setUp()
         self.table = MagicMock()
         self.repository = ImmunizationRepository(table=self.table)
         self.patient = {"id": "a-patient-id"}
 
+    def tearDown(self):
+        super().tearDown()
+
     def test_create_patient_gsi(self):
         """create Immunization method should create Patient index with nhs-number as ID and no system"""
         imms = create_covid_19_immunization_dict("an-id")
@@ -332,13 +355,17 @@ def test_create_patient_with_unauthorised_vaccine_type_permissions(self):
             self.repository.create_immunization(imms, self.patient, "COVID:create", "Test")
 
 
-class TestUpdateImmunization(unittest.TestCase):
+class TestUpdateImmunization(TestFhirRepository):
     def setUp(self):
+        super().setUp()
         self.table = MagicMock()
         self.repository = ImmunizationRepository(table=self.table)
         self.patient = _make_a_patient("update-patient-id")
 
-    def test_update(self):
+    def tearDown(self):
+        return super().tearDown()
+
+    def test_update1(self):
         """it should update record by replacing both Immunization and Patient"""
         imms_id = "an-imms-id"
         imms = create_covid_19_immunization_dict(imms_id)
@@ -651,14 +678,18 @@ def test_bad_response_from_dynamo(self):
         self.assertDictEqual(e.exception.response, response)
 
 
-class TestImmunizationDecimals(unittest.TestCase):
+class TestImmunizationDecimals(TestFhirRepository):
     """It should create a record and keep decimal precision"""
 
     def setUp(self):
+        super().setUp()
         self.table = MagicMock()
         self.repository = ImmunizationRepository(table=self.table)
         self.patient = {"id": "a-patient-id", "identifier": {"value": "an-identifier"}}
 
+    def tearDown(self):
+        return super().tearDown()
+
     def test_decimal_on_create(self):
         """it should create Immunization, and preserve decimal value"""
         imms = create_covid_19_immunization_dict(imms_id="an-id")

backend/tests/test_fhir_service.py

@@ -3,7 +3,7 @@
 import datetime
 import unittest
 from copy import deepcopy
-from unittest.mock import create_autospec
+from unittest.mock import create_autospec, patch
 from decimal import Decimal
 
 from fhir.resources.R4B.bundle import Bundle as FhirBundle, BundleEntry
@@ -21,10 +21,27 @@
     create_covid_19_immunization_dict_no_id,
     VALID_NHS_NUMBER,
 )
-from .utils.generic_utils import load_json_data
-from src.constants import NHS_NUMBER_USED_IN_SAMPLE_DATA
+from utils.generic_utils import load_json_data
+from constants import NHS_NUMBER_USED_IN_SAMPLE_DATA
+from sample_data.mock_redis_cache import fake_hget
+
+class TestFhirServiceBase(unittest.TestCase):
+    """Base class for all tests to set up common fixtures"""
+
+    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_client.hget.side_effect = fake_hget
+        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()
+        
 
-"test"
 class TestServiceUrl(unittest.TestCase):
     def test_get_service_url(self):
         """it should create service url"""
@@ -49,15 +66,20 @@ def test_get_service_url(self):
         self.assertEqual(url, f"https://internal-dev.api.service.nhs.uk/{base_path}")
 
 
-class TestGetImmunizationByAll(unittest.TestCase):
+class TestGetImmunizationByAll(TestFhirServiceBase):
     """Tests for FhirService.get_immunization_by_id"""
 
     def setUp(self):
+        super().setUp()
         self.imms_repo = create_autospec(ImmunizationRepository)
         self.pds_service = create_autospec(PdsService)
         self.validator = create_autospec(ImmunizationValidator)
         self.fhir_service = FhirService(self.imms_repo, self.pds_service, self.validator)
 
+    def tearDown(self):
+        super().tearDown()
+        patch.stopall()
+
     def test_get_immunization_by_id_by_all(self):
         """it should find an Immunization by id"""
         imms_id = "an-id"
@@ -117,7 +139,7 @@ def test_pre_validation_failed(self):
         self.assertEqual(error.exception.message, expected_msg)
         self.imms_repo.update_immunization.assert_not_called()
 
-    def test_post_validation_failed(self):
+    def test_post_validation_failed_get_by_all(self):
         valid_imms = create_covid_19_immunization_dict("an-id", VALID_NHS_NUMBER)
 
         bad_target_disease_imms = deepcopy(valid_imms)
@@ -148,14 +170,19 @@ def test_post_validation_failed(self):
         self.imms_repo.get_immunization_by_id_all.assert_not_called()
 
 
-class TestGetImmunization(unittest.TestCase):
+class TestGetImmunization(TestFhirServiceBase):
     """Tests for FhirService.get_immunization_by_id"""
 
     def setUp(self):
+        super().setUp()
         self.imms_repo = create_autospec(ImmunizationRepository)
         self.pds_service = create_autospec(PdsService)
         self.validator = create_autospec(ImmunizationValidator)
         self.fhir_service = FhirService(self.imms_repo, self.pds_service, self.validator)
+        self.logger_info_patcher = patch("logging.Logger.info")
+        self.mock_logger_info = self.logger_info_patcher.start()
+    def tearDown(self):
+        patch.stopall()
 
     def test_get_immunization_by_id(self):
         """it should find an Immunization by id"""
@@ -232,7 +259,7 @@ def test_pre_validation_failed(self):
         self.imms_repo.update_immunization.assert_not_called()
         self.pds_service.get_patient_details.assert_not_called()
 
-    def test_post_validation_failed(self):
+    def test_post_validation_failed_get(self):
         valid_imms = create_covid_19_immunization_dict("an-id", VALID_NHS_NUMBER)
 
         bad_target_disease_imms = deepcopy(valid_imms)
@@ -307,10 +334,11 @@ def test_immunization_not_found(self):
         self.assertEqual(act_imms["entry"], [])
 
 
-class TestCreateImmunization(unittest.TestCase):
+class TestCreateImmunization(TestFhirServiceBase):
     """Tests for FhirService.create_immunization"""
 
     def setUp(self):
+        super().setUp()
         self.imms_repo = create_autospec(ImmunizationRepository)
         self.pds_service = create_autospec(PdsService)
         self.validator = create_autospec(ImmunizationValidator)
@@ -321,6 +349,10 @@ def setUp(self):
             ImmunizationValidator(add_post_validators=False),
         )
 
+    def tearDown(self):
+        patch.stopall()
+        super().tearDown()
+
     def test_create_immunization(self):
         """it should create Immunization and validate it"""
         imms_id = "an-id"
@@ -378,7 +410,7 @@ def test_pre_validation_failed(self):
         self.imms_repo.create_immunization.assert_not_called()
         self.pds_service.get_patient_details.assert_not_called()
 
-    def test_post_validation_failed(self):
+    def test_post_validation_failed_create(self):
         """it should throw exception if Immunization is not valid"""
 
         valid_imms = create_covid_19_immunization_dict_no_id(VALID_NHS_NUMBER)

backend/tests/test_immunization_pre_validator.py

@@ -765,7 +765,6 @@ def test_pre_validate_extension_url1(self):
         full_error_message = str(error.exception)
         actual_error_messages = full_error_message.replace("Validation errors: ", "").split("; ")
         self.assertIn("extension[0].url must be one of the following: https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-VaccinationProcedure", actual_error_messages)
-        print("hello world")
 
     def test_pre_validate_extension_snomed_code(self):
         """Test test_pre_validate_extension_url accepts valid values and rejects invalid values for extension[0].url"""

backend/tests/test_update_imms.py

@@ -10,12 +10,16 @@
 
 class TestUpdateImmunizations(unittest.TestCase):
     def setUp(self):
-        # self.controller = create_autospec(FhirController)
-        self.logger_exception_patcher = patch("logging.Logger.exception")
-        self.mock_logger_exception = self.logger_exception_patcher.start()
+        self.controller = create_autospec(FhirController)
         # patch FhirController
         self.controller = create_autospec(FhirController)
-        self.controller.update_immunization = FhirController.update_immunization        
+        self.controller.update_immunization = FhirController.update_immunization
+        self.logger_exception_patcher = patch("logging.Logger.exception")
+        self.mock_logger_exception = self.logger_exception_patcher.start()
+        self.logger_info_patcher = patch("logging.Logger.info")
+        self.mock_logger_info = self.logger_info_patcher.start()
+        
+