Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
228fd86
pip(deps): bump attrs from 24.3.0 to 25.1.0
dependabot[bot] Feb 3, 2025
0cbe51b
pip(deps): bump jsonschema-path from 0.3.3 to 0.3.4
dependabot[bot] Feb 3, 2025
516479d
pip(deps): bump referencing from 0.35.1 to 0.36.2
dependabot[bot] Feb 3, 2025
03b1023
Merge dependabot/pip/develop/attrs-25.1.0 into ERSUP-82803-combine-pr…
github-actions[bot] Feb 3, 2025
9bedb4c
Merge dependabot/pip/develop/jsonschema-path-0.3.4 into ERSUP-82803-c…
github-actions[bot] Feb 3, 2025
aea5556
Merge dependabot/pip/develop/referencing-0.36.2 into ERSUP-82803-comb…
github-actions[bot] Feb 3, 2025
12bd3cc
Merge pull request #2088 from NHSDigital/ERSUP-82803-combine-prs-pip-…
nhsd-david-wass Feb 4, 2025
5afb9f7
npm(deps): bump is-weakref from 1.1.0 to 1.1.1
dependabot[bot] Feb 4, 2025
0d73507
npm(deps): bump @redocly/cli from 1.27.2 to 1.28.1
dependabot[bot] Feb 4, 2025
a8d0298
npm(deps): bump dompurify from 3.2.3 to 3.2.4
dependabot[bot] Jan 31, 2025
0d5b99b
npm(deps): bump mobx from 6.13.5 to 6.13.6
dependabot[bot] Jan 31, 2025
db5ab57
npm(deps): bump @redocly/config from 0.20.2 to 0.20.3
dependabot[bot] Feb 3, 2025
b88ed6d
Merge pull request #2091 from NHSDigital/ERSUP-82803-combine-prs-npm-…
nhsd-david-wass Feb 5, 2025
9ec4cee
npm(deps): bump @redocly/cli from 1.27.2 to 1.28.2
dependabot[bot] Feb 5, 2025
ac76f38
Merge pull request #2095 from NHSDigital/dependabot/npm_and_yarn/deve…
nhsd-david-wass Feb 5, 2025
73aa0a9
sandbox-npm(deps-dev): bump import-fresh from 3.3.0 to 3.3.1 in /sandbox
dependabot[bot] Feb 7, 2025
dbf852b
sandbox-npm(deps-dev): bump fastq from 1.18.0 to 1.19.0 in /sandbox
dependabot[bot] Feb 7, 2025
3e4a75f
sandbox-npm(deps-dev): bump @ungap/structured-clone in /sandbox
dependabot[bot] Feb 7, 2025
f01383c
Merge dependabot/npm_and_yarn/sandbox/develop/import-fresh-3.3.1 into…
github-actions[bot] Feb 10, 2025
a5cbebf
Merge dependabot/npm_and_yarn/sandbox/develop/fastq-1.19.0 into ERSSU…
github-actions[bot] Feb 10, 2025
7b137a6
Merge dependabot/npm_and_yarn/sandbox/develop/ungap/structured-clone-…
github-actions[bot] Feb 10, 2025
9591295
Merge pull request #2103 from NHSDigital/ERSSUP-82803-combine-prs-san…
nhsd-david-wass Feb 10, 2025
1cb3e4a
pip(deps-dev): bump authlib from 1.4.0 to 1.4.1
dependabot[bot] Feb 7, 2025
eb4f65e
pip(deps): bump certifi from 2024.12.14 to 2025.1.31
dependabot[bot] Feb 7, 2025
a8fca14
pip(deps-dev): bump prettytable from 3.12.0 to 3.14.0
dependabot[bot] Feb 7, 2025
f1d731d
Merge pull request #2104 from NHSDigital/ERSSUP-82803-combine-prs-pip…
nhsd-david-wass Feb 11, 2025
a6dadb3
npm(deps): bump possible-typed-array-names from 1.0.0 to 1.1.0
dependabot[bot] Feb 10, 2025
3bc453e
npm(deps): bump object-inspect from 1.13.3 to 1.13.4
dependabot[bot] Feb 6, 2025
ff90d5d
npm(deps): bump is-boolean-object from 1.2.1 to 1.2.2
dependabot[bot] Feb 6, 2025
d7f89fc
npm(deps): bump styled-components from 6.1.14 to 6.1.15
dependabot[bot] Feb 6, 2025
1436b71
Merge pull request #2106 from NHSDigital/ERSSUP-82803-combine-prs-npm…
nhsd-david-wass Feb 11, 2025
32c4eb6
pip(deps-dev): bump pytest-nhsd-apim from 3.4.3 to 3.4.5
dependabot[bot] Feb 11, 2025
4eb39d7
Merge pull request #2108 from NHSDigital/dependabot/pip/develop/pytes…
nhsd-david-wass Feb 11, 2025
aa7a647
Bump cryptography from 44.0.0 to 44.0.1
dependabot[bot] Feb 11, 2025
edda271
Merge pull request #2112 from NHSDigital/dependabot/pip/cryptography-…
nhsd-david-wass Feb 12, 2025
7611df2
pip(deps-dev): bump pydantic from 1.10.19 to 1.10.21
dependabot[bot] Feb 11, 2025
70fb25f
Merge pull request #2115 from NHSDigital/ERSSUP-82803-combine-prs-pip…
nhsd-david-wass Feb 12, 2025
7c9d5b8
pip(deps-dev): bump black from 24.10.0 to 25.1.0
dependabot[bot] Feb 12, 2025
438dee2
Merge dependabot/pip/develop/black-25.1.0 into ERSSUP-82803-combine-p…
github-actions[bot] Feb 12, 2025
13fd4c1
Merge pull request #2116 from NHSDigital/ERSSUP-82803-combine-prs2-pi…
nhsd-david-wass Feb 12, 2025
0228bda
[ERSSUP-82347]-[JW]-[APIM Sandbox - A008 Retrieve referral worklist -…
nhsd-david-wass Jan 16, 2025
c7a9913
Merge pull request #2058 from NHSDigital/feature/ERSSUP-82347
nhsd-david-wass Feb 13, 2025
ab22813
npm(deps): bump es-shim-unscopables from 1.0.2 to 1.1.0
dependabot[bot] Feb 13, 2025
d9fd4c5
npm(deps): bump call-bind-apply-helpers from 1.0.1 to 1.0.2
dependabot[bot] Feb 13, 2025
a7b904e
npm(deps): bump for-each from 0.3.4 to 0.3.5
dependabot[bot] Feb 12, 2025
1d819f9
Merge pull request #2121 from NHSDigital/ERSSUP-82803-combine-prs-npm…
nhsd-david-wass Feb 13, 2025
0a214f5
npm(deps): bump @redocly/cli from 1.28.2 to 1.28.5
dependabot[bot] Feb 13, 2025
6172ea6
Merge pull request #2101 from NHSDigital/dependabot/npm_and_yarn/deve…
nhsd-david-wass Feb 13, 2025
9b26271
pip(deps): bump semver from 3.0.2 to 3.0.4
dependabot[bot] Feb 13, 2025
0f54fd8
Merge pull request #2107 from NHSDigital/dependabot/pip/develop/semve…
nhsd-david-wass Feb 13, 2025
07669a1
pip(deps): bump pytest-check from 2.4.1 to 2.5.0
dependabot[bot] Feb 13, 2025
0a8310d
Merge pull request #2123 from NHSDigital/dependabot/pip/develop/pytes…
nhsd-david-wass Feb 13, 2025
2a33b90
pip(deps-dev): bump pytest-asyncio from 0.25.2 to 0.25.3
dependabot[bot] Feb 13, 2025
a6b768e
Merge pull request #2118 from NHSDigital/dependabot/pip/develop/pytes…
nhsd-david-wass Feb 13, 2025
2988b9c
npm(deps): bump form-data from 4.0.1 to 4.0.2
dependabot[bot] Feb 17, 2025
92152f2
npm(deps): bump @babel/runtime from 7.26.7 to 7.26.9
dependabot[bot] Feb 17, 2025
71ee11e
npm(deps): bump @redocly/cli from 1.28.5 to 1.29.0
dependabot[bot] Feb 17, 2025
9e55488
Merge dependabot/npm_and_yarn/develop/redocly/cli-1.29.0 into ERSSUP-…
github-actions[bot] Feb 17, 2025
25d9e3f
Merge dependabot/npm_and_yarn/develop/babel/runtime-7.26.9 into ERSSU…
github-actions[bot] Feb 17, 2025
9c4a99e
Merge dependabot/npm_and_yarn/develop/form-data-4.0.2 into ERSSUP-828…
github-actions[bot] Feb 17, 2025
606dfe8
Merge pull request #2128 from NHSDigital/ERSSUP-82803-combine-prs-npm…
nhsd-david-wass Feb 18, 2025
faa202e
pip(deps-dev): bump flake8 from 7.1.1 to 7.1.2
dependabot[bot] Feb 18, 2025
ddfab33
Merge pull request #2127 from NHSDigital/dependabot/pip/develop/flake…
nhsd-david-wass Feb 18, 2025
a640c14
sandbox-npm(deps-dev): bump flatted from 3.3.2 to 3.3.3 in /sandbox
dependabot[bot] Feb 20, 2025
4af738a
Merge pull request #2130 from NHSDigital/dependabot/npm_and_yarn/sand…
nhsd-david-wass Feb 20, 2025
f5059ed
npm(deps): bump fast-xml-parser from 4.5.1 to 4.5.2
dependabot[bot] Feb 20, 2025
eaf5288
Merge pull request #2129 from NHSDigital/dependabot/npm_and_yarn/deve…
nhsd-david-wass Feb 20, 2025
07ac05c
npm(deps): bump @redocly/cli from 1.29.0 to 1.30.0
dependabot[bot] Feb 21, 2025
746bf29
npm(deps): bump get-intrinsic from 1.2.7 to 1.3.0
dependabot[bot] Feb 24, 2025
5048161
npm(deps): bump strnum from 1.0.5 to 1.1.1
dependabot[bot] Feb 24, 2025
af7cb99
npm(deps): bump fast-xml-parser from 4.5.2 to 4.5.3
dependabot[bot] Feb 24, 2025
4f337dc
npm(deps-dev): bump postman-request
dependabot[bot] Feb 25, 2025
99ce1a4
Merge dependabot/npm_and_yarn/develop/postman-request-2.88.1-postman.…
github-actions[bot] Feb 25, 2025
7629a48
Merge dependabot/npm_and_yarn/develop/fast-xml-parser-4.5.3 into ERSS…
github-actions[bot] Feb 25, 2025
7271a6f
Merge dependabot/npm_and_yarn/develop/strnum-1.1.1 into ERSSUP-82803-…
github-actions[bot] Feb 25, 2025
dddbd1d
Merge dependabot/npm_and_yarn/develop/get-intrinsic-1.3.0 into ERSSUP…
github-actions[bot] Feb 25, 2025
84d5364
Merge dependabot/npm_and_yarn/develop/redocly/cli-1.30.0 into ERSSUP-…
github-actions[bot] Feb 25, 2025
4c58217
Merge pull request #2142 from NHSDigital/ERSSUP-82803-combine-prs-npm…
nhsd-david-wass Feb 25, 2025
0414abd
+minor
nhsd-david-wass Feb 25, 2025
c4b5cf4
Merge pull request #2144 from NHSDigital/feature/ERSSUP-83002
nhsd-david-wass Feb 25, 2025
a47089f
Merge branch 'master' into feature/ERSSUP-83002-M
nhsd-david-wass Feb 25, 2025
1d40ee8
Merge pull request #2146 from NHSDigital/feature/ERSSUP-83002-M
nhsd-david-wass Feb 25, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,301 changes: 971 additions & 3,330 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"license": "MIT",
"homepage": "https://github.com/NHSDigital/e-referrals-service-api",
"dependencies": {
"@redocly/cli": "^1.27.2"
"@redocly/cli": "^1.30.0"
},
"devDependencies": {
"apigeetool": "^0.16.5",
Expand Down
282 changes: 149 additions & 133 deletions poetry.lock

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,23 @@ python = "^3.10"
pyyaml = "^6.0"
docopt = "^0.6.2"
jsonpath-rw = "^1.4.0"
semver = "^3.0.2"
semver = "^3.0.4"
gitpython = "^3.1.44"
lxml = "^4.9.4"
xmlformatter = "^0.2.8"
pytest-check = "^2.4.1"
pytest-check = "^2.5.0"
requests = "^2.32.3"
openapi-core = "^0.19.4"


[tool.poetry.group.dev.dependencies]
flake8 = "^7.1.1"
black = "^24.8"
flake8 = "^7.1.2"
black = "^25.1"
pip-licenses = "^5.0.0"
jinja2 = "^3.1.5"
pytest = "^8.3.4"
pytest-asyncio = "^0.25.2"
pytest-nhsd-apim = "^3.4.3"
pytest-asyncio = "^0.25.3"
pytest-nhsd-apim = "^3.4.5"

[tool.poetry.scripts]

Expand Down
56 changes: 30 additions & 26 deletions sandbox/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sandbox/src/routes/stu3/services/mockResponseProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ module.exports = {
'src/mocks/stu3/retrieveWorklist/requests/MinimalReferralsForReview.json': 'stu3/retrieveWorklist/responses/ReferralsForReview.json',
'src/mocks/stu3/retrieveWorklist/requests/MinimalAppointmentSlotIssues.json': 'stu3/retrieveWorklist/responses/AppointmentSlotIssues.json',
'src/mocks/stu3/retrieveWorklist/requests/FilteringBySpecialty.json': 'stu3/retrieveWorklist/responses/FilteredBySpecialty.json',
'src/mocks/stu3/retrieveWorklist/requests/FilteringByService.json': 'stu3/retrieveWorklist/responses/FilteredByService.json',
'src/mocks/stu3/retrieveWorklist/requests/FilteringByClinician.json': 'stu3/retrieveWorklist/responses/FilteredByClinician.json',
'src/mocks/stu3/retrieveWorklist/requests/MinimalRejectedTriageResponse.json': 'stu3/retrieveWorklist/responses/RejectedTriageResponse.json',
'src/mocks/stu3/retrieveWorklist/requests/MinimalAssessmentReturnedCancelledDna.json': 'stu3/retrieveWorklist/responses/AssessmentReturnedCancelledDna.json',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ requestBody:
filtered-by-service:
summary: Filter by service
value:
$ref: '../../examples/retrieveWorklist/requests/FilteredByService.json'
$ref: '../../examples/retrieveWorklist/requests/FilteringByService.json'
rejected-triage-responses:
summary: Rejected Triage Responses
value:
Expand Down
4 changes: 4 additions & 0 deletions tests/sandbox/stu3/test_a008_get_referral_worklist.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ class TestGetReferralWorklist(SandboxTest):
"stu3/retrieveWorklist/requests/FilteringByClinician.json",
"stu3/retrieveWorklist/responses/FilteredByClinician.json",
),
(
"stu3/retrieveWorklist/requests/FilteringByService.json",
"stu3/retrieveWorklist/responses/FilteredByService.json",
),
(
"stu3/retrieveWorklist/requests/MinimalRejectedTriageResponse.json",
"stu3/retrieveWorklist/responses/RejectedTriageResponse.json",
Expand Down