Merge branch 'feature/PI-606-changelog_add_an_mhs' into release/2024-12-16

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/_test_sds_etl_components.py

@@ -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.AnotherWithSameUniqueIdentifier.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/changelog_components/add/message_handling_system.ldif

@@ -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