[feature/PI-606-changelog_add_an_mhs] e2e update

Author: jaklinger

src/api/createDeviceMessageHandlingSystem/tests/test_index.py

@@ -23,7 +23,8 @@
     QuestionnaireRepository,
 )
 from event.json import json_loads
-from sds.epr.constants import MHS_DEVICE_SUFFIX, EprNameTemplate
+from sds.epr.constants import EprNameTemplate
+from sds.epr.utils import is_mhs_device
 
 from test_helpers.dynamodb import mock_table
 from test_helpers.uuid import consistent_uuid
@@ -210,7 +211,7 @@ def test_index() -> None:
         device = Device(**_device)
         assert device.product_team_id == product.product_team_id
         assert device.product_id == product.id
-        assert device.name.endswith(MHS_DEVICE_SUFFIX)
+        assert is_mhs_device(device)
         assert device.ods_code == ODS_CODE
         assert device.created_on.date() == datetime.today().date()
         assert device.updated_on.date() == datetime.today().date()

src/etl/sds/tests/changelog/changelog_components/add/message_handling_system.AnotherWithSameUniqueIdentifier.ldif

@@ -21,4 +21,5 @@ nhsMhsSvcIA: urn:nhs:names:services:ers:ABCDEFG
 nhsProductKey: 11929
 nhsProductVersion: Mar2023
 nhsRequestorURP: uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs
+nhsMhsManufacturerOrg: LSP04
 uniqueIdentifier: 00000a84594b2ef34279

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

@@ -21,4 +21,5 @@ nhsMhsSvcIA: urn:nhs:names:services:ers:READ_PRACTITIONER_ROLE_R4_V001
 nhsProductKey: 11929
 nhsProductVersion: Mar2023
 nhsRequestorURP: uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs
+nhsMhsManufacturerOrg: C3O9X
 uniqueIdentifier: 00000a84594b2ef34279

src/etl/sds/tests/changelog/conftest.py

@@ -81,11 +81,11 @@ def extract_handler(scenario: Scenario, s3_client: S3Client):
         {"ETL_BUCKET": ETL_BUCKET, "AWS_DEFAULT_REGION": "us-east-1"},
         clear=True,
     ):
-        from etl.sds.worker.extract import extract
+        from etl.sds.worker.update.extract_update import extract_update
 
-        extract.ENVIRONMENT = WorkerEnvironment.build()
-        extract.S3_CLIENT = s3_client
-        yield extract.handler
+        extract_update.ENVIRONMENT = WorkerEnvironment.build()
+        extract_update.S3_CLIENT = s3_client
+        yield extract_update.handler
 
 
 @pytest.fixture
@@ -97,7 +97,7 @@ def transform_handler(scenario: Scenario):
     os.environ["ETL_BUCKET"] = etl_bucket
     os.environ["TABLE_NAME"] = read_terraform_output("dynamodb_table_name.value")
 
-    from etl.sds.worker.transform_update import transform_update
+    from etl.sds.worker.update.transform_update import transform_update
 
     transform_update.S3_CLIENT.put_object(
         Bucket=etl_bucket,
@@ -122,7 +122,7 @@ def load_handler(scenario: Scenario):
     os.environ["ETL_BUCKET"] = read_terraform_output("sds_etl.value.bucket")
     os.environ["TABLE_NAME"] = read_terraform_output("dynamodb_table_name.value")
 
-    from etl.sds.worker.load_update import load_update
+    from etl.sds.worker.update.load_update import load_update
 
     yield load_update.handler
     os.environ = original_environ

src/etl/sds/tests/changelog/scenarios/message_handling_system/can_add_mhs/__init__.py

@@ -0,0 +1,8 @@
+from etl.sds.tests.changelog.utils import ADD_MESSAGE_HANDLING_SYSTEM, _Scenario
+
+SCENARIO = _Scenario(
+    file_path=__file__,
+    extract_input=[
+        ADD_MESSAGE_HANDLING_SYSTEM,
+    ],
+)

…n_add_optional_field/extract_output.json …g_system/can_add_mhs/extract_output.jsonsrc/etl/sds/tests/changelog/scenarios/message_handling_system/can_add_optional_field/extract_output.json renamed to src/etl/sds/tests/changelog/scenarios/message_handling_system/can_add_mhs/extract_output.json src/etl/sds/tests/changelog/scenarios/message_handling_system/can_add_optional_field/extract_output.json renamed to src/etl/sds/tests/changelog/scenarios/message_handling_system/can_add_mhs/extract_output.json

@@ -18,7 +18,7 @@
     "nhs_mhs_in": "READ_PRACTITIONER_ROLE_R4_V001",
     "nhs_mhs_ip_address": null,
     "nhs_mhs_is_authenticated": "none",
-    "nhs_mhs_manufacturer_org": null,
+    "nhs_mhs_manufacturer_org": "C3O9X",
     "nhs_mhs_party_key": "C3O9X-823610",
     "nhs_mhs_persist_duration": null,
     "nhs_mhs_retries": null,
@@ -33,11 +33,5 @@
     "nhs_requestor_urp": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
     "object_class": "nhsMhs",
     "unique_identifier": "00000a84594b2ef34279"
-  },
-  {
-    "change_type": "modify",
-    "modifications": [["add", "nhsmhsackrequested", ["never"]]],
-    "object_class": "modify",
-    "unique_identifier": "00000a84594b2ef34279"
   }
 ]

src/etl/sds/tests/changelog/scenarios/message_handling_system/can_add_mhs/load_output.json

@@ -0,0 +1,93 @@
+[
+  {
+    "id": "C3O9X.fe49c1d5-d9bc-4c2e-8e8d-54d8e2e88250",
+    "name": "C3O9X (EPR)",
+    "ods_code": "C3O9X",
+    "status": "active",
+    "created_on": "2024-12-11T11:18:53.365591+00:00",
+    "updated_on": null,
+    "deleted_on": null,
+    "keys": [{ "key_type": "epr_id", "key_value": "EPR-C3O9X" }]
+  },
+  {
+    "id": "P.9AN-PJG",
+    "product_team_id": "C3O9X.fe49c1d5-d9bc-4c2e-8e8d-54d8e2e88250",
+    "name": "00000a84594b2ef34279",
+    "ods_code": "C3O9X",
+    "status": "active",
+    "created_on": "2024-12-11T11:18:53.407960+00:00",
+    "updated_on": "2024-12-11T11:18:53.408432+00:00",
+    "deleted_on": null,
+    "keys": [{ "key_type": "party_key", "key_value": "C3O9X-823610" }]
+  },
+  {
+    "id": "fe15bd58-6897-4566-9a87-aab781fd96b5",
+    "name": "C3O9X-823610 - Message Handling System",
+    "status": "active",
+    "product_id": "P.9AN-PJG",
+    "product_team_id": "C3O9X.fe49c1d5-d9bc-4c2e-8e8d-54d8e2e88250",
+    "ods_code": "C3O9X",
+    "created_on": "2024-12-11T11:18:53.532840+00:00",
+    "updated_on": "2024-12-11T11:18:53.534066+00:00",
+    "deleted_on": null,
+    "keys": [{ "key_type": "cpa_id", "key_value": "00000a84594b2ef34279" }],
+    "tags": [],
+    "questionnaire_responses": {
+      "spine_mhs/1": [
+        {
+          "id": "07dacf01-359a-4276-9dd2-e11ecb07076a",
+          "questionnaire_name": "spine_mhs",
+          "questionnaire_version": "1",
+          "data": {
+            "Managing Organization": "C3O9X",
+            "Contract Property Template Key": "14",
+            "Interaction Type": "fhir",
+            "Address": "https://test.C3O9X.nhs.uk/",
+            "DNS Approver": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
+            "MHS Party key": "C3O9X-823610",
+            "Product Key": "11929",
+            "Date Approved": "20231030092939",
+            "Product Version": "Mar2023",
+            "Approver URP": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
+            "Date DNS Approved": "20231030092939",
+            "Requestor URP": "uniqueidentifier=555050304105,uniqueidentifier=555008548101,uid=555008545108,ou=people, o=nhs",
+            "MHS Is Authenticated": "none",
+            "MHS CPA ID": "00000a84594b2ef34279",
+            "Date Requested": "20231030092906",
+            "Unique Identifier": "00000a84594b2ef34279",
+            "MHS FQDN": "test.C3O9X.nhs.uk",
+            "MHS Manufacturer Organisation": "C3O9X"
+          },
+          "created_on": "2024-12-11T11:18:53.456536+00:00"
+        }
+      ]
+    },
+    "device_reference_data": { "68cd98db-5d8d-45dc-ba9a-09e892535d83": ["*"] }
+  },
+  {
+    "id": "68cd98db-5d8d-45dc-ba9a-09e892535d83",
+    "name": "C3O9X-823610 - MHS Message Sets",
+    "status": "active",
+    "product_id": "P.9AN-PJG",
+    "product_team_id": "C3O9X.fe49c1d5-d9bc-4c2e-8e8d-54d8e2e88250",
+    "ods_code": "C3O9X",
+    "questionnaire_responses": {
+      "spine_mhs_message_sets/1": [
+        {
+          "id": "2071f8ac-a020-4bf3-b413-c205004bfb08",
+          "questionnaire_name": "spine_mhs_message_sets",
+          "questionnaire_version": "1",
+          "data": {
+            "Interaction ID": "urn:nhs:names:services:ers:READ_PRACTITIONER_ROLE_R4_V001",
+            "MHS SN": "urn:nhs:names:services:ers",
+            "MHS IN": "READ_PRACTITIONER_ROLE_R4_V001"
+          },
+          "created_on": "2024-12-11T11:18:53.409854+00:00"
+        }
+      ]
+    },
+    "created_on": "2024-12-11T11:18:53.452472+00:00",
+    "updated_on": "2024-12-11T11:18:53.452853+00:00",
+    "deleted_on": null
+  }
+]