Skip to content

Commit 0870b47

Browse files
github-actions[bot]github-actions[bot]
authored
Merge dependabot/npm_and_yarn/develop/core-js-3.38.1 into ERSSUP-77300-combine-prs-npm-2024-08-21
2 parents 516ac67 + ea2fe61 commit 0870b47

26 files changed

+341
-48
lines changed

‎package-lock.json‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎poetry.lock‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.Set.nhsd-ers-business-function-header-app-restricted">
2+
<AssignVariable>
3+
<Name>business-function-header-value</Name>
4+
<Ref>app.app-restricted-business-function</Ref>
5+
<Value>PROVIDER_AUTHORISED_APPLICATION</Value>
6+
<!-- default value in case variable above is not defined -->
7+
</AssignVariable>
28
<Set>
39
<Headers>
4-
<Header name="x-ers-business-function">AUTHORISED_APPLICATION</Header>
10+
<Header name="x-ers-business-function">{business-function-header-value}</Header>
511
</Headers>
612
</Set>
713
<IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ lxml = "^4.9.4"
3030
xmlformatter = "^0.2.6"
3131
pytest-check = "^2.3.1"
3232
requests = "^2.32.3"
33-
openapi-core = "^0.19.2"
33+
openapi-core = "^0.19.3"
3434

3535

3636
[tool.poetry.dev-dependencies]

‎sandbox/src/mocks/stu3/retrieveWorklist/requests/FilteredByService.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"resourceType": "Parameters",
3+
"meta": {
4+
"profile": [
5+
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-FetchWorklist-Parameters-1"
6+
]
7+
},
8+
"parameter": [
9+
{
10+
"name": "listType",
11+
"valueCodeableConcept": {
12+
"coding": [
13+
{
14+
"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-ReferralListSelector-1",
15+
"code": "REFERRALS_FOR_REVIEW"
16+
}
17+
]
18+
}
19+
},
20+
{
21+
"name": "service",
22+
"valueIdentifier": {
23+
"system": "http://fhir.nhs.net/Id/ers-service",
24+
"value": "21012"
25+
}
26+
}
27+
]
28+
}

‎sandbox/src/mocks/stu3/retrieveWorklist/responses/FilteredByService.json‎

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
{
2+
"meta": {
3+
"profile": [
4+
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-FetchWorklist-List-1"
5+
]
6+
},
7+
"resourceType": "List",
8+
"contained": [
9+
{
10+
"id": "Practitioner-021600556514",
11+
"meta": {
12+
"profile": [
13+
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-Practitioner-1"
14+
]
15+
},
16+
"resourceType": "Practitioner",
17+
"identifier": [
18+
{
19+
"system": "http://fhir.nhs.net/Id/sds-user-id",
20+
"value": "021600556514"
21+
}
22+
]
23+
},
24+
{
25+
"id": "Patient-1000000001",
26+
"meta": {
27+
"profile": [
28+
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-Patient-1"
29+
]
30+
},
31+
"resourceType": "Patient",
32+
"identifier": [
33+
{
34+
"system": "http://fhir.nhs.net/Id/nhs-number",
35+
"value": "1000000001"
36+
}
37+
]
38+
}
39+
],
40+
"status": "current",
41+
"mode": "snapshot",
42+
"entry": [
43+
{
44+
"extension": [
45+
{
46+
"extension": [
47+
{
48+
"url": "priority",
49+
"valueCodeableConcept": {
50+
"coding": [
51+
{
52+
"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-Priority-1",
53+
"code": "ROUTINE"
54+
}
55+
]
56+
}
57+
},
58+
{
59+
"url": "specialty",
60+
"valueCodeableConcept": {
61+
"coding": [
62+
{
63+
"system": "_baseUrl_/STU3/CodeSystem/SPECIALTY",
64+
"code": "CARDIOLOGY"
65+
}
66+
]
67+
}
68+
},
69+
{
70+
"url": "patient",
71+
"valueReference": {
72+
"reference": "#Patient-1000000001"
73+
}
74+
},
75+
{
76+
"url": "allocatedClinician",
77+
"valueReference": {
78+
"reference": "#Practitioner-021600556514"
79+
}
80+
},
81+
{
82+
"url": "eReferralPathwayStart",
83+
"valueDateTime": "2021-09-03T14:09:11.381Z"
84+
},
85+
{
86+
"url": "clinicalInfoPrinted",
87+
"valueBoolean": false
88+
},
89+
{
90+
"url": "requestContextStatus",
91+
"valueCodeableConcept": {
92+
"coding": [
93+
{
94+
"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-RequestContextStatus-1",
95+
"code": "NEVER_REVIEWED",
96+
"display": "Never Reviewed"
97+
}
98+
]
99+
}
100+
},
101+
{
102+
"url": "clinicalInfoFirstSubmitted",
103+
"valueDateTime": "2021-09-03T14:09:11.022Z"
104+
},
105+
{
106+
"url": "clinicalInfoLastUpdated",
107+
"valueDateTime": "2021-09-03T14:09:12.573Z"
108+
},
109+
{
110+
"url": "appointmentStart",
111+
"valueDateTime": "2021-09-05T15:09:03.971Z"
112+
},
113+
{
114+
"url": "referralType",
115+
"valueCodeableConcept": {
116+
"coding": [
117+
{
118+
"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-ReferralType-1",
119+
"code": "APPOINTMENT"
120+
}
121+
]
122+
}
123+
},
124+
{
125+
"url": "service",
126+
"valueReference": {
127+
"identifier": {
128+
"system": "http://fhir.nhs.net/Id/ers-service",
129+
"value": "21012"
130+
},
131+
"display": "Another Excellent Cardiology Business Service 13"
132+
}
133+
}
134+
],
135+
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ReferralsforReview-WorkListItem-1"
136+
}
137+
],
138+
"item": {
139+
"reference": "ReferralRequest/000000070001"
140+
}
141+
}
142+
]
143+
}

‎sandbox/src/mocks/stu3/retrieveWorklist/responses/ReferralsForReview.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,16 @@
220220
}
221221
]
222222
}
223+
},
224+
{
225+
"url": "service",
226+
"valueReference": {
227+
"identifier": {
228+
"system": "http://fhir.nhs.net/Id/ers-service",
229+
"value": "21012"
230+
},
231+
"display": "Another Excellent Cardiology Business Service 13"
232+
}
223233
}
224234
],
225235
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ReferralsforReview-WorkListItem-1"

‎specification/components/r4/schemas/endpoints/a033-retrieve-healthcare-service.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,14 @@ description: |
99
You can use this endpoint to obtain the current version and attributes of a single service.
1010
1111
## Supported security patterns
12+
- Application-restricted, unattended access
1213
- Healthcare worker, user-restricted access
1314
1415
## Pre-requisites
16+
### Application-restricted access
17+
In order to use this endpoint you must be an authenticated e-RS calling application, working in the context of a Referring Organisation.
18+
19+
### Healthcare worker, user-restricted access
1520
In order to use this endpoint you must be an authenticated e-RS user and use one of the following e-RS roles:
1621
- `REFERRING_CLINICIAN`
1722
- `REFERRING_CLINICIAN_ADMIN`
@@ -44,8 +49,8 @@ tags:
4449
parameters:
4550
- $ref: '../headers/request/BearerAuthorization.yaml'
4651
- $ref: '../pathParameters/ServiceId.yaml'
47-
- $ref: '../headers/request/OdsCode.yaml'
48-
- $ref: '../headers/request/BusinessFunction.yaml'
52+
- $ref: '../headers/request/OdsCodeOnlyUserRestricted.yaml'
53+
- $ref: '../headers/request/BusinessFunctionOnlyUserRestricted.yaml'
4954
- $ref: '../headers/request/CorrelationID.yaml'
5055
responses:
5156
'200':

‎specification/components/r4/schemas/endpoints/a035-search-for-healthcare-services.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,14 @@ description: |
88
You can use this endpoint to obtain a set of services (up to 20) and their associated attributes, in a single call.
99
1010
## Supported security patterns
11+
- Application-restricted, unattended access
1112
- Healthcare worker, user-restricted access
1213
1314
## Pre-requisites
15+
### Application-restricted access
16+
In order to use this endpoint you must be an authenticated e-RS calling application, working in the context of a Referring Organisation.
17+
18+
### Healthcare worker, user-restricted access
1419
In order to use this endpoint you must be an authenticated e-RS user and use one of the following e-RS roles:
1520
- `REFERRING_CLINICIAN`
1621
- `REFERRING_CLINICIAN_ADMIN`
@@ -44,8 +49,8 @@ tags:
4449
- Retrieve healthcare service information
4550
parameters:
4651
- $ref: '../headers/request/BearerAuthorization.yaml'
47-
- $ref: '../headers/request/OdsCode.yaml'
48-
- $ref: '../headers/request/BusinessFunction.yaml'
52+
- $ref: '../headers/request/OdsCodeOnlyUserRestricted.yaml'
53+
- $ref: '../headers/request/BusinessFunctionOnlyUserRestricted.yaml'
4954
- $ref: '../headers/request/CorrelationID.yaml'
5055
- in: query
5156
name: _id

‎specification/components/r4/schemas/endpoints/a037-retrieve-healthcare-service-version.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,14 @@ description: |
88
You can use this endpoint to obtain the current service's "version" held in e-RS, in order to compare to a locally cached version.
99
1010
## Supported security patterns
11+
- Application-restricted, unattended access
1112
- Healthcare worker, user-restricted access
1213
1314
## Pre-requisites
15+
### Application-restricted access
16+
In order to use this endpoint you must be an authenticated e-RS calling application, working in the context of a Referring Organisation.
17+
18+
### Healthcare worker, user-restricted access
1419
In order to use this endpoint you must be an authenticated e-RS user and use one of the following e-RS roles:
1520
- `REFERRING_CLINICIAN`
1621
- `REFERRING_CLINICIAN_ADMIN`
@@ -43,8 +48,8 @@ tags:
4348
parameters:
4449
- $ref: '../headers/request/BearerAuthorization.yaml'
4550
- $ref: '../pathParameters/ServiceId.yaml'
46-
- $ref: '../headers/request/OdsCode.yaml'
47-
- $ref: '../headers/request/BusinessFunction.yaml'
51+
- $ref: '../headers/request/OdsCodeOnlyUserRestricted.yaml'
52+
- $ref: '../headers/request/BusinessFunctionOnlyUserRestricted.yaml'
4853
- $ref: '../headers/request/CorrelationID.yaml'
4954
responses:
5055
'200':

0 commit comments

Comments
 (0)