-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #296 from NHSDigital/develop
Develop PR For Release cut 1.9.0
- Loading branch information
Showing
26 changed files
with
737 additions
and
193 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 0 additions & 9 deletions
9
proxies/live/apiproxy/policies/AssignMessage.AddIssuerHeader.xml
This file was deleted.
Oops, something went wrong.
9 changes: 9 additions & 0 deletions
9
.../apiproxy/policies/AssignMessage.Set.nhsd-ers-business-function-header-app-restricted.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.Set.nhsd-ers-business-function-header-app-restricted"> | ||
| <Set> | ||
| <Headers> | ||
| <Header name="x-ers-business-function">AUTHORISED_APPLICATION</Header> | ||
| </Headers> | ||
| </Set> | ||
| <IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables> | ||
| <AssignTo createNew="false"/> | ||
| </AssignMessage> |
9 changes: 9 additions & 0 deletions
9
proxies/live/apiproxy/policies/AssignMessage.Set.nhsd-ers-ods-code-header-app-restricted.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.Set.nhsd-ers-ods-code-header-app-restricted"> | ||
| <Set> | ||
| <Headers> | ||
| <Header name="x-ers-ods-code">{app.app-restricted-ods-code}</Header> | ||
| </Headers> | ||
| </Set> | ||
| <IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables> | ||
| <AssignTo createNew="false"/> | ||
| </AssignMessage> |
9 changes: 9 additions & 0 deletions
9
proxies/live/apiproxy/policies/AssignMessage.Set.x-ers-user-id-header-app-restricted.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.Set.x-ers-user-id-header-app-restricted"> | ||
| <Set> | ||
| <Headers> | ||
| <Header name="x-ers-user-id">{app.app-restricted-user-id}</Header> | ||
| </Headers> | ||
| </Set> | ||
| <IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables> | ||
| <AssignTo createNew="false"/> | ||
| </AssignMessage> |
11 changes: 3 additions & 8 deletions
11
...ssignMessage.RemoveAndAddUserIdHeader.xml → ....x-ers-user-id-header-user-restricted.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,9 @@ | ||
| <AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.RemoveAndAddUserIdHeader"> | ||
| <Remove> | ||
| <Headers> | ||
| <Header name="x-ers-user-id"/> | ||
| </Headers> | ||
| </Remove> | ||
| <Add> | ||
| <AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.Set.x-ers-user-id-header-user-restricted"> | ||
| <Set> | ||
| <Headers> | ||
| <Header name="x-ers-user-id">{accesstoken.id_token-subject}</Header> | ||
| </Headers> | ||
| </Add> | ||
| </Set> | ||
| <IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables> | ||
| <AssignTo createNew="false"/> | ||
| </AssignMessage> |
12 changes: 3 additions & 9 deletions
12
.../AssignMessage.RemoveAndAddAsidHeader.xml → .../policies/AssignMessage.SetAsidHeader.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,9 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="yes"?> | ||
| <AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.RemoveAndAddAsidHeader"> | ||
| <Remove> | ||
| <Headers> | ||
| <Header name="XAPI_ASID"/> | ||
| </Headers> | ||
| </Remove> | ||
| <Add> | ||
| <AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.SetAsidHeader"> | ||
| <Set> | ||
| <Headers> | ||
| <Header name="XAPI_ASID">{private.apigee.NHSD-ASID}</Header> | ||
| </Headers> | ||
| </Add> | ||
| </Set> | ||
| <IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables> | ||
| <AssignTo createNew="false"/> | ||
| </AssignMessage> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| <OAuthV2 async="false" continueOnError="false" enabled="true" name="OauthV2.VerifyAccessToken"> | ||
| <Operation>VerifyAccessToken</Operation> | ||
| <!-- Set Scope to accept only AAL3 security level. --> | ||
| <Scope>urn:nhsd:apim:user-nhs-id:aal3:e-referrals-service-api</Scope> | ||
| <Scope>urn:nhsd:apim:app:level3:e-referrals-service-api urn:nhsd:apim:user-nhs-id:aal3:e-referrals-service-api</Scope> | ||
| </OAuthV2> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 0 additions & 9 deletions
9
proxies/sandbox/apiproxy/policies/AssignMessage.AddIssuerHeader.xml
This file was deleted.
Oops, something went wrong.
9 changes: 0 additions & 9 deletions
9
proxies/sandbox/apiproxy/policies/AssignMessage.AddUserIdHeader.xml
This file was deleted.
Oops, something went wrong.
198 changes: 198 additions & 0 deletions
198
sandbox/src/mocks/retrieveReferralRequest/responses/WithAdditionalRequirements.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,198 @@ | ||
| { | ||
| "id": "000000070011", | ||
| "meta": { | ||
| "versionId": "5", | ||
| "profile": [ | ||
| "https://fhir.nhs.uk/STU3/StructureDefinition/eRS-ReferralRequest-1" | ||
| ] | ||
| }, | ||
| "resourceType": "ReferralRequest", | ||
| "extension": [ | ||
| { | ||
| "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ClinicalInfoFirstSubmitted-1", | ||
| "valueDateTime": "2021-06-11T12:09:08.667Z" | ||
| }, | ||
| { | ||
| "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ReferralPriority-1", | ||
| "valueCodeableConcept": { | ||
| "coding": [ | ||
| { | ||
| "system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-Priority-1", | ||
| "code": "ROUTINE", | ||
| "display": "Routine" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ReferralShortlist-1", | ||
| "valueReference": { | ||
| "reference": "#shortlist" | ||
| } | ||
| }, | ||
| { | ||
| "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-Commissioning-Rule-Org-1", | ||
| "valueIdentifier": { | ||
| "system": "https://fhir.nhs.uk/Id/ods-organization-code", | ||
| "value": "R69" | ||
| } | ||
| }, | ||
| { | ||
| "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-PatientAdditionalRequirement-1", | ||
| "valueCoding": { | ||
| "system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-AdditionalRequirementType-1", | ||
| "code": "ADVOCACY", | ||
| "display": "Advocacy" | ||
| } | ||
| }, | ||
| { | ||
| "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-PatientAdditionalRequirement-1", | ||
| "valueCoding": { | ||
| "system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-AdditionalRequirementType-1", | ||
| "code": "INTERPRETER", | ||
| "display": "Interpreter" | ||
| } | ||
| }, | ||
| { | ||
| "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-PatientAdditionalRequirement-1", | ||
| "valueCoding": { | ||
| "system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-AdditionalRequirementType-1", | ||
| "code": "TRANSPORT", | ||
| "display": "Transport" | ||
| } | ||
| } | ||
| ], | ||
| "contained": [ | ||
| { | ||
| "id": "serviceSearchCriteria", | ||
| "meta": { | ||
| "profile": [ | ||
| "https://fhir.nhs.uk/STU3/StructureDefinition/eRS-ServiceSearchCriteria-Parameters-1" | ||
| ] | ||
| }, | ||
| "resourceType": "Parameters", | ||
| "parameter": [ | ||
| { | ||
| "name": "priority", | ||
| "valueCoding": { | ||
| "system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-Priority-1", | ||
| "code": "ROUTINE" | ||
| } | ||
| }, | ||
| { | ||
| "name": "specialty", | ||
| "valueCoding": { | ||
| "system": "_baseUrl_/STU3/CodeSystem/SPECIALTY", | ||
| "code": "CARDIOLOGY" | ||
| } | ||
| }, | ||
| { | ||
| "name": "clinicType", | ||
| "valueCoding": { | ||
| "system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-ClinicType-1", | ||
| "code": "HEART_FAILURE" | ||
| } | ||
| }, | ||
| { | ||
| "name": "postcode", | ||
| "valueString": "LS1 2TW" | ||
| }, | ||
| { | ||
| "name": "distanceLimit", | ||
| "valueUnsignedInt": 123 | ||
| }, | ||
| { | ||
| "name": "ageAndGenderAppropriate", | ||
| "valueBoolean": true | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "id": "shortlist", | ||
| "meta": { | ||
| "profile": [ | ||
| "https://fhir.nhs.uk/STU3/StructureDefinition/eRS-Shortlist-List-1" | ||
| ] | ||
| }, | ||
| "resourceType": "List", | ||
| "extension": [ | ||
| { | ||
| "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-Shortlist-SearchCriteria-1", | ||
| "valueReference": { | ||
| "reference": "#serviceSearchCriteria" | ||
| } | ||
| } | ||
| ], | ||
| "status": "current", | ||
| "mode": "snapshot", | ||
| "entry": [ | ||
| { | ||
| "item": { | ||
| "identifier": { | ||
| "system": "http://fhir.nhs.net/Id/ers-service", | ||
| "value": "11002" | ||
| }, | ||
| "display": "Good Cardiology Business Service" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "id": "DocumentReference-80000", | ||
| "meta": { | ||
| "profile": [ | ||
| "https://fhir.nhs.uk/STU3/StructureDefinition/eRS-DocumentReference-1" | ||
| ] | ||
| }, | ||
| "resourceType": "DocumentReference", | ||
| "type": { | ||
| "coding": [ | ||
| { | ||
| "system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-AttachmentType-1", | ||
| "code": "REFERRER", | ||
| "display": "Referrer" | ||
| } | ||
| ] | ||
| }, | ||
| "status": "current", | ||
| "indexed": "2021-06-11T12:09:09.459Z", | ||
| "description": "referralletter pdf", | ||
| "content": [ | ||
| { | ||
| "attachment": { | ||
| "id": "80000", | ||
| "extension": [ | ||
| { | ||
| "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-AttachedBy-1", | ||
| "valueReference": { | ||
| "identifier": { | ||
| "system": "http://fhir.nhs.net/Id/sds-user-id", | ||
| "value": "021600556514" | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "contentType": "application/pdf", | ||
| "url": "Binary/att-70000-80000", | ||
| "size": 6, | ||
| "title": "referralletter.pdf", | ||
| "creation": "2021-06-11" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "status": "active", | ||
| "subject": { | ||
| "identifier": { | ||
| "system": "http://fhir.nhs.net/Id/nhs-number", | ||
| "value": "9912003888" | ||
| } | ||
| }, | ||
| "supportingInfo": [ | ||
| { | ||
| "reference": "#DocumentReference-80000" | ||
| } | ||
| ], | ||
| "intent": "plan" | ||
| } |
Oops, something went wrong.