remove mappings

Author: nhsdevws

backend/src/mappings.py

@@ -28,7 +28,6 @@
     IdentifierDuplicationError,
 )
 from tests.utils.immunization_utils import create_covid_19_immunization
-from mappings import VaccineTypes
 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
@@ -1666,7 +1665,7 @@ def test_get_search_immunizations_vax_permission_check(self, mock_get_supplier_p
         search_result = Bundle.construct()
         self.service.search_immunizations.return_value = search_result
 
-        vaccine_type = VaccineTypes().all[0]
+        vaccine_type = "COVID19"
         lambda_event = {
             "SupplierSystem": "test",
             "multiValueQueryStringParameters": {
@@ -1689,7 +1688,7 @@ def test_get_search_immunizations_for_unauthorized_vaccine_type_search(self, moc
         bundle = Bundle.parse_obj(search_result)
         self.service.search_immunizations.return_value = bundle
 
-        vaccine_type = VaccineTypes().all[0], VaccineTypes().all[1]
+        vaccine_type = ["COVID19", "FLU"]
         vaccine_type = ",".join(vaccine_type)
 
         lambda_event = {
@@ -1743,9 +1742,7 @@ def test_get_search_immunizations_for_unauthorized_vaccine_type_search_403(self,
         mock_get_supplier_permissions.return_value = []
         self.service.search_immunizations.return_value = bundle
 
-        vaccine_type = VaccineTypes().all[0], VaccineTypes().all[1]
-        vaccine_type = ",".join(vaccine_type)
-
+        vaccine_type = "COVID19,FLU"
         lambda_event = {
             "headers": {"Content-Type": "application/x-www-form-urlencoded", "SupplierSystem": "test",},
             "multiValueQueryStringParameters": {
@@ -1768,7 +1765,7 @@ def test_get_search_immunizations_unauthorized(self, mock_get_supplier_permissio
         mock_get_supplier_permissions.return_value = []
         self.service.search_immunizations.return_value = search_result
 
-        vaccine_type = VaccineTypes().all[0]
+        vaccine_type = "COVID19"
         params = f"{self.immunization_target_key}={vaccine_type}&" + urllib.parse.urlencode(
             [(f"{self.patient_identifier_key}", f"{self.patient_identifier_valid_value}")]
         )
@@ -1895,7 +1892,7 @@ def test_post_search_immunizations_for_unauthorized_vaccine_type_search_403(self
         mock_get_supplier_permissions.return_value = []
         self.service.search_immunizations.return_value = bundle
 
-        vaccine_type = VaccineTypes().all[0], VaccineTypes().all[1]
+        vaccine_type = ["COVID19", "FLU"]
         vaccine_type = ",".join(vaccine_type)
 
         # Construct the application/x-www-form-urlencoded body
@@ -2017,7 +2014,7 @@ def test_search_immunizations_returns_200_remove_vaccine_not_done(self, mock_get
     def test_self_link_excludes_extraneous_params(self, mock_get_supplier_permissions):
         search_result = Bundle.construct()
         self.service.search_immunizations.return_value = search_result
-        vaccine_type = VaccineTypes().all[0]
+        vaccine_type = "COVID19"
         mock_get_supplier_permissions.return_value = ["covid19.CUDS"]
         params = f"{self.immunization_target_key}={vaccine_type}&" + urllib.parse.urlencode(
             [(f"{self.patient_identifier_key}", f"{self.patient_identifier_valid_value}")]

backend/tests/test_fhir_controller.py

@@ -6,7 +6,6 @@
 
 import botocore.exceptions
 from boto3.dynamodb.conditions import Attr, Key
-from mappings import DiseaseCodes, VaccineTypes
 from fhir_repository import ImmunizationRepository
 from models.utils.validation_utils import get_vaccine_type
 from models.errors import (
@@ -351,10 +350,10 @@ 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
+        self.mock_redis_client.hget.return_value = "FLU"
         imms = create_covid_19_immunization_dict("an-id")
 
-        update_target_disease_code(imms, DiseaseCodes.flu)
+        update_target_disease_code(imms, "FLU")
         vaccine_type = get_vaccine_type(imms)
 
         self.table.query = MagicMock(return_value={"Count": 0})
@@ -382,7 +381,7 @@ def test_create_patient_with_unauthorised_vaccine_type_permissions(self):
             }
         }
 
-        update_target_disease_code(imms, DiseaseCodes.flu)
+        update_target_disease_code(imms, "FLU")
         with self.assertRaises(UnauthorizedVaxError) as e:
             # When
             self.repository.create_immunization(imms, self.patient, ["COVID19.CRUD"], "Test")
@@ -666,7 +665,7 @@ def test_find_immunizations(self):
         condition = Key("PatientPK").eq(_make_patient_pk(nhs_number))
 
         # When
-        _ = self.repository.find_immunizations(nhs_number, vaccine_types=[VaccineTypes.covid_19])
+        _ = self.repository.find_immunizations(nhs_number, vaccine_types=["COVID19"])
 
         # Then
         self.table.query.assert_called_once_with(
@@ -683,7 +682,7 @@ def test_exclude_deleted(self):
         is_ = Attr("DeletedAt").not_exists() | Attr("DeletedAt").eq("reinstated")
 
         # When
-        _ = self.repository.find_immunizations("an-id", [VaccineTypes.covid_19])
+        _ = self.repository.find_immunizations("an-id", ["COVID19"])
 
         # Then
         self.table.query.assert_called_once_with(
@@ -709,7 +708,7 @@ def test_map_results_to_immunizations(self):
         self.table.query = MagicMock(return_value=dynamo_response)
 
         # When
-        results = self.repository.find_immunizations("an-id", [VaccineTypes.covid_19])
+        results = self.repository.find_immunizations("an-id", ["COVID19"])
 
         # Then
         self.assertListEqual(results, [imms1, imms2])
@@ -722,7 +721,7 @@ def test_bad_response_from_dynamo(self):
 
         with self.assertRaises(UnhandledResponseError) as e:
             # When
-            self.repository.find_immunizations("an-id", [VaccineTypes.covid_19])
+            self.repository.find_immunizations("an-id", ["COVID19"])
 
         # Then
         self.assertDictEqual(e.exception.response, response)

backend/tests/test_fhir_repository.py

@@ -13,7 +13,6 @@
 from fhir.resources.R4B.immunization import Immunization
 from fhir_repository import ImmunizationRepository
 from fhir_service import FhirService, UpdateOutcome, get_service_url
-from mappings import VaccineTypes
 from models.errors import InvalidPatientId, CustomValidationError
 from models.fhir_immunization import ImmunizationValidator
 from pds_service import PdsService
@@ -594,7 +593,7 @@ def setUp(self):
     def test_vaccine_type_search(self):
         """It should search for the correct vaccine type"""
         nhs_number = VALID_NHS_NUMBER
-        vaccine_type = VaccineTypes.covid_19
+        vaccine_type = "COVID19"
         params = f"{self.nhs_search_param}={nhs_number}&{self.vaccine_type_search_param}={vaccine_type}"
 
         # When
@@ -613,7 +612,7 @@ def test_make_fhir_bundle_from_search_result(self):
             "meta": {"security": [{"code": "U"}]},
         }
         nhs_number = NHS_NUMBER_USED_IN_SAMPLE_DATA
-        vaccine_types = [VaccineTypes.covid_19]
+        vaccine_types = ["COVID19"]
         params = f"{self.nhs_search_param}={nhs_number}&{self.vaccine_type_search_param}={vaccine_types}"
         # When
         result = self.fhir_service.search_immunizations(nhs_number, vaccine_types, params)
@@ -645,7 +644,7 @@ def test_date_from_is_used_to_filter(self):
             "meta": {"security": [{"code": "U"}]},
         }
         nhs_number = NHS_NUMBER_USED_IN_SAMPLE_DATA
-        vaccine_types = [VaccineTypes.covid_19]
+        vaccine_types = ["COVID19"]
 
         # CASE: Day before.
         self.imms_repo.find_immunizations.return_value = deepcopy(imms_list)
@@ -708,7 +707,7 @@ def test_date_from_is_optional(self):
             "meta": {"security": [{"code": "U"}]},
         }
         nhs_number = NHS_NUMBER_USED_IN_SAMPLE_DATA
-        vaccine_types = [VaccineTypes.covid_19]
+        vaccine_types = ["COVID19"]
 
         # CASE: Without date_from
         self.imms_repo.find_immunizations.return_value = deepcopy(imms_list)
@@ -748,7 +747,7 @@ def test_date_to_is_used_to_filter(self):
             "meta": {"security": [{"code": "U"}]},
         }
         nhs_number = NHS_NUMBER_USED_IN_SAMPLE_DATA
-        vaccine_types = [VaccineTypes.covid_19]
+        vaccine_types = ["COVID19"]
 
         # CASE: Day after.
         self.imms_repo.find_immunizations.return_value = deepcopy(imms_list)
@@ -813,7 +812,7 @@ def test_date_to_is_optional(self):
             "meta": {"security": [{"code": "U"}]},
         }
         nhs_number = NHS_NUMBER_USED_IN_SAMPLE_DATA
-        vaccine_types = [VaccineTypes.covid_19]
+        vaccine_types = ["COVID19"]
 
         # CASE 1: Without date_to argument
         self.imms_repo.find_immunizations.return_value = deepcopy(imms_list)
@@ -851,7 +850,7 @@ def test_immunization_resources_are_filtered_for_search(self):
             for imms_id in imms_ids
         ]
 
-        vaccine_types = [VaccineTypes.covid_19]
+        vaccine_types = ["COVID19"]
         self.imms_repo.find_immunizations.return_value = deepcopy(imms_list)
 
         # When
@@ -896,7 +895,7 @@ def test_matches_contain_fullUrl(self):
             "meta": {"security": [{"code": "U"}]},
         }
         nhs_number = NHS_NUMBER_USED_IN_SAMPLE_DATA
-        vaccine_types = [VaccineTypes.covid_19]
+        vaccine_types = ["COVID19"]
 
         # When
         result = self.fhir_service.search_immunizations(nhs_number, vaccine_types, "")
@@ -922,7 +921,7 @@ def test_patient_contains_fullUrl(self):
             "meta": {"security": [{"code": "U"}]},
         }
         nhs_number = NHS_NUMBER_USED_IN_SAMPLE_DATA
-        vaccine_types = [VaccineTypes.covid_19]
+        vaccine_types = ["COVID19"]
 
         # When
         result = self.fhir_service.search_immunizations(nhs_number, vaccine_types, "")
@@ -948,7 +947,7 @@ def test_patient_included(self):
             "meta": {"security": [{"code": "U"}]},
         }
         nhs_number = VALID_NHS_NUMBER
-        vaccine_types = [VaccineTypes.covid_19]
+        vaccine_types = ["COVID19"]
 
         # When
         result = self.fhir_service.search_immunizations(nhs_number, vaccine_types, "")
@@ -969,7 +968,7 @@ def test_patient_is_stripped(self):
             "meta": {"security": [{"code": "U"}]},
         }
         nhs_number = VALID_NHS_NUMBER
-        vaccine_types = [VaccineTypes.covid_19]
+        vaccine_types = ["COVID19"]
 
         # When
         result = self.fhir_service.search_immunizations(nhs_number, vaccine_types, "")