Merge branch 'develop' into feature/ERSSUP-89272

nitishRastogiNHS · web-flow · commit 4c7027aa1351 · 2025-09-02T14:04:07.000+01:00
diff --git a/.github/workflows/continous-integration-workflow.yaml b/.github/workflows/continous-integration-workflow.yaml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0  # This causes all history to be fetched, which is required for calculate-version to function
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -25,11 +25,11 @@ pyyaml = "^6.0"
 docopt = "^0.6.2"
 jsonpath-rw = "^1.4.0"
 semver = "^3.0.4"
-gitpython = "^3.1.44"
+gitpython = "^3.1.45"
 lxml = "^4.9.4"
 xmlformatter = "^0.2.8"
 pytest-check = "^2.5.3"
-requests = "^2.32.4"
+requests = "^2.32.5"
 openapi-core = "^0.19.5"
 
 
diff --git a/sandbox/package-lock.json b/sandbox/package-lock.json
diff --git a/sandbox/package.json b/sandbox/package.json
@@ -12,7 +12,7 @@
   "homepage": "https://github.com/NHSDigital/hello-world-api",
   "main": "app.js",
   "dependencies": {
-    "@hapi/hapi": "^21.4.0",
+    "@hapi/hapi": "^21.4.3",
     "@hapi/inert": "^7.1.0",
     "lodash": "^4.17.20"
   },
diff --git a/specification/components/r4/schemas/endpoints/a041-search-service-request.yaml b/specification/components/r4/schemas/endpoints/a041-search-service-request.yaml
@@ -72,7 +72,7 @@ responses:
   '401':
     $ref: '../responses/Unauthorized.yaml'
   '403':
-    $ref: '../responses/searchServiceRequest/403Response.yaml'
+    $ref: '../responses/Forbidden.yaml'
   '406':
     $ref: '../responses/NotAcceptable.yaml'
   '429':
diff --git a/specification/components/r4/schemas/responses/ForbiddenOrNoLR.yaml b/specification/components/r4/schemas/responses/ForbiddenOrNoLR.yaml
@@ -6,6 +6,8 @@ description: |
   | ------------------------- | ---------- | ------------------------------------------------------------------ | ---------------------------------------------------------------------------------- |
   | REC_FORBIDDEN             | forbidden  | [BaRS Error Code](https://fhir.nhs.uk/CodeSystem/http-error-codes) | A call attempts to access or operate upon a resource without proper authorisation. |
   | NO_RELATIONSHIP           | forbidden  | [eRS Error Code](https://fhir.nhs.uk/CodeSystem/ers-error-codes)   | The caller has no legitimate relationship with the resource.                       |
+  | ACCESS_DENIED             | forbidden  | [APIM Error Code](https://fhir.nhs.uk/CodeSystem/NHSD-API-ErrorOrWarningCode) | The request could not be authenticated due to insufficient credentials being provided. |
+
 headers:
   X-Correlation-ID:
     $ref: '../headers/response/CorrelationID.yaml'
@@ -18,4 +20,4 @@ content:
     schema:
       $ref: '../NHSDigital-OperationOutcome.yaml'
     example:
-      $ref: '../../examples/NHSDigital-OperationOutcome-403.json'
+      $ref: '../../examples/NHSDigital-OperationOutcome-403.json'
diff --git a/specification/components/r4/schemas/responses/searchServiceRequest/403Response.yaml b/specification/components/r4/schemas/responses/searchServiceRequest/403Response.yaml
diff --git a/specification/components/stu3/schemas/eRS-Communication.yaml b/specification/components/stu3/schemas/eRS-Communication.yaml
@@ -135,5 +135,4 @@ properties:
         text:
           type: string
           example: 'Example content...'
-  
-
+          description: 'Maximum 8000 characters.'
diff --git a/specification/components/stu3/schemas/eRS-CreateAdviceAndGuidance-Request-Parameters.yaml b/specification/components/stu3/schemas/eRS-CreateAdviceAndGuidance-Request-Parameters.yaml
@@ -32,7 +32,7 @@ properties:
       | `patient`                         | `1..1`      | The patient the Advice request relates to.                                                                                                                                                                                          |
       | `providerConversionAuthorisation` | `1..1`      | A flag detailing whether or not the provider who deals with this advice request is authorised to convert this Advice Request into a Referral                                                                                        |
       | `shortlist`                       | `1..1`      | A list of services where the Advice Request should be sent to. Note currently only shortlists with a single Service included are supported.                                                                                         |
-      | `request`                         | `1..1`      | An initial message outlining the request.                                                                                                                                                                                           |
+      | `request`                         | `1..1`      | An initial message outlining the request. Maximum 8000 characters.                                                                                                                                                                  |
       | `referringClinician`              | `0..1`      | Detail the Referring Clinician that a Referring Clinician Admin is acting on behalf off. Only permitted when creating an Advice Request as a user using the Referring Clinician Admin business function where it is also mandatory. |
       | `requestAttachmentFile`           | `0..*`      | A set of attachments to be included with the initial request.                                                                                                                                                                       |
     items:
@@ -42,4 +42,4 @@ properties:
         - $ref: 'parameters/Shortlist.yaml'
         - $ref: 'parameters/Request.yaml'
         - $ref: 'parameters/ReferringClinician.yaml'
-        - $ref: 'parameters/RequestAttachmentFile.yaml'
+        - $ref: 'parameters/RequestAttachmentFile.yaml'
diff --git a/specification/components/stu3/schemas/eRS-CreateFromCommunicationRequestActionLater-Request-Parameters.yaml b/specification/components/stu3/schemas/eRS-CreateFromCommunicationRequestActionLater-Request-Parameters.yaml
@@ -28,14 +28,14 @@ properties:
     type: array
     description: |
       
-      | Field                             | Cardinality | Notes                                      |
-      | --------------------------------- | ----------- | ------------------------------------------ |
-      | `createFrom`                      | `1..1`      |                                            |
-      | `guidance`                        | `1..1`      |                                            |
-      | `newReferralPriority`             | `1..1`      |                                            | 
-      | `reviewComments`                  | `1..1`      |                                            |
-      | `guidanceAttachmentFile`          | `0..*`      | Property defining files to be included with the supplied `guidance` text | 
-      | `reviewAttachmentFile`            | `0..*`      | Property defining files to be associated with the created `ReferralRequest` | 
+      | Field                             | Cardinality | Notes                                                                                          |
+      | --------------------------------- | ----------- | ---------------------------------------------------------------------------------------------- |
+      | `createFrom`                      | `1..1`      |                                                                                                |
+      | `guidance`                        | `1..1`      | Mandatory guidance response. Maximum 8000 characters.                                          |
+      | `newReferralPriority`             | `1..1`      |                                                                                                | 
+      | `reviewComments`                  | `1..1`      |                                                                                                |
+      | `guidanceAttachmentFile`          | `0..*`      | Property defining files to be included with the supplied `guidance` text                       | 
+      | `reviewAttachmentFile`            | `0..*`      | Property defining files to be associated with the created `ReferralRequest`                    | 
     items:
       anyOf:
         - title: createFrom
diff --git a/specification/components/stu3/schemas/eRS-SendCommunicationToRequester-Request-Parameters.yaml b/specification/components/stu3/schemas/eRS-SendCommunicationToRequester-Request-Parameters.yaml
@@ -28,13 +28,13 @@ properties:
     type: array
     description: |
       
-      | Field                             | Cardinality | Notes                                      |
-      | --------------------------------- | ----------- | ------------------------------------------ |
-      | `guidanceOutcome`                 | `1..1`      |                                            |
+      | Field                             | Cardinality | Notes                                                                                |
+      | --------------------------------- | ----------- | ------------------------------------------------------------------------------------ |
+      | `guidanceOutcome`                 | `1..1`      |                                                                                      |
       | `guidanceIntendedRecommendation`  | `0..1`      | Conditionally Mandatory if guidanceOutcome value is `RETURN_TO_REFERRER_WITH_ADVICE` |
-      | `guidance`                        | `1..1`      |                                            |
-      | `updatedPriority`                 | `1..1`      |                                            | 
-      | `guidanceAttachmentFile`          | `0..*`      | Property defining files to be included with the supplied `guidance` text | 
+      | `guidance`                        | `1..1`      | Mandatory guidance response. Maximum 8000 characters.                                |
+      | `updatedPriority`                 | `1..1`      |                                                                                      | 
+      | `guidanceAttachmentFile`          | `0..*`      | Property defining files to be included with the supplied `guidance` text             | 
     items:
       anyOf:
         - title: guidanceOutcome
