Merge branch 'develop' into dependabot/npm_and_yarn/multi-414e51b474

Author: EdwardWills-nhs

.github/CODEOWNERS

@@ -9,11 +9,11 @@
 
 # For version files that are updated by dependabot we have a cut down list
 
-/sandbox/Dockerfile @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
-/sandbox/package.json @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
-/sandbox/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
-/package.json @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
-/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
-/poetry.lock @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
-/poetry.toml @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
-/pyproject.toml @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
+/sandbox/Dockerfile @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
+/sandbox/package.json @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
+/sandbox/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
+/package.json @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
+/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
+/poetry.lock @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
+/poetry.toml @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
+/pyproject.toml @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs

.github/workflows/continous-integration-workflow.yaml

@@ -12,10 +12,10 @@ jobs:
         with:
           fetch-depth: 0  # This causes all history to be fetched, which is required for calculate-version to function
 
-      - name: Install Python 3.10
+      - name: Install Python 3.13
         uses: actions/setup-python@v6
         with:
-          python-version: '3.10'
+          python-version: '3.13'
 
       - name: Upgrade python packaging tools
         run: python -m pip install --upgrade pip setuptools wheel

azure/azure-build-pipeline.yml

@@ -22,6 +22,7 @@ resources:
 
 variables:
   - template: project.yml
+
 extends:
   template: azure/common/apigee-build.yml@common
   parameters:

azure/project.yml

@@ -5,4 +5,4 @@ variables:
   product_display_name: e-Referrals-Service
   product_description: The NHS e-RS vision is to enable local innovation and adoption of paperless referrals. To support this vision NHS Digital have created a set of APIs which provide a well-defined, simple to use data interface to the NHS e-Referral Service (e-RS). See https://digital.nhs.uk/developer/api-catalogue/e-referral-service-fhir
   spec_file: e-referrals-service-api.json
-  python_version: 3.10
+  python_version: 3.13

poetry.lock

@@ -1,5 +1,5 @@
 [project]
-python = "^3.8"
+python = "^3.13"
 name = "e-referrals-service-api"
 version = "0.0.1-alpha"
 description = "TODO"
@@ -20,13 +20,13 @@ package-mode = false
 
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.13"
 pyyaml = "^6.0"
 docopt = "^0.6.2"
 jsonpath-rw = "^1.4.0"
 semver = "^3.0.4"
 gitpython = "^3.1.45"
-lxml = "^4.9.4"
+lxml = "^5.1.0"
 xmlformatter = "^0.2.8"
 pytest-check = "^2.6.0"
 requests = "^2.32.5"
@@ -40,7 +40,7 @@ pip-licenses = "^5.5.0"
 jinja2 = "^3.1.6"
 pytest = "^8.4.2"
 pytest-asyncio = "^1.3.0"
-pytest-nhsd-apim = "^4.0.1"
+pytest-nhsd-apim = "^5.0.6"
 
 [tool.poetry.scripts]
 

pyproject.toml

@@ -14,7 +14,7 @@
   "dependencies": {
     "@hapi/hapi": "^21.4.4",
     "@hapi/inert": "^7.1.0",
-    "lodash": "^4.17.20"
+    "lodash": "^4.17.23"
   },
   "devDependencies": {
     "eslint": "^9.25.1",

sandbox/package-lock.json

@@ -0,0 +1,17 @@
+{
+  "meta": {
+    "profile": [
+      "https://fhir.nhs.uk/STU3/StructureDefinition/eRS-CancelReferral-Request-Parameters-1"
+    ]
+  },
+  "resourceType": "Parameters",
+  "parameter": [
+    {
+      "name": "cancellationReason",
+      "valueCoding": {
+        "system": "_baseurl_/STU3/CodeSystem/REFERRAL-CANCELLATION-REASON",
+        "code": "BOOKED_OUTSIDE_CAB"
+      }
+    }
+  ]
+}

sandbox/package.json

@@ -0,0 +1,21 @@
+{
+  "meta": {
+    "profile": [
+      "https://fhir.nhs.uk/STU3/StructureDefinition/eRS-CancelReferral-Request-Parameters-1"
+    ]
+  },
+  "resourceType": "Parameters",
+  "parameter": [
+    {
+      "name": "cancellationReason",
+      "valueCoding": {
+        "system": "_baseurl_/STU3/CodeSystem/REFERRAL-CANCELLATION-REASON",
+        "code": "OUTPATIENT_SERVICE_NA"
+      }
+    },
+    {
+      "name": "cancellationComments",
+      "valueString": "This is a cancellation reason comment"
+    }
+  ]
+}