VED-740: review2

Author: Akol125

backend/src/fhir_service.py

@@ -33,7 +33,7 @@
 def get_service_url(service_env: str = None, service_base_path: str = None
  ) -> str:
     service_env: str = service_env if service_env is not None else os.getenv("IMMUNIZATION_ENV", "")
-    service_base_path: str = service_base_path if service_base_path else os.getenv("IMMUNIZATION_BASE_PATH")
+    service_base_path: str = os.getenv("IMMUNIZATION_BASE_PATH")
 
     non_prod = ["internal-dev", "int", "sandbox"]
     if service_env in non_prod:

backend/tests/test_fhir_service.py

@@ -1109,10 +1109,6 @@ def test_patient_contains_fullUrl(self):
         """Patient must have a fullUrl consisting of its id.
         See http://hl7.org/fhir/R4B/bundle-definitions.html#Bundle.entry.fullUrl.
         Tested because fhir.resources validation doesn't check this as mandatory."""
-
-        print(f"IMMUNIZATION_ENV: {os.environ.get('IMMUNIZATION_ENV')}")
-        print(f"IMMUNIZATION_BASE_PATH: {os.environ.get('IMMUNIZATION_BASE_PATH')}")
-
         imms_ids = ["imms-1", "imms-2"]
         imms_list = [create_covid_19_immunization_dict(imms_id) for imms_id in imms_ids]
         self.imms_repo.find_immunizations.return_value = imms_list

terraform/endpoints.tf

@@ -24,7 +24,7 @@ locals {
   imms_lambda_env_vars = {
     "DYNAMODB_TABLE_NAME"    = local.imms_table_name,
     "IMMUNIZATION_ENV"       = local.resource_scope,
-    "IMMUNIZATION_BASE_PATH" = strcontains(var.sub_environment, "pr-") ? "immunisation-fhir-api/FHIR/R4-${var.sub_environment}" : "immunisation-fhir-api"
+    "IMMUNIZATION_BASE_PATH" = strcontains(var.sub_environment, "pr-") ? "immunisation-fhir-api/FHIR/R4-${var.sub_environment}" : "immunisation-fhir-api/FHIR/R4"
     # except for prod and ref, any other env uses PDS int environment
     "PDS_ENV"              = var.pds_environment
     "PDS_CHECK_ENABLED"    = tostring(var.pds_check_enabled)