[release/2024-11-27] fix-forward: fix up merge

Author: jaklinger

src/api/readDevice/tests/test_index.py

@@ -180,8 +180,8 @@ def test_index_mhs_device(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
@@ -206,6 +206,7 @@ def test_index_mhs_device(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)

src/api/tests/feature_tests/features/createDeviceMessageHandlingSystem.success.feature

@@ -70,15 +70,15 @@ Feature: Create MHS Device - success scenarios
     Then I receive a status code "200" with body
       | path                                                                      | value                                                                  |
       | id                                                                        | ${ note(device_id) }                                                   |
-      | name                                                                      | Product-MHS                                                            |
+      | name                                                                      | F5H1R-850000 - Message Handling System                                 |
       | status                                                                    | active                                                                 |
       | product_id                                                                | ${ note(product_id) }                                                  |
       | product_team_id                                                           | ${ note(product_team_id) }                                             |
       | ods_code                                                                  | F5H1R                                                                  |
       | created_on                                                                | << ignore >>                                                           |
       | updated_on                                                                | << ignore >>                                                           |
       | deleted_on                                                                | << ignore >>                                                           |
-      | keys.0.key_type                                                           | interaction_id                                                         |
+      | keys.0.key_type                                                           | cpa_id                                                                 |
       | keys.0.key_value                                                          | F5H1R-850000:urn:nhs:names:services:ers:READ_PRACTITIONER_ROLE_R4_V001 |
       | tags.0.0.0                                                                | ${ note(party_key_tag) }                                               |
       | tags.0.0.1                                                                | ${ note(party_key_tag_value) }                                         |
@@ -102,6 +102,7 @@ Feature: Create MHS Device - success scenarios
       | questionnaire_responses.spine_mhs/1.0.data.MHS Is Authenticated           | PERSISTENT                                                             |
       | questionnaire_responses.spine_mhs/1.0.data.Product Key                    | product-key-001                                                        |
       | questionnaire_responses.spine_mhs/1.0.data.Requestor URP                  | requestor-789                                                          |
+      | questionnaire_responses.spine_mhs/1.0.data.MHS Manufacturer Organisation  | AAA                                                                    |
       | questionnaire_responses.spine_mhs_message_sets/1.0.id                     | << ignore >>                                                           |
       | questionnaire_responses.spine_mhs_message_sets/1.0.questionnaire_name     | spine_mhs_message_sets                                                 |
       | questionnaire_responses.spine_mhs_message_sets/1.0.questionnaire_version  | 1                                                                      |
@@ -113,7 +114,7 @@ Feature: Create MHS Device - success scenarios
     And the response headers contain:
       | name           | value            |
       | Content-Type   | application/json |
-      | Content-Length | 1736             |
+      | Content-Length | 1776             |
 
     Examples:
       | product_team_id            | product_id            |

src/api/tests/feature_tests/features/readDevice.success.feature

@@ -133,20 +133,21 @@ 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 note the response field "$.id" as "device_id"
     When I make a "GET" request with "default" headers to "ProductTeam/<product_team_id>/Product/<product_id>/Device/${ note(device_id) }"
     Then I receive a status code "200" with body
       | path                    | value                                                                  |
       | id                      | ${ note(device_id) }                                                   |
-      | name                    | Product-MHS                                                            |
+      | name                    | F5H1R-850000 - Message Handling System                                 |
       | status                  | active                                                                 |
       | product_id              | ${ note(product_id) }                                                  |
       | product_team_id         | ${ note(product_team_id) }                                             |
       | ods_code                | F5H1R                                                                  |
       | created_on              | << ignore >>                                                           |
       | updated_on              | << ignore >>                                                           |
       | deleted_on              | << ignore >>                                                           |
-      | keys.0.key_type         | interaction_id                                                         |
+      | keys.0.key_type         | cpa_id                                                                 |
       | keys.0.key_value        | F5H1R-850000:urn:nhs:names:services:ers:READ_PRACTITIONER_ROLE_R4_V001 |
       | tags.0.0.0              | ${ note(party_key_tag) }                                               |
       | tags.0.0.1              | ${ note(party_key_tag_value) }                                         |
@@ -155,7 +156,7 @@ Feature: Read Device - success scenarios
     And the response headers contain:
       | name           | value            |
       | Content-Type   | application/json |
-      | Content-Length | 1717             |
+      | Content-Length | 1776             |
 
     Examples:
       | product_team_id            | product_id            |