Skip to content

Commit cdc00b0

Browse files
committed
test e2e
1 parent d02e642 commit cdc00b0

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

e2e/test_search_immunization.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +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
9+
from lib.env import get_service_base_path
1010

1111

1212
class TestSearchImmunization(ImmunizationBaseTest):
@@ -132,7 +132,7 @@ def test_search_backwards_compatible(self):
132132
expected_imms_resource["patient"]["reference"] = response_patient["fullUrl"]
133133
response_imm = next(item for item in entries if item["resource"]["id"] == imms_id)
134134
self.assertEqual(
135-
response_imm["fullUrl"], f"https://{get_service_url()}/Immunization/{imms_id}"
135+
response_imm["fullUrl"], f"{get_service_base_path()}/Immunization/{imms_id}"
136136
)
137137
self.assertEqual(response_imm["search"], {"mode": "match"})
138138
self.assertEqual(response_imm["resource"], expected_imms_resource)

e2e/utils/resource.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -173,20 +173,3 @@ def delete_imms_records(identifiers: list[str]) -> None:
173173
f"failed to delete {failure_count}"
174174
)
175175

176-
177-
def get_service_url(
178-
service_env: str = os.getenv("IMMUNIZATION_ENV"),
179-
service_base_path: str = os.getenv("SERVICE_BASE_PATH"),
180-
):
181-
non_prod = ["internal-dev", "int", "sandbox"]
182-
if service_env in non_prod:
183-
subdomain = f"{service_env}."
184-
elif service_env == "prod":
185-
subdomain = ""
186-
else:
187-
subdomain = "internal-dev."
188-
189-
service_base_path = re.sub(r"immunisation-fhir-api/FHIR/R4-pr-(\d+)",
190-
r"immunisation-fhir-api-pr-\1", service_base_path)
191-
192-
return f"{subdomain}api.service.nhs.uk/{service_base_path}"

0 commit comments

Comments
 (0)