maleo-identity 0.1.2__tar.gz → 0.1.4__tar.gz

{maleo_identity-0.1.2 → maleo_identity-0.1.4}/PKG-INFO

@@ -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 → maleo_identity-0.1.4}/maleo_identity.egg-info/PKG-INFO

@@ -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 → maleo_identity-0.1.4}/maleo_identity.egg-info/SOURCES.txt

@@ -7,7 +7,6 @@ maleo_identity.egg-info/dependency_links.txt
 maleo_identity.egg-info/requires.txt
 maleo_identity.egg-info/top_level.txt
 src/__init__.py
-src/dtos.py
 src/models.py
 src/constants/__init__.py
 src/constants/api_key.py
@@ -65,6 +64,4 @@ src/types/user_profile.py
 src/types/user_system_role.py
 src/utils/__init__.py
 src/utils/organization.py
-src/utils/user.py
-src/validators/__init__.py
-src/validators/patient.py
+src/utils/user.py

{maleo_identity-0.1.2 → maleo_identity-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maleo-identity"
-version = "0.1.2"
+version = "0.1.4"
 description = "MaleoIdentity service package"
 authors = [
     { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }
@@ -103,7 +103,6 @@ packages = [
     "maleo.identity.schemas",
     "maleo.identity.types",
     "maleo.identity.utils",
-    "maleo.identity.validators",
 ]
 
 [tool.setuptools.package-data]
@@ -114,7 +113,6 @@ packages = [
 "maleo.identity.schemas" = ["*.json", "*.yaml"]
 "maleo.identity.types" = ["*.json", "*.yaml"]
 "maleo.identity.utils" = ["*.json", "*.yaml"]
-"maleo.identity.validators" = ["*.json", "*.yaml"]
 
 [tool.setuptools.package-dir]
 "maleo.identity" = "src"
@@ -123,5 +121,4 @@ packages = [
 "maleo.identity.mixins" = "src/mixins"
 "maleo.identity.schemas" = "src/schemas"
 "maleo.identity.types" = "src/types"
-"maleo.identity.utils" = "src/utils"
-"maleo.identity.validators" = "src/validators"
+"maleo.identity.utils" = "src/utils"

{maleo_identity-0.1.2 → maleo_identity-0.1.4}/src/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-0.1.4/src/enums/patient.py

@@ -0,0 +1,13 @@
+from enum import StrEnum
+from maleo.types.string import ListOfStrs
+
+
+class IdentifierType(StrEnum):
+    ID = "id"
+    UUID = "uuid"
+    ID_CARD = "id_card"
+    PASSPORT = "passport"
+
+    @classmethod
+    def choices(cls) -> ListOfStrs:
+        return [e.value for e in cls]

{maleo_identity-0.1.2 → maleo_identity-0.1.4}/src/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-0.1.4/src/enums/user_profile.py

@@ -0,0 +1,13 @@
+from enum import StrEnum
+from maleo.types.string import ListOfStrs
+
+
+class IdentifierType(StrEnum):
+    ID = "id"
+    UUID = "uuid"
+    USER_ID = "user_id"
+    ID_CARD = "id_card"
+
+    @classmethod
+    def choices(cls) -> ListOfStrs:
+        return [e.value for e in cls]

{maleo_identity-0.1.2 → maleo_identity-0.1.4}/src/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-0.1.4/src/mixins/patient.py

@@ -0,0 +1,20 @@
+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 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-0.1.2 → maleo_identity-0.1.4}/src/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-0.1.2 → maleo_identity-0.1.4}/src/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-0.1.2 → maleo_identity-0.1.4}/src/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