refactor: authorization module uses integer ids

fiqrikm18 · fiqrikm18 · commit 2710a5dea11f · 2026-08-01T13:21:50.000+07:00
diff --git a/src/modules/authorization/application/delete_permission/command.py b/src/modules/authorization/application/delete_permission/command.py
@@ -1,7 +1,6 @@
-from uuid import UUID
 
 from pydantic import BaseModel
 
 
 class DeletePermissionCommand(BaseModel):
-    permission_id: UUID
+    permission_id: int
diff --git a/src/modules/authorization/application/delete_role/command.py b/src/modules/authorization/application/delete_role/command.py
@@ -1,7 +1,6 @@
-from uuid import UUID
 
 from pydantic import BaseModel
 
 
 class DeleteRoleCommand(BaseModel):
-    role_id: UUID
+    role_id: int
diff --git a/src/modules/authorization/application/get_permission/query.py b/src/modules/authorization/application/get_permission/query.py
@@ -1,7 +1,6 @@
-from uuid import UUID
 
 from pydantic import BaseModel
 
 
 class GetPermissionQuery(BaseModel):
-    permission_id: UUID
+    permission_id: int
diff --git a/src/modules/authorization/application/get_role/query.py b/src/modules/authorization/application/get_role/query.py
@@ -1,7 +1,6 @@
-from uuid import UUID
 
 from pydantic import BaseModel
 
 
 class GetRoleQuery(BaseModel):
-    role_id: UUID
+    role_id: int
diff --git a/src/modules/authorization/application/update_permission/command.py b/src/modules/authorization/application/update_permission/command.py
@@ -1,10 +1,9 @@
-from uuid import UUID
 
 from pydantic import BaseModel
 
 
 class UpdatePermissionCommand(BaseModel):
-    permission_id: UUID
+    permission_id: int
     resource: str | None = None
     action: str | None = None
     description: str | None = None
diff --git a/src/modules/authorization/application/update_role/command.py b/src/modules/authorization/application/update_role/command.py
@@ -1,9 +1,8 @@
-from uuid import UUID
 
 from pydantic import BaseModel
 
 
 class UpdateRoleCommand(BaseModel):
-    role_id: UUID
+    role_id: int
     name: str | None = None
     description: str | None = None
diff --git a/src/modules/authorization/domain/entities/permission.py b/src/modules/authorization/domain/entities/permission.py
@@ -1,10 +1,9 @@
 from dataclasses import dataclass
-from uuid import UUID, uuid4
 
 
-@dataclass
+@dataclass(kw_only=True)
 class Permission:
-    id: UUID
+    id: int | None = None
     key: str
     resource: str
     action: str
@@ -21,7 +20,7 @@ def create(
         description: str | None,
     ) -> "Permission":
         return cls(
-            id=uuid4(),
+            id=None,
             key=key,
             resource=resource,
             action=action,
diff --git a/src/modules/authorization/domain/entities/resource.py b/src/modules/authorization/domain/entities/resource.py
@@ -1,10 +1,9 @@
 from dataclasses import dataclass
-from uuid import UUID, uuid4
 
 
-@dataclass
+@dataclass(kw_only=True)
 class AuthorizationResource:
-    id: UUID
+    id: int | None = None
     key: str
     name: str
     description: str | None = None
@@ -17,7 +16,7 @@ def create(
         description: str | None = None,
     ) -> "AuthorizationResource":
         return cls(
-            id=uuid4(),
+            id=None,
             key=key,
             name=name,
             description=description,
diff --git a/src/modules/authorization/domain/entities/role.py b/src/modules/authorization/domain/entities/role.py
@@ -1,10 +1,9 @@
 from dataclasses import dataclass
-from uuid import UUID, uuid4
 
 
-@dataclass
+@dataclass(kw_only=True)
 class Role:
-    id: UUID
+    id: int | None = None
     name: str
     description: str | None = None
     created_at: str | None = None
@@ -13,7 +12,7 @@ class Role:
     @classmethod
     def create(cls, name: str, description: str | None = None) -> "Role":
         return cls(
-            id=uuid4(),
+            id=None,
             name=name,
             description=description,
         )
diff --git a/src/modules/authorization/domain/services/authorization_service.py b/src/modules/authorization/domain/services/authorization_service.py
@@ -1,6 +1,5 @@
 from abc import ABC, abstractmethod
 from datetime import datetime
-from uuid import UUID
 
 from src.modules.authorization import Permission, Role
 from src.shared.utils.cursor import CursorDirection
@@ -28,11 +27,11 @@ async def update_role(self, role: Role) -> Role | None:
         pass
 
     @abstractmethod
-    async def delete_role(self, role_id: UUID) -> None:
+    async def delete_role(self, role_id: int) -> None:
         pass
 
     @abstractmethod
-    async def get_role(self, role_id: UUID) -> Role | None:
+    async def get_role(self, role_id: int) -> Role | None:
         pass
 
     @abstractmethod
@@ -43,7 +42,7 @@ async def list_roles(self) -> list[Role]:
     async def list_roles_cursor(
         self,
         cursor_created_at: datetime | None = None,
-        cursor_id: UUID | None = None,
+        cursor_id: int | None = None,
         limit: int = 10,
         direction: CursorDirection = CursorDirection.DIRECTION_NEXT,
     ) -> tuple[list[Role], bool]:
@@ -58,11 +57,11 @@ async def update_permission(self, permission: Permission) -> Permission | None:
         pass
 
     @abstractmethod
-    async def delete_permission(self, permission_id: UUID) -> None:
+    async def delete_permission(self, permission_id: int) -> None:
         pass
 
     @abstractmethod
-    async def get_permission(self, permission_id: UUID) -> Permission | None:
+    async def get_permission(self, permission_id: int) -> Permission | None:
         pass
 
     @abstractmethod
@@ -73,7 +72,7 @@ async def list_permissions(self) -> list[Permission]:
     async def list_permissions_cursor(
         self,
         cursor_created_at: datetime | None = None,
-        cursor_id: UUID | None = None,
+        cursor_id: int | None = None,
         limit: int = 10,
         direction: CursorDirection = CursorDirection.DIRECTION_NEXT,
     ) -> tuple[list[Permission], bool]:
@@ -82,15 +81,15 @@ async def list_permissions_cursor(
     @abstractmethod
     async def assign_permission_to_role(
         self,
-        role_id: UUID,
-        permission_id: UUID,
+        role_id: int,
+        permission_id: int,
     ) -> None:
         pass
 
     @abstractmethod
     async def remove_permission_from_role(
         self,
-        role_id: UUID,
-        permission_id: UUID,
+        role_id: int,
+        permission_id: int,
     ) -> None:
         pass
diff --git a/src/modules/authorization/infrastructure/models/permission_model.py b/src/modules/authorization/infrastructure/models/permission_model.py
@@ -1,5 +1,3 @@
-from uuid import UUID
-
 from sqlalchemy import ForeignKey, Index, String, UniqueConstraint
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
@@ -25,7 +23,7 @@ class PermissionModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
     )
 
     key: Mapped[str] = mapped_column(String(255), unique=True, nullable=False)
-    resource_id: Mapped[UUID] = mapped_column(
+    resource_id: Mapped[int] = mapped_column(
         ForeignKey("authorization_resources.id"),
         nullable=False,
     )
diff --git a/src/modules/authorization/infrastructure/models/role_permission_model.py b/src/modules/authorization/infrastructure/models/role_permission_model.py
@@ -1,5 +1,3 @@
-from uuid import UUID
-
 from sqlalchemy import ForeignKey, Index, UniqueConstraint
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
@@ -24,8 +22,8 @@ class RolePermissionModel(Base, TenantMixin):
         Index("ix_role_permissions_permission_id", "permission_id"),
     )
 
-    role_id: Mapped[UUID] = mapped_column(ForeignKey("roles.id"), nullable=False)
-    permission_id: Mapped[UUID] = mapped_column(
+    role_id: Mapped[int] = mapped_column(ForeignKey("roles.id"), nullable=False)
+    permission_id: Mapped[int] = mapped_column(
         ForeignKey("permissions.id"),
         nullable=False,
     )
diff --git a/src/modules/authorization/infrastructure/models/user_has_role_model.py b/src/modules/authorization/infrastructure/models/user_has_role_model.py
@@ -1,7 +1,4 @@
-from uuid import UUID
-
 from sqlalchemy import ForeignKey, Index, UniqueConstraint
-from sqlalchemy.dialects.postgresql import UUID as PG_UUID
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.modules.user.infrastructure.models.user_model import UserModel
@@ -25,12 +22,11 @@ class UserHasRoleModel(Base, TenantMixin):
         Index("ix_user_has_roles_role_id", "role_id"),
     )
 
-    user_id: Mapped[UUID] = mapped_column(
-        PG_UUID(as_uuid=True),
+    user_id: Mapped[int] = mapped_column(
         ForeignKey("users.id"),
         nullable=False,
     )
-    role_id: Mapped[UUID] = mapped_column(ForeignKey("roles.id"), nullable=False)
+    role_id: Mapped[int] = mapped_column(ForeignKey("roles.id"), nullable=False)
 
     # Relationships
     user: Mapped["UserModel"] = relationship(  # type: ignore[name-defined]
diff --git a/src/modules/authorization/infrastructure/repositories/casbin_policy_repository.py b/src/modules/authorization/infrastructure/repositories/casbin_policy_repository.py
@@ -1,5 +1,4 @@
 from datetime import datetime
-from uuid import UUID
 
 from sqlalchemy import and_, delete, or_, select
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -25,7 +24,7 @@
 
 
 class SQLAlchemyCasbinPolicyRepository:
-    def __init__(self, db: AsyncSession, tenant_id: UUID | None = None):
+    def __init__(self, db: AsyncSession, tenant_id: int | None = None):
         self._db = db
         self._tenant_id = tenant_id
 
@@ -98,7 +97,7 @@ async def assign_role(self, subject: str, role: str) -> None:
         if role_model is None:
             raise ValueError(f"Role does not exist: {role}")
 
-        user_id = UUID(subject)
+        user_id = int(subject)
         stmt = select(UserHasRoleModel).where(
             UserHasRoleModel.user_id == user_id,
             UserHasRoleModel.role_id == role_model.id,
@@ -118,7 +117,7 @@ async def assign_role(self, subject: str, role: str) -> None:
         await self.add_policy("g", subject, role)
 
     async def get_roles_for_subject(self, subject: str) -> list[str]:
-        user_id = UUID(subject)
+        user_id = int(subject)
         stmt = (
             select(RoleModel.name)
             .join(UserHasRoleModel, UserHasRoleModel.role_id == RoleModel.id)
@@ -134,7 +133,6 @@ async def create_resource(
         resource: AuthorizationResource,
     ) -> AuthorizationResource:
         model = AuthorizationResourceModel(
-            id=resource.id,
             key=resource.key,
             name=resource.name,
             description=resource.description,
@@ -153,7 +151,6 @@ async def list_resources(self) -> list[AuthorizationResource]:
 
     async def create_role(self, role: Role) -> Role:
         model = RoleModel(
-            id=role.id,
             name=role.name,
             description=role.description,
             tenant_id=self._tenant_id,
@@ -162,7 +159,7 @@ async def create_role(self, role: Role) -> Role:
         await self._db.flush()
         return self._role_from_model(model)
 
-    async def get_role(self, role_id: UUID) -> Role | None:
+    async def get_role(self, role_id: int) -> Role | None:
         stmt = select(RoleModel).where(RoleModel.id == role_id)
         if self._tenant_id:
             stmt = stmt.where(RoleModel.tenant_id == self._tenant_id)
@@ -182,7 +179,7 @@ async def list_roles(self) -> list[Role]:
     async def list_roles_cursor(
         self,
         cursor_created_at: datetime | None = None,
-        cursor_id: UUID | None = None,
+        cursor_id: int | None = None,
         limit: int = 10,
         direction: CursorDirection = CursorDirection.DIRECTION_NEXT,
     ) -> tuple[list[Role], bool]:
@@ -231,7 +228,7 @@ async def _filter_casbin_stmt(self, stmt):
             return stmt.where(CasbinRuleModel.tenant_id == self._tenant_id)
         return stmt
 
-    async def delete_role(self, role_id: UUID) -> None:
+    async def delete_role(self, role_id: int) -> None:
         role = await self.get_role(role_id)
         if role is None:
             return
@@ -259,7 +256,6 @@ async def delete_role(self, role_id: UUID) -> None:
     async def create_permission(self, permission: Permission) -> Permission:
         resource = await self._get_or_create_resource(permission.resource)
         model = PermissionModel(
-            id=permission.id,
             key=permission.key,
             resource_id=resource.id,
             resource=permission.resource,
@@ -271,7 +267,7 @@ async def create_permission(self, permission: Permission) -> Permission:
         await self._db.flush()
         return self._permission_from_model(model)
 
-    async def get_permission(self, permission_id: UUID) -> Permission | None:
+    async def get_permission(self, permission_id: int) -> Permission | None:
         stmt = select(PermissionModel).where(PermissionModel.id == permission_id)
         if self._tenant_id:
             stmt = stmt.where(PermissionModel.tenant_id == self._tenant_id)
@@ -291,7 +287,7 @@ async def list_permissions(self) -> list[Permission]:
     async def list_permissions_cursor(
         self,
         cursor_created_at: datetime | None = None,
-        cursor_id: UUID | None = None,
+        cursor_id: int | None = None,
         limit: int = 10,
         direction: CursorDirection = CursorDirection.DIRECTION_NEXT,
     ) -> tuple[list[Permission], bool]:
@@ -339,7 +335,7 @@ async def update_permission(self, permission: Permission) -> Permission | None:
 
         return self._permission_from_model(model)
 
-    async def delete_permission(self, permission_id: UUID) -> None:
+    async def delete_permission(self, permission_id: int) -> None:
         permission = await self.get_permission(permission_id)
         if permission is None:
             return
@@ -365,8 +361,8 @@ async def delete_permission(self, permission_id: UUID) -> None:
 
     async def assign_permission_to_role(
         self,
-        role_id: UUID,
-        permission_id: UUID,
+        role_id: int,
+        permission_id: int,
     ) -> None:
         role = await self.get_role(role_id)
         permission = await self.get_permission(permission_id)
@@ -411,8 +407,8 @@ async def list_role_permissions(self) -> list[tuple[str, str]]:
 
     async def remove_permission_from_role(
         self,
-        role_id: UUID,
-        permission_id: UUID,
+        role_id: int,
+        permission_id: int,
     ) -> None:
         role = await self.get_role(role_id)
         permission = await self.get_permission(permission_id)
@@ -541,7 +537,7 @@ def _apply_cursor_pagination(
         query,
         model,
         cursor_created_at: datetime | None,
-        cursor_id: UUID | None,
+        cursor_id: int | None,
         direction: CursorDirection,
     ):
         if cursor_created_at and cursor_id:
diff --git a/src/modules/authorization/infrastructure/services/casbin_authorization_service.py b/src/modules/authorization/infrastructure/services/casbin_authorization_service.py
diff --git a/src/modules/authorization/presentation/dependency.py b/src/modules/authorization/presentation/dependency.py
diff --git a/src/modules/authorization/presentation/routers/permission_router.py b/src/modules/authorization/presentation/routers/permission_router.py
diff --git a/src/modules/authorization/presentation/routers/role_router.py b/src/modules/authorization/presentation/routers/role_router.py
