Skip to content

Commit dbd16cf

Browse files
jaklingerjaklinger
committed
[release/2024-12-16] add some more scenarios
1 parent d101d22 commit dbd16cf

File tree

10 files changed

+515
-0
lines changed

10 files changed

+515
-0
lines changed

‎infrastructure/swagger/12_components--responses.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ components:
5555
message: "Require a 'spine_mhs' questionnaire response to create a MHS Device"
5656
- code: "VALIDATION_ERROR"
5757
message: "Not an EPR Product: Cannot create MHS device for product without exactly one Party Key"
58+
- code: "VALIDATION_ERROR"
59+
message: "Duplicate 'Interaction ID' provided: value '<INTERACTION ID>' occurs <N> times in the questionnaire response."
5860
SdsSearchDeviceBadRequest:
5961
description: searchSDSDevice Bad request
6062
content:

‎src/etl/sds/tests/changelog/changelog_components/add/message_handling_system.SameProduct.ldif‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
dn: uniqueIdentifier=00000a84594b2ef34279,ou=Services,o=nhs
2+
changeType: add
3+
objectClass: nhsMhs
4+
objectClass: top
5+
nhsApproverURP: uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs
6+
nhsContractPropertyTemplateKey: 14
7+
nhsDateApproved: 20231030092939
8+
nhsDateDNSApproved: 20231030092939
9+
nhsDateRequested: 20231030092906
10+
nhsDNSApprover: uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs
11+
nhsEPInteractionType: FHIR
12+
nhsIDCode: C3O9X
13+
nhsMhsCPAId: 123456
14+
nhsMHSEndPoint: https://test.C3O9X.nhs.uk/
15+
nhsMhsFQDN: test.C3O9X.nhs.uk
16+
nhsMHsIN: READ_PRACTITIONER_ROLE_R4_V002
17+
nhsMHSIsAuthenticated: none
18+
nhsMHSPartyKey: C3O9X-823610
19+
nhsMHsSN: urn:nhs:names:services:ers
20+
nhsMhsSvcIA: urn:nhs:names:services:ers:READ_PRACTITIONER_ROLE_R4_V002
21+
nhsProductKey: 11929
22+
nhsProductVersion: Mar2023
23+
nhsRequestorURP: uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs
24+
nhsMhsManufacturerOrg: C3O9X
25+
uniqueIdentifier: 123456

‎src/etl/sds/tests/changelog/changelog_components/add/message_handling_system.SameProductTeam.DifferentProduct.ldif‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
dn: uniqueIdentifier=00000a84594b2ef34279,ou=Services,o=nhs
2+
changeType: add
3+
objectClass: nhsMhs
4+
objectClass: top
5+
nhsApproverURP: uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs
6+
nhsContractPropertyTemplateKey: 14
7+
nhsDateApproved: 20231030092939
8+
nhsDateDNSApproved: 20231030092939
9+
nhsDateRequested: 20231030092906
10+
nhsDNSApprover: uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs
11+
nhsEPInteractionType: FHIR
12+
nhsIDCode: AAA
13+
nhsMhsCPAId: 123456
14+
nhsMHSEndPoint: https://test.AAA.nhs.uk/
15+
nhsMhsFQDN: test.AAA.nhs.uk
16+
nhsMHsIN: READ_PRACTITIONER_ROLE_R4_V002
17+
nhsMHSIsAuthenticated: none
18+
nhsMHSPartyKey: AAA-823610
19+
nhsMHsSN: urn:nhs:names:services:ers
20+
nhsMhsSvcIA: urn:nhs:names:services:ers:READ_PRACTITIONER_ROLE_R4_V002
21+
nhsProductKey: 11929
22+
nhsProductVersion: Mar2023
23+
nhsRequestorURP: uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs
24+
nhsMhsManufacturerOrg: C3O9X
25+
uniqueIdentifier: 123456

‎src/etl/sds/tests/changelog/scenarios/message_handling_system/can_add_two_mhs_in_same_product/__init__.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
from etl.sds.tests.changelog.utils import (
2+
ADD_ANOTHER_MESSAGE_HANDLING_SYSTEM_IN_SAME_PRODUCT,
3+
ADD_MESSAGE_HANDLING_SYSTEM,
4+
_Scenario,
5+
)
6+
7+
SCENARIO = _Scenario(
8+
file_path=__file__,
9+
extract_input=[
10+
ADD_MESSAGE_HANDLING_SYSTEM,
11+
ADD_ANOTHER_MESSAGE_HANDLING_SYSTEM_IN_SAME_PRODUCT,
12+
],
13+
)

‎src/etl/sds/tests/changelog/scenarios/message_handling_system/can_add_two_mhs_in_same_product/extract_output.json‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
[
2+
{
3+
"change_type": "add",
4+
"nhs_approver_urp": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
5+
"nhs_contract_property_template_key": "14",
6+
"nhs_date_approved": "20231030092939",
7+
"nhs_date_dns_approved": "20231030092939",
8+
"nhs_date_requested": "20231030092906",
9+
"nhs_dns_approver": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
10+
"nhs_ep_interaction_type": "fhir",
11+
"nhs_id_code": "C3O9X",
12+
"nhs_mhs_ack_requested": null,
13+
"nhs_mhs_actor": null,
14+
"nhs_mhs_cpa_id": "00000a84594b2ef34279",
15+
"nhs_mhs_duplicate_elimination": null,
16+
"nhs_mhs_end_point": "https://test.C3O9X.nhs.uk/",
17+
"nhs_mhs_fqdn": "test.C3O9X.nhs.uk",
18+
"nhs_mhs_in": "READ_PRACTITIONER_ROLE_R4_V001",
19+
"nhs_mhs_ip_address": null,
20+
"nhs_mhs_is_authenticated": "none",
21+
"nhs_mhs_manufacturer_org": "C3O9X",
22+
"nhs_mhs_party_key": "C3O9X-823610",
23+
"nhs_mhs_persist_duration": null,
24+
"nhs_mhs_retries": null,
25+
"nhs_mhs_retry_interval": null,
26+
"nhs_mhs_service_description": null,
27+
"nhs_mhs_sn": "urn:nhs:names:services:ers",
28+
"nhs_mhs_svc_ia": "urn:nhs:names:services:ers:READ_PRACTITIONER_ROLE_R4_V001",
29+
"nhs_mhs_sync_reply_mode": null,
30+
"nhs_product_key": "11929",
31+
"nhs_product_name": null,
32+
"nhs_product_version": "Mar2023",
33+
"nhs_requestor_urp": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
34+
"object_class": "nhsMhs",
35+
"unique_identifier": "00000a84594b2ef34279"
36+
},
37+
{
38+
"change_type": "add",
39+
"nhs_approver_urp": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
40+
"nhs_contract_property_template_key": "14",
41+
"nhs_date_approved": "20231030092939",
42+
"nhs_date_dns_approved": "20231030092939",
43+
"nhs_date_requested": "20231030092906",
44+
"nhs_dns_approver": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
45+
"nhs_ep_interaction_type": "fhir",
46+
"nhs_id_code": "C3O9X",
47+
"nhs_mhs_ack_requested": null,
48+
"nhs_mhs_actor": null,
49+
"nhs_mhs_cpa_id": "123456",
50+
"nhs_mhs_duplicate_elimination": null,
51+
"nhs_mhs_end_point": "https://test.C3O9X.nhs.uk/",
52+
"nhs_mhs_fqdn": "test.C3O9X.nhs.uk",
53+
"nhs_mhs_in": "READ_PRACTITIONER_ROLE_R4_V002",
54+
"nhs_mhs_ip_address": null,
55+
"nhs_mhs_is_authenticated": "none",
56+
"nhs_mhs_manufacturer_org": "C3O9X",
57+
"nhs_mhs_party_key": "C3O9X-823610",
58+
"nhs_mhs_persist_duration": null,
59+
"nhs_mhs_retries": null,
60+
"nhs_mhs_retry_interval": null,
61+
"nhs_mhs_service_description": null,
62+
"nhs_mhs_sn": "urn:nhs:names:services:ers",
63+
"nhs_mhs_svc_ia": "urn:nhs:names:services:ers:READ_PRACTITIONER_ROLE_R4_V002",
64+
"nhs_mhs_sync_reply_mode": null,
65+
"nhs_product_key": "11929",
66+
"nhs_product_name": null,
67+
"nhs_product_version": "Mar2023",
68+
"nhs_requestor_urp": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
69+
"object_class": "nhsMhs",
70+
"unique_identifier": "123456"
71+
}
72+
]

‎src/etl/sds/tests/changelog/scenarios/message_handling_system/can_add_two_mhs_in_same_product/load_output.json‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
[
2+
{
3+
"id": "C3O9X.fe49c1d5-d9bc-4c2e-8e8d-54d8e2e88250",
4+
"name": "C3O9X (EPR)",
5+
"ods_code": "C3O9X",
6+
"status": "active",
7+
"created_on": "2024-12-11T11:18:53.365591+00:00",
8+
"updated_on": null,
9+
"deleted_on": null,
10+
"keys": [{ "key_type": "epr_id", "key_value": "EPR-C3O9X" }]
11+
},
12+
{
13+
"id": "P.9AN-PJG",
14+
"product_team_id": "C3O9X.fe49c1d5-d9bc-4c2e-8e8d-54d8e2e88250",
15+
"name": "00000a84594b2ef34279",
16+
"ods_code": "C3O9X",
17+
"status": "active",
18+
"created_on": "2024-12-11T11:18:53.407960+00:00",
19+
"updated_on": "2024-12-11T11:18:53.408432+00:00",
20+
"deleted_on": null,
21+
"keys": [{ "key_type": "party_key", "key_value": "C3O9X-823610" }]
22+
},
23+
{
24+
"id": "fe15bd58-6897-4566-9a87-aab781fd96b5",
25+
"name": "C3O9X-823610 - Message Handling System",
26+
"status": "active",
27+
"product_id": "P.9AN-PJG",
28+
"product_team_id": "C3O9X.fe49c1d5-d9bc-4c2e-8e8d-54d8e2e88250",
29+
"ods_code": "C3O9X",
30+
"created_on": "2024-12-11T11:18:53.532840+00:00",
31+
"updated_on": "2024-12-11T11:18:53.534066+00:00",
32+
"deleted_on": null,
33+
"keys": [
34+
{ "key_type": "cpa_id", "key_value": "00000a84594b2ef34279" },
35+
{ "key_type": "cpa_id", "key_value": "123456" }
36+
],
37+
"tags": [],
38+
"questionnaire_responses": {
39+
"spine_mhs/1": [
40+
{
41+
"id": "07dacf01-359a-4276-9dd2-e11ecb07076a",
42+
"questionnaire_name": "spine_mhs",
43+
"questionnaire_version": "1",
44+
"data": {
45+
"Managing Organization": "C3O9X",
46+
"Address": "https://test.C3O9X.nhs.uk/",
47+
"DNS Approver": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
48+
"MHS Party key": "C3O9X-823610",
49+
"Date Approved": "20231030092939",
50+
"Product Version": "Mar2023",
51+
"Approver URP": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
52+
"Date DNS Approved": "20231030092939",
53+
"Requestor URP": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
54+
"Date Requested": "20231030092906",
55+
"MHS Manufacturer Organisation": "C3O9X",
56+
"MHS FQDN": "test.C3O9X.nhs.uk"
57+
},
58+
"created_on": "2024-12-11T11:18:53.456536+00:00"
59+
}
60+
]
61+
},
62+
"device_reference_data": { "68cd98db-5d8d-45dc-ba9a-09e892535d83": ["*"] }
63+
},
64+
{
65+
"id": "68cd98db-5d8d-45dc-ba9a-09e892535d83",
66+
"name": "C3O9X-823610 - MHS Message Sets",
67+
"status": "active",
68+
"product_id": "P.9AN-PJG",
69+
"product_team_id": "C3O9X.fe49c1d5-d9bc-4c2e-8e8d-54d8e2e88250",
70+
"ods_code": "C3O9X",
71+
"questionnaire_responses": {
72+
"spine_mhs_message_sets/1": [
73+
{
74+
"id": "2071f8ac-a020-4bf3-b413-c205004bfb08",
75+
"questionnaire_name": "spine_mhs_message_sets",
76+
"questionnaire_version": "1",
77+
"data": {
78+
"Interaction ID": "urn:nhs:names:services:ers:READ_PRACTITIONER_ROLE_R4_V001",
79+
"MHS SN": "urn:nhs:names:services:ers",
80+
"MHS IN": "READ_PRACTITIONER_ROLE_R4_V001",
81+
"Contract Property Template Key": "14",
82+
"Interaction Type": "fhir",
83+
"Product Key": "11929",
84+
"MHS Is Authenticated": "none",
85+
"MHS CPA ID": "00000a84594b2ef34279",
86+
"Unique Identifier": "00000a84594b2ef34279"
87+
},
88+
"created_on": "2024-12-11T11:18:53.409854+00:00"
89+
},
90+
{
91+
"id": "2071f8ac-a020-4bf3-b413-c205004bfb08",
92+
"questionnaire_name": "spine_mhs_message_sets",
93+
"questionnaire_version": "1",
94+
"data": {
95+
"Interaction ID": "urn:nhs:names:services:ers:READ_PRACTITIONER_ROLE_R4_V002",
96+
"MHS SN": "urn:nhs:names:services:ers",
97+
"MHS IN": "READ_PRACTITIONER_ROLE_R4_V002",
98+
"Contract Property Template Key": "14",
99+
"Interaction Type": "fhir",
100+
"Product Key": "11929",
101+
"MHS Is Authenticated": "none",
102+
"MHS CPA ID": "123456",
103+
"Unique Identifier": "123456"
104+
},
105+
"created_on": "2024-12-11T11:18:53.409854+00:00"
106+
}
107+
]
108+
},
109+
"created_on": "2024-12-11T11:18:53.452472+00:00",
110+
"updated_on": "2024-12-11T11:18:53.452853+00:00",
111+
"deleted_on": null
112+
}
113+
]

‎src/etl/sds/tests/changelog/scenarios/message_handling_system/can_add_two_mhs_in_same_product_team_but_different_product/__init__.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
from etl.sds.tests.changelog.utils import (
2+
ADD_ANOTHER_MESSAGE_HANDLING_SYSTEM_IN_SAME_PRODUCT_TEAM,
3+
ADD_MESSAGE_HANDLING_SYSTEM,
4+
_Scenario,
5+
)
6+
7+
SCENARIO = _Scenario(
8+
file_path=__file__,
9+
extract_input=[
10+
ADD_MESSAGE_HANDLING_SYSTEM,
11+
ADD_ANOTHER_MESSAGE_HANDLING_SYSTEM_IN_SAME_PRODUCT_TEAM,
12+
],
13+
)

‎src/etl/sds/tests/changelog/scenarios/message_handling_system/can_add_two_mhs_in_same_product_team_but_different_product/extract_output.json‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
[
2+
{
3+
"change_type": "add",
4+
"nhs_approver_urp": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
5+
"nhs_contract_property_template_key": "14",
6+
"nhs_date_approved": "20231030092939",
7+
"nhs_date_dns_approved": "20231030092939",
8+
"nhs_date_requested": "20231030092906",
9+
"nhs_dns_approver": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
10+
"nhs_ep_interaction_type": "fhir",
11+
"nhs_id_code": "C3O9X",
12+
"nhs_mhs_ack_requested": null,
13+
"nhs_mhs_actor": null,
14+
"nhs_mhs_cpa_id": "00000a84594b2ef34279",
15+
"nhs_mhs_duplicate_elimination": null,
16+
"nhs_mhs_end_point": "https://test.C3O9X.nhs.uk/",
17+
"nhs_mhs_fqdn": "test.C3O9X.nhs.uk",
18+
"nhs_mhs_in": "READ_PRACTITIONER_ROLE_R4_V001",
19+
"nhs_mhs_ip_address": null,
20+
"nhs_mhs_is_authenticated": "none",
21+
"nhs_mhs_manufacturer_org": "C3O9X",
22+
"nhs_mhs_party_key": "C3O9X-823610",
23+
"nhs_mhs_persist_duration": null,
24+
"nhs_mhs_retries": null,
25+
"nhs_mhs_retry_interval": null,
26+
"nhs_mhs_service_description": null,
27+
"nhs_mhs_sn": "urn:nhs:names:services:ers",
28+
"nhs_mhs_svc_ia": "urn:nhs:names:services:ers:READ_PRACTITIONER_ROLE_R4_V001",
29+
"nhs_mhs_sync_reply_mode": null,
30+
"nhs_product_key": "11929",
31+
"nhs_product_name": null,
32+
"nhs_product_version": "Mar2023",
33+
"nhs_requestor_urp": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
34+
"object_class": "nhsMhs",
35+
"unique_identifier": "00000a84594b2ef34279"
36+
},
37+
{
38+
"change_type": "add",
39+
"nhs_approver_urp": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
40+
"nhs_contract_property_template_key": "14",
41+
"nhs_date_approved": "20231030092939",
42+
"nhs_date_dns_approved": "20231030092939",
43+
"nhs_date_requested": "20231030092906",
44+
"nhs_dns_approver": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
45+
"nhs_ep_interaction_type": "fhir",
46+
"nhs_id_code": "AAA",
47+
"nhs_mhs_ack_requested": null,
48+
"nhs_mhs_actor": null,
49+
"nhs_mhs_cpa_id": "123456",
50+
"nhs_mhs_duplicate_elimination": null,
51+
"nhs_mhs_end_point": "https://test.AAA.nhs.uk/",
52+
"nhs_mhs_fqdn": "test.AAA.nhs.uk",
53+
"nhs_mhs_in": "READ_PRACTITIONER_ROLE_R4_V002",
54+
"nhs_mhs_ip_address": null,
55+
"nhs_mhs_is_authenticated": "none",
56+
"nhs_mhs_manufacturer_org": "C3O9X",
57+
"nhs_mhs_party_key": "AAA-823610",
58+
"nhs_mhs_persist_duration": null,
59+
"nhs_mhs_retries": null,
60+
"nhs_mhs_retry_interval": null,
61+
"nhs_mhs_service_description": null,
62+
"nhs_mhs_sn": "urn:nhs:names:services:ers",
63+
"nhs_mhs_svc_ia": "urn:nhs:names:services:ers:READ_PRACTITIONER_ROLE_R4_V002",
64+
"nhs_mhs_sync_reply_mode": null,
65+
"nhs_product_key": "11929",
66+
"nhs_product_name": null,
67+
"nhs_product_version": "Mar2023",
68+
"nhs_requestor_urp": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
69+
"object_class": "nhsMhs",
70+
"unique_identifier": "123456"
71+
}
72+
]

0 commit comments

Comments
 (0)