Fix delete endpoint

Author: dlzhry2nhs

backend/src/service/fhir_service.py

@@ -230,12 +230,12 @@ def delete_immunization(self, imms_id: str, supplier_system: str) -> Immunizatio
         Exception will be raised if resource does not exist. Multiple calls to this method won't change
         the record in the database.
         """
-        existing_immunisation = self.immunization_repo.get_immunization_by_id(imms_id)
+        existing_immunisation, _ = self.immunization_repo.get_immunization_by_id(imms_id)
 
         if not existing_immunisation:
             raise ResourceNotFoundError(resource_type="Immunization", resource_id=imms_id)
 
-        vaccination_type = get_vaccine_type(existing_immunisation.get("Resource", {}))
+        vaccination_type = get_vaccine_type(existing_immunisation)
 
         if not self.authoriser.authorise(supplier_system, ApiOperationCode.DELETE, {vaccination_type}):
             raise UnauthorizedVaxError()

backend/tests/service/test_fhir_service.py

@@ -729,7 +729,7 @@ def test_delete_immunization(self):
         imms = json.loads(create_covid_19_immunization(self.TEST_IMMUNISATION_ID).json())
         self.mock_redis_client.hget.return_value = "COVID19"
         self.authoriser.authorise.return_value = True
-        self.imms_repo.get_immunization_by_id.return_value = {"Resource": imms}
+        self.imms_repo.get_immunization_by_id.return_value = (imms, "1")
         self.imms_repo.delete_immunization.return_value = imms
 
         # When
@@ -744,7 +744,7 @@ def test_delete_immunization(self):
 
     def test_delete_immunization_throws_not_found_exception_if_does_not_exist(self):
         """it should raise a ResourceNotFound exception if the immunisation does not exist"""
-        self.imms_repo.get_immunization_by_id.return_value = None
+        self.imms_repo.get_immunization_by_id.return_value = (None, None)
 
         # When
         with self.assertRaises(ResourceNotFoundError):
@@ -758,7 +758,7 @@ def test_delete_immunization_throws_authorisation_exception_if_does_not_have_req
         imms = json.loads(create_covid_19_immunization(self.TEST_IMMUNISATION_ID).json())
         self.mock_redis_client.hget.return_value = "FLU"
         self.authoriser.authorise.return_value = False
-        self.imms_repo.get_immunization_by_id.return_value = {"Resource": imms}
+        self.imms_repo.get_immunization_by_id.return_value = (imms, "1")
 
         # When
         with self.assertRaises(UnauthorizedVaxError):