Skip to content

Commit 3ef6f50

Browse files
committed
VED-740b: fix unit test and e2e tests
1 parent ed4ccd4 commit 3ef6f50

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

backend/src/fhir_service.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ def get_service_url(
3333
service_env: str = os.getenv("IMMUNIZATION_ENV"),
3434
service_base_path: str = os.getenv("IMMUNIZATION_BASE_PATH"),
3535
):
36+
if not service_base_path:
37+
service_base_path = "immunisation-fhir-api"
38+
3639
non_prod = ["internal-dev", "int", "sandbox"]
3740
if service_env in non_prod:
3841
subdomain = f"{service_env}."

e2e/test_search_immunization.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from utils.constants import valid_nhs_number1, valid_nhs_number2, valid_patient_identifier2, valid_patient_identifier1
77
from utils.resource import generate_imms_resource, generate_filtered_imms_resource
88
from utils.mappings import VaccineTypes
9+
from utils.resource import get_service_url
910

1011

1112
class TestSearchImmunization(ImmunizationBaseTest):
@@ -131,7 +132,7 @@ def test_search_backwards_compatible(self):
131132
expected_imms_resource["patient"]["reference"] = response_patient["fullUrl"]
132133
response_imm = next(item for item in entries if item["resource"]["id"] == imms_id)
133134
self.assertEqual(
134-
response_imm["fullUrl"], f"https://api.service.nhs.uk/immunisation-fhir-api/Immunization/{imms_id}"
135+
response_imm["fullUrl"], f"https://{get_service_url()}/Immunization/{imms_id}"
135136
)
136137
self.assertEqual(response_imm["search"], {"mode": "match"})
137138
self.assertEqual(response_imm["resource"], expected_imms_resource)

e2e/utils/resource.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,3 +171,15 @@ def delete_imms_records(identifiers: list[str]) -> None:
171171
f"[teardown warning] Deleted {success_count} records out of {total}, "
172172
f"failed to delete {failure_count}"
173173
)
174+
def get_service_url(
175+
service_env: str = os.getenv("IMMUNIZATION_ENV"),
176+
service_base_path: str = os.getenv("IMMUNIZATION_BASE_PATH"),
177+
):
178+
non_prod = ["internal-dev", "int", "sandbox"]
179+
if service_env in non_prod:
180+
subdomain = f"{service_env}."
181+
elif service_env == "prod":
182+
subdomain = ""
183+
else:
184+
subdomain = "internal-dev."
185+
return f"https://{subdomain}api.service.nhs.uk/{service_base_path}"

0 commit comments

Comments
 (0)