Merge pull request #1723 from NHSDigital/develop

APIM-R 1.36 Cut

Author: nhsd-david-wass

package-lock.json

@@ -12,7 +12,7 @@
   "license": "MIT",
   "homepage": "https://github.com/NHSDigital/e-referrals-service-api",
   "dependencies": {
-    "@redocly/cli": "^1.18.0"
+    "@redocly/cli": "^1.19.0"
   },
   "devDependencies": {
     "apigeetool": "^0.16.4",

package.json

@@ -1,7 +1,13 @@
 <AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.Set.nhsd-ers-business-function-header-app-restricted">
+    <AssignVariable>
+        <Name>business-function-header-value</Name>
+        <Ref>app.app-restricted-business-function</Ref>
+        <Value>PROVIDER_AUTHORISED_APPLICATION</Value>
+        <!-- default value in case variable above is not defined -->
+    </AssignVariable>
     <Set>
         <Headers>
-            <Header name="x-ers-business-function">AUTHORISED_APPLICATION</Header>
+            <Header name="x-ers-business-function">{business-function-header-value}</Header>
         </Headers>
     </Set>
     <IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>

poetry.lock

@@ -30,15 +30,15 @@ lxml = "^4.9.4"
 xmlformatter = "^0.2.6"
 pytest-check = "^2.3.1"
 requests = "^2.32.3"
-openapi-core = "^0.19.2"
+openapi-core = "^0.19.3"
 
 
 [tool.poetry.dev-dependencies]
 flake8 = "^5.0.4"
-black = "^24.4"
+black = "^24.8"
 pip-licenses = "^4.5.1"
 jinja2 = "^3.1.4"
-pytest = "^8.2.2"
+pytest = "^8.3.2"
 pytest-asyncio = "^0.23.8"
 pytest-nhsd-apim = "^3.4.2"
 

proxies/live/apiproxy/policies/AssignMessage.Set.nhsd-ers-business-function-header-app-restricted.xml

@@ -89,7 +89,7 @@
                 {
                     "system": "https://fhir.nhs.uk/CodeSystem/eRS-RequestFlowType",
                     "code": "BOOKABLE",
-                    "display": "Appointment Request"
+                    "display": "A service which supports a patient appointment"
                 }
             ]
         },

pyproject.toml

@@ -108,7 +108,7 @@
                             {
                                 "system": "https://fhir.nhs.uk/CodeSystem/eRS-RequestFlowType",
                                 "code": "BOOKABLE",
-                                "display": "Appointment Request"
+                                "display": "A service which supports a patient appointment"
                             }
                         ]
                     },
@@ -163,7 +163,7 @@
                             {
                                 "system": "https://fhir.nhs.uk/CodeSystem/eRS-RequestFlowType",
                                 "code": "BOOKABLE",
-                                "display": "Appointment Request"
+                                "display": "A service which supports a patient appointment"
                             }
                         ]
                     },

sandbox/package-lock.json

@@ -24,6 +24,10 @@
       "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ClinicalInfoFirstSubmitted-1",
       "valueDateTime": "2021-10-13T12:51:16.848Z"
     },
+    {
+      "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-eReferralPathwayStart-1",
+      "valueInstant": "2024-05-01T09:55:00.000Z"
+    },
     {
       "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ReferralPriority-1",
       "valueCodeableConcept": {

sandbox/src/mocks/r4/getService/responses/sampleServiceWithFullAttributes.json

@@ -24,6 +24,10 @@
 			"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ClinicalInfoFirstSubmitted-1",
 			"valueDateTime": "2021-11-03T12:54:40.560Z"
 		},
+    {
+      "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-eReferralPathwayStart-1",
+      "valueInstant": "2024-05-01T09:55:00.000Z"
+    },
 		{
 			"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ReferralPriority-1",
 			"valueCodeableConcept": {