Skip to content

Commit 00a8733

Browse files
EdwardWills-nhsEdwardWills-nhs
authored
Merge branch 'develop' into dependabot/npm_and_yarn/undici-6.23.0
2 parents e1479a3 + 5b3fa5c commit 00a8733

25 files changed

Lines changed: 1530 additions & 308 deletions

‎.github/CODEOWNERS‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
# For version files that are updated by dependabot we have a cut down list
1111

12-
/sandbox/Dockerfile @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
13-
/sandbox/package.json @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
14-
/sandbox/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
15-
/package.json @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
16-
/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
17-
/poetry.lock @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
18-
/poetry.toml @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
19-
/pyproject.toml @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
12+
/sandbox/Dockerfile @daniel-mcadam-nhs @kevinmason-nhs @EdwardWills-nhs @georgeCraftReferrals @csaw-nhs @petkopetkov2
13+
/sandbox/package.json @daniel-mcadam-nhs @kevinmason-nhs @EdwardWills-nhs @georgeCraftReferrals @csaw-nhs @petkopetkov2
14+
/sandbox/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @EdwardWills-nhs @georgeCraftReferrals @csaw-nhs @petkopetkov2
15+
/package.json @daniel-mcadam-nhs @kevinmason-nhs @EdwardWills-nhs @georgeCraftReferrals @csaw-nhs @petkopetkov2
16+
/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @EdwardWills-nhs @georgeCraftReferrals @csaw-nhs @petkopetkov2
17+
/poetry.lock @daniel-mcadam-nhs @kevinmason-nhs @EdwardWills-nhs @georgeCraftReferrals @csaw-nhs @petkopetkov2
18+
/poetry.toml @daniel-mcadam-nhs @kevinmason-nhs @EdwardWills-nhs @georgeCraftReferrals @csaw-nhs @petkopetkov2
19+
/pyproject.toml @daniel-mcadam-nhs @kevinmason-nhs @EdwardWills-nhs @georgeCraftReferrals @csaw-nhs @petkopetkov2

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The contents of this repository are protected by Crown Copyright (C).
3535
### Environment setup
3636
Currently, automation for setting up the right environment is only available for machines based on RedHatEnterpriseLinux (RHEL).
3737
Running the following will ensure your environment is ready for development.
38-
It will install [pyenv](https://github.com/pyenv/pyenv), Python 3.10.8 and its dependencies (yum), create a virtual environment (named apigee), and ensure poetry is installed under it.
38+
It will install [pyenv](https://github.com/pyenv/pyenv), Python 3.13 and its dependencies (yum), create a virtual environment (named apigee), and ensure poetry is installed under it.
3939
```
4040
$ make setup-environment
4141
```

‎package-lock.json‎

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

‎poetry.lock‎

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

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ openapi-core = "^0.19.5"
3535

3636
[tool.poetry.group.dev.dependencies]
3737
flake8 = "^7.3.0"
38-
black = "^25.11"
38+
black = "^26.3.1"
3939
pip-licenses = "^5.5.0"
4040
jinja2 = "^3.1.6"
4141
pytest = "^8.4.2"

‎sandbox/package-lock.json‎

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

‎sandbox/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"dependencies": {
1515
"@hapi/hapi": "^21.4.4",
1616
"@hapi/inert": "^7.1.0",
17-
"lodash": "^4.17.20"
17+
"lodash": "^4.17.23"
1818
},
1919
"devDependencies": {
2020
"eslint": "^9.25.1",

‎sandbox/src/mocks/stu3/cancelReferral/requests/bookedOutsideCabWithoutComment.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"meta": {
3+
"profile": [
4+
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-CancelReferral-Request-Parameters-1"
5+
]
6+
},
7+
"resourceType": "Parameters",
8+
"parameter": [
9+
{
10+
"name": "cancellationReason",
11+
"valueCoding": {
12+
"system": "_baseurl_/STU3/CodeSystem/REFERRAL-CANCELLATION-REASON",
13+
"code": "BOOKED_OUTSIDE_CAB"
14+
}
15+
}
16+
]
17+
}

‎sandbox/src/mocks/stu3/cancelReferral/requests/outpatientService.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"meta": {
3+
"profile": [
4+
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-CancelReferral-Request-Parameters-1"
5+
]
6+
},
7+
"resourceType": "Parameters",
8+
"parameter": [
9+
{
10+
"name": "cancellationReason",
11+
"valueCoding": {
12+
"system": "_baseurl_/STU3/CodeSystem/REFERRAL-CANCELLATION-REASON",
13+
"code": "OUTPATIENT_SERVICE_NA"
14+
}
15+
},
16+
{
17+
"name": "cancellationComments",
18+
"valueString": "This is a cancellation reason comment"
19+
}
20+
]
21+
}

‎sandbox/src/mocks/stu3/cancelReferral/responses/CancelledReferralBookedOutsideCabWithoutComment.json‎

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
{
2+
"meta": {
3+
"profile": [
4+
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-CancelReferral-Response-Parameters-1"
5+
]
6+
},
7+
"resourceType": "Parameters",
8+
"parameter": [
9+
{
10+
"name": "updatedReferralRequest",
11+
"resource": {
12+
"id": "000000070000",
13+
"meta": {
14+
"versionId": "4",
15+
"profile": [
16+
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-ReferralRequest-1"
17+
]
18+
},
19+
"resourceType": "ReferralRequest",
20+
"extension": [
21+
{
22+
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ReferralPriority-1",
23+
"valueCodeableConcept": {
24+
"coding": [
25+
{
26+
"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-Priority-1",
27+
"code": "ROUTINE",
28+
"display": "Routine"
29+
}
30+
]
31+
}
32+
},
33+
{
34+
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ReferralShortlist-1",
35+
"valueReference": {
36+
"reference": "#shortlist"
37+
}
38+
},
39+
{
40+
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-Commissioning-Rule-Org-1",
41+
"valueIdentifier": {
42+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
43+
"value": "R69"
44+
}
45+
},
46+
{
47+
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ReferralState-1",
48+
"extension": [
49+
{
50+
"url": "state",
51+
"valueCoding": {
52+
"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-ReferralState-1",
53+
"code": "CANCELLED_REFERRAL",
54+
"display": "Cancelled Referral"
55+
}
56+
},
57+
{
58+
"url": "reason",
59+
"valueCoding": {
60+
"system": "_baseUrl_/STU3/CodeSystem/REFERRAL-CANCELLATION-REASON",
61+
"code": "BOOKED_OUTSIDE_CAB",
62+
"display": "Patient booked outside NHS e-Referral Service"
63+
}
64+
}
65+
]
66+
}
67+
],
68+
"contained": [
69+
{
70+
"id": "serviceSearchCriteria",
71+
"meta": {
72+
"profile": [
73+
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-ServiceSearchCriteria-Parameters-1"
74+
]
75+
},
76+
"resourceType": "Parameters",
77+
"parameter": [
78+
{
79+
"name": "priority",
80+
"valueCoding": {
81+
"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-Priority-1",
82+
"code": "ROUTINE"
83+
}
84+
},
85+
{
86+
"name": "specialty",
87+
"valueCoding": {
88+
"system": "_baseUrl_/STU3/CodeSystem/SPECIALTY",
89+
"code": "CARDIOLOGY"
90+
}
91+
},
92+
{
93+
"name": "clinicType",
94+
"valueCoding": {
95+
"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-ClinicType-1",
96+
"code": "HEART_FAILURE"
97+
}
98+
},
99+
{
100+
"name": "ageAndGenderAppropriate",
101+
"valueBoolean": false
102+
},
103+
{
104+
"name": "commissioningProvisioning",
105+
"valueCoding": {
106+
"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-CommissioningProvisioning-1",
107+
"code": "ALL_AVAILABLE_FOR_BOOKING"
108+
}
109+
}
110+
]
111+
},
112+
{
113+
"id": "shortlist",
114+
"meta": {
115+
"profile": [
116+
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-Shortlist-List-1"
117+
]
118+
},
119+
"resourceType": "List",
120+
"extension": [
121+
{
122+
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-Shortlist-SearchCriteria-1",
123+
"valueReference": {
124+
"reference": "#serviceSearchCriteria"
125+
}
126+
}
127+
],
128+
"status": "current",
129+
"mode": "snapshot",
130+
"entry": [
131+
{
132+
"item": {
133+
"identifier": {
134+
"system": "http://fhir.nhs.net/Id/ers-service",
135+
"value": "11004"
136+
},
137+
"display": "Cardiology Triage Business Service"
138+
}
139+
}
140+
]
141+
}
142+
],
143+
"status": "cancelled",
144+
"specialty": {
145+
"coding": [
146+
{
147+
"system": "_baseUrl_/STU3/CodeSystem/SPECIALTY",
148+
"code": "CARDIOLOGY",
149+
"display": "Cardiology"
150+
}
151+
]
152+
},
153+
"subject": {
154+
"identifier": {
155+
"system": "http://fhir.nhs.net/Id/nhs-number",
156+
"value": "9912003888"
157+
}
158+
},
159+
"supportingInfo": [],
160+
"intent": "plan",
161+
"identifier":[
162+
{
163+
"system":"https://fhir.nhs.uk/Id/ers-request-id",
164+
"value":"r.c18c4ec4-7d0a-480e-8506-347e0ec228b0"
165+
}
166+
]
167+
}
168+
}
169+
]
170+
}

0 commit comments

Comments
 (0)