[feature/PI-618-bulk_etl] fix up tests after tag changes

NHSDigital · Dec 3, 2024 · 14008d5 · 14008d5
1 parent 44d1bf7
commit 14008d5
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 368 deletions.
diff --git a/src/layers/domain/api/sds/query.py b/src/layers/domain/api/sds/query.py
@@ -7,9 +7,9 @@ class SearchSDSDeviceQueryParams(BaseModel, extra=Extra.forbid):
     nhs_mhs_manufacturer_org: str = None
     nhs_mhs_party_key: str = None
 
-    @root_validator
-    def client_to_id(cls, values):
-        nhs_as_client = values.get("nhs_as_client")
+    @root_validator(pre=True)
+    def client_to_id(cls, values: dict):
+        nhs_as_client = values.pop("nhs_as_client", None)
         nhs_id_code = values.get("nhs_id_code")
         if nhs_as_client and not nhs_id_code:
             values["nhs_id_code"] = nhs_as_client

diff --git a/src/layers/domain/core/cpm_system_id/tests/test_cpm_system_id_v1.py b/src/layers/domain/core/cpm_system_id/tests/test_cpm_system_id_v1.py
@@ -19,7 +19,7 @@ def test_party_key_generator_validate_key_valid():
     [
         "ABC000124",  # Missing hyphen
         "ABC-1234",  # Number part too short
-        "ABC-1234567",  # Number part too long
+        "ABC-123456789101112",  # Number part too long
         "ABC-0001A4",  # Number part contains a non-digit character
         "",  # Empty string
     ],

diff --git a/src/layers/etl_utils/ldif/tests/test_ldif.py b/src/layers/etl_utils/ldif/tests/test_ldif.py
@@ -322,7 +322,7 @@
 myOtherField: 123
 """
 
-FILTERED_AND_GROUPED_LDIF_TO_FILTER_AND_GROUP_EXAMPLE = """
+FILTERED_AND_GROUPED_LDIF_TO_FILTER_AND_GROUP_EXAMPLE_BASE_64 = """
 dn: uniqueIdentifier=AAA1
 myField:: QUFB
 myOtherField: 123
@@ -453,7 +453,7 @@ def test_filter_and_group_ldif_from_s3_by_property_with_b64encoded_group(mocked_
         )
     assert (
         "".join(data.tobytes().decode() for data in filtered_ldif)
-        == FILTERED_AND_GROUPED_LDIF_TO_FILTER_AND_GROUP_EXAMPLE
+        == FILTERED_AND_GROUPED_LDIF_TO_FILTER_AND_GROUP_EXAMPLE_BASE_64
     )
 
 

diff --git a/src/layers/sds/epr/bulk_create/tests/conftest.py b/src/layers/sds/epr/bulk_create/tests/conftest.py
@@ -100,7 +100,7 @@ def accredited_system_2() -> NhsMhs:
         nhsrequestorurp="requester-456",
         nhsdaterequested="a week ago",
         nhsdateapproved="today",
-        nhsidcode="AAA",
+        nhsidcode="BBB",
         nhsmhspartykey="AAA-456789",
         nhsproductkey="key-123",
         nhsasclient={"ABC", "JKL", "LMN"},