maleo-identity 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

maleo/identity/dtos.py

@@ -1,6 +1,6 @@
 from datetime import date
-from pydantic import BaseModel, Field, model_validator
-from typing import Annotated, Generic, Self, TypeVar, Type
+from pydantic import BaseModel, Field
+from typing import Annotated, Generic, TypeVar, Type
 from maleo.enums.identity import (
     OptBloodType,
     BloodTypeMixin,
@@ -26,17 +26,15 @@ from maleo.schemas.mixins.identity import (
     IntUserId,
     BirthDate,
     DateOfBirth,
-    IntSourceId,
-    IntTargetId,
 )
-from maleo.schemas.mixins.timestamp import DataTimestamp
+from maleo.schemas.mixins.timestamp import LifecycleTimestamp
 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_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,
@@ -46,7 +44,6 @@ from .mixins.user_profile import (
     AvatarName,
 )
 from .mixins.user import Username, Email, Phone
-from .validators.patient import validate_id_card_or_passport
 
 
 class PatientDTO(
@@ -56,17 +53,12 @@ class PatientDTO(
     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 OrganizationRegistrationCodeDTO(
@@ -75,7 +67,7 @@ class OrganizationRegistrationCodeDTO(
     Code[str],
     IntOrganizationId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -96,7 +88,7 @@ class StandardOrganizationDTO(
     OrganizationKey[str],
     FullOrganizationTypeMixin[OrganizationType],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -108,35 +100,51 @@ class SourceOrganizationDTOMixin(BaseModel):
     ]
 
 
+class SourceOrganizationRelationDTO(
+    Meta,
+    IsBidirectional[bool],
+    SourceOrganizationDTOMixin,
+    SimpleDataStatusMixin[DataStatusEnum],
+    LifecycleTimestamp,
+    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 OrganizationRelationDTO(
-    Metadata,
+class TargetOrganizationRelationDTO(
+    Meta,
     IsBidirectional[bool],
     TargetOrganizationDTOMixin,
-    IntTargetId[int],
-    SourceOrganizationDTOMixin,
-    IntSourceId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
 
 
-class OrganizationRelationsDTOMixin(BaseModel):
-    relations: Annotated[
-        list[OrganizationRelationDTO],
-        Field(list[OrganizationRelationDTO](), description="Relations"),
-    ] = list[OrganizationRelationDTO]()
+class TargetOrganizationRelationsDTOMixin(BaseModel):
+    targets: Annotated[
+        list[TargetOrganizationRelationDTO],
+        Field(list[TargetOrganizationRelationDTO](), description="Targets"),
+    ] = list[TargetOrganizationRelationDTO]()
 
 
 class FullOrganizationDTO(
-    OrganizationRelationsDTOMixin,
+    TargetOrganizationRelationsDTOMixin,
+    SourceOrganizationRelationsDTOMixin,
     OrganizationRegistrationCodeDTOMixin,
     StandardOrganizationDTO,
 ):
@@ -157,7 +165,7 @@ class UserMedicalRoleDTO(
     IntOrganizationId[int],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -175,7 +183,7 @@ class UserOrganizationRoleDTO(
     IntOrganizationId[int],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -203,7 +211,7 @@ class UserProfileDTO(
     IdCard[OptStr],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -222,7 +230,7 @@ class UserSystemRoleDTO(
     FullSystemRoleMixin[SystemRole],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -246,7 +254,7 @@ class StandardUserDTO(
     Username[str],
     FullUserTypeMixin[UserType],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -257,7 +265,7 @@ class UserOrganizationDTO(
     UserOrganizationRolesDTOMixin,
     OrganizationDTOMixin[StandardOrganizationDTO],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -289,7 +297,7 @@ class UserAndOrganizationDTO(
     OrganizationDTOMixin[StandardOrganizationDTO],
     UserDTOMixin[StandardUserDTO],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass

maleo/identity/enums/patient.py

@@ -2,6 +2,15 @@ from enum import StrEnum
 from maleo.types.string import ListOfStrs
 
 
+class Granularity(StrEnum):
+    STANDARD = "standard"
+    FULL = "full"
+
+    @classmethod
+    def choices(cls) -> ListOfStrs:
+        return [e.value for e in cls]
+
+
 class IdentifierType(StrEnum):
     ID = "id"
     UUID = "uuid"

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/models.py

@@ -94,6 +94,29 @@ class Patient(
     )
 
 
+class OrganizationRegistrationCode(
+    DataStatus,
+    DataTimestamp,
+    DataIdentifier,
+):
+    __tablename__ = "organization_registration_codes"
+    organization_id: Mapped[int] = mapped_column(
+        Integer,
+        ForeignKey("organizations.id", ondelete="CASCADE", onupdate="CASCADE"),
+        unique=True,
+        nullable=False,
+    )
+    code: Mapped[str] = mapped_column(
+        name="code", type_=String(36), unique=True, nullable=False
+    )
+    max_uses: Mapped[int] = mapped_column(
+        name="max_uses", type_=Integer, nullable=False, default=1
+    )
+    current_uses: Mapped[int] = mapped_column(
+        name="current_uses", type_=Integer, nullable=False, default=0
+    )
+
+
 class OrganizationRelation(
     DataStatus,
     DataTimestamp,
@@ -123,29 +146,6 @@ class OrganizationRelation(
     )
 
 
-class OrganizationRegistrationCode(
-    DataStatus,
-    DataTimestamp,
-    DataIdentifier,
-):
-    __tablename__ = "organization_registration_codes"
-    organization_id: Mapped[int] = mapped_column(
-        Integer,
-        ForeignKey("organizations.id", ondelete="CASCADE", onupdate="CASCADE"),
-        unique=True,
-        nullable=False,
-    )
-    code: Mapped[str] = mapped_column(
-        name="code", type_=String(36), unique=True, nullable=False
-    )
-    max_uses: Mapped[int] = mapped_column(
-        name="max_uses", type_=Integer, nullable=False, default=1
-    )
-    current_uses: Mapped[int] = mapped_column(
-        name="current_uses", type_=Integer, nullable=False, default=0
-    )
-
-
 class Organization(
     DataStatus,
     DataTimestamp,

maleo/identity/schemas/common.py

@@ -1,6 +1,6 @@
 from datetime import date
-from pydantic import BaseModel, Field, model_validator
-from typing import Annotated, Generic, Self, TypeVar, Type
+from pydantic import BaseModel, Field
+from typing import Annotated, Generic, TypeVar, Type
 from maleo.enums.identity import OptRhesus, RhesusMixin
 from maleo.metadata.schemas.organization_role import (
     FullOrganizationRoleMixin,
@@ -38,19 +38,17 @@ from maleo.schemas.mixins.identity import (
     IntUserId,
     BirthDate,
     DateOfBirth,
-    IntSourceId,
-    IntTargetId,
 )
-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,
@@ -60,7 +58,6 @@ from ..mixins.user_profile import (
     AvatarUrl,
 )
 from ..mixins.user import Username, Email, Phone
-from ..validators.patient import validate_id_card_or_passport
 
 
 class APIKeySchema(
@@ -68,7 +65,7 @@ class APIKeySchema(
     IntOrganizationId[OptInt],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -81,17 +78,12 @@ class PatientSchema(
     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(
@@ -100,7 +92,7 @@ class OrganizationRegistrationCodeSchema(
     Code[str],
     IntOrganizationId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -121,7 +113,7 @@ class StandardOrganizationSchema(
     OrganizationKey[str],
     FullOrganizationTypeMixin[KeyOrStandardOrganizationTypeSchema],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -133,34 +125,51 @@ class SourceOrganizationSchemaMixin(BaseModel):
     ]
 
 
+class SourceOrganizationRelationSchema(
+    Meta,
+    IsBidirectional[bool],
+    SourceOrganizationSchemaMixin,
+    SimpleDataStatusMixin[DataStatusEnum],
+    LifecycleTimestamp,
+    DataIdentifier,
+):
+    pass
+
+
+class SourceOrganizationRelationsSchemaMixin(BaseModel):
+    sources: Annotated[
+        list[SourceOrganizationRelationSchema],
+        Field(list[SourceOrganizationRelationSchema](), description="Sources"),
+    ] = list[SourceOrganizationRelationSchema]()
+
+
 class TargetOrganizationSchemaMixin(BaseModel):
     target: Annotated[
         StandardOrganizationSchema, Field(..., description="Target organization")
     ]
 
 
-class OrganizationRelationSchema(
-    Metadata,
+class TargetOrganizationRelationSchema(
+    Meta,
     IsBidirectional[bool],
     TargetOrganizationSchemaMixin,
-    IntTargetId[int],
-    SourceOrganizationSchemaMixin,
-    IntSourceId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
 
 
-class OrganizationRelationsSchemaMixin(BaseModel):
-    relations: Annotated[
-        list[OrganizationRelationSchema],
-        Field(list[OrganizationRelationSchema](), description="Relations"),
-    ] = list[OrganizationRelationSchema]()
+class TargetOrganizationRelationsSchemaMixin(BaseModel):
+    targets: Annotated[
+        list[TargetOrganizationRelationSchema],
+        Field(list[TargetOrganizationRelationSchema](), description="Targets"),
+    ] = list[TargetOrganizationRelationSchema]()
 
 
 class FullOrganizationSchema(
+    TargetOrganizationRelationsSchemaMixin,
+    SourceOrganizationRelationsSchemaMixin,
     OrganizationRegistrationCodeSchemaMixin,
     StandardOrganizationSchema,
 ):
@@ -185,7 +194,7 @@ class UserMedicalRoleSchema(
     IntOrganizationId[int],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -203,7 +212,7 @@ class UserOrganizationRoleSchema(
     IntOrganizationId[int],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -231,7 +240,7 @@ class UserProfileSchema(
     IdCard[OptStr],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -250,7 +259,7 @@ class UserSystemRoleSchema(
     FullSystemRoleMixin[KeyOrStandardSystemRoleSchema],
     IntUserId[int],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -274,7 +283,7 @@ class StandardUserSchema(
     Username[str],
     FullUserTypeMixin[KeyOrStandardUserTypeSchema],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -285,7 +294,7 @@ class UserOrganizationSchema(
     UserOrganizationRolesSchemaMixin,
     OrganizationSchemaMixin[StandardOrganizationSchema],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass
@@ -317,7 +326,7 @@ class UserAndOrganizationSchema(
     OrganizationSchemaMixin[StandardOrganizationSchema],
     UserSchemaMixin[StandardUserSchema],
     SimpleDataStatusMixin[DataStatusEnum],
-    DataTimestamp,
+    LifecycleTimestamp,
     DataIdentifier,
 ):
     pass

maleo/identity/schemas/organization.py

@@ -38,9 +38,9 @@ from ..types.organization import IdentifierValueType
 
 
 class Expand(BaseModel):
-    expand: Annotated[
-        OptListOfExpandableFields, Field(None, description="Expand", min_length=1)
-    ] = None
+    expand: Annotated[OptListOfExpandableFields, Field(None, description="Expand")] = (
+        None
+    )
 
 
 class CreateQuery(Expand):

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 Annotated, Generic, Literal, TypeVar, overload
 from uuid import UUID
 from maleo.enums.identity import (
     OptBloodType,
@@ -45,15 +45,14 @@ from maleo.types.string import OptStr, OptListOfStrs
 from maleo.types.uuid import OptListOfUUIDs
 from ..enums.patient import IdentifierType, OptListOfExpandableFields
 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
+    expand: Annotated[OptListOfExpandableFields, Field(None, description="Expand")] = (
+        None
+    )
 
 
 class CreateQuery(Expand):
@@ -67,14 +66,10 @@ class CreateData(
     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
+    pass
 
 
 class CreateParameter(CreateQuery, CreateData):
@@ -183,7 +178,7 @@ class FullUpdateData(
     DateOfBirth[date],
     PlaceOfBirth[OptStr],
     FullName[str],
-    Passport[OptStr],
+    PatientIdentifier,
     IdCard[OptStr],
 ):
     pass
@@ -196,7 +191,7 @@ class PartialUpdateData(
     DateOfBirth[OptDate],
     PlaceOfBirth[OptStr],
     FullName[OptStr],
-    Passport[OptStr],
+    PatientIdentifier,
     IdCard[OptStr],
 ):
     pass

maleo/identity/schemas/user.py

@@ -43,9 +43,9 @@ from ..types.user import IdentifierValueType
 
 
 class Expand(BaseModel):
-    expand: Annotated[
-        OptListOfExpandableFields, Field(None, description="Expand", min_length=1)
-    ] = None
+    expand: Annotated[OptListOfExpandableFields, Field(None, description="Expand")] = (
+        None
+    )
 
 
 class CreateParameter(

maleo/identity/schemas/user_profile.py

@@ -54,9 +54,9 @@ from ..types.user_profile import IdentifierValueType
 
 
 class Expand(BaseModel):
-    expand: Annotated[
-        OptListOfExpandableFields, Field(None, description="Expand", min_length=1)
-    ] = None
+    expand: Annotated[OptListOfExpandableFields, Field(None, description="Expand")] = (
+        None
+    )
 
 
 class CoreCreateData(

{maleo_identity-0.1.1.dist-info → maleo_identity-0.1.3.dist-info}/METADATA

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

{maleo_identity-0.1.1.dist-info → maleo_identity-0.1.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 maleo/identity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo/identity/dtos.py,sha256=Zc7ApGe5UgrlKUajHHNHS8i9B4_YSNL0sxG5bYA8obM,7459
-maleo/identity/models.py,sha256=uG_L670oLnWXfUWoq3bya62MoUtAh5M-Sdju4L33iVc,10223
+maleo/identity/dtos.py,sha256=Jsvz9qIi9-ojYLp_zwByahH1_rVZ4znDP_JhFn0HT7g,7648
+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
 maleo/identity/constants/organization.py,sha256=Jeewz4VlaTmuHHDqNZUZyLD3bdndQjpx9K0EabhCFUM,259
@@ -17,7 +17,7 @@ maleo/identity/enums/api_key.py,sha256=WST6RsRrvJGeSL5ugVeZNKXReGsh9GEPDxmRy-owi
 maleo/identity/enums/organization.py,sha256=6dALM4rhK9EEsSIQzanW6S0KfhzfHSZ2-VAS7AHAK28,591
 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/patient.py,sha256=ddOoy16JTzHX5n1STDnPO0U3lqxGtFmPNwd7KdDhAVI,633
 maleo/identity/enums/user.py,sha256=Cpp3Oj_NwqF6-fHGruF16TNFProu10ybX1k0HATPcPw,767
 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
@@ -28,21 +28,21 @@ maleo/identity/mixins/api_key.py,sha256=btlTZkJxhLyxj0T50ZBJnSUwiDIJl4Dz7oNl7Ftc
 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=dnLQO321jEDqkzM8CC5sKrr6urlq2J0ZX94vPkP7xM0,8740
-maleo/identity/schemas/organization.py,sha256=hcKYw-fObxvme2PUkU9jWk0dgj6XIQdU4gIs-Z3JY08,5391
+maleo/identity/schemas/common.py,sha256=h-NZ1oDYsY1vj8IyM2Ct4F5CunEHwhx2RcOdUZCx36Q,8989
+maleo/identity/schemas/organization.py,sha256=8V1DSDMGXyF1gsfpOK0fN-djbKQxNey1Rr5YLO_ZEg0,5379
 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=4nBjz5K-AYJnVIIMA5PHGX7UxG0UtNEM0t6g5SP-jkY,5957
+maleo/identity/schemas/user.py,sha256=rxMV24k0KB4FVwR9lmv1SiLNqTbzwRTUItgJie2LMJc,5273
 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=saFmMuQ-TNlE--hoUxNVeXt4ZUalJaOVxqmYGkCiJ6I,6582
 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
@@ -58,10 +58,8 @@ maleo/identity/types/user_system_role.py,sha256=6KIDk7kCWBlrloNLfIElflS5N8oBYqPe
 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.1.dist-info/licenses/LICENSE,sha256=aftGsecnk7TWVX-7KW94FqK4Syy6YSZ8PZEF7EcIp3M,2621
-maleo_identity-0.1.1.dist-info/METADATA,sha256=CGrcEG56vdmk1T69LIT2n8FDjfa1nLSwts7VLwEMz_E,3583
-maleo_identity-0.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_identity-0.1.1.dist-info/top_level.txt,sha256=3Tpd1siVsfYoeI9FEOJNYnffx_shzZ3wsPpTvz5bljc,6
-maleo_identity-0.1.1.dist-info/RECORD,,
+maleo_identity-0.1.3.dist-info/licenses/LICENSE,sha256=aftGsecnk7TWVX-7KW94FqK4Syy6YSZ8PZEF7EcIp3M,2621
+maleo_identity-0.1.3.dist-info/METADATA,sha256=Les5ugTSugq3zOtLB5EAEm78c3l7s_K0lYFhlFWbPNc,3583
+maleo_identity-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_identity-0.1.3.dist-info/top_level.txt,sha256=3Tpd1siVsfYoeI9FEOJNYnffx_shzZ3wsPpTvz5bljc,6
+maleo_identity-0.1.3.dist-info/RECORD,,

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")