maleo-identity 0.0.43__py3-none-any.whl → 0.0.45__py3-none-any.whl

maleo_identity/client/services/user.py

@@ -72,13 +72,24 @@ class MaleoIdentityUserClientService(MaleoClientService):
             no_data_class=MaleoIdentityUserClientResultsTransfers.NoData
         )
         @cached(
-            ttl=int(BaseEnums.CacheTTL.TTL_1DY),
+            ttl=int(BaseEnums.CacheTTL.TTL_30MN),
             namespace=self.service_manager.configs.cache.redis.namespaces.create(
                 "user",
                 type=BaseEnums.CacheType.CLIENT,
                 base_override=self.key
             ),
             key_builder=BaseCacheConfigurations.key_builder,
+            skip_cache_func=lambda x: (
+                self.service_manager.settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL
+                or x is None
+                or (
+                    isinstance(x, dict)
+                    and (
+                        x.get("success") in [False, None]
+                        or (x.get("success") is True and x.get("data") is None)
+                    )
+                )
+            ),
             cache=Cache.REDIS,
             serializer=JsonSerializer(),
             endpoint=self.service_manager.configs.cache.redis.host,
@@ -158,13 +169,24 @@ class MaleoIdentityUserClientService(MaleoClientService):
             data_found_class=MaleoIdentityUserClientResultsTransfers.SingleData
         )
         @cached(
-            ttl=int(BaseEnums.CacheTTL.TTL_1DY),
+            ttl=int(BaseEnums.CacheTTL.TTL_30MN),
             namespace=self.service_manager.configs.cache.redis.namespaces.create(
                 "user",
                 type=BaseEnums.CacheType.CLIENT,
                 base_override=self.key
             ),
             key_builder=BaseCacheConfigurations.key_builder,
+            skip_cache_func=lambda x: (
+                self.service_manager.settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL
+                or x is None
+                or (
+                    isinstance(x, dict)
+                    and (
+                        x.get("success") in [False, None]
+                        or (x.get("success") is True and x.get("data") is None)
+                    )
+                )
+            ),
             cache=Cache.REDIS,
             serializer=JsonSerializer(),
             endpoint=self.service_manager.configs.cache.redis.host,
@@ -350,13 +372,24 @@ class MaleoIdentityUserClientService(MaleoClientService):
             data_found_class=MaleoIdentityUserClientResultsTransfers.SinglePassword
         )
         @cached(
-            ttl=int(BaseEnums.CacheTTL.TTL_1DY),
+            ttl=int(BaseEnums.CacheTTL.TTL_30MN),
             namespace=self.service_manager.configs.cache.redis.namespaces.create(
                 "user",
                 type=BaseEnums.CacheType.CLIENT,
                 base_override=self.key
             ),
             key_builder=BaseCacheConfigurations.key_builder,
+            skip_cache_func=lambda x: (
+                self.service_manager.settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL
+                or x is None
+                or (
+                    isinstance(x, dict)
+                    and (
+                        x.get("success") in [False, None]
+                        or (x.get("success") is True and x.get("data") is None)
+                    )
+                )
+            ),
             cache=Cache.REDIS,
             serializer=JsonSerializer(),
             endpoint=self.service_manager.configs.cache.redis.host,
@@ -429,13 +462,24 @@ class MaleoIdentityUserClientService(MaleoClientService):
             no_data_class=MaleoIdentityUserOrganizationClientResultsTransfers.NoData
         )
         @cached(
-            ttl=int(BaseEnums.CacheTTL.TTL_1DY),
+            ttl=int(BaseEnums.CacheTTL.TTL_30MN),
             namespace=self.service_manager.configs.cache.redis.namespaces.create(
                 "user_organization",
                 type=BaseEnums.CacheType.CLIENT,
                 base_override=self.key
             ),
             key_builder=BaseCacheConfigurations.key_builder,
+            skip_cache_func=lambda x: (
+                self.service_manager.settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL
+                or x is None
+                or (
+                    isinstance(x, dict)
+                    and (
+                        x.get("success") in [False, None]
+                        or (x.get("success") is True and x.get("data") is None)
+                    )
+                )
+            ),
             cache=Cache.REDIS,
             serializer=JsonSerializer(),
             endpoint=self.service_manager.configs.cache.redis.host,
@@ -515,13 +559,24 @@ class MaleoIdentityUserClientService(MaleoClientService):
             data_found_class=MaleoIdentityUserOrganizationClientResultsTransfers.SingleData
         )
         @cached(
-            ttl=int(BaseEnums.CacheTTL.TTL_1DY),
+            ttl=int(BaseEnums.CacheTTL.TTL_30MN),
             namespace=self.service_manager.configs.cache.redis.namespaces.create(
                 "user_organization",
                 type=BaseEnums.CacheType.CLIENT,
                 base_override=self.key
             ),
             key_builder=BaseCacheConfigurations.key_builder,
+            skip_cache_func=lambda x: (
+                self.service_manager.settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL
+                or x is None
+                or (
+                    isinstance(x, dict)
+                    and (
+                        x.get("success") in [False, None]
+                        or (x.get("success") is True and x.get("data") is None)
+                    )
+                )
+            ),
             cache=Cache.REDIS,
             serializer=JsonSerializer(),
             endpoint=self.service_manager.configs.cache.redis.host,
@@ -594,13 +649,24 @@ class MaleoIdentityUserClientService(MaleoClientService):
             no_data_class=MaleoIdentityUserSystemRoleClientResultsTransfers.NoData
         )
         @cached(
-            ttl=int(BaseEnums.CacheTTL.TTL_1DY),
+            ttl=int(BaseEnums.CacheTTL.TTL_30MN),
             namespace=self.service_manager.configs.cache.redis.namespaces.create(
                 "user_system_role",
                 type=BaseEnums.CacheType.CLIENT,
                 base_override=self.key
             ),
             key_builder=BaseCacheConfigurations.key_builder,
+            skip_cache_func=lambda x: (
+                self.service_manager.settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL
+                or x is None
+                or (
+                    isinstance(x, dict)
+                    and (
+                        x.get("success") in [False, None]
+                        or (x.get("success") is True and x.get("data") is None)
+                    )
+                )
+            ),
             cache=Cache.REDIS,
             serializer=JsonSerializer(),
             endpoint=self.service_manager.configs.cache.redis.host,
@@ -677,13 +743,24 @@ class MaleoIdentityUserClientService(MaleoClientService):
             data_found_class=MaleoIdentityUserSystemRoleClientResultsTransfers.SingleData
         )
         @cached(
-            ttl=int(BaseEnums.CacheTTL.TTL_1DY),
+            ttl=int(BaseEnums.CacheTTL.TTL_30MN),
             namespace=self.service_manager.configs.cache.redis.namespaces.create(
                 "user_system_role",
                 type=BaseEnums.CacheType.CLIENT,
                 base_override=self.key
             ),
             key_builder=BaseCacheConfigurations.key_builder,
+            skip_cache_func=lambda x: (
+                self.service_manager.settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL
+                or x is None
+                or (
+                    isinstance(x, dict)
+                    and (
+                        x.get("success") in [False, None]
+                        or (x.get("success") is True and x.get("data") is None)
+                    )
+                )
+            ),
             cache=Cache.REDIS,
             serializer=JsonSerializer(),
             endpoint=self.service_manager.configs.cache.redis.host,
@@ -755,13 +832,24 @@ class MaleoIdentityUserClientService(MaleoClientService):
             no_data_class=MaleoIdentityUserOrganizationRoleClientResultsTransfers.NoData
         )
         @cached(
-            ttl=int(BaseEnums.CacheTTL.TTL_1DY),
+            ttl=int(BaseEnums.CacheTTL.TTL_30MN),
             namespace=self.service_manager.configs.cache.redis.namespaces.create(
                 "user_organization_role",
                 type=BaseEnums.CacheType.CLIENT,
                 base_override=self.key
             ),
             key_builder=BaseCacheConfigurations.key_builder,
+            skip_cache_func=lambda x: (
+                self.service_manager.settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL
+                or x is None
+                or (
+                    isinstance(x, dict)
+                    and (
+                        x.get("success") in [False, None]
+                        or (x.get("success") is True and x.get("data") is None)
+                    )
+                )
+            ),
             cache=Cache.REDIS,
             serializer=JsonSerializer(),
             endpoint=self.service_manager.configs.cache.redis.host,
@@ -841,13 +929,24 @@ class MaleoIdentityUserClientService(MaleoClientService):
             data_found_class=MaleoIdentityUserOrganizationRoleClientResultsTransfers.SingleData
         )
         @cached(
-            ttl=int(BaseEnums.CacheTTL.TTL_1DY),
+            ttl=int(BaseEnums.CacheTTL.TTL_30MN),
             namespace=self.service_manager.configs.cache.redis.namespaces.create(
                 "user_organization_role",
                 type=BaseEnums.CacheType.CLIENT,
                 base_override=self.key
             ),
             key_builder=BaseCacheConfigurations.key_builder,
+            skip_cache_func=lambda x: (
+                self.service_manager.settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL
+                or x is None
+                or (
+                    isinstance(x, dict)
+                    and (
+                        x.get("success") in [False, None]
+                        or (x.get("success") is True and x.get("data") is None)
+                    )
+                )
+            ),
             cache=Cache.REDIS,
             serializer=JsonSerializer(),
             endpoint=self.service_manager.configs.cache.redis.host,

maleo_identity/constants/user.py

@@ -1,7 +1,6 @@
 from typing import Dict, List
 from uuid import UUID
 from maleo_identity.enums.user import MaleoIdentityUserEnums
-from maleo_identity.enums.user_profile import MaleoIdentityUserProfileEnums
 
 class MaleoIdentityUserConstants:
     IDENTIFIER_TYPE_VALUE_TYPE_MAP:Dict[
@@ -23,12 +22,4 @@ class MaleoIdentityUserConstants:
             MaleoIdentityUserEnums.ExpandableFields.GENDER,
             MaleoIdentityUserEnums.ExpandableFields.BLOOD_TYPE
         ]
-    }
-
-    USER_PROFILE_EXPANDABLE_FIELDS_MAP:Dict[
-        MaleoIdentityUserEnums.ExpandableFields,
-        MaleoIdentityUserProfileEnums.ExpandableFields
-    ] = {
-        MaleoIdentityUserEnums.ExpandableFields.GENDER: MaleoIdentityUserProfileEnums.ExpandableFields.GENDER,
-        MaleoIdentityUserEnums.ExpandableFields.BLOOD_TYPE: MaleoIdentityUserProfileEnums.ExpandableFields.BLOOD_TYPE
     }

maleo_identity/constants/user_system_role.py

@@ -8,13 +8,11 @@ class MaleoIdentityUserSystemRoleConstants:
         List[MaleoIdentityUserSystemRoleEnums.ExpandableFields]
     ] = {
         MaleoIdentityUserSystemRoleEnums.ExpandableFields.USER: [
-            MaleoIdentityUserSystemRoleEnums.ExpandableFields.USER_TYPE
+            MaleoIdentityUserSystemRoleEnums.ExpandableFields.USER_TYPE,
+            MaleoIdentityUserSystemRoleEnums.ExpandableFields.PROFILE
+        ],
+        MaleoIdentityUserSystemRoleEnums.ExpandableFields.PROFILE: [
+            MaleoIdentityUserSystemRoleEnums.ExpandableFields.GENDER,
+            MaleoIdentityUserSystemRoleEnums.ExpandableFields.BLOOD_TYPE
         ]
-    }
-
-    USER_EXPANDABLE_FIELDS_MAP:Dict[
-        MaleoIdentityUserSystemRoleEnums.ExpandableFields,
-        MaleoIdentityUserEnums.ExpandableFields
-    ] = {
-        MaleoIdentityUserSystemRoleEnums.ExpandableFields.USER_TYPE: MaleoIdentityUserEnums.ExpandableFields.USER_TYPE
     }

maleo_identity/enums/user_system_role.py

@@ -4,4 +4,7 @@ class MaleoIdentityUserSystemRoleEnums:
     class ExpandableFields(StrEnum):
         USER = "user"
         USER_TYPE = "user.user_type"
+        PROFILE = "user.profile"
+        GENDER = "user.profile.gender"
+        BLOOD_TYPE = "user.profile.blood_type"
         SYSTEM_ROLE = "system_role"

maleo_identity/models/__init__.py

@@ -1,9 +1,11 @@
 from __future__ import annotations
 from .tables import MaleoIdentityTables
+from .schemas import MaleoIdentitySchemas
 from .transfers import MaleoIdentityTransfers
 from .responses import MaleoIdentityResponses
 
 class MaleoIdentityModels:
     Tables = MaleoIdentityTables
+    Schemas = MaleoIdentitySchemas
     Transfers = MaleoIdentityTransfers
     Responses = MaleoIdentityResponses

maleo_identity/models/responses/organization.py

@@ -1,7 +1,7 @@
 from pydantic import Field
 from maleo_foundation.models.responses import BaseResponses
 from maleo_identity.enums.organization import MaleoIdentityOrganizationEnums
-from maleo_identity.models.transfers.general.organization import OrganizationTransfers
+from maleo_identity.models.transfers.general.organization import OrganizationTransfers, StructuredOrganizationTransfers
 
 class MaleoIdentityOrganizationResponses:
     class InvalidIdentifierType(BaseResponses.BadRequest):
@@ -27,20 +27,32 @@ class MaleoIdentityOrganizationResponses:
         description:str = "Requested organizations found in database"
         data:list[OrganizationTransfers] = Field(..., description="Organizations")
 
-    class CreateFailed(BaseResponses.BadRequest):
+    class GetSingleStructured(BaseResponses.SingleData):
         code:str = "IDT-ORG-005"
+        message:str = "Structured organization found"
+        description:str = "Requested structured organization found in database"
+        data:StructuredOrganizationTransfers = Field(..., description="Structured organization")
+
+    class GetMultipleStructured(BaseResponses.PaginatedMultipleData):
+        code:str = "IDT-ORG-006"
+        message:str = "Structured organizations found"
+        description:str = "Requested structured organizations found in database"
+        data:list[StructuredOrganizationTransfers] = Field(..., description="Structured organizations")
+
+    class CreateFailed(BaseResponses.BadRequest):
+        code:str = "IDT-ORG-007"
         message:str = "Failed creating new organization"
 
     class CreateSuccess(BaseResponses.SingleData):
-        code:str = "IDT-ORG-006"
+        code:str = "IDT-ORG-008"
         message:str = "Successfully created new organization"
         data:OrganizationTransfers = Field(..., description="Organization")
 
     class UpdateFailed(BaseResponses.BadRequest):
-        code:str = "IDT-ORG-007"
+        code:str = "IDT-ORG-009"
         message:str = "Failed updating organization's data"
 
     class UpdateSuccess(BaseResponses.SingleData):
-        code:str = "IDT-ORG-008"
+        code:str = "IDT-ORG-010"
         message:str = "Successfully updated organization's data"
         data:OrganizationTransfers = Field(..., description="Organization")

maleo_identity/models/schemas/__init__.py

@@ -1,9 +1,19 @@
 from __future__ import annotations
 from .general import MaleoIdentityGeneralSchemas
-from .parameters import MaleoIdentityParametersSchemas
-from .results import MaleoIdentityResultsSchemas
+from .organization_role import MaleoIdentityOrganizationRoleSchemas
+from .organization import MaleoIdentityOrganizationSchemas
+from .user_organization_role import MaleoIdentityUserOrganizationRoleSchemas
+from .user_organization import MaleoIdentityUserOrganizationSchemas
+from .user_profile import MaleoIdentityUserProfileSchemas
+from .user_system_role import MaleoIdentityUserSystemRoleSchemas
+from .user import MaleoIdentityUserSchemas
 
 class MaleoIdentitySchemas:
     General = MaleoIdentityGeneralSchemas
-    Parameters = MaleoIdentityParametersSchemas
-    Results = MaleoIdentityResultsSchemas
+    OrganizationRole = MaleoIdentityOrganizationRoleSchemas
+    Organization = MaleoIdentityOrganizationSchemas
+    UserOrganizationRole = MaleoIdentityUserOrganizationRoleSchemas
+    UserOrganization = MaleoIdentityUserOrganizationSchemas
+    UserProfile = MaleoIdentityUserProfileSchemas
+    UserSystemRole = MaleoIdentityUserSystemRoleSchemas
+    User = MaleoIdentityUserSchemas

maleo_identity/models/schemas/general.py

@@ -0,0 +1,15 @@
+from pydantic import BaseModel, Field
+from maleo_foundation.types import BaseTypes
+
+class MaleoIdentityGeneralSchemas:
+    class UserId(BaseModel):
+        user_id:int = Field(..., ge=1, description="User's ID")
+
+    class OptionalListOfUserIds(BaseModel):
+        user_ids:BaseTypes.OptionalListOfIntegers = Field(None, description="User's IDs")
+
+    class OrganizationId(BaseModel):
+        organization_id:int = Field(..., ge=1, description="Organization's ID")
+
+    class OptionalListOfOrganizationIds(BaseModel):
+        organization_ids:BaseTypes.OptionalListOfIntegers = Field(None, description="Organization's IDs")

maleo_identity/models/schemas/{general/organization.py → organization.py}

@@ -1,21 +1,22 @@
 from pydantic import BaseModel, Field
-from typing import Optional, List
-from maleo_foundation.types import BaseTypes
+from typing import List, Optional
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
+from maleo_foundation.types import BaseTypes
 from maleo_identity.enums.organization import MaleoIdentityOrganizationEnums
 
-class MaleoIdentityOrganizationGeneralSchemas:
-    class IdentifierType(BaseModel):
+class MaleoIdentityOrganizationSchemas:
+    class IdentifierType(BaseParameterSchemas.IdentifierType):
         identifier:MaleoIdentityOrganizationEnums.IdentifierType = Field(..., description="Organization's identifier")
 
-    class Expand(BaseModel):
+    class Expand(BaseParameterSchemas.Expand):
         expand:Optional[List[MaleoIdentityOrganizationEnums.ExpandableFields]] = Field(None, description="Expanded field(s)")
 
-    class OptionalParentOrganizationId(BaseModel):
-        parent_organization_id:BaseTypes.OptionalInteger = Field(None, ge=1, description="Parent organization's Id")
+    class OptionalParentId(BaseModel):
+        parent_id:BaseTypes.OptionalInteger = Field(None, ge=1, description="Parent organization's Id")
 
-    class OptionalListOfParentOrganizationId(BaseModel):
-        parent_organization_ids:BaseTypes.OptionalListOfIntegers = Field(None, description="Parent organization's Ids")
+    class OptionalListOfParentIds(BaseModel):
+        parent_ids:BaseTypes.OptionalListOfIntegers = Field(None, description="Parent organization's Ids")
 
     class Key(BaseGeneralSchemas.Key):
         key:str = Field(..., max_length=255, description="Organization's key")

maleo_identity/models/schemas/organization_role.py

@@ -0,0 +1,15 @@
+from pydantic import Field
+from typing import List, Optional
+from maleo_foundation.models.schemas.general import BaseGeneralSchemas
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
+from maleo_identity.enums.organization_role import MaleoIdentityOrganizationRoleEnums
+
+class MaleoIdentityOrganizationRoleSchemas:
+    class Expand(BaseParameterSchemas.Expand):
+        expand:Optional[List[MaleoIdentityOrganizationRoleEnums.ExpandableFields]] = Field(None, description="Expanded field(s)")
+
+    class Key(BaseGeneralSchemas.Key):
+        key:str = Field(..., max_length=50, description="Organization Role's key")
+
+    class Name(BaseGeneralSchemas.Name):
+        name:str = Field(..., max_length=50, description="Organization Role's name")

maleo_identity/models/schemas/{general/user.py → user.py}

@@ -1,35 +1,36 @@
 from pydantic import BaseModel, Field
-from typing import Optional, List
+from typing import List, Optional
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
 from maleo_foundation.types import BaseTypes
 from maleo_identity.enums.user import MaleoIdentityUserEnums
 
-class MaleoIdentityUserGeneralSchemas:
-    class IdentifierType(BaseModel):
+class MaleoIdentityUserSchemas:
+    class IdentifierType(BaseParameterSchemas.IdentifierType):
         identifier:MaleoIdentityUserEnums.IdentifierType = Field(..., description="User's identifier")
 
-    class Expand(BaseModel):
+    class Expand(BaseParameterSchemas.Expand):
         expand:Optional[List[MaleoIdentityUserEnums.ExpandableFields]] = Field(None, description="Expanded field(s)")
 
+    class OptionalOrganizationId(BaseModel):
+        organization_id:BaseTypes.OptionalInteger = Field(..., ge=1, description="Organization's ID")
+
     class Username(BaseModel):
         username:str = Field(..., max_length=50, description="User's username")
 
-    class Usernames(BaseModel):
+    class OptionalListOfUsernames(BaseModel):
         usernames:BaseTypes.OptionalListOfStrings = Field(None, description="Specific usernames")
 
     class Email(BaseModel):
         email:str = Field(..., max_length=255, description="User's email")
 
-    class Emails(BaseModel):
+    class OptionalListOfEmails(BaseModel):
         emails:BaseTypes.OptionalListOfStrings = Field(None, description="Specific emails")
 
     class Phone(BaseModel):
         phone:str = Field(..., max_length=15, description="User's username")
 
-    class Phones(BaseModel):
+    class OptionalListOfPhones(BaseModel):
         phones:BaseTypes.OptionalListOfStrings = Field(None, description="Specific phones")
 
     class Password(BaseModel):
-        password:str = Field(..., max_length=255, description="User's password")
-
-    class OptionalOrganizationId(BaseModel):
-        organization_id:BaseTypes.OptionalInteger = Field(..., ge=1, description="Organization's ID")
+        password:str = Field(..., max_length=255, description="User's password")

maleo_identity/models/schemas/user_organization.py

@@ -0,0 +1,8 @@
+from pydantic import Field
+from typing import List, Optional
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
+from maleo_identity.enums.user_organization import MaleoIdentityUserOrganizationEnums
+
+class MaleoIdentityUserOrganizationSchemas:
+    class Expand(BaseParameterSchemas.Expand):
+        expand:Optional[List[MaleoIdentityUserOrganizationEnums.ExpandableFields]] = Field(None, description="Expanded field(s)")

maleo_identity/models/schemas/user_organization_role.py

@@ -0,0 +1,15 @@
+from pydantic import Field
+from typing import List, Optional
+from maleo_foundation.models.schemas.general import BaseGeneralSchemas
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
+from maleo_identity.enums.user_organization_role import MaleoIdentityUserOrganizationRoleEnums
+
+class MaleoIdentityUserOrganizationRoleSchemas:
+    class Expand(BaseParameterSchemas.Expand):
+        expand:Optional[List[MaleoIdentityUserOrganizationRoleEnums.ExpandableFields]] = Field(None, description="Expanded field(s)")
+
+    class Key(BaseGeneralSchemas.Key):
+        key:str = Field(..., max_length=50, description="Organization Role's key")
+
+    class Name(BaseGeneralSchemas.Name):
+        name:str = Field(..., max_length=50, description="Organization Role's name")

maleo_identity/models/schemas/{general/user_profile.py → user_profile.py}

@@ -1,21 +1,16 @@
 from pydantic import BaseModel, Field
-from typing import Optional, List
+from typing import List, Optional
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
 from maleo_foundation.types import BaseTypes
 from maleo_identity.enums.user_profile import MaleoIdentityUserProfileEnums
 
-class MaleoIdentityUserProfileGeneralSchemas:
-    class IdentifierType(BaseModel):
+class MaleoIdentityUserProfileSchemas:
+    class IdentifierType(BaseParameterSchemas.IdentifierType):
         identifier:MaleoIdentityUserProfileEnums.IdentifierType = Field(..., description="User profile's identifier")
 
-    class Expand(BaseModel):
+    class Expand(BaseParameterSchemas.Expand):
         expand:Optional[List[MaleoIdentityUserProfileEnums.ExpandableFields]] = Field(None, description="Expanded field(s)")
 
-    class UserId(BaseModel):
-        user_id:int = Field(..., ge=1, description="User's ID")
-
-    class OptionalListOfUserId(BaseModel):
-        user_ids:BaseTypes.OptionalListOfIntegers = Field(None, description="User's IDs")
-
     class IdCard(BaseModel):
         id_card:str = Field(..., max_length=16, description="User's ID Card")
 

maleo_identity/models/schemas/user_system_role.py

@@ -0,0 +1,8 @@
+from pydantic import Field
+from typing import List, Optional
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
+from maleo_identity.enums.user_system_role import MaleoIdentityUserSystemRoleEnums
+
+class MaleoIdentityUserSystemRoleSchemas:
+    class Expand(BaseParameterSchemas.Expand):
+        expand:Optional[List[MaleoIdentityUserSystemRoleEnums.ExpandableFields]] = Field(None, description="Expanded field(s)")

maleo_identity/models/tables/organization.py

@@ -1,4 +1,5 @@
 from sqlalchemy import Column, ForeignKey
+from sqlalchemy.orm import relationship
 from sqlalchemy.types import Integer, String, Enum, UUID
 from uuid import uuid4
 from maleo_metadata.enums.organization_type import MaleoMetadataOrganizationTypeEnums
@@ -12,7 +13,20 @@ class OrganizationsTable(MaleoIdentityMetadataManager.Base):
         default=MaleoMetadataOrganizationTypeEnums.OrganizationType.REGULAR,
         nullable=False
     )
-    parent_organization_id = Column("parent_organization_id", Integer, ForeignKey("organizations.id", ondelete="SET NULL", onupdate="CASCADE"))
+    parent_id = Column("parent_id", Integer, ForeignKey("organizations.id", ondelete="SET NULL", onupdate="CASCADE"))
     key = Column(name="key", type_=String(255), unique=True, nullable=False)
     name = Column(name="name", type_=String(255), nullable=False)
-    secret = Column(name="secret", type_=UUID, default=uuid4, unique=True, nullable=False)
+    secret = Column(name="secret", type_=UUID, default=uuid4, unique=True, nullable=False)
+    parent = relationship(
+        "OrganizationsTable",
+        remote_side="OrganizationsTable.id",
+        back_populates="children"
+    )
+    children = relationship(
+        "OrganizationsTable",
+        back_populates="parent",
+        cascade="all",
+        lazy="select",
+        foreign_keys="[OrganizationsTable.parent_id]",
+        order_by="OrganizationsTable.id"
+    )

maleo_identity/models/tables/user.py

@@ -1,4 +1,5 @@
 from sqlalchemy import Column
+from sqlalchemy.orm import relationship
 from sqlalchemy.types import String, Enum
 from maleo_metadata.enums.user_type import MaleoMetadataUserTypeEnums
 from maleo_identity.db import MaleoIdentityMetadataManager
@@ -14,4 +15,15 @@ class UsersTable(MaleoIdentityMetadataManager.Base):
     username = Column(name="username", type_=String(50), unique=True, nullable=False)
     email = Column(name="email", type_=String(255), unique=True, nullable=False)
     phone = Column(name="phone", type_=String(15), unique=True, nullable=False)
-    password = Column(name="password", type_=String(255), nullable=False)
+    password = Column(name="password", type_=String(255), nullable=False)
+    profile = relationship(
+        "UserProfilesTable",
+        back_populates="user",
+        uselist=False,
+        cascade="all, delete-orphan"
+    )
+    system_roles = relationship(
+        "UserSystemRolesTable",
+        back_populates="user_details",
+        cascade="all, delete-orphan"
+    )

maleo_identity/models/tables/user_profile.py

@@ -1,4 +1,5 @@
 from sqlalchemy import Column, ForeignKey
+from sqlalchemy.orm import relationship
 from sqlalchemy.types import String, Enum, Integer, Date
 from maleo_metadata.enums.blood_type import MaleoMetadataBloodTypeEnums
 from maleo_metadata.enums.gender import MaleoMetadataGenderEnums
@@ -8,6 +9,7 @@ class UserProfilesTable(MaleoIdentityMetadataManager.Base):
     __tablename__ = "user_profiles"
     #* Foreign Key and Relationship to UsersTable
     user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE", onupdate="CASCADE"), nullable=False)
+    user = relationship("UsersTable", back_populates="profile")
     id_card = Column(name="id_card", type_=String(16))
     leading_title = Column(name="leading_title", type_=String(25))
     first_name = Column(name="first_name", type_=String(50), nullable=False)

maleo_identity/models/tables/user_system_role.py

@@ -1,4 +1,5 @@
 from sqlalchemy import Column, ForeignKey
+from sqlalchemy.orm import relationship
 from sqlalchemy.types import Enum, Integer
 from maleo_metadata.enums.system_role import MaleoMetadataSystemRoleEnums
 from maleo_identity.db import MaleoIdentityMetadataManager
@@ -7,6 +8,7 @@ class UserSystemRolesTable(MaleoIdentityMetadataManager.Base):
     __tablename__ = "user_system_roles"
     #* Foreign Key and Relationship to UsersTable
     user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE", onupdate="CASCADE"), nullable=False)
+    user_details = relationship("UsersTable", back_populates="system_roles")
     system_role = Column(
         name="system_role",
         type_=Enum(MaleoMetadataSystemRoleEnums.SystemRole, name="system_role"),