feat: add TenantMixin to all models

fiqrikm18 · fiqrikm18 · commit 829a23c98bcf · 2026-06-26T11:55:16.000+07:00
diff --git a/alembic/env.py b/alembic/env.py
@@ -36,6 +36,7 @@
     UserHasRoleModel,  # noqa: F401
 )
 from src.modules.api_key.infrastructure.models import ApiKeyModel  # noqa: F401
+from src.modules.tenants.infrastructure.models.tenant_model import TenantModel  # noqa: F401
 from src.modules.todo.infrastructure.models.todo_model import TodoModel  # noqa: F401
 from src.modules.user.infrastructure import models as user_models  # noqa: F401
 from src.shared.database.model import Base
diff --git a/src/core/security/infrastructure/models/audit_log_model.py b/src/core/security/infrastructure/models/audit_log_model.py
@@ -3,10 +3,11 @@
 from sqlalchemy import DateTime, JSON, String
 from sqlalchemy.orm import Mapped, mapped_column
 
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.model import Base
 
 
-class AuditLogModel(Base):
+class AuditLogModel(Base, TenantMixin):
     __tablename__ = "audit_logs"
 
     action: Mapped[str] = mapped_column(String(120), index=True)
diff --git a/src/core/security/infrastructure/models/error_trace_model.py b/src/core/security/infrastructure/models/error_trace_model.py
@@ -3,10 +3,11 @@
 from sqlalchemy import DateTime, JSON, String, Text
 from sqlalchemy.orm import Mapped, mapped_column
 
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.model import Base
 
 
-class ErrorTraceModel(Base):
+class ErrorTraceModel(Base, TenantMixin):
     __tablename__ = "error_traces"
 
     error_type: Mapped[str] = mapped_column(String(120), index=True)
diff --git a/src/core/security/infrastructure/models/login_attempt_model.py b/src/core/security/infrastructure/models/login_attempt_model.py
@@ -3,10 +3,11 @@
 from sqlalchemy import DateTime, String
 from sqlalchemy.orm import Mapped, mapped_column
 
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.model import Base
 
 
-class LoginAttemptModel(Base):
+class LoginAttemptModel(Base, TenantMixin):
     __tablename__ = "login_attempts"
 
     email: Mapped[str] = mapped_column(String(255), index=True)
diff --git a/src/modules/api_key/infrastructure/models.py b/src/modules/api_key/infrastructure/models.py
@@ -3,10 +3,11 @@
 from sqlalchemy import Boolean, DateTime, String, Text, func
 from sqlalchemy.orm import Mapped, mapped_column
 
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.model import Base
 
 
-class ApiKeyModel(Base):
+class ApiKeyModel(Base, TenantMixin):
     __tablename__ = "api_keys"
 
     id: Mapped[str] = mapped_column(String(36), primary_key=True)
diff --git a/src/modules/authorization/infrastructure/models/casbin_rule_model.py b/src/modules/authorization/infrastructure/models/casbin_rule_model.py
@@ -1,10 +1,11 @@
 from sqlalchemy import String
 from sqlalchemy.orm import Mapped, mapped_column
 
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.model import Base
 
 
-class CasbinRuleModel(Base):
+class CasbinRuleModel(Base, TenantMixin):
     __tablename__ = "casbin_rules"
 
     ptype: Mapped[str] = mapped_column(String(16), index=True)
diff --git a/src/modules/authorization/infrastructure/models/permission_model.py b/src/modules/authorization/infrastructure/models/permission_model.py
@@ -3,11 +3,12 @@
 from sqlalchemy import ForeignKey, Index, String, UniqueConstraint
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.mixin.timestamp import SoftDeleteMixin, TimeStampMixin
 from src.shared.database.model import Base
 
 
-class PermissionModel(Base, TimeStampMixin, SoftDeleteMixin):
+class PermissionModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
     """Permission definition for RBAC system.
 
     Permissions represent specific actions on resources.
diff --git a/src/modules/authorization/infrastructure/models/resource_model.py b/src/modules/authorization/infrastructure/models/resource_model.py
@@ -1,11 +1,12 @@
 from sqlalchemy import Index, String
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.mixin.timestamp import SoftDeleteMixin, TimeStampMixin
 from src.shared.database.model import Base
 
 
-class AuthorizationResourceModel(Base, TimeStampMixin, SoftDeleteMixin):
+class AuthorizationResourceModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
     """Authorization resource definition for grouping permissions.
 
     Resources represent domain entities that permissions act upon.
diff --git a/src/modules/authorization/infrastructure/models/role_model.py b/src/modules/authorization/infrastructure/models/role_model.py
@@ -7,11 +7,12 @@
 from src.modules.authorization.infrastructure.models.user_has_role_model import (
     UserHasRoleModel,
 )
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.mixin.timestamp import SoftDeleteMixin, TimeStampMixin
 from src.shared.database.model import Base
 
 
-class RoleModel(Base, TimeStampMixin, SoftDeleteMixin):
+class RoleModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
     """Role definition for RBAC system.
 
     Roles group permissions and can be assigned to users.
diff --git a/src/modules/authorization/infrastructure/models/role_permission_model.py b/src/modules/authorization/infrastructure/models/role_permission_model.py
@@ -3,10 +3,11 @@
 from sqlalchemy import ForeignKey, Index, UniqueConstraint
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.model import Base
 
 
-class RolePermissionModel(Base):
+class RolePermissionModel(Base, TenantMixin):
     """Junction table for role-to-permission assignments.
 
     Many-to-many relationship between roles and permissions.
diff --git a/src/modules/authorization/infrastructure/models/user_has_role_model.py b/src/modules/authorization/infrastructure/models/user_has_role_model.py
@@ -5,10 +5,11 @@
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.modules.user.infrastructure.models.user_model import UserModel
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.model import Base
 
 
-class UserHasRoleModel(Base):
+class UserHasRoleModel(Base, TenantMixin):
     """Junction table for user-to-role assignments.
 
     Many-to-many relationship between users and roles.
diff --git a/src/modules/todo/infrastructure/models/todo_model.py b/src/modules/todo/infrastructure/models/todo_model.py
@@ -3,11 +3,12 @@
 from sqlalchemy import Boolean, ForeignKey, String
 from sqlalchemy.orm import Mapped, mapped_column
 
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.model import Base
 from src.shared.database.mixin.timestamp import SoftDeleteMixin, TimeStampMixin
 
 
-class TodoModel(Base, TimeStampMixin, SoftDeleteMixin):
+class TodoModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
     __tablename__ = "todos"
 
     title: Mapped[str] = mapped_column(String(255))
diff --git a/src/modules/user/infrastructure/models/refresh_token_model.py b/src/modules/user/infrastructure/models/refresh_token_model.py
@@ -5,11 +5,12 @@
 from sqlalchemy.dialects.postgresql import UUID as PG_UUID
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.mixin.timestamp import SoftDeleteMixin, TimeStampMixin
 from src.shared.database.model import Base
 
 
-class UserSessionModel(Base, TimeStampMixin, SoftDeleteMixin):
+class UserSessionModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
     """User session management for tracking active sessions.
 
     One-to-many relationship with users table.
diff --git a/src/modules/user/infrastructure/models/user_address_model.py b/src/modules/user/infrastructure/models/user_address_model.py
@@ -5,11 +5,12 @@
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.modules.user.infrastructure.models.user_model import UserModel
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.mixin.timestamp import SoftDeleteMixin, TimeStampMixin
 from src.shared.database.model import Base
 
 
-class UserAddressModel(Base, TimeStampMixin, SoftDeleteMixin):
+class UserAddressModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
     """User addresses supporting multiple locations.
 
     One-to-many relationship with users table.
diff --git a/src/modules/user/infrastructure/models/user_contact_model.py b/src/modules/user/infrastructure/models/user_contact_model.py
@@ -6,6 +6,7 @@
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.modules.user.infrastructure.models.user_model import UserModel
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.mixin.timestamp import SoftDeleteMixin, TimeStampMixin
 from src.shared.database.model import Base
 
@@ -19,7 +20,7 @@ class ContactType(str, Enum):
     OTHER = "other"
 
 
-class UserContactModel(Base, TimeStampMixin, SoftDeleteMixin):
+class UserContactModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
     """User contact methods supporting multiple channels.
 
     One-to-many relationship with users table.
diff --git a/src/modules/user/infrastructure/models/user_model.py b/src/modules/user/infrastructure/models/user_model.py
@@ -5,6 +5,7 @@
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.shared.database.mixin.timestamp import SoftDeleteMixin, TimeStampMixin
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.model import Base
 
 if TYPE_CHECKING:
@@ -32,6 +33,7 @@ class UserModel(
     Base,
     TimeStampMixin,
     SoftDeleteMixin,
+    TenantMixin,
 ):
     """Core user identity and authentication table.
 
diff --git a/src/modules/user/infrastructure/models/user_profile_model.py b/src/modules/user/infrastructure/models/user_profile_model.py
@@ -5,11 +5,12 @@
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.modules.user.infrastructure.models.user_model import UserModel
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.mixin.timestamp import SoftDeleteMixin, TimeStampMixin
 from src.shared.database.model import Base
 
 
-class UserProfileModel(Base, TimeStampMixin, SoftDeleteMixin):
+class UserProfileModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
     """User profile containing personal information.
 
     One-to-one relationship with users table.
diff --git a/src/modules/user/infrastructure/models/user_security_model.py b/src/modules/user/infrastructure/models/user_security_model.py
@@ -6,11 +6,12 @@
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.modules.user.infrastructure.models.user_model import UserModel
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.mixin.timestamp import SoftDeleteMixin, TimeStampMixin
 from src.shared.database.model import Base
 
 
-class UserSecurityModel(Base, TimeStampMixin, SoftDeleteMixin):
+class UserSecurityModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
     """User security configuration and state.
 
     One-to-one relationship with users table.
diff --git a/src/modules/user/infrastructure/models/user_settings_model.py b/src/modules/user/infrastructure/models/user_settings_model.py
@@ -6,11 +6,12 @@
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.modules.user.infrastructure.models.user_model import UserModel
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.mixin.timestamp import SoftDeleteMixin, TimeStampMixin
 from src.shared.database.model import Base
 
 
-class UserSettingsModel(Base, TimeStampMixin, SoftDeleteMixin):
+class UserSettingsModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
     """User preferences and settings stored as JSONB.
 
     One-to-one relationship with users table.
diff --git a/src/modules/user/infrastructure/models/user_verification_model.py b/src/modules/user/infrastructure/models/user_verification_model.py
@@ -6,11 +6,12 @@
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.modules.user.infrastructure.models.user_model import UserModel
+from src.shared.database.mixin.tenant import TenantMixin
 from src.shared.database.mixin.timestamp import SoftDeleteMixin, TimeStampMixin
 from src.shared.database.model import Base
 
 
-class UserVerificationModel(Base, TimeStampMixin, SoftDeleteMixin):
+class UserVerificationModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
     """User verification status per communication channel.
 
     One-to-many relationship with users table.

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`	`UserHasRoleModel, # noqa: F401`
`37`	`37`	`)`
`38`	`38`	`from src.modules.api_key.infrastructure.models import ApiKeyModel # noqa: F401`
	`39`	`+from src.modules.tenants.infrastructure.models.tenant_model import TenantModel # noqa: F401`
`39`	`40`	`from src.modules.todo.infrastructure.models.todo_model import TodoModel # noqa: F401`
`40`	`41`	`from src.modules.user.infrastructure import models as user_models # noqa: F401`
`41`	`42`	`from src.shared.database.model import Base`