Rebase fixes

NHSDigital · Nov 27, 2024 · 4188a8d · 4188a8d
1 parent 5f18255
commit 4188a8d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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 |