From 4188a8d44457ea19a7190f3103ed809b16fa370e Mon Sep 17 00:00:00 2001 From: jameslinnell Date: Wed, 27 Nov 2024 19:51:18 +0000 Subject: [PATCH] Rebase fixes --- src/api/readDevice/tests/test_index.py | 6 ++++-- .../features/createDeviceAccreditedSystem.success.feature | 1 + .../tests/feature_tests/features/readDevice.success.feature | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/api/readDevice/tests/test_index.py b/src/api/readDevice/tests/test_index.py index d5994d8c8..2c7740342 100644 --- a/src/api/readDevice/tests/test_index.py +++ b/src/api/readDevice/tests/test_index.py @@ -337,8 +337,8 @@ def test_index_mhs_device_adjusted_data(version): # Set up Device in DB device: Device = cpm_product.create_device(name="Product-MHS") - device.add_key(key_type="interaction_id", key_value="F5H1R-850000:urn:foo") - device.add_key(key_type="interaction_id", key_value="F5H1R-850000:urn:foo2") + device.add_key(key_type="cpa_id", key_value="F5H1R-850000:urn:foo") + device.add_key(key_type="cpa_id", key_value="F5H1R-850000:urn:foo2") device.add_tag(party_key="f5h1r-850000") # set up spine mhs questionnaire response @@ -363,8 +363,10 @@ def test_index_mhs_device_adjusted_data(version): "MHS Is Authenticated": "PERSISTENT", "Product Key": "product-key-001", "Requestor URP": "requestor-789", + "MHS Manufacturer Organisation": "AAA", } ) + device.add_questionnaire_response(spine_mhs_questionnaire_response) device.add_device_reference_data_id( diff --git a/src/api/tests/feature_tests/features/createDeviceAccreditedSystem.success.feature b/src/api/tests/feature_tests/features/createDeviceAccreditedSystem.success.feature index 51b7089e5..e193c8dd9 100644 --- a/src/api/tests/feature_tests/features/createDeviceAccreditedSystem.success.feature +++ b/src/api/tests/feature_tests/features/createDeviceAccreditedSystem.success.feature @@ -31,6 +31,7 @@ Feature: Create AS Device - success scenarios | questionnaire_responses.spine_mhs.0.Address | http://example.com | | questionnaire_responses.spine_mhs.0.Unique Identifier | 123456 | | questionnaire_responses.spine_mhs.0.Managing Organization | Example Org | + | questionnaire_responses.spine_mhs.0.MHS Manufacturer Organisation | AAA | | questionnaire_responses.spine_mhs.0.MHS Party key | party-key-001 | | questionnaire_responses.spine_mhs.0.MHS CPA ID | cpa-id-001 | | questionnaire_responses.spine_mhs.0.Approver URP | approver-123 | diff --git a/src/api/tests/feature_tests/features/readDevice.success.feature b/src/api/tests/feature_tests/features/readDevice.success.feature index 045fbe8cc..fdbb69132 100644 --- a/src/api/tests/feature_tests/features/readDevice.success.feature +++ b/src/api/tests/feature_tests/features/readDevice.success.feature @@ -203,6 +203,7 @@ Feature: Read Device - success scenarios | questionnaire_responses.spine_mhs.0.MHS Is Authenticated | PERSISTENT | | questionnaire_responses.spine_mhs.0.Product Key | product-key-001 | | questionnaire_responses.spine_mhs.0.Requestor URP | requestor-789 | + | questionnaire_responses.spine_mhs.0.MHS Manufacturer Organisation | AAA | And I have already made a "POST" request with "default" headers to "ProductTeam/${ note(product_team_id) }/Product/${ note(product_id) }/DeviceReferenceData/AccreditedSystemsAdditionalInteractions" with body: | path | value | | questionnaire_responses.spine_as_additional_interactions.0.Interaction ID | urn:nhs:names:services:ers:READ_PRACTITIONER_ROLE_R4_V002 |