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

maleo/identity/constants/user_profile.py

@@ -1,4 +1,5 @@
 from maleo.schemas.resource import Resource, ResourceIdentifier
+from maleo.types.string import SeqOfStrs
 
 
 USER_PROFILE_RESOURCE = Resource(
@@ -9,3 +10,17 @@ USER_PROFILE_RESOURCE = Resource(
     ],
     details=None,
 )
+
+
+VALID_EXTENSIONS: SeqOfStrs = (
+    ".jpeg",
+    ".jpg",
+    ".png",
+)
+
+
+VALID_MIME_TYPES: SeqOfStrs = (
+    "image/jpeg",
+    "image/jpg",
+    "image/png",
+)

maleo/identity/enums/organization_relation.py

@@ -20,3 +20,16 @@ class IdentifierType(StrEnum):
         elif self is IdentifierType.COMPOSITE:
             return ("source_id", "target_id", "relation")
         raise ValueError(f"Unknown column(s) for identifier type: {self}")
+
+
+class ExpandableField(StrEnum):
+    ORGANIZATION_TYPE = "organization_type"
+
+    @classmethod
+    def choices(cls) -> ListOfStrs:
+        return [e.value for e in cls]
+
+
+OptExpandableField = ExpandableField | None
+ListOfExpandableFields = list[ExpandableField]
+OptListOfExpandableFields = ListOfExpandableFields | None

maleo/identity/enums/user_profile.py

@@ -15,3 +15,17 @@ class IdentifierType(StrEnum):
     @property
     def column(self) -> str:
         return self.value
+
+
+class ExpandableField(StrEnum):
+    GENDER = "gender"
+    BLOOD_TYPE = "blood_type"
+
+    @classmethod
+    def choices(cls) -> ListOfStrs:
+        return [e.value for e in cls]
+
+
+OptExpandableField = ExpandableField | None
+ListOfExpandableFields = list[ExpandableField]
+OptListOfExpandableFields = ListOfExpandableFields | None

maleo/identity/mixins/api_key.py

@@ -41,7 +41,9 @@ class CompositeAPIKeyIdentifier(
         Literal[IdentifierType.COMPOSITE],
         Field(IdentifierType.COMPOSITE, description="Identifier's type"),
     ] = IdentifierType.COMPOSITE
-    value: Annotated[CompositeIdentifierType, Field(..., description="Identifier's value")]
+    value: Annotated[
+        CompositeIdentifierType, Field(..., description="Identifier's value")
+    ]
 
 
 AnyAPIKeyIdentifier = (

maleo/identity/mixins/organization_relation.py

@@ -6,7 +6,7 @@ from maleo.types.any import ManyAny
 from maleo.types.boolean import OptBoolT
 from maleo.types.misc import OptListOfAnyOrStrToAnyDict
 from maleo.types.string import ManyStrs
-from ..enums.organization_relation import IdentifierType
+from ..enums.organization_relation import IdentifierType, OptListOfExpandableFields
 from ..types.organization_relation import CompositeIdentifierType, IdentifierValueType
 
 
@@ -18,6 +18,12 @@ class Meta(BaseModel):
     meta: Annotated[OptListOfAnyOrStrToAnyDict, Field(None, description="Meta")] = None
 
 
+class Expand(BaseModel):
+    expand: Annotated[
+        OptListOfExpandableFields, Field(None, description="Expanded field(s)")
+    ] = None
+
+
 class OrganizationRelationIdentifier(Identifier[IdentifierType, IdentifierValueType]):
     @property
     def columns_and_values(self) -> tuple[ManyStrs, ManyAny]:
@@ -49,7 +55,9 @@ class CompositeOrganizationRelationIdentifier(
         Literal[IdentifierType.COMPOSITE],
         Field(IdentifierType.COMPOSITE, description="Identifier's type"),
     ] = IdentifierType.COMPOSITE
-    value: Annotated[CompositeIdentifierType, Field(..., description="Identifier's value")]
+    value: Annotated[
+        CompositeIdentifierType, Field(..., description="Identifier's value")
+    ]
 
 
 AnyOrganizationRelationIdentifier = (

maleo/identity/mixins/user_medical_role.py

@@ -37,7 +37,9 @@ class CompositeUserMedicalRoleIdentifier(
         Literal[IdentifierType.COMPOSITE],
         Field(IdentifierType.COMPOSITE, description="Identifier's type"),
     ] = IdentifierType.COMPOSITE
-    value: Annotated[CompositeIdentifierType, Field(..., description="Identifier's value")]
+    value: Annotated[
+        CompositeIdentifierType, Field(..., description="Identifier's value")
+    ]
 
 
 AnyUserMedicalRoleIdentifier = (

maleo/identity/mixins/user_organization_role.py

@@ -39,7 +39,9 @@ class CompositeUserOrganizationRoleIdentifier(
         Literal[IdentifierType.COMPOSITE],
         Field(IdentifierType.COMPOSITE, description="Identifier's type"),
     ] = IdentifierType.COMPOSITE
-    value: Annotated[CompositeIdentifierType, Field(..., description="Identifier's value")]
+    value: Annotated[
+        CompositeIdentifierType, Field(..., description="Identifier's value")
+    ]
 
 
 AnyUserOrganizationRoleIdentifier = (

maleo/identity/mixins/user_profile.py

@@ -3,7 +3,7 @@ from typing import Annotated, Generic, Literal, TypeGuard
 from uuid import UUID
 from maleo.schemas.mixins.identity import Identifier
 from maleo.types.string import OptStrT
-from ..enums.user_profile import IdentifierType
+from ..enums.user_profile import IdentifierType, OptListOfExpandableFields
 from ..types.user_profile import IdentifierValueType
 
 
@@ -37,6 +37,19 @@ class EndingTitle(BaseModel, Generic[OptStrT]):
     ]
 
 
+class Avatar(BaseModel):
+    content: Annotated[bytes, Field(..., description="Avatar's content")]
+    content_type: Annotated[str, Field(..., description="Avatar's content type")]
+    filename: Annotated[str, Field(..., description="Avatar's filename")]
+
+
+OptAvatar = Avatar | None
+
+
+class AvatarMixin(BaseModel):
+    avatar: Annotated[OptAvatar, Field(None, description="Avatar")]
+
+
 class AvatarName(BaseModel, Generic[OptStrT]):
     avatar_name: Annotated[OptStrT, Field(..., description="User's Avatar Name")]
 
@@ -45,6 +58,12 @@ class AvatarUrl(BaseModel, Generic[OptStrT]):
     avatar_url: Annotated[OptStrT, Field(..., description="User's Avatar URL")]
 
 
+class Expand(BaseModel):
+    expand: Annotated[
+        OptListOfExpandableFields, Field(None, description="Expanded field(s)")
+    ] = None
+
+
 class UserProfileIdentifier(Identifier[IdentifierType, IdentifierValueType]):
     @property
     def column_and_value(self) -> tuple[str, IdentifierValueType]:

maleo/identity/mixins/user_system_role.py

@@ -43,7 +43,9 @@ class CompositeUserSystemRoleIdentifier(
         Literal[IdentifierType.COMPOSITE],
         Field(IdentifierType.COMPOSITE, description="Identifier's type"),
     ] = IdentifierType.COMPOSITE
-    value: Annotated[CompositeIdentifierType, Field(..., description="Identifier's value")]
+    value: Annotated[
+        CompositeIdentifierType, Field(..., description="Identifier's value")
+    ]
 
 
 AnyUserSystemRoleIdentifier = (

maleo/identity/schemas/common.py

@@ -191,6 +191,18 @@ class OrganizationSchemaMixin(BaseModel, Generic[AnyOrganizationSchemaT]):
     ]
 
 
+class OrganizationRelationSchema(
+    Meta,
+    IsBidirectional[bool],
+    TargetOrganizationSchemaMixin,
+    SourceOrganizationSchemaMixin,
+    SimpleDataStatusMixin[DataStatusEnum],
+    LifecycleTimestamp,
+    DataIdentifier,
+):
+    pass
+
+
 class UserMedicalRoleSchema(
     FullMedicalRoleMixin[MedicalRoleKeyOrStandardSchema],
     IntOrganizationId[int],
@@ -246,7 +258,7 @@ class UserProfileSchema(
     LifecycleTimestamp,
     DataIdentifier,
 ):
-    pass
+    avatar_url: Annotated[OptStr, Field(None, description="Avatar URL")]
 
 
 OptUserProfileSchema = UserProfileSchema | None

maleo/identity/schemas/organization_relation.py

@@ -33,16 +33,18 @@ from maleo.types.boolean import OptBool
 from maleo.types.dict import StrToAnyDict
 from maleo.types.integer import OptListOfInts
 from maleo.types.uuid import OptListOfUUIDs
-from ..enums.organization_relation import IdentifierType
+from ..enums.organization_relation import IdentifierType, OptListOfExpandableFields
 from ..mixins.organization_relation import (
     IsBidirectional,
     Meta,
     OrganizationRelationIdentifier,
+    Expand,
 )
 from ..types.organization_relation import CompositeIdentifierType, IdentifierValueType
 
 
 class CreateParameter(
+    Expand,
     Meta,
     IsBidirectional[bool],
     SimpleOrganizationRelationMixin[OrganizationRelation],
@@ -55,8 +57,10 @@ class CreateParameter(
 
 
 class ReadMultipleParameter(
+    Expand,
     ReadPaginatedMultipleParameter,
     SimpleOrganizationRelationsMixin[OptListOfOrganizationRelations],
+    IsBidirectional[OptBool],
     IntTargetIds[OptListOfInts],
     IntSourceIds[OptListOfInts],
     UUIDs[OptListOfUUIDs],
@@ -66,6 +70,9 @@ class ReadMultipleParameter(
     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
+    is_bidirectional: Annotated[
+        OptBool, Field(None, description="Whether is bidirectional")
+    ] = None
     relations: Annotated[
         OptListOfOrganizationRelations,
         Field(None, description="Organization Relations"),
@@ -79,11 +86,13 @@ class ReadMultipleParameter(
             "statuses",
             "source_ids",
             "target_ids",
+            "is_bidirectional",
             "relations",
             "search",
             "page",
             "limit",
             "use_cache",
+            "expand",
         }
 
     def to_query_params(self) -> StrToAnyDict:
@@ -96,15 +105,20 @@ class ReadMultipleParameter(
         return params
 
 
-class ReadSingleParameter(BaseReadSingleParameter[OrganizationRelationIdentifier]):
+class ReadSingleParameter(
+    Expand, BaseReadSingleParameter[OrganizationRelationIdentifier]
+):
     @classmethod
     def from_identifier(
         cls,
         identifier: OrganizationRelationIdentifier,
         statuses: ListOfDataStatuses = FULL_DATA_STATUSES,
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter":
-        return cls(identifier=identifier, statuses=statuses, use_cache=use_cache)
+        return cls(
+            identifier=identifier, statuses=statuses, use_cache=use_cache, expand=expand
+        )
 
     @overload
     @classmethod
@@ -114,6 +128,7 @@ class ReadSingleParameter(BaseReadSingleParameter[OrganizationRelationIdentifier
         identifier_value: int,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -123,6 +138,7 @@ class ReadSingleParameter(BaseReadSingleParameter[OrganizationRelationIdentifier
         identifier_value: UUID,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -132,6 +148,7 @@ class ReadSingleParameter(BaseReadSingleParameter[OrganizationRelationIdentifier
         identifier_value: CompositeIdentifierType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -141,6 +158,7 @@ class ReadSingleParameter(BaseReadSingleParameter[OrganizationRelationIdentifier
         identifier_value: IdentifierValueType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @classmethod
     def new(
@@ -149,6 +167,7 @@ class ReadSingleParameter(BaseReadSingleParameter[OrganizationRelationIdentifier
         identifier_value: IdentifierValueType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter":
         return cls(
             identifier=OrganizationRelationIdentifier(
@@ -156,11 +175,12 @@ class ReadSingleParameter(BaseReadSingleParameter[OrganizationRelationIdentifier
             ),
             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
         )
 
 
@@ -180,6 +200,7 @@ class UpdateDataMixin(BaseModel, Generic[UpdateDataT]):
 
 
 class UpdateParameter(
+    Expand,
     UpdateDataMixin[UpdateDataT],
     IdentifierMixin[OrganizationRelationIdentifier],
     Generic[UpdateDataT],
@@ -191,6 +212,7 @@ class UpdateParameter(
         identifier_type: Literal[IdentifierType.ID],
         identifier_value: int,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
@@ -199,6 +221,7 @@ class UpdateParameter(
         identifier_type: Literal[IdentifierType.UUID],
         identifier_value: UUID,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
@@ -207,6 +230,7 @@ class UpdateParameter(
         identifier_type: Literal[IdentifierType.COMPOSITE],
         identifier_value: CompositeIdentifierType,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
@@ -215,6 +239,7 @@ class UpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @classmethod
     def new(
@@ -222,16 +247,19 @@ class UpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter":
         return cls(
             identifier=OrganizationRelationIdentifier(
                 type=identifier_type, value=identifier_value
             ),
             data=data,
+            expand=expand,
         )
 
 
 class StatusUpdateParameter(
+    Expand,
     BaseStatusUpdateParameter[OrganizationRelationIdentifier],
 ):
     @overload
@@ -241,6 +269,7 @@ class StatusUpdateParameter(
         identifier_type: Literal[IdentifierType.ID],
         identifier_value: int,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
@@ -249,6 +278,7 @@ class StatusUpdateParameter(
         identifier_type: Literal[IdentifierType.UUID],
         identifier_value: UUID,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
@@ -257,6 +287,7 @@ class StatusUpdateParameter(
         identifier_type: Literal[IdentifierType.COMPOSITE],
         identifier_value: CompositeIdentifierType,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
@@ -265,6 +296,7 @@ class StatusUpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @classmethod
     def new(
@@ -272,12 +304,14 @@ class StatusUpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter":
         return cls(
             identifier=OrganizationRelationIdentifier(
                 type=identifier_type, value=identifier_value
             ),
             type=type,
+            expand=expand,
         )
 
 

maleo/identity/schemas/user_profile.py

@@ -22,7 +22,6 @@ from maleo.schemas.mixins.identity import (
     UUIDs,
     IntUserId,
     IntUserIds,
-    IntOrganizationIds,
     BirthDate,
 )
 from maleo.schemas.mixins.sort import convert as convert_sort
@@ -38,10 +37,9 @@ from maleo.types.dict import StrToAnyDict
 from maleo.types.integer import OptListOfInts
 from maleo.types.string import OptStr
 from maleo.types.uuid import OptListOfUUIDs
-from ..enums.user_profile import IdentifierType
+from ..enums.user_profile import IdentifierType, OptListOfExpandableFields
 from ..mixins.common import (
     IdCard,
-    FullName,
     BirthPlace,
 )
 from ..mixins.user_profile import (
@@ -50,17 +48,20 @@ from ..mixins.user_profile import (
     MiddleName,
     LastName,
     EndingTitle,
+    AvatarMixin,
+    Expand,
     UserProfileIdentifier,
 )
 from ..types.user_profile import IdentifierValueType
 
 
 class CreateParameter(
+    Expand,
+    AvatarMixin,
     BloodTypeMixin[OptBloodType],
     GenderMixin[OptGender],
     BirthDate[OptDate],
     BirthPlace[OptStr],
-    FullName[str],
     EndingTitle[OptStr],
     LastName[str],
     MiddleName[OptStr],
@@ -73,20 +74,17 @@ class CreateParameter(
 
 
 class ReadMultipleParameter(
+    Expand,
     ReadPaginatedMultipleParameter,
     BloodTypesMixin[OptListOfBloodTypes],
     GendersMixin[OptListOfGenders],
+    IntUserIds[OptListOfInts],
     UUIDs[OptListOfUUIDs],
     Ids[OptListOfInts],
-    IntOrganizationIds[OptListOfInts],
-    IntUserIds[OptListOfInts],
 ):
-    user_ids: Annotated[OptListOfInts, Field(None, description="User's IDs")] = None
-    organization_ids: Annotated[
-        OptListOfInts, Field(None, description="Organization's IDs")
-    ] = None
     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
     genders: Annotated[OptListOfGenders, Field(None, description="Genders")] = None
     blood_types: Annotated[
         OptListOfBloodTypes, Field(None, description="Blood Types")
@@ -95,17 +93,17 @@ class ReadMultipleParameter(
     @property
     def _query_param_fields(self) -> set[str]:
         return {
-            "user_ids",
-            "organization_ids",
             "ids",
             "uuids",
             "statuses",
+            "user_ids",
             "genders",
             "blood_types",
             "search",
             "page",
             "limit",
             "use_cache",
+            "expand",
         }
 
     def to_query_params(self) -> StrToAnyDict:
@@ -118,15 +116,18 @@ class ReadMultipleParameter(
         return params
 
 
-class ReadSingleParameter(BaseReadSingleParameter[UserProfileIdentifier]):
+class ReadSingleParameter(Expand, BaseReadSingleParameter[UserProfileIdentifier]):
     @classmethod
     def from_identifier(
         cls,
         identifier: UserProfileIdentifier,
         statuses: ListOfDataStatuses = FULL_DATA_STATUSES,
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter":
-        return cls(identifier=identifier, statuses=statuses, use_cache=use_cache)
+        return cls(
+            identifier=identifier, statuses=statuses, use_cache=use_cache, expand=expand
+        )
 
     @overload
     @classmethod
@@ -136,6 +137,7 @@ class ReadSingleParameter(BaseReadSingleParameter[UserProfileIdentifier]):
         identifier_value: int,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -145,6 +147,7 @@ class ReadSingleParameter(BaseReadSingleParameter[UserProfileIdentifier]):
         identifier_value: UUID,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -154,6 +157,7 @@ class ReadSingleParameter(BaseReadSingleParameter[UserProfileIdentifier]):
         identifier_value: str,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -163,6 +167,7 @@ class ReadSingleParameter(BaseReadSingleParameter[UserProfileIdentifier]):
         identifier_value: IdentifierValueType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @classmethod
     def new(
@@ -171,6 +176,7 @@ class ReadSingleParameter(BaseReadSingleParameter[UserProfileIdentifier]):
         identifier_value: IdentifierValueType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter":
         return cls(
             identifier=UserProfileIdentifier(
@@ -179,15 +185,17 @@ class ReadSingleParameter(BaseReadSingleParameter[UserProfileIdentifier]):
             ),
             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
         )
 
 
 class FullUpdateData(
+    AvatarMixin,
     BloodTypeMixin[OptBloodType],
     GenderMixin[OptGender],
     BirthDate[OptDate],
@@ -203,6 +211,7 @@ class FullUpdateData(
 
 
 class PartialUpdateData(
+    AvatarMixin,
     BloodTypeMixin[OptBloodType],
     GenderMixin[OptGender],
     BirthDate[OptDate],
@@ -225,6 +234,7 @@ class UpdateDataMixin(BaseModel, Generic[UpdateDataT]):
 
 
 class UpdateParameter(
+    Expand,
     UpdateDataMixin[UpdateDataT],
     IdentifierMixin[UserProfileIdentifier],
     Generic[UpdateDataT],
@@ -236,6 +246,7 @@ class UpdateParameter(
         identifier_type: Literal[IdentifierType.ID, IdentifierType.USER_ID],
         identifier_value: int,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
@@ -244,6 +255,7 @@ class UpdateParameter(
         identifier_type: Literal[IdentifierType.UUID],
         identifier_value: UUID,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
@@ -252,6 +264,7 @@ class UpdateParameter(
         identifier_type: Literal[IdentifierType.ID_CARD],
         identifier_value: str,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
@@ -260,6 +273,7 @@ class UpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @classmethod
     def new(
@@ -267,16 +281,19 @@ class UpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter":
         return cls(
             identifier=UserProfileIdentifier(
                 type=identifier_type, value=identifier_value
             ),
             data=data,
+            expand=expand,
         )
 
 
 class StatusUpdateParameter(
+    Expand,
     BaseStatusUpdateParameter[UserProfileIdentifier],
 ):
     @overload
@@ -286,6 +303,7 @@ class StatusUpdateParameter(
         identifier_type: Literal[IdentifierType.ID, IdentifierType.USER_ID],
         identifier_value: int,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
@@ -294,6 +312,7 @@ class StatusUpdateParameter(
         identifier_type: Literal[IdentifierType.UUID],
         identifier_value: UUID,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
@@ -302,6 +321,7 @@ class StatusUpdateParameter(
         identifier_type: Literal[IdentifierType.ID_CARD],
         identifier_value: str,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
@@ -310,6 +330,7 @@ class StatusUpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @classmethod
     def new(
@@ -317,12 +338,14 @@ class StatusUpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter":
         return cls(
             identifier=UserProfileIdentifier(
                 type=identifier_type, value=identifier_value
             ),
             type=type,
+            expand=expand,
         )
 
 

maleo/identity/types/organization_relation.py

@@ -2,6 +2,6 @@ from typing import Tuple
 from uuid import UUID
 from maleo.enums.organization import OrganizationRelation
 
-
+BasicIdentifierType = int | UUID
 CompositeIdentifierType = Tuple[int, int, OrganizationRelation]
-IdentifierValueType = int | UUID | CompositeIdentifierType
+IdentifierValueType = BasicIdentifierType | CompositeIdentifierType

{maleo_identity-0.1.24.dist-info → maleo_identity-0.1.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo-identity
-Version: 0.1.24
+Version: 0.1.31
 Summary: MaleoIdentity service package
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: Proprietary

{maleo_identity-0.1.24.dist-info → maleo_identity-0.1.31.dist-info}/RECORD

@@ -8,48 +8,48 @@ maleo/identity/constants/patient.py,sha256=F_OP2yp67L34ygbvPV7GLhezWW7RV7KE7OZsO
 maleo/identity/constants/user.py,sha256=lIwXkUzbE6WtHc8RdHSmVa4BAVlLHtdUj2-l0TVY7EY,189
 maleo/identity/constants/user_medical_role.py,sha256=jxPDawhnauLBoWqJ1SW4p6nUkPASIJVYrHPcdTo_7qI,302
 maleo/identity/constants/user_organization_role.py,sha256=g7JTYhv6jih0QoF4-HrQmNf4DS3dnIVONTcQZgOONjI,322
-maleo/identity/constants/user_profile.py,sha256=qNox8XB8gQlVj2rnsTU8j59gLgLRINRQN0rcyVuEQAw,257
+maleo/identity/constants/user_profile.py,sha256=uPy2ptpH7EVTEyrx6WNIW8SwGJe71RK8YU24mMPNENg,459
 maleo/identity/constants/user_system_role.py,sha256=zc44fMwguNkErmHQ2P7I-L_KU__7PpX8ihdAyVKUx-Y,400
 maleo/identity/enums/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/identity/enums/api_key.py,sha256=twpkiI21x52roagXHJjq4vhMLv9WPGhWFtPM55LSZ-w,721
 maleo/identity/enums/organization.py,sha256=y9sLqKPx9iC2402MKY8GTZ0_WWNRJT5_rVQkG_CCgso,476
 maleo/identity/enums/organization_registration_code.py,sha256=Cz7ZIo2a1lTXko9rJLQerNP90qMvrvV7gSAKkGup418,352
-maleo/identity/enums/organization_relation.py,sha256=-GxBCzUi-PFrICnHqray2PtFZb6LoG7NluDmyjljOa8,628
+maleo/identity/enums/organization_relation.py,sha256=dENAiIZ2mSrAuCj2Vk3kcmBCBlLlGxiLTT-FoVPdHVU,949
 maleo/identity/enums/patient.py,sha256=gonmheVM5S99Wtddha7uJI4FzVOl9V0l1-ov1a-Kcqc,623
 maleo/identity/enums/user.py,sha256=Vv_5fHov_cPxKCcaxVeNNJgZL_wa2uewtr7w4smiVVU,506
 maleo/identity/enums/user_medical_role.py,sha256=KvPDu66wIh_sqvx0dyW38aTlCt5e_kRDcJ05Rk0rOd4,636
 maleo/identity/enums/user_organization_role.py,sha256=bV07sZYttbJPfefkp7u9Bkc4V1e3xsyhtErtpkXb-Xg,641
-maleo/identity/enums/user_profile.py,sha256=xYf5FNso2vjORZDSgLqwT5kb3P_1GtMZsR3utoAEgT8,342
+maleo/identity/enums/user_profile.py,sha256=WvlEnYqKxlImEgYARl-NvEkz3Zm-HLvHCbsXxoePjTI,671
 maleo/identity/enums/user_system_role.py,sha256=zINGAt5D1nZ95ddvLXrFZaO_2k15S5gc4S9jF8sZ72s,925
 maleo/identity/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo/identity/mixins/api_key.py,sha256=T5N-YKdDRrCQNaouZ3-FygzryzGmv9pDINq7sA60fys,2369
+maleo/identity/mixins/api_key.py,sha256=T-MupQfKe5ru_kO-AQ3JZ11aqK92lFOgsIUy2cJWoo8,2383
 maleo/identity/mixins/common.py,sha256=diWtUiPMI_ypHtDrmI5y8IArxCdomo9Gt6X69iFhyuw,905
 maleo/identity/mixins/organization.py,sha256=P_GW483KCK4_ds9Jm82RVXEszwGgSzq1PHQk0ykgghk,2556
 maleo/identity/mixins/organization_registration_code.py,sha256=t_OHVoJobjYyfOVwAw_I3nebIFgG-AodApmIhDCVYmM,4693
-maleo/identity/mixins/organization_relation.py,sha256=tkpJcQ5lhG5mwPa8ZJ9mYzYXaGKTFmVx34dsR7pG5PQ,2867
+maleo/identity/mixins/organization_relation.py,sha256=EGelkrwNo4qod-HbEESkefJ4qvBe6dqnHOLs7x1ElB4,3051
 maleo/identity/mixins/patient.py,sha256=unDmyazC5tyIsoXtAjMyWjAOOoxgMXa2DYfg6vZbLGI,2193
 maleo/identity/mixins/user.py,sha256=ShTtmt5mTSrJwbffnFePP7IXC08j2q1BKsAmV32YEiM,3537
-maleo/identity/mixins/user_medical_role.py,sha256=hdvJtQA9A2xA6LlDhdHMECdETCPtG5gJvmVquzRcAm4,2407
-maleo/identity/mixins/user_organization_role.py,sha256=3K7eZxRjEYhRTVvGGKYM8WQHpW0mFQO2x-_qqEDjrPc,2498
-maleo/identity/mixins/user_profile.py,sha256=fxKCS5N7fGEgOLWPeNry25nKsXDUrI9TB2nNbWb6Iyw,3813
-maleo/identity/mixins/user_system_role.py,sha256=Vi39Au-IT4y7tQ-dfsnv9FFTqhY2rCny91ohPai552Y,2571
+maleo/identity/mixins/user_medical_role.py,sha256=DHdh3-JMysspWUM2A7Yx-OFcUz-KxwGHvgLDQuRXv08,2421
+maleo/identity/mixins/user_organization_role.py,sha256=rU4Ci0iVqG4QFVRZM8PmCTgvDg5PqS2Ea-DSENYgj6Y,2512
+maleo/identity/mixins/user_profile.py,sha256=Bnc4JRrUfFbVYi7kqFZkh_ke1CoJehN3n5Ob8pDAE8g,4368
+maleo/identity/mixins/user_system_role.py,sha256=7L0C-sFCMzjUZYk2ZJZ6FLXJwvMO66KaYWODW1oFXAE,2585
 maleo/identity/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/identity/schemas/api_key.py,sha256=_JWrUwrRCqxTrcan-eKMegNVU1T46gERNcr8pNK_Y-U,5376
-maleo/identity/schemas/common.py,sha256=ijaLA6LQU8q0uw5qve0ksvuZMV6MKGv_CxbmofBiCh0,9046
+maleo/identity/schemas/common.py,sha256=ihLXhdRsPj1CvKZCla2sKdtatMklLKvJjH3u_QCVr7Q,9352
 maleo/identity/schemas/organization.py,sha256=0oVnuvB-E55AZ2h-PFoprY9wyyKi-xPLErXJW6yrBn8,9302
 maleo/identity/schemas/organization_registration_code.py,sha256=6LzKsIXt5DNQv1605dRsv2DmaonDLN36jgHyi9xxY-k,9192
-maleo/identity/schemas/organization_relation.py,sha256=9HGZypuhpK9egCHVDS1nh_lm5D0osxYM_4KmEEV8sHI,9487
+maleo/identity/schemas/organization_relation.py,sha256=gjMPoSOgF9liNMDjqI4VDbASHh8N2MQWxEb_BwX-ksg,10715
 maleo/identity/schemas/patient.py,sha256=qhycLtZfEDL8FWdT5GSe63so_9fdRXW_vAPNU0-kNi8,10222
 maleo/identity/schemas/user.py,sha256=y2X_2QckxrO2qWPYbn5RIMsK4MYgJU1V3huKTX3C7ds,9390
 maleo/identity/schemas/user_medical_role.py,sha256=zZdsRmty2InIthAvEgrXDWu7uv7Ez5dQ0XX86-JSE4E,9303
 maleo/identity/schemas/user_organization_role.py,sha256=r_9zEjL7tmDzSdsflf80qez2DgbGNEoueHCmM9wWOZo,9475
-maleo/identity/schemas/user_profile.py,sha256=9EgQ7Gi1kFAvgUrCsJ3I4SzZTRNJCUrX1Hkyp1t6Bgo,10165
+maleo/identity/schemas/user_profile.py,sha256=SqPYTMegEjMkxof5I9ezW2EJFBNO0sEDkJnCHxZX0rE,11035
 maleo/identity/schemas/user_system_role.py,sha256=89vucqAxQjjfe0CFd6Z76008de5JxnZb56Zi1GU-Y-A,10095
 maleo/identity/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/identity/types/api_key.py,sha256=dJ4dnw9xYwedJVmSlQhGJrDFlY91T7-2EibP5FI_-rM,198
 maleo/identity/types/organization.py,sha256=UqOBL4v138jumjQstCAZ-2ZV1Ax8-Cr4SvL36nx8brw,63
 maleo/identity/types/organization_registration_code.py,sha256=UqOBL4v138jumjQstCAZ-2ZV1Ax8-Cr4SvL36nx8brw,63
-maleo/identity/types/organization_relation.py,sha256=slyRLcaT1gatzXCufzawAspwM18KeuCBTND0c3tLzQc,230
+maleo/identity/types/organization_relation.py,sha256=PhBG7Ti8H5kDNDUBsRBoAU3TW8z575FZ3eZjFuz5jl0,271
 maleo/identity/types/patient.py,sha256=DJ-l-Ft2atX2oMzExo381PTSgdpVCtqBVSxZlmF_pCA,57
 maleo/identity/types/user.py,sha256=UqOBL4v138jumjQstCAZ-2ZV1Ax8-Cr4SvL36nx8brw,63
 maleo/identity/types/user_medical_role.py,sha256=xQohfQyK1D6ngjUUiJYfA5pMJaFYi7_nNmeuNvgMlMg,207
@@ -59,8 +59,8 @@ maleo/identity/types/user_system_role.py,sha256=9kNZ56HOMCdiT7fsT9uB2w0p8iQyfclY
 maleo/identity/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/identity/utils/organization.py,sha256=aEegzeoNLUptrScUB5kWrYlJj7dzTZeVXymltE5lWpE,874
 maleo/identity/utils/user.py,sha256=1pyfmAbXkAEOo6WM2KRA_kRnFi0O_A2ZUEqv01wY-cU,794
-maleo_identity-0.1.24.dist-info/licenses/LICENSE,sha256=aftGsecnk7TWVX-7KW94FqK4Syy6YSZ8PZEF7EcIp3M,2621
-maleo_identity-0.1.24.dist-info/METADATA,sha256=gsxFKe8h5zSZQ5UiwzW1NQ0yzNOmTusluJkHnaR-p7E,3584
-maleo_identity-0.1.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_identity-0.1.24.dist-info/top_level.txt,sha256=3Tpd1siVsfYoeI9FEOJNYnffx_shzZ3wsPpTvz5bljc,6
-maleo_identity-0.1.24.dist-info/RECORD,,
+maleo_identity-0.1.31.dist-info/licenses/LICENSE,sha256=aftGsecnk7TWVX-7KW94FqK4Syy6YSZ8PZEF7EcIp3M,2621
+maleo_identity-0.1.31.dist-info/METADATA,sha256=YyfKzAYa0fZOxztM48EgzA0nIc3_4Tgc2NLYJ8PqZvg,3584
+maleo_identity-0.1.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_identity-0.1.31.dist-info/top_level.txt,sha256=3Tpd1siVsfYoeI9FEOJNYnffx_shzZ3wsPpTvz5bljc,6
+maleo_identity-0.1.31.dist-info/RECORD,,