maleo-identity 0.1.10__py3-none-any.whl → 0.1.12__py3-none-any.whl

maleo/identity/constants/user_system_role.py

@@ -1,4 +1,5 @@
 from maleo.schemas.resource import Resource, ResourceIdentifier
+from maleo.types.string import DoubleStrs
 
 
 USER_SYSTEM_ROLE_RESOURCE = Resource(
@@ -11,3 +12,6 @@ USER_SYSTEM_ROLE_RESOURCE = Resource(
     ],
     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_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/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_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,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", "system_role")
+        raise ValueError(f"Unknown column(s) for identifier type: {self}")

maleo/identity/mixins/api_key.py

@@ -2,6 +2,8 @@ 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
 
@@ -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]):

maleo/identity/mixins/organization_relation.py

@@ -2,8 +2,10 @@ 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
 
@@ -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]):

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
 
 
 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]):

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
 
 
 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]):

maleo/identity/mixins/user_system_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_system_role import IdentifierType
 from ..types.user_system_role import CompositeIdentifier, IdentifierValueType
 
 
 class UserSystemRoleIdentifier(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 IdUserSystemRoleIdentifier(Identifier[Literal[IdentifierType.ID], int]):

maleo/identity/models.py

@@ -58,6 +58,11 @@ class Patient(
     DataIdentifier,
 ):
     __tablename__ = "patients"
+    user_id: Mapped[int] = mapped_column(
+        Integer,
+        ForeignKey("users.id", ondelete="CASCADE", onupdate="CASCADE"),
+        nullable=False,
+    )
     organization_id: Mapped[int] = mapped_column(
         Integer,
         ForeignKey("organizations.id", ondelete="CASCADE", onupdate="CASCADE"),

{maleo_identity-0.1.10.dist-info → maleo_identity-0.1.12.dist-info}/METADATA

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

{maleo_identity-0.1.10.dist-info → maleo_identity-0.1.12.dist-info}/RECORD

@@ -1,5 +1,5 @@
 maleo/identity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo/identity/models.py,sha256=gxsLPJeNG6cddGx8V7k30LJkCKPPdQ77dXOQUSSZuiM,10132
+maleo/identity/models.py,sha256=CkcLrrcT_WEvNdp_FvUfnJZ8wVMVwrE4zrbor_Cvc_0,10293
 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
@@ -10,30 +10,30 @@ maleo/identity/constants/user.py,sha256=vlF60H4-THtoOpwyAHMYqaLknXsQOANCLTngbyhN
 maleo/identity/constants/user_medical_role.py,sha256=HVeXXb191qpAJJHtSgJ0NdFlLCxeEQBOKRr7JCQN8Pg,304
 maleo/identity/constants/user_organization_role.py,sha256=-6z8e5-OJWmm_47_zbbp61JxiRGGytELqk0iZ5yX4Wk,324
 maleo/identity/constants/user_profile.py,sha256=trDI4mNlcbA1_ignknMy07I6H-VqAytlfB8ejoQ7XH0,259
-maleo/identity/constants/user_system_role.py,sha256=_p5FI2X7yBUJuA06ia_vIkDRyfY4WZweQD08G3wCuRw,300
+maleo/identity/constants/user_system_role.py,sha256=JPnKbuP_kqNngfQubhnL9_L2NlvNb5sKsnNwyO5YPXU,402
 maleo/identity/enums/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo/identity/enums/api_key.py,sha256=WST6RsRrvJGeSL5ugVeZNKXReGsh9GEPDxmRy-owiEk,276
+maleo/identity/enums/api_key.py,sha256=twpkiI21x52roagXHJjq4vhMLv9WPGhWFtPM55LSZ-w,721
 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/organization_relation.py,sha256=-GxBCzUi-PFrICnHqray2PtFZb6LoG7NluDmyjljOa8,628
 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_medical_role.py,sha256=KvPDu66wIh_sqvx0dyW38aTlCt5e_kRDcJ05Rk0rOd4,636
+maleo/identity/enums/user_organization_role.py,sha256=bV07sZYttbJPfefkp7u9Bkc4V1e3xsyhtErtpkXb-Xg,641
 maleo/identity/enums/user_profile.py,sha256=LgX7Ct-MAfx7o0W8MICzpHMfDhi7wpiJfRszn6vr1zc,272
-maleo/identity/enums/user_system_role.py,sha256=jH9AIYKhxPtK-I02KVrYfZ9Wdo-KNCFk0rDBauwt-Ps,252
+maleo/identity/enums/user_system_role.py,sha256=njHPqJGDw3BMgY_i05ywyQX86Pc8ZSpg4_SeiXSwD2A,616
 maleo/identity/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo/identity/mixins/api_key.py,sha256=WbRhcO_wdQnn4ow62eg4kRoPYMyNFjXvi5pivRNdP14,2093
+maleo/identity/mixins/api_key.py,sha256=kyFX5gZNZ9aDe8QL31a4XOzF-0tAMpCNl8Fi9Lb4gkQ,2357
 maleo/identity/mixins/common.py,sha256=diWtUiPMI_ypHtDrmI5y8IArxCdomo9Gt6X69iFhyuw,905
 maleo/identity/mixins/organization.py,sha256=cJQWOWaRj5F3ITCrpLU7R8hOUM-OWZz_T7H0aV6nc2I,2440
 maleo/identity/mixins/organization_registration_code.py,sha256=--XHacpOTCdOLou2I9wE3DiWD_H5MeIotGsg3KJCVaw,3418
-maleo/identity/mixins/organization_relation.py,sha256=b76eiW6Qrw-Ce6qASaYOVTK4Ox7UAltvLl3sbPra9mY,2591
+maleo/identity/mixins/organization_relation.py,sha256=f3HRunKAMq4sJspOVG6qdu_e5jknA6jzcte7P96qPrk,2855
 maleo/identity/mixins/patient.py,sha256=kLJKyc5KDgHvK9ljfiaZJJExnovbCWO70HdtHkdKYeQ,3120
 maleo/identity/mixins/user.py,sha256=PrBEF9GDMewh4UUwWRKF5mVr9exEjBlczLAmbfY3gKY,3421
-maleo/identity/mixins/user_medical_role.py,sha256=p1QHv_X9bce0zpDTzjuZP6LVNrKaE5vlFRmNDU7vRyk,2131
-maleo/identity/mixins/user_organization_role.py,sha256=KOSGPLhcnNB7ejD-OhDsSgRAv7aiMOrhgW5-3RR8H90,2222
+maleo/identity/mixins/user_medical_role.py,sha256=p4_YDi-OAoNHNKcCUhLtwqBLs6KLVqp40--4pFBkC0s,2395
+maleo/identity/mixins/user_organization_role.py,sha256=E09ZGfL5gI-J7GVyCodcDKqNsgoF4q6exVaBnwPHSWY,2486
 maleo/identity/mixins/user_profile.py,sha256=QbCIiuKeottVLMWg3MJQe6e7nl_RcF6K5yhtCjqf3OA,3697
-maleo/identity/mixins/user_system_role.py,sha256=wxCX7HpT5xYuOqC-rPqnXqdEU5WEf_JLYg7l1zhQIwM,2114
+maleo/identity/mixins/user_system_role.py,sha256=n016-hDsR9YJLZxvrASHzMfEHWDsvhT1ZusgLKE0850,2378
 maleo/identity/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/identity/schemas/api_key.py,sha256=3wFfQBiNQEFAF2ZStfczvFhCgM3zC4A2wfWyZshJhhA,4675
 maleo/identity/schemas/common.py,sha256=YseA6bREI4YFdSHGXK3eS4CIibqm7ZmMBcxLKBiB64Y,8218
@@ -60,8 +60,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=aEegzeoNLUptrScUB5kWrYlJj7dzTZeVXymltE5lWpE,874
 maleo/identity/utils/user.py,sha256=1pyfmAbXkAEOo6WM2KRA_kRnFi0O_A2ZUEqv01wY-cU,794
-maleo_identity-0.1.10.dist-info/licenses/LICENSE,sha256=aftGsecnk7TWVX-7KW94FqK4Syy6YSZ8PZEF7EcIp3M,2621
-maleo_identity-0.1.10.dist-info/METADATA,sha256=QRRoqWPwC8ZUWJUv5De36A_oK3gdLO3sR0z6Cs74XIg,3546
-maleo_identity-0.1.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_identity-0.1.10.dist-info/top_level.txt,sha256=3Tpd1siVsfYoeI9FEOJNYnffx_shzZ3wsPpTvz5bljc,6
-maleo_identity-0.1.10.dist-info/RECORD,,
+maleo_identity-0.1.12.dist-info/licenses/LICENSE,sha256=aftGsecnk7TWVX-7KW94FqK4Syy6YSZ8PZEF7EcIp3M,2621
+maleo_identity-0.1.12.dist-info/METADATA,sha256=R-hcRmV9yz9MOIBLr7QF2gpgNYJ6J580g7HcE7gxGwE,3546
+maleo_identity-0.1.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_identity-0.1.12.dist-info/top_level.txt,sha256=3Tpd1siVsfYoeI9FEOJNYnffx_shzZ3wsPpTvz5bljc,6
+maleo_identity-0.1.12.dist-info/RECORD,,