Merge branch 'master' into VED-713-mavis-permissions-update

Author: mfjarvis

ack_backend/poetry.lock

@@ -10,11 +10,11 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "~3.11"
-boto3 = "~1.40.20"
+boto3 = "~1.40.22"
 mypy-boto3-dynamodb = "^1.40.20"
 freezegun      = "^1.5.2"
 moto           = "^4"
-coverage = "^7.10.5"
+coverage = "^7.10.6"
 
 
 [build-system]

ack_backend/pyproject.toml

@@ -9,8 +9,8 @@ packages    = [{include = "src"}]
 [tool.poetry.dependencies]
 python                  = "~3.11"
 "fhir.resources"        = "~7.0.2"
-boto3                   = "~1.40.20"
-boto3-stubs-lite        = {extras = ["dynamodb"], version = "~1.40.20"}
+boto3                   = "~1.40.22"
+boto3-stubs-lite        = {extras = ["dynamodb"], version = "~1.40.22"}
 aws-lambda-typing       = "~2.20.0"
 redis                   = "^4.6.0"
 moto                    = "^5.1.11"
@@ -25,7 +25,7 @@ simplejson              = "^3.19.2"
 structlog               = "^24.1.0"
 python-stdnum           = "^2.1"
 freezegun               = "^1.5.1"
-coverage                = "^7.10.5"
+coverage                = "^7.10.6"
 
 [build-system]
 requires      = ["poetry-core ~= 1.5.0"]

backend/poetry.lock

@@ -29,17 +29,20 @@
 logging.basicConfig(level="INFO")
 logger = logging.getLogger()
 
-def get_service_url(
-    service_env: str = os.getenv("IMMUNIZATION_ENV"),
-    service_base_path: str = os.getenv("IMMUNIZATION_BASE_PATH"),
-):
+def get_service_url(service_env: str = os.getenv("IMMUNIZATION_ENV"), service_base_path: str = os.getenv("IMMUNIZATION_BASE_PATH")
+ ) -> str:
+    
+    if not service_base_path:
+        service_base_path = "immunisation-fhir-api/FHIR/R4"
+
     non_prod = ["internal-dev", "int", "sandbox"]
     if service_env in non_prod:
         subdomain = f"{service_env}."
     elif service_env == "prod":
         subdomain = ""
     else:
         subdomain = "internal-dev."
+
     return f"https://{subdomain}api.service.nhs.uk/{service_base_path}"
 
 
@@ -366,7 +369,7 @@ def search_immunizations(
             BundleEntry(
                 resource=Immunization.parse_obj(imms),
                 search=BundleEntrySearch(mode="match"),
-                fullUrl=f"https://api.service.nhs.uk/immunisation-fhir-api/Immunization/{imms['id']}",
+                fullUrl=f"{get_service_url()}/Immunization/{imms['id']}",
             )
             for imms in resources_filtered_for_search
         ]

backend/pyproject.toml

@@ -2,7 +2,8 @@
 import uuid
 import datetime
 import unittest
-from unittest.mock import MagicMock
+import os
+from unittest.mock import MagicMock, patch
 from copy import deepcopy
 from unittest.mock import create_autospec, patch
 from decimal import Decimal
@@ -54,22 +55,22 @@ def tearDown(self):
     def test_get_service_url(self):
         """it should create service url"""
         env = "int"
-        base_path = "my-base-path"
+        base_path = "immunisation-fhir-api/FHIR/R4"
         url = get_service_url(env, base_path)
         self.assertEqual(url, f"https://{env}.api.service.nhs.uk/{base_path}")
         # default should be internal-dev
         env = "it-does-not-exist"
-        base_path = "my-base-path"
+        base_path = "immunisation-fhir-api/FHIR/R4"
         url = get_service_url(env, base_path)
         self.assertEqual(url, f"https://internal-dev.api.service.nhs.uk/{base_path}")
         # prod should not have a subdomain
         env = "prod"
-        base_path = "my-base-path"
+        base_path = "immunisation-fhir-api/FHIR/R4"
         url = get_service_url(env, base_path)
         self.assertEqual(url, f"https://api.service.nhs.uk/{base_path}")
         # any other env should fall back to internal-dev (like pr-xx or per-user)
         env = "pr-42"
-        base_path = "my-base-path"
+        base_path = "immunisation-fhir-api/FHIR/R4"
         url = get_service_url(env, base_path)
         self.assertEqual(url, f"https://internal-dev.api.service.nhs.uk/{base_path}")
 
@@ -772,6 +773,8 @@ class TestSearchImmunizations(unittest.TestCase):
     MOCK_SUPPLIER_SYSTEM_NAME = "Test"
 
     def setUp(self):
+        os.environ["IMMUNIZATION_ENV"] = "internal-dev"
+        os.environ["IMMUNIZATION_BASE_PATH"] = "immunisation-fhir-api/FHIR/R4"
         self.authoriser = create_autospec(Authoriser)
         self.imms_repo = create_autospec(ImmunizationRepository)
         self.validator = create_autospec(ImmunizationValidator)
@@ -1083,7 +1086,6 @@ def test_matches_contain_fullUrl(self):
         """All matches must have a fullUrl consisting of their id.
         See http://hl7.org/fhir/R4B/bundle-definitions.html#Bundle.entry.fullUrl.
         Tested because fhir.resources validation doesn't check this as mandatory."""
-
         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
@@ -1100,14 +1102,13 @@ def test_matches_contain_fullUrl(self):
         for i, entry in enumerate(entries):
             self.assertEqual(
                 entry.fullUrl,
-                f"https://api.service.nhs.uk/immunisation-fhir-api/Immunization/{imms_ids[i]}",
+                f"https://internal-dev.api.service.nhs.uk/immunisation-fhir-api/FHIR/R4/Immunization/{imms_ids[i]}",
             )
 
     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."""
-
         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