Skip to content

Commit 8f10751

Browse files
megan-bower4megan-bower4
authored
Merge pull request #423 from NHSDigital/release/2024-11-25
Release/2024 11 25
2 parents e947cde + a03046a commit 8f10751

13 files changed

+51
-21
lines changed

‎.github/workflows/_deploy.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,9 @@ jobs:
197197
uses: ./.github/actions/catch-failed-step
198198
- name: Send job result to slack
199199
id: slack
200-
uses: slackapi/slack-github-action@v1.27.0
200+
uses: slackapi/slack-github-action@v2.0.0
201201
with:
202+
webhook-type: webhook-trigger
202203
payload: |
203204
{
204205
"action_url": "${{ format('{0}/{1}/actions/runs/{2}/attempts/{3}', github.server_url, github.repository, github.run_id, github.run_attempt) }}",

‎.github/workflows/merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
uses: ./.github/actions/catch-failed-step
6969
- name: Send merge result to slack
7070
id: slack
71-
uses: slackapi/slack-github-action@v1.27.0
71+
uses: slackapi/slack-github-action@v2.0.0
7272
with:
7373
payload: |
7474
{

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 2024-11-25
4+
- [PI-643] Add status to Device Reference Data
5+
- Dependabot: slack-github-action, pydantic
6+
37
## 2024-11-22
48
- [PI-528] Collapse versioning to v1
59
- [PI-581] MHS Device with Device Reference Data

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024.11.22
1+
2024.11.25

‎changelog/2024-11-25.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- [PI-643] Add status to Device Reference Data
2+
- Dependabot: slack-github-action, pydantic

‎infrastructure/swagger/07_components--schemas--domain.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ components:
235235
example:
236236
id: "55e86121-3826-468c-a6f0-dd0f1fbc0259"
237237
name: "Sample DeviceReferenceDataResponse"
238+
status: "active"
238239
product_id: "123-XXX"
239240
product_team_id: "F5H1R.55e86121-3826-468c-a6f0-dd0f1fbc0259"
240241
ods_code: "F5H1R"
@@ -256,6 +257,7 @@ components:
256257
results:
257258
- id: "55e86121-3826-468c-a6f0-dd0f1fbc0259"
258259
name: "Sample Device Reference Data"
260+
status: "active"
259261
product_id: "123-XXX"
260262
product_team_id: "F5H1R.55e86121-3826-468c-a6f0-dd0f1fbc0259"
261263
ods_code: "F5H1R"

‎pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "connecting-party-manager"
3-
version = "2024.11.22"
3+
version = "2024.11.25"
44
description = "Repository for the Connecting Party Manager API and related services"
55
authors = ["NHS England"]
66
license = "LICENSE.md"
@@ -17,7 +17,7 @@ packages = [
1717

1818
[tool.poetry.dependencies]
1919
python = "3.12.3"
20-
pydantic = "1.10.18"
20+
pydantic = "1.10.19"
2121
nhs-context-logging = "^0.6.8"
2222
requests = "^2.31.0"
2323
aws-lambda-powertools = "^2.26.0"

‎src/api/tests/feature_tests/features/createDeviceReferenceData.success.feature

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Feature: Create Device Reference Data - success scenarios
2626
| path | value |
2727
| id | << ignore >> |
2828
| name | My Device Reference Data |
29+
| status | active |
2930
| product_id | ${ note(product_id) } |
3031
| product_team_id | ${ note(product_team_id) } |
3132
| ods_code | F5H1R |
@@ -36,13 +37,14 @@ Feature: Create Device Reference Data - success scenarios
3637
And the response headers contain:
3738
| name | value |
3839
| Content-Type | application/json |
39-
| Content-Length | 316 |
40+
| Content-Length | 336 |
4041
And I note the response field "$.id" as "device_reference_data_id"
4142
When I make a "GET" request with "default" headers to "ProductTeam/${ note(product_team_id) }/Product/${ note(product_id) }/DeviceReferenceData/${ note(device_reference_data_id) }"
4243
Then I receive a status code "200" with body
4344
| path | value |
4445
| id | ${ note(device_reference_data_id) } |
4546
| name | My Device Reference Data |
47+
| status | active |
4648
| product_id | ${ note(product_id) } |
4749
| product_team_id | ${ note(product_team_id) } |
4850
| ods_code | F5H1R |
@@ -53,7 +55,7 @@ Feature: Create Device Reference Data - success scenarios
5355
And the response headers contain:
5456
| name | value |
5557
| Content-Type | application/json |
56-
| Content-Length | 316 |
58+
| Content-Length | 336 |
5759

5860
Examples:
5961
| product_team_id |
@@ -80,6 +82,7 @@ Feature: Create Device Reference Data - success scenarios
8082
| path | value |
8183
| id | << ignore >> |
8284
| name | My Device Reference Data |
85+
| status | active |
8386
| product_id | ${ note(product_id) } |
8487
| product_team_id | ${ note(product_team_id) } |
8588
| ods_code | F5H1R |
@@ -90,13 +93,14 @@ Feature: Create Device Reference Data - success scenarios
9093
And the response headers contain:
9194
| name | value |
9295
| Content-Type | application/json |
93-
| Content-Length | 316 |
96+
| Content-Length | 336 |
9497
And I note the response field "$.id" as "device_reference_data_id"
9598
When I make a "GET" request with "default" headers to "ProductTeam/${ note(product_team_id) }/Product/${ note(product_id) }/DeviceReferenceData/${ note(device_reference_data_id) }"
9699
Then I receive a status code "200" with body
97100
| path | value |
98101
| id | ${ note(device_reference_data_id) } |
99102
| name | My Device Reference Data |
103+
| status | active |
100104
| product_id | ${ note(product_id) } |
101105
| product_team_id | ${ note(product_team_id) } |
102106
| ods_code | F5H1R |
@@ -107,7 +111,7 @@ Feature: Create Device Reference Data - success scenarios
107111
And the response headers contain:
108112
| name | value |
109113
| Content-Type | application/json |
110-
| Content-Length | 316 |
114+
| Content-Length | 336 |
111115

112116
Examples:
113117
| product_team_id | product_id |

‎src/api/tests/feature_tests/features/createDeviceReferenceDataAdditionalInteractions.success.feature

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Feature: Create "Additional Interactions" Device Reference Data - success scenar
2525
| path | value |
2626
| id | << ignore >> |
2727
| name | F5H1R-850000 - AS Additional Interactions |
28+
| status | active |
2829
| product_id | ${ note(product_id) } |
2930
| product_team_id | ${ note(product_team_id) } |
3031
| ods_code | F5H1R |
@@ -35,13 +36,14 @@ Feature: Create "Additional Interactions" Device Reference Data - success scenar
3536
And the response headers contain:
3637
| name | value |
3738
| Content-Type | application/json |
38-
| Content-Length | 333 |
39+
| Content-Length | 353 |
3940
And I note the response field "$.id" as "device_reference_data_id"
4041
When I make a "GET" request with "default" headers to "ProductTeam/${ note(product_team_id) }/Product/${ note(product_id) }/DeviceReferenceData/${ note(device_reference_data_id) }"
4142
Then I receive a status code "200" with body
4243
| path | value |
4344
| id | ${ note(device_reference_data_id) } |
4445
| name | F5H1R-850000 - AS Additional Interactions |
46+
| status | active |
4547
| product_id | ${ note(product_id) } |
4648
| product_team_id | ${ note(product_team_id) } |
4749
| ods_code | F5H1R |
@@ -52,7 +54,7 @@ Feature: Create "Additional Interactions" Device Reference Data - success scenar
5254
And the response headers contain:
5355
| name | value |
5456
| Content-Type | application/json |
55-
| Content-Length | 333 |
57+
| Content-Length | 353 |
5658

5759
Examples:
5860
| product_team_id | product_id |
@@ -82,6 +84,7 @@ Feature: Create "Additional Interactions" Device Reference Data - success scenar
8284
| path | value |
8385
| id | << ignore >> |
8486
| name | F5H1R-850000 - AS Additional Interactions |
87+
| status | active |
8588
| product_id | ${ note(product_id) } |
8689
| product_team_id | ${ note(product_team_id) } |
8790
| ods_code | F5H1R |
@@ -101,13 +104,14 @@ Feature: Create "Additional Interactions" Device Reference Data - success scenar
101104
And the response headers contain:
102105
| name | value |
103106
| Content-Type | application/json |
104-
| Content-Length | 938 |
107+
| Content-Length | 958 |
105108
And I note the response field "$.id" as "device_reference_data_id"
106109
When I make a "GET" request with "default" headers to "ProductTeam/${ note(product_team_id) }/Product/${ note(product_id) }/DeviceReferenceData/${ note(device_reference_data_id) }"
107110
Then I receive a status code "200" with body
108111
| path | value |
109112
| id | ${ note(device_reference_data_id) } |
110113
| name | F5H1R-850000 - AS Additional Interactions |
114+
| status | active |
111115
| product_id | ${ note(product_id) } |
112116
| product_team_id | ${ note(product_team_id) } |
113117
| ods_code | F5H1R |
@@ -127,7 +131,7 @@ Feature: Create "Additional Interactions" Device Reference Data - success scenar
127131
And the response headers contain:
128132
| name | value |
129133
| Content-Type | application/json |
130-
| Content-Length | 938 |
134+
| Content-Length | 958 |
131135

132136
Examples:
133137
| product_team_id | product_id |

‎src/api/tests/feature_tests/features/createDeviceReferenceDataMessageSet.success.feature

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Feature: Create "Message Set" Device Reference Data - success scenarios
2525
| path | value |
2626
| id | << ignore >> |
2727
| name | F5H1R-850000 - MHS Message Set |
28+
| status | active |
2829
| product_id | ${ note(product_id) } |
2930
| product_team_id | ${ note(product_team_id) } |
3031
| ods_code | F5H1R |
@@ -35,13 +36,14 @@ Feature: Create "Message Set" Device Reference Data - success scenarios
3536
And the response headers contain:
3637
| name | value |
3738
| Content-Type | application/json |
38-
| Content-Length | 322 |
39+
| Content-Length | 342 |
3940
And I note the response field "$.id" as "device_reference_data_id"
4041
When I make a "GET" request with "default" headers to "ProductTeam/${ note(product_team_id) }/Product/${ note(product_id) }/DeviceReferenceData/${ note(device_reference_data_id) }"
4142
Then I receive a status code "200" with body
4243
| path | value |
4344
| id | ${ note(device_reference_data_id) } |
4445
| name | F5H1R-850000 - MHS Message Set |
46+
| status | active |
4547
| product_id | ${ note(product_id) } |
4648
| product_team_id | ${ note(product_team_id) } |
4749
| ods_code | F5H1R |
@@ -52,7 +54,7 @@ Feature: Create "Message Set" Device Reference Data - success scenarios
5254
And the response headers contain:
5355
| name | value |
5456
| Content-Type | application/json |
55-
| Content-Length | 322 |
57+
| Content-Length | 342 |
5658

5759
Examples:
5860
| product_team_id | product_id |
@@ -87,6 +89,7 @@ Feature: Create "Message Set" Device Reference Data - success scenarios
8789
| path | value |
8890
| id | << ignore >> |
8991
| name | F5H1R-850000 - MHS Message Set |
92+
| status | active |
9093
| product_id | ${ note(product_id) } |
9194
| product_team_id | ${ note(product_team_id) } |
9295
| ods_code | F5H1R |
@@ -113,13 +116,14 @@ Feature: Create "Message Set" Device Reference Data - success scenarios
113116
And the response headers contain:
114117
| name | value |
115118
| Content-Type | application/json |
116-
| Content-Length | 1199 |
119+
| Content-Length | 1219 |
117120
And I note the response field "$.id" as "device_reference_data_id"
118121
When I make a "GET" request with "default" headers to "ProductTeam/${ note(product_team_id) }/Product/${ note(product_id) }/DeviceReferenceData/${ note(device_reference_data_id) }"
119122
Then I receive a status code "200" with body
120123
| path | value |
121124
| id | ${ note(device_reference_data_id) } |
122125
| name | F5H1R-850000 - MHS Message Set |
126+
| status | active |
123127
| product_id | ${ note(product_id) } |
124128
| product_team_id | ${ note(product_team_id) } |
125129
| ods_code | F5H1R |
@@ -146,4 +150,4 @@ Feature: Create "Message Set" Device Reference Data - success scenarios
146150
And the response headers contain:
147151
| name | value |
148152
| Content-Type | application/json |
149-
| Content-Length | 1199 |
153+
| Content-Length | 1219 |

0 commit comments

Comments
 (0)