maleo-identity 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

maleo/identity/enums/organization.py

@@ -19,11 +19,3 @@ class IdentifierType(StrEnum):
     @classmethod
     def choices(cls) -> ListOfStrs:
         return [e.value for e in cls]
-
-
-class ExpandableField(StrEnum):
-    ORGANIZATION_TYPE = "organization_type"
-
-
-ListOfExpandableFields = list[ExpandableField]
-OptListOfExpandableFields = ListOfExpandableFields | None

maleo/identity/enums/patient.py

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

maleo/identity/enums/user.py

@@ -20,16 +20,3 @@ class IdentifierType(StrEnum):
     @classmethod
     def choices(cls) -> ListOfStrs:
         return [e.value for e in cls]
-
-
-class ExpandableField(StrEnum):
-    USER_TYPE = "user_type"
-    GENDER = "gender"
-    BLOOD_TYPE = "blood_type"
-    SYSTEM_ROLE = "system_role"
-    MEDICAL_ROLE = "medical_role"
-    ORGANIZATION_ROLE = "organization_role"
-
-
-ListOfExpandableFields = list[ExpandableField]
-OptListOfExpandableFields = ListOfExpandableFields | None

maleo/identity/enums/user_profile.py

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

maleo/identity/mixins/organization_relation.py

@@ -8,7 +8,5 @@ class IsBidirectional(BaseModel, Generic[OptBoolT]):
     is_bidirectional: Annotated[OptBoolT, Field(..., description="Is Bidirectional")]
 
 
-class Metadata(BaseModel):
-    metadata: Annotated[
-        OptListOfAnyOrStrToAnyDict, Field(None, description="Metadata")
-    ] = None
+class Meta(BaseModel):
+    meta: Annotated[OptListOfAnyOrStrToAnyDict, Field(None, description="Meta")] = None

maleo/identity/mixins/patient.py

@@ -1,8 +1,20 @@
-from pydantic import Field
-from typing import Annotated, Generic
+from pydantic import Field, model_validator
+from typing import Annotated, Generic, Self
 from maleo.schemas.mixins.identity import Passport as BasePassport
-from maleo.types.string import OptStrT
+from maleo.types.string import OptStr, OptStrT
+from .common import IdCard
 
 
 class Passport(BasePassport, Generic[OptStrT]):
     passport: Annotated[OptStrT, Field(..., description="Passport", max_length=9)]
+
+
+class PatientIdentifier(
+    Passport[OptStr],
+    IdCard[OptStr],
+):
+    @model_validator(mode="after")
+    def chk_id_card_or_passport(self) -> Self:
+        if self.id_card is None and self.passport is None:
+            raise ValueError("Either ID Card or Passport must exist")
+        return self

maleo/identity/schemas/common.py

@@ -1,37 +1,25 @@
 from datetime import date
-from pydantic import BaseModel, Field, model_validator
-from typing import Annotated, Generic, Self, TypeVar, Type
-from maleo.enums.identity import OptRhesus, RhesusMixin
-from maleo.metadata.schemas.organization_role import (
-    FullOrganizationRoleMixin,
-    KeyOrStandardSchema as KeyOrStandardOrganizationRoleSchema,
-)
-from maleo.enums.status import DataStatus as DataStatusEnum, SimpleDataStatusMixin
-from maleo.metadata.schemas.blood_type import (
-    FullBloodTypeMixin,
-    OptKeyOrStandardSchema as OptKeyOrStandardBloodTypeSchema,
+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.metadata.schemas.gender import (
-    FullGenderMixin,
-    KeyOrStandardSchema as KeyOrStandardGenderSchema,
-    OptKeyOrStandardSchema as OptKeyOrStandardGenderSchema,
-)
-from maleo.metadata.schemas.medical_role import (
-    FullMedicalRoleMixin,
-    KeyOrStandardSchema as KeyOrStandardMedicalRoleSchema,
-)
-from maleo.metadata.schemas.organization_type import (
+from maleo.enums.medical import MedicalRole, FullMedicalRoleMixin
+from maleo.enums.organization import (
+    OrganizationRole,
+    FullOrganizationRoleMixin,
+    OrganizationType,
     FullOrganizationTypeMixin,
-    KeyOrStandardSchema as KeyOrStandardOrganizationTypeSchema,
-)
-from maleo.metadata.schemas.system_role import (
-    FullSystemRoleMixin,
-    KeyOrStandardSchema as KeyOrStandardSystemRoleSchema,
-)
-from maleo.metadata.schemas.user_type import (
-    FullUserTypeMixin,
-    KeyOrStandardSchema as KeyOrStandardUserTypeSchema,
 )
+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.schemas.mixins.identity import (
     DataIdentifier,
     IntOrganizationId,
@@ -39,26 +27,26 @@ from maleo.schemas.mixins.identity import (
     BirthDate,
     DateOfBirth,
 )
-from maleo.schemas.mixins.timestamp import DataTimestamp
+from maleo.schemas.mixins.timestamp import LifecycleTimestamp
 from maleo.types.datetime import OptDate
 from maleo.types.integer import OptInt
 from maleo.types.string import OptStr
 from ..mixins.common import IdCard, FullName, BirthPlace, PlaceOfBirth
 from ..mixins.api_key import APIKey
 from ..mixins.organization_registration_code import Code, MaxUses, CurrentUses
-from ..mixins.organization_relation import IsBidirectional, Metadata
+from ..mixins.organization_relation import IsBidirectional, Meta
 from ..mixins.organization import Key as OrganizationKey, Name as OrganizationName
-from ..mixins.patient import Passport
+from ..mixins.patient import PatientIdentifier
 from ..mixins.user_profile import (
     LeadingTitle,
     FirstName,
     MiddleName,
     LastName,
     EndingTitle,
+    AvatarName,
     AvatarUrl,
 )
 from ..mixins.user import Username, Email, Phone
-from ..validators.patient import validate_id_card_or_passport
 
 
 class APIKeySchema(
@@ -66,7 +54,7 @@ class APIKeySchema(
     IntOrganizationId[OptInt],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -74,22 +62,17 @@ class APIKeySchema(
 
 class PatientSchema(
     RhesusMixin[OptRhesus],
-    FullBloodTypeMixin[OptKeyOrStandardBloodTypeSchema],
-    FullGenderMixin[KeyOrStandardGenderSchema],
+    BloodTypeMixin[OptBloodType],
+    GenderMixin[Gender],
     DateOfBirth[date],
     PlaceOfBirth[OptStr],
     FullName[str],
-    Passport[OptStr],
-    IdCard[OptStr],
-    IntOrganizationId[int],
+    PatientIdentifier,
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
-    @model_validator(mode="after")
-    def chk_id_card_or_passport(self) -> Self:
-        validate_id_card_or_passport(self.id_card, self.passport)
-        return self
+    pass
 
 
 class OrganizationRegistrationCodeSchema(
@@ -98,7 +81,7 @@ class OrganizationRegistrationCodeSchema(
     Code[str],
     IntOrganizationId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -117,9 +100,9 @@ class OrganizationRegistrationCodeSchemaMixin(BaseModel):
 class StandardOrganizationSchema(
     OrganizationName[str],
     OrganizationKey[str],
-    FullOrganizationTypeMixin[KeyOrStandardOrganizationTypeSchema],
+    FullOrganizationTypeMixin[OrganizationType],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -132,11 +115,11 @@ class SourceOrganizationSchemaMixin(BaseModel):
 
 
 class SourceOrganizationRelationSchema(
-    Metadata,
+    Meta,
     IsBidirectional[bool],
     SourceOrganizationSchemaMixin,
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -156,11 +139,11 @@ class TargetOrganizationSchemaMixin(BaseModel):
 
 
 class TargetOrganizationRelationSchema(
-    Metadata,
+    Meta,
     IsBidirectional[bool],
     TargetOrganizationSchemaMixin,
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -196,11 +179,11 @@ class OrganizationSchemaMixin(BaseModel, Generic[AnyOrganizationSchemaT]):
 
 
 class UserMedicalRoleSchema(
-    FullMedicalRoleMixin[KeyOrStandardMedicalRoleSchema],
+    FullMedicalRoleMixin[MedicalRole],
     IntOrganizationId[int],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -214,11 +197,11 @@ class UserMedicalRolesSchemaMixin(BaseModel):
 
 
 class UserOrganizationRoleSchema(
-    FullOrganizationRoleMixin[KeyOrStandardOrganizationRoleSchema],
+    FullOrganizationRoleMixin[OrganizationRole],
     IntOrganizationId[int],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -232,9 +215,10 @@ class UserOrganizationRolesSchemaMixin(BaseModel):
 
 
 class UserProfileSchema(
-    AvatarUrl[str],
-    FullBloodTypeMixin[OptKeyOrStandardBloodTypeSchema],
-    FullGenderMixin[OptKeyOrStandardGenderSchema],
+    AvatarUrl[OptStr],
+    AvatarName[str],
+    BloodTypeMixin[OptBloodType],
+    GenderMixin[OptGender],
     BirthDate[OptDate],
     BirthPlace[OptStr],
     FullName[str],
@@ -246,7 +230,7 @@ class UserProfileSchema(
     IdCard[OptStr],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -262,10 +246,10 @@ class UserProfileSchemaMixin(BaseModel):
 
 
 class UserSystemRoleSchema(
-    FullSystemRoleMixin[KeyOrStandardSystemRoleSchema],
+    FullSystemRoleMixin[SystemRole],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -287,9 +271,9 @@ class StandardUserSchema(
     Phone[str],
     Email[str],
     Username[str],
-    FullUserTypeMixin[KeyOrStandardUserTypeSchema],
+    FullUserTypeMixin[UserType],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -300,7 +284,7 @@ class UserOrganizationSchema(
     UserOrganizationRolesSchemaMixin,
     OrganizationSchemaMixin[StandardOrganizationSchema],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -332,7 +316,7 @@ class UserAndOrganizationSchema(
     OrganizationSchemaMixin[StandardOrganizationSchema],
     UserSchemaMixin[StandardUserSchema],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass

maleo/identity/schemas/organization.py

@@ -32,38 +32,23 @@ from maleo.types.dict import StrToAnyDict
 from maleo.types.integer import OptInt, OptListOfInts
 from maleo.types.string import OptStr, OptListOfStrs
 from maleo.types.uuid import OptListOfUUIDs
-from ..enums.organization import IdentifierType, OptListOfExpandableFields
+from ..enums.organization import IdentifierType
 from ..mixins.organization import Key, Name
 from ..types.organization import IdentifierValueType
 
 
-class Expand(BaseModel):
-    expand: Annotated[
-        OptListOfExpandableFields, Field(None, description="Expand", min_length=1)
-    ] = None
-
-
-class CreateQuery(Expand):
-    pass
-
-
 class InsertData(Name[str], Key[str], FullOrganizationTypeMixin[OrganizationType]):
     pass
 
 
-class CreateData(InsertData):
+class CreateParameter(InsertData):
     related_to: Annotated[OptInt, Field(None, description="Related to", ge=1)] = None
     relation: Annotated[
         OptOrganizationRelation, Field(None, description="Relation")
     ] = None
 
 
-class CreateParameter(CreateQuery, CreateData):
-    pass
-
-
 class ReadMultipleParameter(
-    Expand,
     ReadPaginatedMultipleParameter,
     Names[OptListOfStrs],
     Keys[OptListOfStrs],
@@ -84,7 +69,6 @@ class ReadMultipleParameter(
             "page",
             "limit",
             "use_cache",
-            "expand",
         }
 
     def to_query_params(self) -> StrToAnyDict:
@@ -97,9 +81,7 @@ class ReadMultipleParameter(
         return params
 
 
-class ReadSingleParameter(
-    Expand, BaseReadSingleParameter[IdentifierType, IdentifierValueType]
-):
+class ReadSingleParameter(BaseReadSingleParameter[IdentifierType, IdentifierValueType]):
     @overload
     @classmethod
     def new(
@@ -108,7 +90,6 @@ class ReadSingleParameter(
         identifier_value: int,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
-        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -118,7 +99,6 @@ class ReadSingleParameter(
         identifier_value: UUID,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
-        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -128,7 +108,6 @@ class ReadSingleParameter(
         identifier_value: str,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
-        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @classmethod
     def new(
@@ -137,19 +116,17 @@ class ReadSingleParameter(
         identifier_value: IdentifierValueType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
-        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter":
         return cls(
             identifier_type=identifier_type,
             identifier_value=identifier_value,
             statuses=statuses,
             use_cache=use_cache,
-            expand=expand,
         )
 
     def to_query_params(self) -> StrToAnyDict:
         return self.model_dump(
-            mode="json", include={"statuses", "use_cache", "expand"}, exclude_none=True
+            mode="json", include={"statuses", "use_cache"}, exclude_none=True
         )
 
 
@@ -171,7 +148,6 @@ class UpdateDataMixin(BaseModel, Generic[UpdateDataT]):
 
 
 class UpdateParameter(
-    Expand,
     UpdateDataMixin[UpdateDataT],
     IdentifierTypeValue[
         IdentifierType,
@@ -183,7 +159,6 @@ class UpdateParameter(
 
 
 class StatusUpdateParameter(
-    Expand,
     BaseStatusUpdateParameter[IdentifierType, IdentifierValueType],
 ):
     pass

maleo/identity/schemas/organization_relation.py

@@ -33,12 +33,12 @@ 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 ..mixins.organization_relation import IsBidirectional, Metadata
+from ..mixins.organization_relation import IsBidirectional, Meta
 from ..types.organization_relation import IdentifierValueType
 
 
 class CreateParameter(
-    Metadata,
+    Meta,
     IsBidirectional[bool],
     SimpleOrganizationRelationMixin[OrganizationRelation],
     IntTargetId[int],
@@ -140,11 +140,11 @@ class ReadSingleParameter(BaseReadSingleParameter[IdentifierType, IdentifierValu
         )
 
 
-class FullUpdateData(Metadata, IsBidirectional[bool]):
+class FullUpdateData(Meta, IsBidirectional[bool]):
     pass
 
 
-class PartialUpdateData(Metadata, IsBidirectional[OptBool]):
+class PartialUpdateData(Meta, IsBidirectional[OptBool]):
     pass
 
 

maleo/identity/schemas/patient.py

@@ -1,6 +1,6 @@
 from datetime import date
-from pydantic import BaseModel, Field, model_validator
-from typing import Annotated, Generic, Literal, Self, TypeVar, overload
+from pydantic import BaseModel, Field
+from typing import Generic, Literal, TypeVar, overload
 from uuid import UUID
 from maleo.enums.identity import (
     OptBloodType,
@@ -43,46 +43,26 @@ 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, OptListOfExpandableFields
+from ..enums.patient import IdentifierType
 from ..mixins.common import IdCard, FullName, PlaceOfBirth
-from ..mixins.patient import Passport
+from ..mixins.patient import PatientIdentifier
 from ..types.patient import IdentifierValueType
-from ..validators.patient import validate_id_card_or_passport
 
 
-class Expand(BaseModel):
-    expand: Annotated[
-        OptListOfExpandableFields, Field(None, description="Expand", min_length=1)
-    ] = None
-
-
-class CreateQuery(Expand):
-    pass
-
-
-class CreateData(
+class CreateParameter(
     RhesusMixin[OptRhesus],
     BloodTypeMixin[OptBloodType],
     GenderMixin[Gender],
     DateOfBirth[date],
     PlaceOfBirth[OptStr],
     FullName[str],
-    Passport[OptStr],
-    IdCard[OptStr],
+    PatientIdentifier,
     IntOrganizationId[int],
 ):
-    @model_validator(mode="after")
-    def chk_id_card_or_passport(self) -> Self:
-        validate_id_card_or_passport(self.id_card, self.passport)
-        return self
-
-
-class CreateParameter(CreateQuery, CreateData):
     pass
 
 
 class ReadMultipleParameter(
-    Expand,
     ReadPaginatedMultipleParameter,
     RhesusesMixin[OptListOfRhesuses],
     BloodTypesMixin[OptListOfBloodTypes],
@@ -120,9 +100,7 @@ class ReadMultipleParameter(
         return params
 
 
-class ReadSingleParameter(
-    Expand, BaseReadSingleParameter[IdentifierType, IdentifierValueType]
-):
+class ReadSingleParameter(BaseReadSingleParameter[IdentifierType, IdentifierValueType]):
     @overload
     @classmethod
     def new(
@@ -131,7 +109,6 @@ class ReadSingleParameter(
         identifier_value: int,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
-        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -141,7 +118,6 @@ class ReadSingleParameter(
         identifier_value: UUID,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
-        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -151,7 +127,6 @@ class ReadSingleParameter(
         identifier_value: str,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
-        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @classmethod
     def new(
@@ -160,19 +135,17 @@ class ReadSingleParameter(
         identifier_value: IdentifierValueType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
-        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter":
         return cls(
             identifier_type=identifier_type,
             identifier_value=identifier_value,
             statuses=statuses,
             use_cache=use_cache,
-            expand=expand,
         )
 
     def to_query_params(self) -> StrToAnyDict:
         return self.model_dump(
-            mode="json", include={"statuses", "use_cache", "expand"}, exclude_none=True
+            mode="json", include={"statuses", "use_cache"}, exclude_none=True
         )
 
 
@@ -183,7 +156,7 @@ class FullUpdateData(
     DateOfBirth[date],
     PlaceOfBirth[OptStr],
     FullName[str],
-    Passport[OptStr],
+    PatientIdentifier,
     IdCard[OptStr],
 ):
     pass
@@ -196,7 +169,7 @@ class PartialUpdateData(
     DateOfBirth[OptDate],
     PlaceOfBirth[OptStr],
     FullName[OptStr],
-    Passport[OptStr],
+    PatientIdentifier,
     IdCard[OptStr],
 ):
     pass
@@ -210,7 +183,6 @@ class UpdateDataMixin(BaseModel, Generic[UpdateDataT]):
 
 
 class UpdateParameter(
-    Expand,
     UpdateDataMixin[UpdateDataT],
     IdentifierTypeValue[
         IdentifierType,
@@ -222,7 +194,6 @@ class UpdateParameter(
 
 
 class StatusUpdateParameter(
-    Expand,
     BaseStatusUpdateParameter[IdentifierType, IdentifierValueType],
 ):
     pass

maleo/identity/schemas/user.py

@@ -30,7 +30,7 @@ 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.user import IdentifierType, OptListOfExpandableFields
+from ..enums.user import IdentifierType
 from ..mixins.user import (
     Username,
     Usernames,
@@ -42,12 +42,6 @@ from ..mixins.user import (
 from ..types.user import IdentifierValueType
 
 
-class Expand(BaseModel):
-    expand: Annotated[
-        OptListOfExpandableFields, Field(None, description="Expand", min_length=1)
-    ] = None
-
-
 class CreateParameter(
     Phone[str], Email[str], Username[str], FullUserTypeMixin[UserType]
 ):
@@ -55,7 +49,6 @@ class CreateParameter(
 
 
 class ReadMultipleParameter(
-    Expand,
     ReadPaginatedMultipleParameter,
     Phones[OptListOfStrs],
     Emails[OptListOfStrs],
@@ -93,9 +86,7 @@ class ReadMultipleParameter(
         return params
 
 
-class ReadSingleParameter(
-    Expand, BaseReadSingleParameter[IdentifierType, IdentifierValueType]
-):
+class ReadSingleParameter(BaseReadSingleParameter[IdentifierType, IdentifierValueType]):
     @overload
     @classmethod
     def new(
@@ -140,7 +131,7 @@ class ReadSingleParameter(
 
     def to_query_params(self) -> StrToAnyDict:
         return self.model_dump(
-            mode="json", include={"statuses", "use_cache", "expand"}, exclude_none=True
+            mode="json", include={"statuses", "use_cache"}, exclude_none=True
         )
 
 
@@ -172,7 +163,6 @@ class UpdateDataMixin(BaseModel, Generic[UpdateDataT]):
 
 
 class UpdateParameter(
-    Expand,
     UpdateDataMixin[UpdateDataT],
     IdentifierTypeValue[
         IdentifierType,
@@ -184,7 +174,6 @@ class UpdateParameter(
 
 
 class StatusUpdateParameter(
-    Expand,
     BaseStatusUpdateParameter[IdentifierType, IdentifierValueType],
 ):
     pass

maleo/identity/schemas/user_profile.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field
-from typing import Annotated, Generic, Literal, TypeVar, overload
+from typing import Generic, Literal, TypeVar, overload
 from uuid import UUID
 from maleo.enums.identity import (
     OptBloodType,
@@ -36,7 +36,7 @@ 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, OptListOfExpandableFields
+from ..enums.user_profile import IdentifierType
 from ..mixins.common import (
     IdCard,
     FullName,
@@ -53,12 +53,6 @@ from ..mixins.user_profile import (
 from ..types.user_profile import IdentifierValueType
 
 
-class Expand(BaseModel):
-    expand: Annotated[
-        OptListOfExpandableFields, Field(None, description="Expand", min_length=1)
-    ] = None
-
-
 class CoreCreateData(
     BloodTypeMixin[OptBloodType],
     GenderMixin[OptGender],
@@ -118,7 +112,6 @@ class CreateParameter(
 
 
 class ReadMultipleParameter(
-    Expand,
     ReadPaginatedMultipleParameter,
     BloodTypesMixin[OptListOfBloodTypes],
     GendersMixin[OptListOfGenders],
@@ -152,9 +145,7 @@ class ReadMultipleParameter(
         return params
 
 
-class ReadSingleParameter(
-    Expand, BaseReadSingleParameter[IdentifierType, IdentifierValueType]
-):
+class ReadSingleParameter(BaseReadSingleParameter[IdentifierType, IdentifierValueType]):
     @overload
     @classmethod
     def new(
@@ -163,7 +154,6 @@ class ReadSingleParameter(
         identifier_value: int,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
-        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -173,7 +163,6 @@ class ReadSingleParameter(
         identifier_value: UUID,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
-        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -183,7 +172,6 @@ class ReadSingleParameter(
         identifier_value: str,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
-        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @classmethod
     def new(
@@ -192,19 +180,17 @@ class ReadSingleParameter(
         identifier_value: IdentifierValueType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
-        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter":
         return cls(
             identifier_type=identifier_type,
             identifier_value=identifier_value,
             statuses=statuses,
             use_cache=use_cache,
-            expand=expand,
         )
 
     def to_query_params(self) -> StrToAnyDict:
         return self.model_dump(
-            mode="json", include={"statuses", "use_cache", "expand"}, exclude_none=True
+            mode="json", include={"statuses", "use_cache"}, exclude_none=True
         )
 
 
@@ -246,7 +232,6 @@ class UpdateDataMixin(BaseModel, Generic[UpdateDataT]):
 
 
 class UpdateParameter(
-    Expand,
     UpdateDataMixin[UpdateDataT],
     IdentifierTypeValue[
         IdentifierType,
@@ -258,7 +243,6 @@ class UpdateParameter(
 
 
 class StatusUpdateParameter(
-    Expand,
     BaseStatusUpdateParameter[IdentifierType, IdentifierValueType],
 ):
     pass

maleo/identity/utils/organization.py

@@ -1,9 +1,4 @@
 from typing import Literal, Type, overload
-from ..dtos import (
-    StandardOrganizationDTO,
-    FullOrganizationDTO,
-    AnyOrganizationDTOType,
-)
 from ..schemas.common import (
     StandardOrganizationSchema,
     FullOrganizationSchema,
@@ -12,31 +7,6 @@ from ..schemas.common import (
 from ..enums.organization import Granularity
 
 
-@overload
-def get_dto_model(
-    granularity: Literal[Granularity.STANDARD],
-    /,
-) -> Type[StandardOrganizationDTO]: ...
-@overload
-def get_dto_model(
-    granularity: Literal[Granularity.FULL],
-    /,
-) -> Type[FullOrganizationDTO]: ...
-@overload
-def get_dto_model(
-    granularity: Granularity = Granularity.STANDARD,
-    /,
-) -> AnyOrganizationDTOType: ...
-def get_dto_model(
-    granularity: Granularity = Granularity.STANDARD,
-    /,
-) -> AnyOrganizationDTOType:
-    if granularity is Granularity.STANDARD:
-        return StandardOrganizationDTO
-    elif granularity is Granularity.FULL:
-        return FullOrganizationDTO
-
-
 @overload
 def get_schema_model(
     granularity: Literal[Granularity.STANDARD],

maleo/identity/utils/user.py

@@ -1,9 +1,4 @@
 from typing import Literal, Type, overload
-from ..dtos import (
-    StandardUserDTO,
-    FullUserDTO,
-    AnyUserDTOType,
-)
 from ..schemas.common import (
     StandardUserSchema,
     FullUserSchema,
@@ -12,31 +7,6 @@ from ..schemas.common import (
 from ..enums.user import Granularity
 
 
-@overload
-def get_dto_model(
-    granularity: Literal[Granularity.STANDARD],
-    /,
-) -> Type[StandardUserDTO]: ...
-@overload
-def get_dto_model(
-    granularity: Literal[Granularity.FULL],
-    /,
-) -> Type[FullUserDTO]: ...
-@overload
-def get_dto_model(
-    granularity: Granularity = Granularity.STANDARD,
-    /,
-) -> AnyUserDTOType: ...
-def get_dto_model(
-    granularity: Granularity = Granularity.STANDARD,
-    /,
-) -> AnyUserDTOType:
-    if granularity is Granularity.STANDARD:
-        return StandardUserDTO
-    elif granularity is Granularity.FULL:
-        return FullUserDTO
-
-
 @overload
 def get_schema_model(
     granularity: Literal[Granularity.STANDARD],

{maleo_identity-0.1.2.dist-info → maleo_identity-0.1.4.dist-info}/METADATA

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

{maleo_identity-0.1.2.dist-info → maleo_identity-0.1.4.dist-info}/RECORD

@@ -1,5 +1,4 @@
 maleo/identity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo/identity/dtos.py,sha256=XhfLat9emtRaVl-2McVDz8zunyoshAK7gm2OYmhZ_ZE,7876
 maleo/identity/models.py,sha256=aBYbkkd07BzH2zRq3q_D80xMR8DdhCiw1eQ2EYa9ZTQ,10223
 maleo/identity/constants/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/identity/constants/api_key.py,sha256=e7CsTodUBgyoX30SJUnYx457WBZeRFyyeaOFGsZ-7mY,264
@@ -14,35 +13,35 @@ maleo/identity/constants/user_profile.py,sha256=trDI4mNlcbA1_ignknMy07I6H-VqAytl
 maleo/identity/constants/user_system_role.py,sha256=_p5FI2X7yBUJuA06ia_vIkDRyfY4WZweQD08G3wCuRw,300
 maleo/identity/enums/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/identity/enums/api_key.py,sha256=WST6RsRrvJGeSL5ugVeZNKXReGsh9GEPDxmRy-owiEk,276
-maleo/identity/enums/organization.py,sha256=6dALM4rhK9EEsSIQzanW6S0KfhzfHSZ2-VAS7AHAK28,591
+maleo/identity/enums/organization.py,sha256=akxi_BJqRMokQ59K4KMZDkO-yLVC0Q_A7jErOiuixqs,406
 maleo/identity/enums/organization_registration_code.py,sha256=ZkteIpOW6MOLEHBbmDUaRGalTlTWUIRlimz-FohBWiM,282
 maleo/identity/enums/organization_relation.py,sha256=jH9AIYKhxPtK-I02KVrYfZ9Wdo-KNCFk0rDBauwt-Ps,252
-maleo/identity/enums/patient.py,sha256=JYnVPKZV_hhdygkVut5B1YS3BMknHPzDmthiT7EfwkY,467
-maleo/identity/enums/user.py,sha256=Cpp3Oj_NwqF6-fHGruF16TNFProu10ybX1k0HATPcPw,767
+maleo/identity/enums/patient.py,sha256=rMyUPFApFV9Mf3H-hsvTf4KFbHVkR-GAIluGfdQMpHc,274
+maleo/identity/enums/user.py,sha256=Y81ZPrZa8Of84AwFmPtrFygK_kXuWYxMZXUm2FFISK8,436
 maleo/identity/enums/user_medical_role.py,sha256=jH9AIYKhxPtK-I02KVrYfZ9Wdo-KNCFk0rDBauwt-Ps,252
 maleo/identity/enums/user_organization_role.py,sha256=jH9AIYKhxPtK-I02KVrYfZ9Wdo-KNCFk0rDBauwt-Ps,252
-maleo/identity/enums/user_profile.py,sha256=Kujd6xyDluP5M2DogR5Esw8TViFartjMY1jl39sFpNk,465
+maleo/identity/enums/user_profile.py,sha256=LgX7Ct-MAfx7o0W8MICzpHMfDhi7wpiJfRszn6vr1zc,272
 maleo/identity/enums/user_system_role.py,sha256=jH9AIYKhxPtK-I02KVrYfZ9Wdo-KNCFk0rDBauwt-Ps,252
 maleo/identity/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/identity/mixins/api_key.py,sha256=btlTZkJxhLyxj0T50ZBJnSUwiDIJl4Dz7oNl7Ftc9WM,173
 maleo/identity/mixins/common.py,sha256=diWtUiPMI_ypHtDrmI5y8IArxCdomo9Gt6X69iFhyuw,905
 maleo/identity/mixins/organization.py,sha256=KMl7Zz_SXu6SvF_1fTibN2vORFGWH7P22cxS_T4KXmE,574
 maleo/identity/mixins/organization_registration_code.py,sha256=G-kgdf2IzKENEyZcV6IXT69eAemnqR1vph3hhG3l1y4,508
-maleo/identity/mixins/organization_relation.py,sha256=fALtOSx9gIEuzDdykKAWiPkCjStJxo4q8UzUTAdoq2s,453
-maleo/identity/mixins/patient.py,sha256=ziNj9Sn_fvQWGmod1GSFpmtwjYLUCICAmL_u0zbokk8,304
+maleo/identity/mixins/organization_relation.py,sha256=kf7vDF7-564cIy6g_scxoWaumsJW0xraK3QdyJk_-Qw,427
+maleo/identity/mixins/patient.py,sha256=1zW6u_b8DM-7dSHfqX6HWJbQsRLKD2H1unEUnZco5MI,665
 maleo/identity/mixins/user.py,sha256=UHoMgFJXptE9x9QsR07KG2bgp5OlCNqvYjEtP9S3TIY,1054
 maleo/identity/mixins/user_profile.py,sha256=LFHAzGD-3wli6YJGfl9-Sy0gtQHkhgvrZ5EzOfl1vXY,1174
 maleo/identity/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/identity/schemas/api_key.py,sha256=UnQfnoEMkFgOfWDKai6wWNyD5QsovyoOov6jN52QPKI,3713
-maleo/identity/schemas/common.py,sha256=AxI4NKUM30Y4oS-jDjhdNnJGF-0-kOCA0wCnUl9ESlc,9213
-maleo/identity/schemas/organization.py,sha256=hcKYw-fObxvme2PUkU9jWk0dgj6XIQdU4gIs-Z3JY08,5391
+maleo/identity/schemas/common.py,sha256=x_cK5SexE-0dzuUpb3F0qTQ9RbX9bTTweioi7-Q3zPU,8249
+maleo/identity/schemas/organization.py,sha256=lyUDA654ydnL8C6tc9GVsE30E_se5TefI2rZPIL8KUk,4817
 maleo/identity/schemas/organization_registration_code.py,sha256=jAP7MGb_28wh1WoBZDl2FSJBxKFRH56YSQvMFQ5_iyo,4731
-maleo/identity/schemas/organization_relation.py,sha256=ZQauGidff-cAFY1gS9i3XRwauyWLg1f8xFES7mL6B8M,5083
-maleo/identity/schemas/patient.py,sha256=pV4qukuUXqlLNR2_2AlzvpmxZueNbLzIczdpiWE7_wc,6221
-maleo/identity/schemas/user.py,sha256=M2aYjNrhiw1tTjjNdyFaAFYfdACOROegqyBo3hsDVY4,5285
+maleo/identity/schemas/organization_relation.py,sha256=xEdOuZ6J4r7R4heEagd_UtioYJla73LZs1qloSSEs4I,5067
+maleo/identity/schemas/patient.py,sha256=xy5HGUkMVz2BgU_H2w8AOAr241_zVs8fJyjIMEdCg9I,5406
+maleo/identity/schemas/user.py,sha256=VyaT3tGC0oolYMMsBUy4EMPiQfbwptOvsr4BeD0s1fs,5052
 maleo/identity/schemas/user_medical_role.py,sha256=YzYsjMRKIA4CWdfOlGoPqWFl4v2JTj2EBwOWhNtUKSQ,4893
 maleo/identity/schemas/user_organization_role.py,sha256=MW1Ry1HnGrASmP2Mulk3Pfk1_mIOlLTBARerOA0TowI,4983
-maleo/identity/schemas/user_profile.py,sha256=zC1yCFg1cUsIYMjQghi6n7y-lxi4Y7PqN-dSbZILB8s,6594
+maleo/identity/schemas/user_profile.py,sha256=sa3dJd6T1nxCKW3L-xJLmZIBQFjNApk0hPYAzNh5Vk4,6123
 maleo/identity/schemas/user_system_role.py,sha256=CRI8KgNpcjJU9EBtEc75-vUmC64J5ZgigFO6IRWuRKM,4665
 maleo/identity/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/identity/types/api_key.py,sha256=pjWzyAh1p0DTS6v2ImYv849iF-T0PbEM8qlrwN3c-2o,190
@@ -56,12 +55,10 @@ maleo/identity/types/user_organization_role.py,sha256=FFgzo2IvblckLwKN-rnOXI9TRp
 maleo/identity/types/user_profile.py,sha256=UqOBL4v138jumjQstCAZ-2ZV1Ax8-Cr4SvL36nx8brw,63
 maleo/identity/types/user_system_role.py,sha256=6KIDk7kCWBlrloNLfIElflS5N8oBYqPeNRqySD2BQEE,191
 maleo/identity/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo/identity/utils/organization.py,sha256=jU-PLlxPbsRciid82p-ScdLSydspI-5ofJX7KL5qmDo,1611
-maleo/identity/utils/user.py,sha256=Mk1NTrViz1nBJxtPZRWdQmYHjTPxxc61a02eyikEBoU,1459
-maleo/identity/validators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo/identity/validators/patient.py,sha256=b4krKsXMuwUCXYuzCeUXtOXNTaEkKtQaAYmAmuVYIgo,221
-maleo_identity-0.1.2.dist-info/licenses/LICENSE,sha256=aftGsecnk7TWVX-7KW94FqK4Syy6YSZ8PZEF7EcIp3M,2621
-maleo_identity-0.1.2.dist-info/METADATA,sha256=zabPBMKNTilRuDNdeqgQuVzuMtIybcdiD-7_u3PLfd0,3583
-maleo_identity-0.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_identity-0.1.2.dist-info/top_level.txt,sha256=3Tpd1siVsfYoeI9FEOJNYnffx_shzZ3wsPpTvz5bljc,6
-maleo_identity-0.1.2.dist-info/RECORD,,
+maleo/identity/utils/organization.py,sha256=aEegzeoNLUptrScUB5kWrYlJj7dzTZeVXymltE5lWpE,874
+maleo/identity/utils/user.py,sha256=1pyfmAbXkAEOo6WM2KRA_kRnFi0O_A2ZUEqv01wY-cU,794
+maleo_identity-0.1.4.dist-info/licenses/LICENSE,sha256=aftGsecnk7TWVX-7KW94FqK4Syy6YSZ8PZEF7EcIp3M,2621
+maleo_identity-0.1.4.dist-info/METADATA,sha256=M9q5rHT-I2to7CeXeV3ZVeQXzJRM2JV6_a8On6-tnow,3583
+maleo_identity-0.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_identity-0.1.4.dist-info/top_level.txt,sha256=3Tpd1siVsfYoeI9FEOJNYnffx_shzZ3wsPpTvz5bljc,6
+maleo_identity-0.1.4.dist-info/RECORD,,

maleo/identity/dtos.py

@@ -1,309 +0,0 @@
-from datetime import date
-from pydantic import BaseModel, Field, model_validator
-from typing import Annotated, Generic, Self, TypeVar, Type
-from maleo.enums.identity import (
-    OptBloodType,
-    BloodTypeMixin,
-    OptRhesus,
-    RhesusMixin,
-    Gender,
-    OptGender,
-    GenderMixin,
-)
-from maleo.enums.medical import MedicalRole, FullMedicalRoleMixin
-from maleo.enums.organization import (
-    OrganizationRole,
-    FullOrganizationRoleMixin,
-    OrganizationType,
-    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.schemas.mixins.identity import (
-    DataIdentifier,
-    IntOrganizationId,
-    IntUserId,
-    BirthDate,
-    DateOfBirth,
-)
-from maleo.schemas.mixins.timestamp import DataTimestamp
-from maleo.types.datetime import OptDate
-from maleo.types.string import OptStr
-from .mixins.common import IdCard, FullName, BirthPlace, PlaceOfBirth
-from .mixins.organization_registration_code import Code, MaxUses, CurrentUses
-from .mixins.organization_relation import IsBidirectional, Metadata
-from .mixins.organization import Key as OrganizationKey, Name as OrganizationName
-from .mixins.patient import Passport
-from .mixins.user_profile import (
-    LeadingTitle,
-    FirstName,
-    MiddleName,
-    LastName,
-    EndingTitle,
-    AvatarName,
-)
-from .mixins.user import Username, Email, Phone
-from .validators.patient import validate_id_card_or_passport
-
-
-class PatientDTO(
-    RhesusMixin[OptRhesus],
-    BloodTypeMixin[OptBloodType],
-    GenderMixin[Gender],
-    DateOfBirth[date],
-    PlaceOfBirth[OptStr],
-    FullName[str],
-    Passport[OptStr],
-    IdCard[OptStr],
-    IntOrganizationId[int],
-    SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
-    DataIdentifier,
-):
-    @model_validator(mode="after")
-    def chk_id_card_or_passport(self) -> Self:
-        validate_id_card_or_passport(self.id_card, self.passport)
-        return self
-
-
-class OrganizationRegistrationCodeDTO(
-    CurrentUses,
-    MaxUses[int],
-    Code[str],
-    IntOrganizationId[int],
-    SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
-    DataIdentifier,
-):
-    pass
-
-
-OptOrganizationRegistrationCodeDTO = OrganizationRegistrationCodeDTO | None
-
-
-class OrganizationRegistrationCodeDTOMixin(BaseModel):
-    registration_code: Annotated[
-        OptOrganizationRegistrationCodeDTO,
-        Field(None, description="Organization's registration code"),
-    ] = None
-
-
-class StandardOrganizationDTO(
-    OrganizationName[str],
-    OrganizationKey[str],
-    FullOrganizationTypeMixin[OrganizationType],
-    SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
-    DataIdentifier,
-):
-    pass
-
-
-class SourceOrganizationDTOMixin(BaseModel):
-    source: Annotated[
-        StandardOrganizationDTO, Field(..., description="Source organization")
-    ]
-
-
-class SourceOrganizationRelationDTO(
-    Metadata,
-    IsBidirectional[bool],
-    SourceOrganizationDTOMixin,
-    SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
-    DataIdentifier,
-):
-    pass
-
-
-class SourceOrganizationRelationsDTOMixin(BaseModel):
-    sources: Annotated[
-        list[SourceOrganizationRelationDTO],
-        Field(list[SourceOrganizationRelationDTO](), description="Sources"),
-    ] = list[SourceOrganizationRelationDTO]()
-
-
-class TargetOrganizationDTOMixin(BaseModel):
-    target: Annotated[
-        StandardOrganizationDTO, Field(..., description="Target organization")
-    ]
-
-
-class TargetOrganizationRelationDTO(
-    Metadata,
-    IsBidirectional[bool],
-    TargetOrganizationDTOMixin,
-    SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
-    DataIdentifier,
-):
-    pass
-
-
-class TargetOrganizationRelationsDTOMixin(BaseModel):
-    targets: Annotated[
-        list[TargetOrganizationRelationDTO],
-        Field(list[TargetOrganizationRelationDTO](), description="Targets"),
-    ] = list[TargetOrganizationRelationDTO]()
-
-
-class FullOrganizationDTO(
-    TargetOrganizationRelationsDTOMixin,
-    SourceOrganizationRelationsDTOMixin,
-    OrganizationRegistrationCodeDTOMixin,
-    StandardOrganizationDTO,
-):
-    pass
-
-
-AnyOrganizationDTOType = Type[StandardOrganizationDTO] | Type[FullOrganizationDTO]
-AnyOrganizationDTO = StandardOrganizationDTO | FullOrganizationDTO
-AnyOrganizationDTOT = TypeVar("AnyOrganizationDTOT", bound=AnyOrganizationDTO)
-
-
-class OrganizationDTOMixin(BaseModel, Generic[AnyOrganizationDTOT]):
-    organization: Annotated[AnyOrganizationDTOT, Field(..., description="Organization")]
-
-
-class UserMedicalRoleDTO(
-    FullMedicalRoleMixin[MedicalRole],
-    IntOrganizationId[int],
-    IntUserId[int],
-    SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
-    DataIdentifier,
-):
-    pass
-
-
-class UserMedicalRolesDTOMixin(BaseModel):
-    medical_roles: Annotated[
-        list[UserMedicalRoleDTO],
-        Field(list[UserMedicalRoleDTO](), description="Medical roles"),
-    ] = list[UserMedicalRoleDTO]()
-
-
-class UserOrganizationRoleDTO(
-    FullOrganizationRoleMixin[OrganizationRole],
-    IntOrganizationId[int],
-    IntUserId[int],
-    SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
-    DataIdentifier,
-):
-    pass
-
-
-class UserOrganizationRolesDTOMixin(BaseModel):
-    organization_roles: Annotated[
-        list[UserOrganizationRoleDTO],
-        Field(list[UserOrganizationRoleDTO](), description="Organization roles"),
-    ] = list[UserOrganizationRoleDTO]()
-
-
-class UserProfileDTO(
-    AvatarName[str],
-    BloodTypeMixin[OptBloodType],
-    GenderMixin[OptGender],
-    BirthDate[OptDate],
-    BirthPlace[OptStr],
-    FullName[str],
-    EndingTitle[OptStr],
-    LastName[str],
-    MiddleName[OptStr],
-    FirstName[str],
-    LeadingTitle[OptStr],
-    IdCard[OptStr],
-    IntUserId[int],
-    SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
-    DataIdentifier,
-):
-    pass
-
-
-OptUserProfileDTO = UserProfileDTO | None
-
-
-class UserProfileDTOMixin(BaseModel):
-    profile: Annotated[OptUserProfileDTO, Field(None, description="User's Profile")] = (
-        None
-    )
-
-
-class UserSystemRoleDTO(
-    FullSystemRoleMixin[SystemRole],
-    IntUserId[int],
-    SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
-    DataIdentifier,
-):
-    pass
-
-
-class UserSystemRolesDTOMixin(BaseModel):
-    system_roles: Annotated[
-        list[UserSystemRoleDTO],
-        Field(
-            list[UserSystemRoleDTO](),
-            description="User's system roles",
-            min_length=1,
-        ),
-    ] = list[UserSystemRoleDTO]()
-
-
-class StandardUserDTO(
-    UserProfileDTOMixin,
-    Phone[str],
-    Email[str],
-    Username[str],
-    FullUserTypeMixin[UserType],
-    SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
-    DataIdentifier,
-):
-    pass
-
-
-class UserOrganizationDTO(
-    UserMedicalRolesDTOMixin,
-    UserOrganizationRolesDTOMixin,
-    OrganizationDTOMixin[StandardOrganizationDTO],
-    SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
-    DataIdentifier,
-):
-    pass
-
-
-class UserOrganizationsDTOMixin(BaseModel):
-    organizations: Annotated[
-        list[UserOrganizationDTO],
-        Field(list[UserOrganizationDTO](), description="Organizations"),
-    ] = list[UserOrganizationDTO]()
-
-
-class FullUserDTO(UserOrganizationsDTOMixin, StandardUserDTO):
-    pass
-
-
-AnyUserDTOType = Type[StandardUserDTO] | Type[FullUserDTO]
-AnyUserDTO = StandardUserDTO | FullUserDTO
-AnyUserDTOT = TypeVar("AnyUserDTOT", bound=AnyUserDTO)
-
-
-class UserDTOMixin(BaseModel, Generic[AnyUserDTOT]):
-    user: Annotated[AnyUserDTOT, Field(..., description="User")]
-
-
-class UserAndOrganizationDTO(
-    UserMedicalRolesDTOMixin,
-    UserOrganizationRolesDTOMixin,
-    OrganizationDTOMixin[StandardOrganizationDTO],
-    UserDTOMixin[StandardUserDTO],
-    SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
-    DataIdentifier,
-):
-    pass

maleo/identity/validators/patient.py

@@ -1,6 +0,0 @@
-from maleo.types.string import OptStr
-
-
-def validate_id_card_or_passport(id_card: OptStr, passport: OptStr):
-    if id_card is None and passport is None:
-        raise ValueError("Either ID Card and Passport must exist")