Remove party key support from fhir models

Author: Vox-Ben

gateway-api/src/fhir/constants.py

@@ -11,5 +11,4 @@ class FHIRSystem(StrEnum):
     SDS_USER_ID = "https://fhir.nhs.uk/Id/sds-user-id"
     SDS_ROLE_PROFILE_ID = "https://fhir.nhs.uk/Id/sds-role-profile-id"
     NHS_SERVICE_INTERACTION_ID = "https://fhir.nhs.uk/Id/nhsServiceInteractionId"
-    NHS_MHS_PARTY_KEY = "https://fhir.nhs.uk/Id/nhsMhsPartyKey"
     NHS_SPINE_ASID = "https://fhir.nhs.uk/Id/nhsSpineASID"

gateway-api/src/fhir/r4/__init__.py

@@ -4,7 +4,6 @@
 from .elements.identifier import (
     ASIDIdentifier,
     OrganizationIdentifier,
-    PartyKeyIdentifier,
     PatientIdentifier,
     UUIDIdentifier,
 )
@@ -25,7 +24,6 @@
     "GeneralPractitioner",
     "OrganizationIdentifier",
     "Organization",
-    "PartyKeyIdentifier",
     "Patient",
     "PatientIdentifier",
     "Practitioner",

gateway-api/src/fhir/r4/elements/identifier.py

@@ -33,12 +33,6 @@ class ASIDIdentifier(Identifier, expected_system="https://fhir.nhs.uk/Id/nhsSpin
     """A FHIR R4 ASID Identifier."""
 
 
-class PartyKeyIdentifier(
-    Identifier, expected_system="https://fhir.nhs.uk/Id/nhsMhsPartyKey"
-):
-    """A FHIR R4 Party Key Identifier."""
-
-
 class AgnosticDeviceIdentifier(Identifier, expected_system="__unknown__"):
     """TODO [GPCAPIM-358]: define system once JWT Device details are understood."""
 

gateway-api/src/fhir/r4/resources/device.py

@@ -7,7 +7,6 @@
 from ..elements.identifier import (
     AgnosticDeviceIdentifier,
     ASIDIdentifier,
-    PartyKeyIdentifier,
 )
 
 
@@ -17,6 +16,6 @@ class Device(Resource, resource_type="Device"):
     model_config = ConfigDict(extra="allow")
 
     identifier: Annotated[
-        list[ASIDIdentifier | PartyKeyIdentifier | AgnosticDeviceIdentifier],
+        list[ASIDIdentifier | AgnosticDeviceIdentifier],
         Field(frozen=True, min_length=1),
     ]

gateway-api/src/fhir/r4/resources/test_resources.py

@@ -12,7 +12,6 @@
     Entry,
     GeneralPractitioner,
     OrganizationIdentifier,
-    PartyKeyIdentifier,
     Patient,
     PatientIdentifier,
     Practitioner,
@@ -375,46 +374,11 @@ def test_create_with_asid_identifier(self) -> None:
             "identifier value should match"
         )
 
-    def test_create_with_party_key_identifier(self) -> None:
-        device = Device.create(
-            identifier=[
-                PartyKeyIdentifier(
-                    system="https://fhir.nhs.uk/Id/nhsMhsPartyKey",
-                    value="P12345-000001",
-                )
-            ],
-        )
-
-        assert device.identifier[0].system == "https://fhir.nhs.uk/Id/nhsMhsPartyKey", (
-            "system should match the party key URI"
-        )
-
-    def test_create_with_mixed_identifiers(self) -> None:
-        device = Device.create(
-            identifier=[
-                ASIDIdentifier(
-                    system="https://fhir.nhs.uk/Id/nhsSpineASID",
-                    value="123",
-                ),
-                PartyKeyIdentifier(
-                    system="https://fhir.nhs.uk/Id/nhsMhsPartyKey",
-                    value="PK-1",
-                ),
-            ],
-        )
-
-        assert len(device.identifier) == 2, "should have two identifiers"
-
     def test_asid_identifier_expected_system(self) -> None:
         assert ASIDIdentifier._expected_system == (
             "https://fhir.nhs.uk/Id/nhsSpineASID"
         ), "_expected_system should be the ASID URI"
 
-    def test_party_key_identifier_expected_system(self) -> None:
-        assert PartyKeyIdentifier._expected_system == (
-            "https://fhir.nhs.uk/Id/nhsMhsPartyKey"
-        ), "_expected_system should be the party key URI"
-
 
 class TestDeviceModelValidate:
     def test_valid_device(self) -> None: