Sort conflicts post rebasing

Author: dlzhry2nhs

backend/tests/repository/test_fhir_repository.py

@@ -687,15 +687,15 @@ def run_update_immunization_test(self, imms_id, imms, updated_dose_quantity=None
     def test_decimal_on_update(self):
         """it should update record when replacing doseQuantity and keep decimal precision"""
         imms_id = "an-imms-id"
-        imms = create_covid_19_immunization_dict(imms_id, VALID_NHS_NUMBER)
+        imms = create_covid_immunization_dict(imms_id, VALID_NHS_NUMBER)
         updated_dose_quantity = 0.7566
         imms["doseQuantity"]["value"] = updated_dose_quantity
         self.run_update_immunization_test(imms_id, imms, updated_dose_quantity)
 
     def test_decimal_on_update_patient(self):
         """it should update record by replacing both Immunization and Patient and dose quantity"""
         imms_id = "an-imms-id"
-        imms = create_covid_19_immunization_dict(imms_id, VALID_NHS_NUMBER)
+        imms = create_covid_immunization_dict(imms_id, VALID_NHS_NUMBER)
         updated_dose_quantity = 0.7566
         imms["doseQuantity"]["value"] = updated_dose_quantity
         imms["patient"] = self.patient

backend/tests/service/test_fhir_service.py

@@ -441,7 +441,7 @@ def setUp(self):
         self.authoriser = create_autospec(Authoriser)
         self.imms_repo = create_autospec(ImmunizationRepository)
         self.fhir_service = FhirService(self.imms_repo, self.authoriser)
-        self.mock_redis_client.hget.return_value = "COVID19"
+        self.mock_redis_client.hget.return_value = "COVID"
 
     def test_update_immunization(self):
         """it should update Immunization and validate NHS number"""