maleo-identity 0.1.11__py3-none-any.whl → 0.1.24__py3-none-any.whl

maleo/identity/mixins/user_system_role.py

@@ -1,13 +1,24 @@
-from pydantic import Field
+from pydantic import BaseModel, Field
 from typing import Annotated, Literal, TypeGuard
 from uuid import UUID
 from maleo.schemas.mixins.identity import Identifier
-from ..enums.user_system_role import IdentifierType
-from ..types.user_system_role import CompositeIdentifier, IdentifierValueType
+from maleo.types.any import ManyAny
+from maleo.types.string import ManyStrs
+from ..enums.user_system_role import IdentifierType, OptListOfExpandableFields
+from ..types.user_system_role import CompositeIdentifierType, IdentifierValueType
+
+
+class Expand(BaseModel):
+    expand: Annotated[
+        OptListOfExpandableFields, Field(None, description="Expanded field(s)")
+    ] = None
 
 
 class UserSystemRoleIdentifier(Identifier[IdentifierType, IdentifierValueType]):
-    pass
+    @property
+    def columns_and_values(self) -> tuple[ManyStrs, ManyAny]:
+        values = self.value if isinstance(self.value, tuple) else (self.value,)
+        return self.type.columns, values
 
 
 class IdUserSystemRoleIdentifier(Identifier[Literal[IdentifierType.ID], int]):
@@ -26,13 +37,13 @@ class UUIDUserSystemRoleIdentifier(Identifier[Literal[IdentifierType.UUID], UUID
 
 
 class CompositeUserSystemRoleIdentifier(
-    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifier]
+    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifierType]
 ):
     type: Annotated[
         Literal[IdentifierType.COMPOSITE],
         Field(IdentifierType.COMPOSITE, description="Identifier's type"),
     ] = IdentifierType.COMPOSITE
-    value: Annotated[CompositeIdentifier, Field(..., description="Identifier's value")]
+    value: Annotated[CompositeIdentifierType, Field(..., description="Identifier's value")]
 
 
 AnyUserSystemRoleIdentifier = (

maleo/identity/schemas/api_key.py

@@ -1,4 +1,5 @@
-from typing import Literal, overload
+from pydantic import Field
+from typing import Annotated, Literal, overload
 from uuid import UUID
 from maleo.enums.status import (
     ListOfDataStatuses,
@@ -24,7 +25,7 @@ from maleo.types.integer import OptInt, OptListOfInts
 from maleo.types.uuid import OptListOfUUIDs
 from ..enums.api_key import IdentifierType
 from ..mixins.api_key import APIKeyIdentifier
-from ..types.api_key import CompositeIdentifier, IdentifierValueType
+from ..types.api_key import CompositeIdentifierType, IdentifierValueType
 
 
 class CreateParameter(
@@ -41,6 +42,13 @@ class ReadMultipleParameter(
     UUIDs[OptListOfUUIDs],
     Ids[OptListOfInts],
 ):
+    ids: Annotated[OptListOfInts, Field(None, description="Ids")] = None
+    uuids: Annotated[OptListOfUUIDs, Field(None, description="UUIDs")] = None
+    user_ids: Annotated[OptListOfInts, Field(None, description="User's IDs")] = None
+    organization_ids: Annotated[
+        OptListOfInts, Field(None, description="Organization's IDs")
+    ] = None
+
     @property
     def _query_param_fields(self) -> set[str]:
         return {
@@ -66,6 +74,15 @@ class ReadMultipleParameter(
 
 
 class ReadSingleParameter(BaseReadSingleParameter[APIKeyIdentifier]):
+    @classmethod
+    def from_identifier(
+        cls,
+        identifier: APIKeyIdentifier,
+        statuses: ListOfDataStatuses = FULL_DATA_STATUSES,
+        use_cache: bool = True,
+    ) -> "ReadSingleParameter":
+        return cls(identifier=identifier, statuses=statuses, use_cache=use_cache)
+
     @overload
     @classmethod
     def new(
@@ -89,7 +106,7 @@ class ReadSingleParameter(BaseReadSingleParameter[APIKeyIdentifier]):
     def new(
         cls,
         identifier_type: Literal[IdentifierType.COMPOSITE],
-        identifier_value: CompositeIdentifier,
+        identifier_value: CompositeIdentifierType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
     ) -> "ReadSingleParameter": ...
@@ -138,7 +155,7 @@ class DeleteSingleParameter(BaseDeleteSingleParameter[APIKeyIdentifier]):
     def new(
         cls,
         identifier_type: Literal[IdentifierType.COMPOSITE],
-        identifier_value: CompositeIdentifier,
+        identifier_value: CompositeIdentifierType,
     ) -> "DeleteSingleParameter": ...
     @overload
     @classmethod

maleo/identity/schemas/common.py

@@ -1,25 +1,37 @@
 from datetime import date
 from pydantic import BaseModel, Field
 from typing import Annotated, Generic, TypeVar, Type
-from maleo.enums.identity import (
-    OptBloodType,
-    BloodTypeMixin,
-    OptRhesus,
-    RhesusMixin,
-    Gender,
-    OptGender,
-    GenderMixin,
+from maleo.enums.identity import OptRhesus, RhesusMixin
+from maleo.enums.status import DataStatus as DataStatusEnum, SimpleDataStatusMixin
+from maleo.metadata.schemas.blood_type import (
+    OptKeyOrStandardSchema as BloodTypeOptKeyOrStandardSchema,
+    FullBloodTypeMixin,
+)
+from maleo.metadata.schemas.gender import (
+    OptKeyOrStandardSchema as GenderOptKeyOrStandardSchema,
+    KeyOrStandardSchema as GenderKeyOrStandardSchema,
+    FullGenderMixin,
+)
+from maleo.metadata.schemas.medical_role import (
+    KeyOrStandardSchema as MedicalRoleKeyOrStandardSchema,
+    FullMedicalRoleMixin,
 )
-from maleo.enums.medical import MedicalRole, FullMedicalRoleMixin
-from maleo.enums.organization import (
-    OrganizationRole,
+from maleo.metadata.schemas.organization_role import (
+    KeyOrStandardSchema as OrganizationRoleKeyOrStandardSchema,
     FullOrganizationRoleMixin,
-    OrganizationType,
+)
+from maleo.metadata.schemas.organization_type import (
+    KeyOrStandardSchema as OrganizationTypeKeyOrStandardSchema,
     FullOrganizationTypeMixin,
 )
-from maleo.enums.status import DataStatus as DataStatusEnum, SimpleDataStatusMixin
-from maleo.enums.system import SystemRole, FullSystemRoleMixin
-from maleo.enums.user import UserType, FullUserTypeMixin
+from maleo.metadata.schemas.system_role import (
+    KeyOrStandardSchema as SystemRoleKeyOrStandardSchema,
+    FullSystemRoleMixin,
+)
+from maleo.metadata.schemas.user_type import (
+    KeyOrStandardSchema as UserTypeKeyOrStandardSchema,
+    FullUserTypeMixin,
+)
 from maleo.schemas.mixins.identity import (
     DataIdentifier,
     IntOrganizationId,
@@ -62,12 +74,14 @@ class APIKeySchema(
 
 class PatientSchema(
     RhesusMixin[OptRhesus],
-    BloodTypeMixin[OptBloodType],
-    GenderMixin[Gender],
+    FullBloodTypeMixin[BloodTypeOptKeyOrStandardSchema],
+    FullGenderMixin[GenderKeyOrStandardSchema],
     DateOfBirth[date],
     PlaceOfBirth[OptStr],
     FullName[str],
     PatientIdentity,
+    IntOrganizationId[int],
+    IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
     LifecycleTimestamp,
     DataIdentifier,
@@ -99,7 +113,7 @@ class OrganizationRegistrationCodeSchemaMixin(BaseModel):
 class StandardOrganizationSchema(
     OrganizationName[str],
     OrganizationKey[str],
-    FullOrganizationTypeMixin[OrganizationType],
+    FullOrganizationTypeMixin[OrganizationTypeKeyOrStandardSchema],
     SimpleDataStatusMixin[DataStatusEnum],
     LifecycleTimestamp,
     DataIdentifier,
@@ -178,7 +192,7 @@ class OrganizationSchemaMixin(BaseModel, Generic[AnyOrganizationSchemaT]):
 
 
 class UserMedicalRoleSchema(
-    FullMedicalRoleMixin[MedicalRole],
+    FullMedicalRoleMixin[MedicalRoleKeyOrStandardSchema],
     IntOrganizationId[int],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
@@ -196,7 +210,7 @@ class UserMedicalRolesSchemaMixin(BaseModel):
 
 
 class UserOrganizationRoleSchema(
-    FullOrganizationRoleMixin[OrganizationRole],
+    FullOrganizationRoleMixin[OrganizationRoleKeyOrStandardSchema],
     IntOrganizationId[int],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
@@ -216,8 +230,8 @@ class UserOrganizationRolesSchemaMixin(BaseModel):
 class UserProfileSchema(
     AvatarUrl[OptStr],
     AvatarName[str],
-    BloodTypeMixin[OptBloodType],
-    GenderMixin[OptGender],
+    FullBloodTypeMixin[BloodTypeOptKeyOrStandardSchema],
+    FullGenderMixin[GenderOptKeyOrStandardSchema],
     BirthDate[OptDate],
     BirthPlace[OptStr],
     FullName[str],
@@ -245,7 +259,7 @@ class UserProfileSchemaMixin(BaseModel):
 
 
 class UserSystemRoleSchema(
-    FullSystemRoleMixin[SystemRole],
+    FullSystemRoleMixin[SystemRoleKeyOrStandardSchema],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
     LifecycleTimestamp,
@@ -270,7 +284,7 @@ class StandardUserSchema(
     Phone[str],
     Email[str],
     Username[str],
-    FullUserTypeMixin[UserType],
+    FullUserTypeMixin[UserTypeKeyOrStandardSchema],
     SimpleDataStatusMixin[DataStatusEnum],
     LifecycleTimestamp,
     DataIdentifier,

maleo/identity/schemas/organization.py

@@ -57,6 +57,14 @@ class ReadMultipleParameter(
     UUIDs[OptListOfUUIDs],
     Ids[OptListOfInts],
 ):
+    ids: Annotated[OptListOfInts, Field(None, description="Ids")] = None
+    uuids: Annotated[OptListOfUUIDs, Field(None, description="UUIDs")] = None
+    organization_types: Annotated[
+        OptListOfOrganizationTypes, Field(None, description="Organization Types")
+    ] = None
+    keys: Annotated[OptListOfStrs, Field(None, description="Keys")] = None
+    names: Annotated[OptListOfStrs, Field(None, description="Names")] = None
+
     @property
     def _query_param_fields(self) -> set[str]:
         return {
@@ -83,6 +91,15 @@ class ReadMultipleParameter(
 
 
 class ReadSingleParameter(BaseReadSingleParameter[OrganizationIdentifier]):
+    @classmethod
+    def from_identifier(
+        cls,
+        identifier: OrganizationIdentifier,
+        statuses: ListOfDataStatuses = FULL_DATA_STATUSES,
+        use_cache: bool = True,
+    ) -> "ReadSingleParameter":
+        return cls(identifier=identifier, statuses=statuses, use_cache=use_cache)
+
     @overload
     @classmethod
     def new(
@@ -110,6 +127,15 @@ class ReadSingleParameter(BaseReadSingleParameter[OrganizationIdentifier]):
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
     ) -> "ReadSingleParameter": ...
+    @overload
+    @classmethod
+    def new(
+        cls,
+        identifier_type: IdentifierType,
+        identifier_value: IdentifierValueType,
+        statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
+        use_cache: bool = True,
+    ) -> "ReadSingleParameter": ...
     @classmethod
     def new(
         cls,

maleo/identity/schemas/organization_registration_code.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field
-from typing import Generic, Literal, TypeVar, overload
+from typing import Annotated, Generic, Literal, TypeVar, overload
 from uuid import UUID
 from maleo.enums.status import (
     ListOfDataStatuses,
@@ -28,6 +28,7 @@ from maleo.types.string import OptStr, OptListOfStrs
 from maleo.types.uuid import OptListOfUUIDs
 from ..enums.organization_registration_code import IdentifierType
 from ..mixins.organization_registration_code import (
+    CodeOrLength,
     Code,
     MaxUses,
     OrganizationRegistrationCodeIdentifier,
@@ -35,7 +36,7 @@ from ..mixins.organization_registration_code import (
 from ..types.organization_registration_code import IdentifierValueType
 
 
-class StandardCreateData(Code[OptStr]):
+class StandardCreateData(CodeOrLength):
     pass
 
 
@@ -57,6 +58,13 @@ class ReadMultipleParameter(
     UUIDs[OptListOfUUIDs],
     Ids[OptListOfInts],
 ):
+    ids: Annotated[OptListOfInts, Field(None, description="Ids")] = None
+    uuids: Annotated[OptListOfUUIDs, Field(None, description="UUIDs")] = None
+    organization_ids: Annotated[
+        OptListOfInts, Field(None, description="Organization's IDs")
+    ] = None
+    codes: Annotated[OptListOfStrs, Field(None, description="Codes")] = None
+
     @property
     def _query_param_fields(self) -> set[str]:
         return {
@@ -84,6 +92,15 @@ class ReadMultipleParameter(
 class ReadSingleParameter(
     BaseReadSingleParameter[OrganizationRegistrationCodeIdentifier]
 ):
+    @classmethod
+    def from_identifier(
+        cls,
+        identifier: OrganizationRegistrationCodeIdentifier,
+        statuses: ListOfDataStatuses = FULL_DATA_STATUSES,
+        use_cache: bool = True,
+    ) -> "ReadSingleParameter":
+        return cls(identifier=identifier, statuses=statuses, use_cache=use_cache)
+
     @overload
     @classmethod
     def new(

maleo/identity/schemas/organization_relation.py

@@ -39,7 +39,7 @@ from ..mixins.organization_relation import (
     Meta,
     OrganizationRelationIdentifier,
 )
-from ..types.organization_relation import CompositeIdentifier, IdentifierValueType
+from ..types.organization_relation import CompositeIdentifierType, IdentifierValueType
 
 
 class CreateParameter(
@@ -62,6 +62,15 @@ class ReadMultipleParameter(
     UUIDs[OptListOfUUIDs],
     Ids[OptListOfInts],
 ):
+    ids: Annotated[OptListOfInts, Field(None, description="Ids")] = None
+    uuids: Annotated[OptListOfUUIDs, Field(None, description="UUIDs")] = None
+    source_ids: Annotated[OptListOfInts, Field(None, description="Source's IDs")] = None
+    target_ids: Annotated[OptListOfInts, Field(None, description="Target's IDs")] = None
+    relations: Annotated[
+        OptListOfOrganizationRelations,
+        Field(None, description="Organization Relations"),
+    ] = None
+
     @property
     def _query_param_fields(self) -> set[str]:
         return {
@@ -88,6 +97,15 @@ class ReadMultipleParameter(
 
 
 class ReadSingleParameter(BaseReadSingleParameter[OrganizationRelationIdentifier]):
+    @classmethod
+    def from_identifier(
+        cls,
+        identifier: OrganizationRelationIdentifier,
+        statuses: ListOfDataStatuses = FULL_DATA_STATUSES,
+        use_cache: bool = True,
+    ) -> "ReadSingleParameter":
+        return cls(identifier=identifier, statuses=statuses, use_cache=use_cache)
+
     @overload
     @classmethod
     def new(
@@ -111,7 +129,7 @@ class ReadSingleParameter(BaseReadSingleParameter[OrganizationRelationIdentifier
     def new(
         cls,
         identifier_type: Literal[IdentifierType.COMPOSITE],
-        identifier_value: CompositeIdentifier,
+        identifier_value: CompositeIdentifierType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
     ) -> "ReadSingleParameter": ...
@@ -187,7 +205,7 @@ class UpdateParameter(
     def new(
         cls,
         identifier_type: Literal[IdentifierType.COMPOSITE],
-        identifier_value: CompositeIdentifier,
+        identifier_value: CompositeIdentifierType,
         data: UpdateDataT,
     ) -> "UpdateParameter": ...
     @overload
@@ -237,7 +255,7 @@ class StatusUpdateParameter(
     def new(
         cls,
         identifier_type: Literal[IdentifierType.COMPOSITE],
-        identifier_value: CompositeIdentifier,
+        identifier_value: CompositeIdentifierType,
         type: ResourceOperationStatusUpdateType,
     ) -> "StatusUpdateParameter": ...
     @overload
@@ -279,7 +297,7 @@ class DeleteSingleParameter(BaseDeleteSingleParameter[OrganizationRelationIdenti
     def new(
         cls,
         identifier_type: Literal[IdentifierType.COMPOSITE],
-        identifier_value: CompositeIdentifier,
+        identifier_value: CompositeIdentifierType,
     ) -> "DeleteSingleParameter": ...
     @overload
     @classmethod

maleo/identity/schemas/patient.py

@@ -1,6 +1,6 @@
 from datetime import date
 from pydantic import BaseModel, Field
-from typing import Generic, Literal, TypeVar, overload
+from typing import Annotated, Generic, Literal, TypeVar, overload
 from uuid import UUID
 from maleo.enums.identity import (
     OptBloodType,
@@ -28,6 +28,8 @@ from maleo.schemas.mixins.identity import (
     UUIDs,
     FullNames,
     DateOfBirth,
+    IntUserId,
+    IntUserIds,
     IntOrganizationId,
     IntOrganizationIds,
 )
@@ -44,9 +46,9 @@ from maleo.types.dict import StrToAnyDict
 from maleo.types.integer import OptListOfInts
 from maleo.types.string import OptStr, OptListOfStrs
 from maleo.types.uuid import OptListOfUUIDs
-from ..enums.patient import IdentifierType
+from ..enums.patient import IdentifierType, OptListOfExpandableFields
 from ..mixins.common import IdCard, FullName, PlaceOfBirth
-from ..mixins.patient import PatientIdentity, PatientIdentifier
+from ..mixins.patient import PatientIdentity, PatientIdentifier, Expand
 from ..types.patient import IdentifierValueType
 
 
@@ -69,26 +71,42 @@ class FullCreateData(
     pass
 
 
-class CreateParameter(FullCreateData):
+class CreateParameter(Expand, FullCreateData, IntUserId[int]):
     pass
 
 
 class ReadMultipleParameter(
+    Expand,
     ReadPaginatedMultipleParameter,
     RhesusesMixin[OptListOfRhesuses],
     BloodTypesMixin[OptListOfBloodTypes],
     GendersMixin[OptListOfGenders],
     FullNames[OptListOfStrs],
     IntOrganizationIds[OptListOfInts],
+    IntUserIds[OptListOfInts],
     UUIDs[OptListOfUUIDs],
     Ids[OptListOfInts],
 ):
+    ids: Annotated[OptListOfInts, Field(None, description="Ids")] = None
+    uuids: Annotated[OptListOfUUIDs, Field(None, description="UUIDs")] = None
+    user_ids: Annotated[OptListOfInts, Field(None, description="User's IDs")] = None
+    organization_ids: Annotated[
+        OptListOfInts, Field(None, description="Organization's IDs")
+    ] = None
+    full_names: Annotated[OptListOfStrs, Field(None, description="Full Names")] = None
+    genders: Annotated[OptListOfGenders, Field(None, description="Genders")] = None
+    blood_types: Annotated[
+        OptListOfBloodTypes, Field(None, description="Blood Types")
+    ] = None
+    rhesuses: Annotated[OptListOfRhesuses, Field(None, description="Rhesuses")] = None
+
     @property
     def _query_param_fields(self) -> set[str]:
         return {
             "ids",
             "uuids",
             "statuses",
+            "user_ids",
             "organization_ids",
             "full_names",
             "genders",
@@ -98,6 +116,7 @@ class ReadMultipleParameter(
             "page",
             "limit",
             "use_cache",
+            "expand",
         }
 
     def to_query_params(self) -> StrToAnyDict:
@@ -110,7 +129,19 @@ class ReadMultipleParameter(
         return params
 
 
-class ReadSingleParameter(BaseReadSingleParameter[PatientIdentifier]):
+class ReadSingleParameter(Expand, BaseReadSingleParameter[PatientIdentifier]):
+    @classmethod
+    def from_identifier(
+        cls,
+        identifier: PatientIdentifier,
+        statuses: ListOfDataStatuses = FULL_DATA_STATUSES,
+        use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
+    ) -> "ReadSingleParameter":
+        return cls(
+            identifier=identifier, statuses=statuses, use_cache=use_cache, expand=expand
+        )
+
     @overload
     @classmethod
     def new(
@@ -119,6 +150,7 @@ class ReadSingleParameter(BaseReadSingleParameter[PatientIdentifier]):
         identifier_value: int,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -128,15 +160,17 @@ class ReadSingleParameter(BaseReadSingleParameter[PatientIdentifier]):
         identifier_value: UUID,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
     def new(
         cls,
-        identifier_type: Literal[IdentifierType.ID_CARD, IdentifierType.PASSPORT],
-        identifier_value: str,
+        identifier_type: IdentifierType,
+        identifier_value: IdentifierValueType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @classmethod
     def new(
@@ -145,6 +179,7 @@ class ReadSingleParameter(BaseReadSingleParameter[PatientIdentifier]):
         identifier_value: IdentifierValueType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter":
         return cls(
             identifier=PatientIdentifier(
@@ -153,11 +188,12 @@ class ReadSingleParameter(BaseReadSingleParameter[PatientIdentifier]):
             ),
             statuses=statuses,
             use_cache=use_cache,
+            expand=expand,
         )
 
     def to_query_params(self) -> StrToAnyDict:
         return self.model_dump(
-            mode="json", include={"statuses", "use_cache"}, exclude_none=True
+            mode="json", include={"statuses", "use_cache", "expand"}, exclude_none=True
         )
 
 
@@ -195,6 +231,7 @@ class UpdateDataMixin(BaseModel, Generic[UpdateDataT]):
 
 
 class UpdateParameter(
+    Expand,
     UpdateDataMixin[UpdateDataT],
     IdentifierMixin[PatientIdentifier],
     Generic[UpdateDataT],
@@ -206,6 +243,7 @@ class UpdateParameter(
         identifier_type: Literal[IdentifierType.ID],
         identifier_value: int,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
@@ -214,14 +252,7 @@ class UpdateParameter(
         identifier_type: Literal[IdentifierType.UUID],
         identifier_value: UUID,
         data: UpdateDataT,
-    ) -> "UpdateParameter": ...
-    @overload
-    @classmethod
-    def new(
-        cls,
-        identifier_type: Literal[IdentifierType.ID_CARD, IdentifierType.PASSPORT],
-        identifier_value: str,
-        data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
@@ -230,6 +261,7 @@ class UpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @classmethod
     def new(
@@ -237,14 +269,17 @@ class UpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter":
         return cls(
             identifier=PatientIdentifier(type=identifier_type, value=identifier_value),
             data=data,
+            expand=expand,
         )
 
 
 class StatusUpdateParameter(
+    Expand,
     BaseStatusUpdateParameter[PatientIdentifier],
 ):
     @overload
@@ -254,6 +289,7 @@ class StatusUpdateParameter(
         identifier_type: Literal[IdentifierType.ID],
         identifier_value: int,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
@@ -262,14 +298,7 @@ class StatusUpdateParameter(
         identifier_type: Literal[IdentifierType.UUID],
         identifier_value: UUID,
         type: ResourceOperationStatusUpdateType,
-    ) -> "StatusUpdateParameter": ...
-    @overload
-    @classmethod
-    def new(
-        cls,
-        identifier_type: Literal[IdentifierType.ID_CARD, IdentifierType.PASSPORT],
-        identifier_value: str,
-        type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
@@ -278,6 +307,7 @@ class StatusUpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @classmethod
     def new(
@@ -285,10 +315,12 @@ class StatusUpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter":
         return cls(
             identifier=PatientIdentifier(type=identifier_type, value=identifier_value),
             type=type,
+            expand=expand,
         )
 
 
@@ -305,13 +337,6 @@ class DeleteSingleParameter(BaseDeleteSingleParameter[PatientIdentifier]):
     ) -> "DeleteSingleParameter": ...
     @overload
     @classmethod
-    def new(
-        cls,
-        identifier_type: Literal[IdentifierType.ID_CARD, IdentifierType.PASSPORT],
-        identifier_value: str,
-    ) -> "DeleteSingleParameter": ...
-    @overload
-    @classmethod
     def new(
         cls, identifier_type: IdentifierType, identifier_value: IdentifierValueType
     ) -> "DeleteSingleParameter": ...