maleo-identity 0.0.55__py3-none-any.whl → 0.0.59__py3-none-any.whl

maleo_identity/constants/organization_role.py

@@ -8,7 +8,8 @@ class MaleoIdentityOrganizationRoleConstants:
         List[MaleoIdentityOrganizationRoleEnums.ExpandableFields]
     ] = {
         MaleoIdentityOrganizationRoleEnums.ExpandableFields.ORGANIZATION: [
-            MaleoIdentityOrganizationRoleEnums.ExpandableFields.ORGANIZATION_TYPE
+            MaleoIdentityOrganizationRoleEnums.ExpandableFields.ORGANIZATION_TYPE,
+            MaleoIdentityOrganizationRoleEnums.ExpandableFields.REGISTRATION_CODE
         ]
     }
 
@@ -16,5 +17,6 @@ class MaleoIdentityOrganizationRoleConstants:
         MaleoIdentityOrganizationRoleEnums.ExpandableFields,
         MaleoIdentityOrganizationEnums.ExpandableFields
     ] = {
-        MaleoIdentityOrganizationRoleEnums.ExpandableFields.ORGANIZATION_TYPE: MaleoIdentityOrganizationEnums.ExpandableFields.ORGANIZATION_TYPE
+        MaleoIdentityOrganizationRoleEnums.ExpandableFields.ORGANIZATION_TYPE: MaleoIdentityOrganizationEnums.ExpandableFields.ORGANIZATION_TYPE,
+        MaleoIdentityOrganizationRoleEnums.ExpandableFields.REGISTRATION_CODE: MaleoIdentityOrganizationEnums.ExpandableFields.REGISTRATION_CODE
     }

maleo_identity/constants/user.py

@@ -20,5 +20,8 @@ class MaleoIdentityUserConstants:
         MaleoIdentityUserEnums.ExpandableFields.PROFILE: [
             MaleoIdentityUserEnums.ExpandableFields.GENDER,
             MaleoIdentityUserEnums.ExpandableFields.BLOOD_TYPE
+        ],
+        MaleoIdentityUserEnums.ExpandableFields.SYSTEM_ROLES: [
+            MaleoIdentityUserEnums.ExpandableFields.SYSTEM_ROLE_DETAILS
         ]
     }

maleo_identity/constants/user_organization.py

@@ -9,10 +9,19 @@ class MaleoIdentityUserOrganizationConstants:
         List[MaleoIdentityUserOrganizationEnums.ExpandableFields]
     ] = {
         MaleoIdentityUserOrganizationEnums.ExpandableFields.USER: [
-            MaleoIdentityUserOrganizationEnums.ExpandableFields.USER_TYPE
+            MaleoIdentityUserOrganizationEnums.ExpandableFields.USER_TYPE,
+            MaleoIdentityUserOrganizationEnums.ExpandableFields.PROFILE
+        ],
+        MaleoIdentityUserOrganizationEnums.ExpandableFields.PROFILE: [
+            MaleoIdentityUserOrganizationEnums.ExpandableFields.BLOOD_TYPE,
+            MaleoIdentityUserOrganizationEnums.ExpandableFields.GENDER
+        ],
+        MaleoIdentityUserOrganizationEnums.ExpandableFields.SYSTEM_ROLES: [
+            MaleoIdentityUserOrganizationEnums.ExpandableFields.SYSTEM_ROLE_DETAILS
         ],
         MaleoIdentityUserOrganizationEnums.ExpandableFields.ORGANIZATION: [
-            MaleoIdentityUserOrganizationEnums.ExpandableFields.ORGANIZATION_TYPE
+            MaleoIdentityUserOrganizationEnums.ExpandableFields.ORGANIZATION_TYPE,
+            MaleoIdentityUserOrganizationEnums.ExpandableFields.REGISTRATION_CODE
         ]
     }
 
@@ -20,12 +29,18 @@ class MaleoIdentityUserOrganizationConstants:
         MaleoIdentityUserOrganizationEnums.ExpandableFields,
         MaleoIdentityUserEnums.ExpandableFields
     ] = {
-        MaleoIdentityUserOrganizationEnums.ExpandableFields.USER_TYPE: MaleoIdentityUserEnums.ExpandableFields.USER_TYPE
+        MaleoIdentityUserOrganizationEnums.ExpandableFields.USER_TYPE: MaleoIdentityUserEnums.ExpandableFields.USER_TYPE,
+        MaleoIdentityUserOrganizationEnums.ExpandableFields.PROFILE: MaleoIdentityUserEnums.ExpandableFields.PROFILE,
+        MaleoIdentityUserOrganizationEnums.ExpandableFields.BLOOD_TYPE: MaleoIdentityUserEnums.ExpandableFields.BLOOD_TYPE,
+        MaleoIdentityUserOrganizationEnums.ExpandableFields.GENDER: MaleoIdentityUserEnums.ExpandableFields.GENDER,
+        MaleoIdentityUserOrganizationEnums.ExpandableFields.SYSTEM_ROLES: MaleoIdentityUserEnums.ExpandableFields.SYSTEM_ROLES,
+        MaleoIdentityUserOrganizationEnums.ExpandableFields.SYSTEM_ROLE_DETAILS: MaleoIdentityUserEnums.ExpandableFields.SYSTEM_ROLE_DETAILS
     }
 
     ORGANIZATION_EXPANDABLE_FIELDS_MAP:Dict[
         MaleoIdentityUserOrganizationEnums.ExpandableFields,
         MaleoIdentityOrganizationEnums.ExpandableFields
     ] = {
-        MaleoIdentityUserOrganizationEnums.ExpandableFields.ORGANIZATION_TYPE: MaleoIdentityOrganizationEnums.ExpandableFields.ORGANIZATION_TYPE
+        MaleoIdentityUserOrganizationEnums.ExpandableFields.ORGANIZATION_TYPE: MaleoIdentityOrganizationEnums.ExpandableFields.ORGANIZATION_TYPE,
+        MaleoIdentityUserOrganizationEnums.ExpandableFields.REGISTRATION_CODE: MaleoIdentityOrganizationEnums.ExpandableFields.REGISTRATION_CODE
     }

maleo_identity/constants/user_organization_role.py

@@ -9,10 +9,12 @@ class MaleoIdentityUserOrganizationRoleConstants:
         List[MaleoIdentityUserOrganizationRoleEnums.ExpandableFields]
     ] = {
         MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.USER: [
-            MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.USER_TYPE
+            MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.USER_TYPE,
+            MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.PROFILE
         ],
         MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.ORGANIZATION: [
-            MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.ORGANIZATION_TYPE
+            MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.ORGANIZATION_TYPE,
+            MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.REGISTRATION_CODE
         ]
     }
 
@@ -20,12 +22,14 @@ class MaleoIdentityUserOrganizationRoleConstants:
         MaleoIdentityUserOrganizationRoleEnums.ExpandableFields,
         MaleoIdentityUserEnums.ExpandableFields
     ] = {
-        MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.USER_TYPE: MaleoIdentityUserEnums.ExpandableFields.USER_TYPE
+        MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.USER_TYPE: MaleoIdentityUserEnums.ExpandableFields.USER_TYPE,
+        MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.PROFILE: MaleoIdentityUserEnums.ExpandableFields.PROFILE
     }
 
     ORGANIZATION_EXPANDABLE_FIELDS_MAP:Dict[
         MaleoIdentityUserOrganizationRoleEnums.ExpandableFields,
         MaleoIdentityOrganizationEnums.ExpandableFields
     ] = {
-        MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.ORGANIZATION_TYPE: MaleoIdentityOrganizationEnums.ExpandableFields.ORGANIZATION_TYPE
+        MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.ORGANIZATION_TYPE: MaleoIdentityOrganizationEnums.ExpandableFields.ORGANIZATION_TYPE,
+        MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.REGISTRATION_CODE: MaleoIdentityOrganizationEnums.ExpandableFields.REGISTRATION_CODE
     }

maleo_identity/constants/user_system_role.py

@@ -6,13 +6,4 @@ class MaleoIdentityUserSystemRoleConstants:
     EXPANDABLE_FIELDS_DEPENDENCIES_MAP:Dict[
         MaleoIdentityUserSystemRoleEnums.ExpandableFields,
         List[MaleoIdentityUserSystemRoleEnums.ExpandableFields]
-    ] = {
-        MaleoIdentityUserSystemRoleEnums.ExpandableFields.USER: [
-            MaleoIdentityUserSystemRoleEnums.ExpandableFields.USER_TYPE,
-            MaleoIdentityUserSystemRoleEnums.ExpandableFields.PROFILE
-        ],
-        MaleoIdentityUserSystemRoleEnums.ExpandableFields.PROFILE: [
-            MaleoIdentityUserSystemRoleEnums.ExpandableFields.GENDER,
-            MaleoIdentityUserSystemRoleEnums.ExpandableFields.BLOOD_TYPE
-        ]
-    }
+    ] = {}

maleo_identity/enums/organization.py

@@ -8,4 +8,4 @@ class MaleoIdentityOrganizationEnums:
 
     class ExpandableFields(StrEnum):
         ORGANIZATION_TYPE = "organization_type"
-        REGISTRATION_CODES = "registration_codes"
+        REGISTRATION_CODE = "registration_code"

maleo_identity/enums/organization_role.py

@@ -3,4 +3,5 @@ from enum import StrEnum
 class MaleoIdentityOrganizationRoleEnums:
     class ExpandableFields(StrEnum):
         ORGANIZATION = "organization"
-        ORGANIZATION_TYPE = "organization.organization_type"
+        ORGANIZATION_TYPE = "organization.organization_type"
+        REGISTRATION_CODE = "organization.registration_code"

maleo_identity/enums/user.py

@@ -9,6 +9,8 @@ class MaleoIdentityUserEnums:
 
     class ExpandableFields(StrEnum):
         USER_TYPE = "user_type"
+        SYSTEM_ROLES = "system_roles"
+        SYSTEM_ROLE_DETAILS = "system_roles.system_role_details"
         PROFILE = "profile"
         GENDER = "profile.gender"
         BLOOD_TYPE = "profile.blood_type"

maleo_identity/enums/user_organization.py

@@ -3,6 +3,12 @@ from enum import StrEnum
 class MaleoIdentityUserOrganizationEnums:
     class ExpandableFields(StrEnum):
         USER = "user"
-        USER_TYPE = "user.user_type"
+        USER_TYPE = "user_type"
+        SYSTEM_ROLES = "system_roles"
+        SYSTEM_ROLE_DETAILS = "system_roles.system_role_details"
+        PROFILE = "profile"
+        GENDER = "profile.gender"
+        BLOOD_TYPE = "profile.blood_type"
         ORGANIZATION = "organization"
-        ORGANIZATION_TYPE = "organization.organization_type"
+        ORGANIZATION_TYPE = "organization.organization_type"
+        REGISTRATION_CODE = "organization.registration_code"

maleo_identity/enums/user_organization_role.py

@@ -4,5 +4,12 @@ class MaleoIdentityUserOrganizationRoleEnums:
     class ExpandableFields(StrEnum):
         USER = "user"
         USER_TYPE = "user.user_type"
+        SYSTEM_ROLES = "system_roles"
+        SYSTEM_ROLE_DETAILS = "system_roles.system_role_details"
+        PROFILE = "user.profile"
+        GENDER = "profile.gender"
+        BLOOD_TYPE = "profile.blood_type"
         ORGANIZATION = "organization"
-        ORGANIZATION_TYPE = "organization.organization_type"
+        ORGANIZATION_TYPE = "organization.organization_type"
+        REGISTRATION_CODE = "organization.registration_code"
+        USER_ORGANIZATION = "user_organization"

maleo_identity/enums/user_system_role.py

@@ -2,9 +2,4 @@ from enum import StrEnum
 
 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/responses/user.py

@@ -1,6 +1,8 @@
 from pydantic import Field
+from typing import Optional
 from maleo_foundation.models.responses import BaseResponses
 from maleo_identity.enums.user import MaleoIdentityUserEnums
+from maleo_identity.models.schemas.user import MaleoIdentityUserSchemas
 from maleo_identity.models.transfers.general.user import UserTransfers, PasswordTransfers
 
 class MaleoIdentityUserResponses:
@@ -53,4 +55,14 @@ class MaleoIdentityUserResponses:
         code:str = "IDT-USR-010"
         message:str = "User's password found"
         description:str = "Requested user's password found in database"
-        data:PasswordTransfers = Field(..., description="User's password")
+        data:PasswordTransfers = Field(..., description="User's password")
+
+    class RegisterFailed(BaseResponses.BadRequest):
+        code:str = "IDT-USR-011"
+        message:str = "Failed registering new user"
+
+    class RegisterSuccess(BaseResponses.SingleData):
+        code:str = "IDT-USR-012"
+        message:str = "Successfully registered new user"
+        data:UserTransfers = Field(..., description="User")
+        metadata:Optional[MaleoIdentityUserSchemas.RegisterResultMetadata] = Field(None, description="Optional metadata")

maleo_identity/models/schemas/user.py

@@ -2,6 +2,7 @@ from pydantic import BaseModel, Field
 from typing import List, Optional
 from uuid import UUID
 from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
+from maleo_foundation.models.schemas.result import ResultMetadata
 from maleo_foundation.types import BaseTypes
 from maleo_identity.enums.user import MaleoIdentityUserEnums
 
@@ -37,4 +38,7 @@ class MaleoIdentityUserSchemas:
         password_confirmation:str = Field(..., max_length=255, description="User's password confirmation")
 
     class RegistrationCode(BaseModel):
-        registration_code:UUID = Field(..., description="Registration code")
+        registration_code:UUID = Field(..., description="Registration code")
+
+    class RegisterResultMetadata(ResultMetadata):
+        organization_key:BaseTypes.OptionalString = Field(None, description="Organization key")

maleo_identity/models/tables/organization.py

@@ -4,9 +4,9 @@ from sqlalchemy.types import Integer, String, Enum, UUID
 from uuid import uuid4
 from maleo_metadata.enums.organization_type import MaleoMetadataOrganizationTypeEnums
 from maleo_identity.db import MaleoIdentityMetadataManager
+from maleo_foundation.models.table import DataTable
 
-class OrganizationsTable(MaleoIdentityMetadataManager.Base):
-    __tablename__ = "organizations"
+class OrganizationsMixin:
     organization_type = Column(
         name="organization_type",
         type_=Enum(MaleoMetadataOrganizationTypeEnums.OrganizationType, name="organization_type"),
@@ -17,6 +17,13 @@ class OrganizationsTable(MaleoIdentityMetadataManager.Base):
     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)
+
+class OrganizationsTable(
+    OrganizationsMixin,
+    DataTable,
+    MaleoIdentityMetadataManager.Base
+):
+    __tablename__ = "organizations"
     parent = relationship(
         "OrganizationsTable",
         remote_side="OrganizationsTable.id",
@@ -36,4 +43,16 @@ class OrganizationsTable(MaleoIdentityMetadataManager.Base):
         cascade="all",
         lazy="select",
         uselist=False
+    )
+    user_organization = relationship(
+        "UserOrganizationsTable",
+        back_populates="organization",
+        cascade="all, delete-orphan",
+        uselist=False
+    )
+    organization_roles = relationship(
+        "OrganizationRolesTable",
+        back_populates="organization",
+        cascade="all, delete-orphan",
+        uselist=False
     )

maleo_identity/models/tables/organization_registration_code.py

@@ -3,9 +3,9 @@ from sqlalchemy.orm import relationship
 from sqlalchemy.types import Integer, UUID
 from uuid import uuid4
 from maleo_identity.db import MaleoIdentityMetadataManager
+from maleo_foundation.models.table import DataTable
 
-class OrganizationRegistrationCodesTable(MaleoIdentityMetadataManager.Base):
-    __tablename__ = "organization_registration_codes"
+class OrganizationRegistrationCodesMixin:
     #* Foreign Key OrganizationsTable
     organization_id = Column(
         Integer,
@@ -17,13 +17,21 @@ class OrganizationRegistrationCodesTable(MaleoIdentityMetadataManager.Base):
         unique=True,
         nullable=False
     )
+    code = Column(name="code", type_=UUID, default=uuid4, unique=True, nullable=False)
+    max_uses = Column(name="max_uses", type_=Integer, nullable=False, default=1)
+    current_uses = Column(name="current_uses", type_=Integer, nullable=False, default=0)
+
+class OrganizationRegistrationCodesTable(
+    OrganizationRegistrationCodesMixin,
+    DataTable,
+    MaleoIdentityMetadataManager.Base
+):
+    __tablename__ = "organization_registration_codes"
+    
     organization = relationship(
         "OrganizationsTable",
         back_populates="registration_code",
         cascade="all",
         lazy="select",
         uselist=False
-    )
-    code = Column(name="code", type_=UUID, default=uuid4, unique=True, nullable=False)
-    max_uses = Column(name="max_uses", type_=Integer, nullable=False, default=1)
-    current_uses = Column(name="current_uses", type_=Integer, nullable=False, default=0)
+    )

maleo_identity/models/tables/organization_role.py

@@ -1,12 +1,43 @@
 from sqlalchemy import Column, ForeignKey
+from sqlalchemy.orm import relationship
 from sqlalchemy.types import Integer, String, Boolean
 from maleo_identity.db import MaleoIdentityMetadataManager
+from maleo_foundation.models.table import DataTable
 
-class OrganizationRolesTable(MaleoIdentityMetadataManager.Base):
-    __tablename__ = "organization_roles"
+class OrganizationRolesMixin:
     #* Foreign Key OrganizationsTable
-    organization_id = Column(Integer, ForeignKey("organizations.id", ondelete="CASCADE", onupdate="CASCADE"), nullable=False)
+    organization_id = Column(
+        Integer,
+        ForeignKey(
+            "organizations.id",
+            ondelete="CASCADE",
+            onupdate="CASCADE"
+        ),
+        nullable=False
+    )
     is_default = Column(name="is_default", type_=Boolean, nullable=False, default=False)
     order = Column(name="order", type_=Integer)
     key = Column(name="key", type_=String(50), nullable=False)
-    name = Column(name="name", type_=String(50), nullable=False)
+    name = Column(name="name", type_=String(50), nullable=False)
+
+class OrganizationRolesTable(
+    OrganizationRolesMixin,
+    DataTable,
+    MaleoIdentityMetadataManager.Base
+):
+    __tablename__ = "organization_roles"
+
+    organization = relationship(
+        "OrganizationsTable",
+        back_populates="organization_roles",
+        cascade="all",
+        lazy="select",
+        uselist=False
+    )
+
+    user_organization_roles = relationship(
+        "UserOrganizationRolesTable",
+        back_populates="organization_role",
+        cascade="all, delete-orphan",
+        lazy="select"
+    )

maleo_identity/models/tables/user.py

@@ -3,9 +3,9 @@ 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
+from maleo_foundation.models.table import DataTable
 
-class UsersTable(MaleoIdentityMetadataManager.Base):
-    __tablename__ = "users"
+class UsersMixin:
     user_type = Column(
         name="user_type",
         type_=Enum(MaleoMetadataUserTypeEnums.UserType, name="user_type"),
@@ -16,6 +16,14 @@ class UsersTable(MaleoIdentityMetadataManager.Base):
     email = Column(name="email", type_=String(255), unique=True, nullable=False)
     phone = Column(name="phone", type_=String(15), nullable=False)
     password = Column(name="password", type_=String(255), nullable=False)
+
+class UsersTable(
+    UsersMixin,
+    DataTable,
+    MaleoIdentityMetadataManager.Base
+):
+    __tablename__ = "users"
+
     profile = relationship(
         "UserProfilesTable",
         back_populates="user",
@@ -24,6 +32,12 @@ class UsersTable(MaleoIdentityMetadataManager.Base):
     )
     system_roles = relationship(
         "UserSystemRolesTable",
-        back_populates="user_details",
+        back_populates="user",
         cascade="all, delete-orphan"
+    )
+    user_organization = relationship(
+        "UserOrganizationsTable",
+        back_populates="user",
+        cascade="all, delete-orphan",
+        uselist=False
     )

maleo_identity/models/tables/user_organization.py

@@ -1,10 +1,58 @@
 from sqlalchemy import Column, ForeignKey
+from sqlalchemy.orm import relationship
 from sqlalchemy.types import Integer
 from maleo_identity.db import MaleoIdentityMetadataManager
+from maleo_foundation.models.table import DataTable
 
-class UserOrganizationsTable(MaleoIdentityMetadataManager.Base):
-    __tablename__ = "user_organizations"
+class UserOrganizationsMixin:
     #* Foreign Key UsersTable
-    user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE", onupdate="CASCADE"), nullable=False)
+    user_id = Column(
+        Integer,
+        ForeignKey(
+            "users.id",
+            ondelete="CASCADE",
+            onupdate="CASCADE"
+        ),
+        nullable=False
+    )
+
     #* Foreign Key OrganizationsTable
-    organization_id = Column(Integer, ForeignKey("organizations.id", ondelete="CASCADE", onupdate="CASCADE"), nullable=False)
+    organization_id = Column(
+        Integer,
+        ForeignKey(
+            "organizations.id",
+            ondelete="CASCADE",
+            onupdate="CASCADE"
+        ),
+        nullable=False
+    )
+
+class UserOrganizationsTable(
+    UserOrganizationsMixin,
+    DataTable,
+    MaleoIdentityMetadataManager.Base
+):
+    __tablename__ = "user_organizations"
+
+    user = relationship(
+        "UsersTable",
+        back_populates="user_organization",
+        cascade="all",
+        lazy="select",
+        uselist=False
+    )
+
+    organization = relationship(
+        "OrganizationsTable",
+        back_populates="user_organization",
+        cascade="all",
+        lazy="select",
+        uselist=False
+    )
+
+    user_organization_roles = relationship(
+        "UserOrganizationRolesTable",
+        back_populates="user_organization",
+        cascade="all, delete-orphan",
+        lazy="select"
+    )

maleo_identity/models/tables/user_organization_role.py

@@ -1,10 +1,69 @@
 from sqlalchemy import Column, ForeignKey
+from sqlalchemy.orm import relationship
 from sqlalchemy.types import Integer
 from maleo_identity.db import MaleoIdentityMetadataManager
+from maleo_foundation.models.table import DataTable
 
-class UserOrganizationRolesTable(MaleoIdentityMetadataManager.Base):
-    __tablename__ = "user_organization_roles"
+class UserOrganizationRolesMixin:
     #* Foreign Key UserOrganizationsTable
-    user_organization_id = Column(Integer, ForeignKey("user_organizations.id", ondelete="CASCADE", onupdate="CASCADE"), nullable=False)
+    user_organization_id = Column(
+        Integer,
+        ForeignKey(
+            "user_organizations.id",
+            ondelete="CASCADE",
+            onupdate="CASCADE"
+        ),
+        nullable=False
+    )
+
     #* Foreign Key OrganizationRolesTable
-    organization_role_id = Column(Integer, ForeignKey("organization_roles.id", ondelete="CASCADE", onupdate="CASCADE"), nullable=False)
+    organization_role_id = Column(
+        Integer,
+        ForeignKey(
+            "organization_roles.id",
+            ondelete="CASCADE",
+            onupdate="CASCADE"
+        ),
+        nullable=False
+    )
+
+class UserOrganizationRolesTable(
+    UserOrganizationRolesMixin,
+    DataTable,
+    MaleoIdentityMetadataManager.Base
+):
+    __tablename__ = "user_organization_roles"
+
+    user_organization = relationship(
+        "UserOrganizationsTable",
+        back_populates="user_organization_roles",
+        cascade="all",
+        lazy="select",
+        uselist=False
+    )
+
+    user = relationship(
+        "UsersTable",
+        secondary="user_organizations",
+        primaryjoin="UserOrganizationRolesTable.user_organization_id == UserOrganizationsTable.id",
+        secondaryjoin="UserOrganizationsTable.user_id == UsersTable.id",
+        uselist=False,
+        viewonly=True
+    )
+
+    organization = relationship(
+        "OrganizationsTable",
+        secondary="user_organizations",
+        primaryjoin="UserOrganizationRolesTable.user_organization_id == UserOrganizationsTable.id",
+        secondaryjoin="UserOrganizationsTable.organization_id == OrganizationsTable.id",
+        uselist=False,
+        viewonly=True
+    )
+
+    organization_role = relationship(
+        "OrganizationRolesTable",
+        back_populates="user_organization_roles",
+        cascade="all",
+        lazy="select",
+        uselist=False
+    )

maleo_identity/models/tables/user_profile.py

@@ -4,12 +4,11 @@ from sqlalchemy.types import String, Enum, Integer, Date, Text
 from maleo_metadata.enums.blood_type import MaleoMetadataBloodTypeEnums
 from maleo_metadata.enums.gender import MaleoMetadataGenderEnums
 from maleo_identity.db import MaleoIdentityMetadataManager
+from maleo_foundation.models.table import DataTable
 
-class UserProfilesTable(MaleoIdentityMetadataManager.Base):
-    __tablename__ = "user_profiles"
+class UserProfilesMixin:
     #* 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)
@@ -21,4 +20,12 @@ class UserProfilesTable(MaleoIdentityMetadataManager.Base):
     birth_date = Column(name="birth_date", type_=Date)
     gender = Column(name="gender", type_=Enum(MaleoMetadataGenderEnums.Gender, name="gender"))
     blood_type = Column(name="blood_type", type_=Enum(MaleoMetadataBloodTypeEnums.BloodType, name="blood_type"))
-    avatar_name = Column(name="avatar_name", type_=Text, nullable=False)
+    avatar_name = Column(name="avatar_name", type_=Text, nullable=False)
+
+class UserProfilesTable(
+    UserProfilesMixin,
+    DataTable,
+    MaleoIdentityMetadataManager.Base
+):
+    __tablename__ = "user_profiles"
+    user = relationship("UsersTable", back_populates="profile")

maleo_identity/models/tables/user_system_role.py

@@ -3,15 +3,22 @@ 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
+from maleo_foundation.models.table import DataTable
 
-class UserSystemRolesTable(MaleoIdentityMetadataManager.Base):
-    __tablename__ = "user_system_roles"
-    #* Foreign Key and Relationship to UsersTable
+class UserSystemRolesMixin:
     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"),
         default=MaleoMetadataSystemRoleEnums.SystemRole.USER,
         nullable=False
-    )
+    )
+
+class UserSystemRolesTable(
+    UserSystemRolesMixin,
+    DataTable,
+    MaleoIdentityMetadataManager.Base
+):
+    __tablename__ = "user_system_roles"
+    #* Foreign Key and Relationship to UsersTable
+    user = relationship("UsersTable", back_populates="system_roles")

maleo_identity/models/transfers/general/organization.py

@@ -18,8 +18,11 @@ class OrganizationTransfers(
 ):
     pass
 
+class ExpandedOrganization(BaseModel):
+    organization:OrganizationTransfers = Field(..., description="Organization's details")
+
 class OptionalExpandedOrganization(BaseModel):
-    organization_details:Optional[OrganizationTransfers] = Field(None, description="Organization's details")
+    organization:Optional[OrganizationTransfers] = Field(None, description="Organization's details")
 
 class StructuredOrganizationTransfers(OrganizationTransfers):
     children:List["StructuredOrganizationTransfers"] = Field(..., description="Organization children")

maleo_identity/models/transfers/general/organization_role.py

@@ -1,3 +1,4 @@
+from pydantic import BaseModel, Field
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
 from maleo_identity.models.schemas.general import MaleoIdentityGeneralSchemas
 from maleo_identity.models.schemas.organization_role import MaleoIdentityOrganizationRoleSchemas
@@ -13,4 +14,7 @@ class OrganizationRoleTransfers(
     BaseGeneralSchemas.Status,
     BaseGeneralSchemas.Timestamps,
     BaseGeneralSchemas.Identifiers
-): pass
+): pass
+
+class ExpandedOrganizationRole(BaseModel):
+    organization_role:OrganizationRoleTransfers = Field(..., description="Organization role")

maleo_identity/models/transfers/general/user.py

@@ -4,9 +4,11 @@ from maleo_foundation.models.schemas.general import BaseGeneralSchemas
 from maleo_metadata.models.expanded_schemas.user_type import MaleoMetadataUserTypeExpandedSchemas
 from maleo_identity.models.schemas.user import MaleoIdentityUserSchemas
 from maleo_identity.models.transfers.general.user_profile import OptionalExpandedUserProfile
+from .user_system_role import ListOfExpandedUserSystemRole
 
 class UserTransfers(
     OptionalExpandedUserProfile,
+    ListOfExpandedUserSystemRole,
     MaleoIdentityUserSchemas.Phone,
     MaleoIdentityUserSchemas.Email,
     MaleoIdentityUserSchemas.Username,
@@ -17,7 +19,10 @@ class UserTransfers(
     BaseGeneralSchemas.Identifiers
 ): pass
 
+class ExpandedUser(BaseModel):
+    user:UserTransfers = Field(..., description="User's details")
+
 class OptionalExpandedUser(BaseModel):
-    user_details:Optional[UserTransfers] = Field(None, description="User's details")
+    user:Optional[UserTransfers] = Field(None, description="User's details")
 
 class PasswordTransfers(MaleoIdentityUserSchemas.Password): pass