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

maleo/identity/constants/api_key.py

@@ -4,8 +4,8 @@ from maleo.schemas.resource import Resource, ResourceIdentifier
 API_KEY_RESOURCE = Resource(
     identifiers=[
         ResourceIdentifier(
-            key="api_keys",
-            name="API Keys",
+            key="api_key",
+            name="API Key",
             slug="api-keys",
         )
     ],

maleo/identity/constants/organization.py

@@ -4,7 +4,7 @@ from maleo.schemas.resource import Resource, ResourceIdentifier
 ORGANIZATION_RESOURCE = Resource(
     identifiers=[
         ResourceIdentifier(
-            key="organizations", name="Organizations", slug="organizations"
+            key="organization", name="Organization", slug="organizations"
         )
     ],
     details=None,

maleo/identity/constants/organization_registration_code.py

@@ -4,8 +4,8 @@ from maleo.schemas.resource import Resource, ResourceIdentifier
 ORGANIZATION_REGISTRATION_CODE_RESOURCE = Resource(
     identifiers=[
         ResourceIdentifier(
-            key="organization_registration_codes",
-            name="Organization Registration Codes",
+            key="organization_registration_code",
+            name="Organization Registration Code",
             slug="organization-registration-codes",
         )
     ],

maleo/identity/constants/organization_relation.py

@@ -4,8 +4,8 @@ from maleo.schemas.resource import Resource, ResourceIdentifier
 ORGANIZATION_RELATION_RESOURCE = Resource(
     identifiers=[
         ResourceIdentifier(
-            key="organization_relations",
-            name="Organization Relations",
+            key="organization_relation",
+            name="Organization Relation",
             slug="organization-relations",
         )
     ],

maleo/identity/constants/patient.py

@@ -2,6 +2,6 @@ from maleo.schemas.resource import Resource, ResourceIdentifier
 
 
 PATIENT_RESOURCE = Resource(
-    identifiers=[ResourceIdentifier(key="patients", name="Patients", slug="patients")],
+    identifiers=[ResourceIdentifier(key="patient", name="Patient", slug="patients")],
     details=None,
 )

maleo/identity/constants/user.py

@@ -2,6 +2,6 @@ from maleo.schemas.resource import Resource, ResourceIdentifier
 
 
 USER_RESOURCE = Resource(
-    identifiers=[ResourceIdentifier(key="users", name="Users", slug="users")],
+    identifiers=[ResourceIdentifier(key="user", name="User", slug="users")],
     details=None,
 )

maleo/identity/constants/user_medical_role.py

@@ -4,8 +4,8 @@ from maleo.schemas.resource import Resource, ResourceIdentifier
 USER_MEDICAL_ROLE_RESOURCE = Resource(
     identifiers=[
         ResourceIdentifier(
-            key="user_medical_roles",
-            name="User Medical Roles",
+            key="user_medical_role",
+            name="User Medical Role",
             slug="user-medical-roles",
         )
     ],

maleo/identity/constants/user_organization_role.py

@@ -4,8 +4,8 @@ from maleo.schemas.resource import Resource, ResourceIdentifier
 USER_ORGANIZATION_ROLE_RESOURCE = Resource(
     identifiers=[
         ResourceIdentifier(
-            key="user_organization_roles",
-            name="User Organization Roles",
+            key="user_organization_role",
+            name="User Organization Role",
             slug="user-organization-roles",
         )
     ],

maleo/identity/constants/user_profile.py

@@ -4,7 +4,7 @@ from maleo.schemas.resource import Resource, ResourceIdentifier
 USER_PROFILE_RESOURCE = Resource(
     identifiers=[
         ResourceIdentifier(
-            key="user_profiles", name="User Profiles", slug="user-profiles"
+            key="user_profile", name="User Profile", slug="user-profiles"
         )
     ],
     details=None,

maleo/identity/constants/user_system_role.py

@@ -1,13 +1,17 @@
 from maleo.schemas.resource import Resource, ResourceIdentifier
+from maleo.types.string import DoubleStrs
 
 
 USER_SYSTEM_ROLE_RESOURCE = Resource(
     identifiers=[
         ResourceIdentifier(
-            key="user_system_roles",
-            name="User System Roles",
+            key="user_system_role",
+            name="User System Role",
             slug="user-system-roles",
         )
     ],
     details=None,
 )
+
+
+COMPOSITE_COLUMS: DoubleStrs = ("user_id", "system_role")

maleo/identity/enums/api_key.py

@@ -1,5 +1,5 @@
 from enum import StrEnum
-from maleo.types.string import ListOfStrs
+from maleo.types.string import ListOfStrs, ManyStrs
 
 
 class IdentifierType(StrEnum):
@@ -11,3 +11,15 @@ class IdentifierType(StrEnum):
     @classmethod
     def choices(cls) -> ListOfStrs:
         return [e.value for e in cls]
+
+    @property
+    def columns(self) -> ManyStrs:
+        if self is IdentifierType.ID:
+            return ("id",)
+        elif self is IdentifierType.UUID:
+            return ("uuid",)
+        elif self is IdentifierType.API_KEY:
+            return ("api_key",)
+        elif self is IdentifierType.COMPOSITE:
+            return ("user_id", "organization_id")
+        raise ValueError(f"Unknown column(s) for identifier type: {self}")

maleo/identity/enums/organization.py

@@ -19,3 +19,7 @@ class IdentifierType(StrEnum):
     @classmethod
     def choices(cls) -> ListOfStrs:
         return [e.value for e in cls]
+
+    @property
+    def column(self) -> str:
+        return self.value

maleo/identity/enums/organization_registration_code.py

@@ -11,3 +11,7 @@ class IdentifierType(StrEnum):
     @classmethod
     def choices(cls) -> ListOfStrs:
         return [e.value for e in cls]
+
+    @property
+    def column(self) -> str:
+        return self.value

maleo/identity/enums/organization_relation.py

@@ -1,5 +1,5 @@
 from enum import StrEnum
-from maleo.types.string import ListOfStrs
+from maleo.types.string import ListOfStrs, ManyStrs
 
 
 class IdentifierType(StrEnum):
@@ -10,3 +10,13 @@ class IdentifierType(StrEnum):
     @classmethod
     def choices(cls) -> ListOfStrs:
         return [e.value for e in cls]
+
+    @property
+    def columns(self) -> ManyStrs:
+        if self is IdentifierType.ID:
+            return ("id",)
+        elif self is IdentifierType.UUID:
+            return ("uuid",)
+        elif self is IdentifierType.COMPOSITE:
+            return ("source_id", "target_id", "relation")
+        raise ValueError(f"Unknown column(s) for identifier type: {self}")

maleo/identity/enums/patient.py

@@ -5,9 +5,25 @@ 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]
+
+    @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/enums/user.py

@@ -20,3 +20,7 @@ class IdentifierType(StrEnum):
     @classmethod
     def choices(cls) -> ListOfStrs:
         return [e.value for e in cls]
+
+    @property
+    def column(self) -> str:
+        return self.value

maleo/identity/enums/user_medical_role.py

@@ -1,5 +1,5 @@
 from enum import StrEnum
-from maleo.types.string import ListOfStrs
+from maleo.types.string import ListOfStrs, ManyStrs
 
 
 class IdentifierType(StrEnum):
@@ -10,3 +10,13 @@ class IdentifierType(StrEnum):
     @classmethod
     def choices(cls) -> ListOfStrs:
         return [e.value for e in cls]
+
+    @property
+    def columns(self) -> ManyStrs:
+        if self is IdentifierType.ID:
+            return ("id",)
+        elif self is IdentifierType.UUID:
+            return ("uuid",)
+        elif self is IdentifierType.COMPOSITE:
+            return ("user_id", "organization_id", "medical_role")
+        raise ValueError(f"Unknown column(s) for identifier type: {self}")

maleo/identity/enums/user_organization_role.py

@@ -1,5 +1,5 @@
 from enum import StrEnum
-from maleo.types.string import ListOfStrs
+from maleo.types.string import ListOfStrs, ManyStrs
 
 
 class IdentifierType(StrEnum):
@@ -10,3 +10,13 @@ class IdentifierType(StrEnum):
     @classmethod
     def choices(cls) -> ListOfStrs:
         return [e.value for e in cls]
+
+    @property
+    def columns(self) -> ManyStrs:
+        if self is IdentifierType.ID:
+            return ("id",)
+        elif self is IdentifierType.UUID:
+            return ("uuid",)
+        elif self is IdentifierType.COMPOSITE:
+            return ("user_id", "organization_id", "organization_role")
+        raise ValueError(f"Unknown column(s) for identifier type: {self}")

maleo/identity/enums/user_profile.py

@@ -11,3 +11,7 @@ class IdentifierType(StrEnum):
     @classmethod
     def choices(cls) -> ListOfStrs:
         return [e.value for e in cls]
+
+    @property
+    def column(self) -> str:
+        return self.value

maleo/identity/enums/user_system_role.py

@@ -1,5 +1,5 @@
 from enum import StrEnum
-from maleo.types.string import ListOfStrs
+from maleo.types.string import ListOfStrs, ManyStrs
 
 
 class IdentifierType(StrEnum):
@@ -10,3 +10,26 @@ class IdentifierType(StrEnum):
     @classmethod
     def choices(cls) -> ListOfStrs:
         return [e.value for e in cls]
+
+    @property
+    def columns(self) -> ManyStrs:
+        if self is IdentifierType.ID:
+            return ("id",)
+        elif self is IdentifierType.UUID:
+            return ("uuid",)
+        elif self is IdentifierType.COMPOSITE:
+            return ("user_id", "system_role")
+        raise ValueError(f"Unknown column(s) for identifier type: {self}")
+
+
+class ExpandableField(StrEnum):
+    SYSTEM_ROLE = "system_role"
+
+    @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

@@ -2,8 +2,10 @@ from pydantic import BaseModel, Field
 from typing import Annotated, Literal, TypeGuard
 from uuid import UUID
 from maleo.schemas.mixins.identity import Identifier
+from maleo.types.any import ManyAny
+from maleo.types.string import ManyStrs
 from ..enums.api_key import IdentifierType
-from ..types.api_key import CompositeIdentifier, IdentifierValueType
+from ..types.api_key import CompositeIdentifierType, IdentifierValueType
 
 
 class APIKey(BaseModel):
@@ -11,7 +13,10 @@ class APIKey(BaseModel):
 
 
 class APIKeyIdentifier(Identifier[IdentifierType, IdentifierValueType]):
-    pass
+    @property
+    def columns_and_values(self) -> tuple[ManyStrs, ManyAny]:
+        values = self.value if isinstance(self.value, tuple) else (self.value,)
+        return self.type.columns, values
 
 
 class IdAPIKeyIdentifier(Identifier[Literal[IdentifierType.ID], int]):
@@ -30,13 +35,13 @@ class UUIDAPIKeyIdentifier(Identifier[Literal[IdentifierType.UUID], UUID]):
 
 
 class CompositeAPIKeyIdentifier(
-    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifier]
+    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifierType]
 ):
     type: Annotated[
         Literal[IdentifierType.COMPOSITE],
         Field(IdentifierType.COMPOSITE, description="Identifier's type"),
     ] = IdentifierType.COMPOSITE
-    value: Annotated[CompositeIdentifier, Field(..., description="Identifier's value")]
+    value: Annotated[CompositeIdentifierType, Field(..., description="Identifier's value")]
 
 
 AnyAPIKeyIdentifier = (

maleo/identity/mixins/organization.py

@@ -21,7 +21,9 @@ class Secret(BaseModel, Generic[OptUUIDT]):
 
 
 class OrganizationIdentifier(Identifier[IdentifierType, IdentifierValueType]):
-    pass
+    @property
+    def column_and_value(self) -> tuple[str, IdentifierValueType]:
+        return self.type.column, self.value
 
 
 class IdOrganizationIdentifier(Identifier[Literal[IdentifierType.ID], int]):

maleo/identity/mixins/organization_registration_code.py

@@ -1,15 +1,49 @@
-from pydantic import BaseModel, Field
-from typing import Annotated, Generic, Literal, TypeGuard
+from pydantic import BaseModel, Field, model_validator
+from typing import Annotated, Generic, Literal, Self, TypeGuard
 from uuid import UUID
 from maleo.schemas.mixins.identity import Identifier
 from maleo.types.integer import OptIntT
+from maleo.types.misc import OptIntOrStr
 from maleo.types.string import OptStrT
 from ..enums.organization_registration_code import IdentifierType
 from ..types.organization_registration_code import IdentifierValueType
 
 
+class CodeOrLength(BaseModel):
+    code_or_length: Annotated[
+        OptIntOrStr,
+        Field(
+            None,
+            description=(
+                "Code (str) or length (int). "
+                "If code is given, the length must be between 6 and 36 inclusive. "
+                "If length is given, the value must be between 6 and 36 inclusive. "
+                "Will generate random 6 char string if omitted"
+            ),
+        ),
+    ]
+
+    @model_validator(mode="after")
+    def validate_code_or_length(self) -> Self:
+        code_or_length = self.code_or_length
+        if code_or_length is None:
+            return self
+        print(code_or_length)
+        if isinstance(code_or_length, int):
+            length = code_or_length
+        elif isinstance(code_or_length, str):
+            length = len(code_or_length)
+        else:
+            raise ValueError("Code or Length must be either int or str")
+        if length < 6 or length > 36:
+            raise ValueError("Code or Length must be between 6 and 36 inclusive")
+        return self
+
+
 class Code(BaseModel, Generic[OptStrT]):
-    code: Annotated[OptStrT, Field(..., description="Code", max_length=36)]
+    code: Annotated[
+        OptStrT, Field(..., description="Code", min_length=6, max_length=36)
+    ]
 
 
 class MaxUses(BaseModel, Generic[OptIntT]):
@@ -23,7 +57,9 @@ class CurrentUses(BaseModel):
 class OrganizationRegistrationCodeIdentifier(
     Identifier[IdentifierType, IdentifierValueType]
 ):
-    pass
+    @property
+    def column_and_value(self) -> tuple[str, IdentifierValueType]:
+        return self.type.column, self.value
 
 
 class IdOrganizationRegistrationCodeIdentifier(

maleo/identity/mixins/organization_relation.py

@@ -2,10 +2,12 @@ from pydantic import BaseModel, Field
 from typing import Annotated, Generic, Literal, TypeGuard
 from uuid import UUID
 from maleo.schemas.mixins.identity import Identifier
+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 ..types.organization_relation import CompositeIdentifier, IdentifierValueType
+from ..types.organization_relation import CompositeIdentifierType, IdentifierValueType
 
 
 class IsBidirectional(BaseModel, Generic[OptBoolT]):
@@ -17,7 +19,10 @@ class Meta(BaseModel):
 
 
 class OrganizationRelationIdentifier(Identifier[IdentifierType, IdentifierValueType]):
-    pass
+    @property
+    def columns_and_values(self) -> tuple[ManyStrs, ManyAny]:
+        values = self.value if isinstance(self.value, tuple) else (self.value,)
+        return self.type.columns, values
 
 
 class IdOrganizationRelationIdentifier(Identifier[Literal[IdentifierType.ID], int]):
@@ -38,13 +43,13 @@ class UUIDOrganizationRelationIdentifier(
 
 
 class CompositeOrganizationRelationIdentifier(
-    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifier]
+    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifierType]
 ):
     type: Annotated[
         Literal[IdentifierType.COMPOSITE],
         Field(IdentifierType.COMPOSITE, description="Identifier's type"),
     ] = IdentifierType.COMPOSITE
-    value: Annotated[CompositeIdentifier, Field(..., description="Identifier's value")]
+    value: Annotated[CompositeIdentifierType, Field(..., description="Identifier's value")]
 
 
 AnyOrganizationRelationIdentifier = (

maleo/identity/mixins/patient.py

@@ -1,10 +1,9 @@
-from pydantic import Field, model_validator
+from pydantic import BaseModel, Field, model_validator
 from typing import Annotated, Generic, Literal, Self, TypeGuard
 from uuid import UUID
-from maleo.schemas.mixins.identity import Identifier
-from maleo.schemas.mixins.identity import Passport as BasePassport
+from maleo.schemas.mixins.identity import Identifier, Passport as BasePassport
 from maleo.types.string import OptStr, OptStrT
-from ..enums.patient import IdentifierType
+from ..enums.patient import IdentifierType, OptListOfExpandableFields
 from ..types.patient import IdentifierValueType
 from .common import IdCard
 
@@ -24,8 +23,16 @@ class PatientIdentity(
         return self
 
 
+class Expand(BaseModel):
+    expand: Annotated[
+        OptListOfExpandableFields, Field(None, description="Expanded field(s)")
+    ] = None
+
+
 class PatientIdentifier(Identifier[IdentifierType, IdentifierValueType]):
-    pass
+    @property
+    def column_and_value(self) -> tuple[str, IdentifierValueType]:
+        return self.type.column, self.value
 
 
 class IdPatientIdentifier(Identifier[Literal[IdentifierType.ID], int]):
@@ -43,29 +50,7 @@ class UUIDPatientIdentifier(Identifier[Literal[IdentifierType.UUID], UUID]):
     ] = IdentifierType.UUID
 
 
-class IdCardPatientIdentifier(Identifier[Literal[IdentifierType.ID_CARD], str]):
-    type: Annotated[
-        Literal[IdentifierType.ID_CARD],
-        Field(IdentifierType.ID_CARD, description="Identifier's type"),
-    ] = IdentifierType.ID_CARD
-    value: Annotated[str, Field(..., description="Identifier's value", max_length=16)]
-
-
-class PassportPatientIdentifier(Identifier[Literal[IdentifierType.PASSPORT], str]):
-    type: Annotated[
-        Literal[IdentifierType.PASSPORT],
-        Field(IdentifierType.PASSPORT, description="Identifier's type"),
-    ] = IdentifierType.PASSPORT
-    value: Annotated[str, Field(..., description="Identifier's value", max_length=9)]
-
-
-AnyPatientIdentifier = (
-    PatientIdentifier
-    | IdPatientIdentifier
-    | UUIDPatientIdentifier
-    | IdCardPatientIdentifier
-    | PassportPatientIdentifier
-)
+AnyPatientIdentifier = PatientIdentifier | IdPatientIdentifier | UUIDPatientIdentifier
 
 
 def is_id_identifier(
@@ -78,19 +63,3 @@ def is_uuid_identifier(
     identifier: AnyPatientIdentifier,
 ) -> TypeGuard[UUIDPatientIdentifier]:
     return identifier.type is IdentifierType.UUID and isinstance(identifier.value, UUID)
-
-
-def is_id_card_identifier(
-    identifier: AnyPatientIdentifier,
-) -> TypeGuard[IdCardPatientIdentifier]:
-    return identifier.type is IdentifierType.ID_CARD and isinstance(
-        identifier.value, str
-    )
-
-
-def is_passport_identifier(
-    identifier: AnyPatientIdentifier,
-) -> TypeGuard[PassportPatientIdentifier]:
-    return identifier.type is IdentifierType.PASSPORT and isinstance(
-        identifier.value, str
-    )

maleo/identity/mixins/user.py

@@ -38,7 +38,9 @@ class Password(BaseModel):
 
 
 class UserIdentifier(Identifier[IdentifierType, IdentifierValueType]):
-    pass
+    @property
+    def column_and_value(self) -> tuple[str, IdentifierValueType]:
+        return self.type.column, self.value
 
 
 class IdUserIdentifier(Identifier[Literal[IdentifierType.ID], int]):

maleo/identity/mixins/user_medical_role.py

@@ -2,12 +2,17 @@ from pydantic import Field
 from typing import Annotated, Literal, TypeGuard
 from uuid import UUID
 from maleo.schemas.mixins.identity import Identifier
+from maleo.types.any import ManyAny
+from maleo.types.string import ManyStrs
 from ..enums.user_medical_role import IdentifierType
-from ..types.user_medical_role import CompositeIdentifier, IdentifierValueType
+from ..types.user_medical_role import CompositeIdentifierType, IdentifierValueType
 
 
 class UserMedicalRoleIdentifier(Identifier[IdentifierType, IdentifierValueType]):
-    pass
+    @property
+    def columns_and_values(self) -> tuple[ManyStrs, ManyAny]:
+        values = self.value if isinstance(self.value, tuple) else (self.value,)
+        return self.type.columns, values
 
 
 class IdUserMedicalRoleIdentifier(Identifier[Literal[IdentifierType.ID], int]):
@@ -26,13 +31,13 @@ class UUIDUserMedicalRoleIdentifier(Identifier[Literal[IdentifierType.UUID], UUI
 
 
 class CompositeUserMedicalRoleIdentifier(
-    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifier]
+    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifierType]
 ):
     type: Annotated[
         Literal[IdentifierType.COMPOSITE],
         Field(IdentifierType.COMPOSITE, description="Identifier's type"),
     ] = IdentifierType.COMPOSITE
-    value: Annotated[CompositeIdentifier, Field(..., description="Identifier's value")]
+    value: Annotated[CompositeIdentifierType, Field(..., description="Identifier's value")]
 
 
 AnyUserMedicalRoleIdentifier = (

maleo/identity/mixins/user_organization_role.py

@@ -2,12 +2,17 @@ from pydantic import Field
 from typing import Annotated, Literal, TypeGuard
 from uuid import UUID
 from maleo.schemas.mixins.identity import Identifier
+from maleo.types.any import ManyAny
+from maleo.types.string import ManyStrs
 from ..enums.user_organization_role import IdentifierType
-from ..types.user_organization_role import CompositeIdentifier, IdentifierValueType
+from ..types.user_organization_role import CompositeIdentifierType, IdentifierValueType
 
 
 class UserOrganizationRoleIdentifier(Identifier[IdentifierType, IdentifierValueType]):
-    pass
+    @property
+    def columns_and_values(self) -> tuple[ManyStrs, ManyAny]:
+        values = self.value if isinstance(self.value, tuple) else (self.value,)
+        return self.type.columns, values
 
 
 class IdUserOrganizationRoleIdentifier(Identifier[Literal[IdentifierType.ID], int]):
@@ -28,13 +33,13 @@ class UUIDUserOrganizationRoleIdentifier(
 
 
 class CompositeUserOrganizationRoleIdentifier(
-    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifier]
+    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifierType]
 ):
     type: Annotated[
         Literal[IdentifierType.COMPOSITE],
         Field(IdentifierType.COMPOSITE, description="Identifier's type"),
     ] = IdentifierType.COMPOSITE
-    value: Annotated[CompositeIdentifier, Field(..., description="Identifier's value")]
+    value: Annotated[CompositeIdentifierType, Field(..., description="Identifier's value")]
 
 
 AnyUserOrganizationRoleIdentifier = (

maleo/identity/mixins/user_profile.py

@@ -46,7 +46,9 @@ class AvatarUrl(BaseModel, Generic[OptStrT]):
 
 
 class UserProfileIdentifier(Identifier[IdentifierType, IdentifierValueType]):
-    pass
+    @property
+    def column_and_value(self) -> tuple[str, IdentifierValueType]:
+        return self.type.column, self.value
 
 
 class IdUserProfileIdentifier(Identifier[Literal[IdentifierType.ID], int]):