comments addressed

Author: nhsdevws

.gitignore

@@ -29,3 +29,4 @@ openapi.json
 !**/.vscode/settings.json.default
 
 devtools/volume/
+backend/tests/.coverage

backend/src/constants.py

@@ -23,6 +23,3 @@ class Urls:
 
 
 GENERIC_SERVER_ERROR_DIAGNOSTICS_MESSAGE = "Unable to process request. Issue may be transient."
-
-VACCINE_TYPE_TO_DISEASES_HASH_KEY = "vacc_to_diseases"
-DISEASES_TO_VACCINE_TYPE_HASH_KEY = "diseases_to_vacc"

backend/src/models/constants.py

@@ -42,4 +42,4 @@ class Constants:
 
     SUPPLIER_PERMISSIONS_KEY = "supplier_permissions"
     VACCINE_TYPE_TO_DISEASES_HASH_KEY = "vacc_to_diseases"
-    DISEASES_TO_VACCINE_TYPE_HASH_KEY = "diseases_to_vacc"
+    DISEASES_TO_VACCINE_TYPE_HASH_KEY = "diseases_to_vacc"

backend/src/models/utils/validation_utils.py

@@ -1,15 +1,15 @@
 """Utils for backend folder"""
 
 import json
-import inspect
 
 from typing import Union
 from .generic_utils import create_diagnostics_error
 from base_utils.base_utils import obtain_field_location
 from models.obtain_field_value import ObtainFieldValue
 from models.field_names import FieldNames
 from models.errors import MandatoryError
-from constants import Urls, DISEASES_TO_VACCINE_TYPE_HASH_KEY
+from constants import Urls
+from models.constants import Constants
 from clients import redis_client
 
 
@@ -53,7 +53,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_VACCINE_TYPE_HASH_KEY, key)
+    vaccine_type = redis_client.hget(Constants.DISEASES_TO_VACCINE_TYPE_HASH_KEY, key)
 
     if not vaccine_type:
         raise ValueError(

backend/src/parameter_parser.py

@@ -8,7 +8,7 @@
 
 from clients import redis_client
 from models.errors import ParameterException
-from constants import VACCINE_TYPE_TO_DISEASES_HASH_KEY
+from models.constants import Constants
 
 ParamValue = list[str]
 ParamContainer = dict[str, ParamValue]
@@ -109,8 +109,8 @@ def process_search_params(params: ParamContainer) -> SearchParams:
     if len(vaccine_types) < 1:
         raise ParameterException(f"Search parameter {immunization_target_key} must have one or more values.")
 
-    valid_vaccine_types = redis_client.hkeys(VACCINE_TYPE_TO_DISEASES_HASH_KEY)
-    if any([x not in valid_vaccine_types for x in vaccine_types]):
+    valid_vaccine_types = redis_client.hkeys(Constants.VACCINE_TYPE_TO_DISEASES_HASH_KEY)
+    if any(x not in valid_vaccine_types for x in vaccine_types):
         raise ParameterException(
             f"immunization-target must be one or more of the following: {', '.join(valid_vaccine_types)}")
 

backend/tests/.coverage

@@ -32,7 +32,6 @@
 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
 
 class TestFhirControllerBase(unittest.TestCase):
     """Base class for all tests to set up common fixtures"""
@@ -1607,6 +1606,19 @@ def test_immunization_unhandled_error(self, mock_get_supplier_permissions):
         self.assertEqual(body["issue"][0]["code"], "exception")
 
 class TestSearchImmunizations(TestFhirControllerBase):
+    MOCK_REDIS_V2D_RESPONSE = {
+        "PERTUSSIS": "[{\"code\": \"27836007\", \"term\": \"Pertussis (disorder)\"}]",
+        "RSV": "[{\"code\": \"55735004\", \"term\": \"Respiratory syncytial virus infection (disorder)\"}]",
+        "3in1": "[{\"code\": \"398102009\", \"term\": \"Acute poliomyelitis\"}, {\"code\": \"397430003\", \"term\": \"Diphtheria caused by Corynebacterium diphtheriae\"}, {\"code\": \"76902006\", \"term\": \"Tetanus (disorder)\"}]",
+        "MMR": "[{\"code\": \"14189004\", \"term\": \"Measles (disorder)\"}, {\"code\": \"36989005\", \"term\": \"Mumps (disorder)\"}, {\"code\": \"36653000\", \"term\": \"Rubella (disorder)\"}]",
+        "HPV": "[{\"code\": \"240532009\", \"term\": \"Human papillomavirus infection\"}]",
+        "MMRV": "[{\"code\": \"14189004\", \"term\": \"Measles (disorder)\"}, {\"code\": \"36989005\", \"term\": \"Mumps (disorder)\"}, {\"code\": \"36653000\", \"term\": \"Rubella (disorder)\"}, {\"code\": \"38907003\", \"term\": \"Varicella (disorder)\"}]",
+        "PCV13": "[{\"code\": \"16814004\", \"term\": \"Pneumococcal infectious disease\"}]",
+        "SHINGLES": "[{\"code\": \"4740000\", \"term\": \"Herpes zoster\"}]",
+        "COVID19": "[{\"code\": \"840539006\", \"term\": \"Disease caused by severe acute respiratory syndrome coronavirus 2\"}]",
+        "FLU": "[{\"code\": \"6142004\", \"term\": \"Influenza caused by seasonal influenza virus (disorder)\"}]",
+        "MENACWY": "[{\"code\": \"23511006\", \"term\": \"Meningococcal infectious disease\"}]"
+    }
     def setUp(self):
         super().setUp()
         self.service = create_autospec(FhirService)
@@ -1919,7 +1931,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
+        self.mock_redis_client.hkeys.return_value = self.MOCK_REDIS_V2D_RESPONSE
         lambda_event = {
             "multiValueQueryStringParameters": {
                 self.patient_identifier_key: ["https://fhir.nhs.uk/Id/nhs-number|9000000009"],

backend/tests/sample_data/permissions_config.py

@@ -3,16 +3,14 @@
 import unittest
 from copy import deepcopy
 from decimal import Decimal
-from unittest import mock
-import json
 from unittest.mock import patch
 
 from jsonpath_ng.ext import parse
 
 from clients import redis_client
 from models.fhir_immunization import ImmunizationValidator
 from models.utils.generic_utils import get_generic_extension_value
-from .utils.generic_utils import (
+from utils.generic_utils import (
     # these have an underscore to avoid pytest collecting them as tests
     test_valid_values_accepted as _test_valid_values_accepted,
     test_invalid_values_rejected as _test_invalid_values_rejected,
@@ -26,11 +24,25 @@
 )
 from utils.pre_validation_test_utils import ValidatorModelTests
 from utils.values_for_tests import ValidValues, InvalidValues
-from utils.mock_redis import MOCK_REDIS_D2V_RESPONSE
+from models.constants import Constants
 
 class TestImmunizationModelPreValidationRules(unittest.TestCase):
     """Test immunization pre validation rules on the FHIR model using the covid sample data"""
 
+    MOCK_REDIS_D2V_RESPONSE = {
+        "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 for each test. This runs before every test"""
         self.json_data = load_json_data(filename="completed_covid19_immunization_event.json")
@@ -39,6 +51,7 @@ def setUp(self):
         self.mock_redis_client = self.redis_patcher.start()
 
 
+        
     def tearDown(self):
         patch.stopall()
 
@@ -700,7 +713,7 @@ def test_pre_validate_missing_valueCodeableConcept2(self):
 
     def test_pre_validate_missing_valueCodeableConcept3(self):
         # Test case: valid data (should not raise an exception)
-        self.mock_redis_client.hget.return_value = MOCK_REDIS_D2V_RESPONSE
+        self.mock_redis_client.hget.return_value = self.MOCK_REDIS_D2V_RESPONSE
         valid_json_data = deepcopy(self.json_data)
         try:
             self.validator.validate(valid_json_data)