refactor: todo module uses integer ids

Author: fiqrikm18

src/modules/todo/application/create_todo/handler.py

@@ -1,5 +1,3 @@
-from uuid import UUID
-
 from src.modules.todo.application.create_todo.command import CreateTodoCommand
 from src.modules.todo.application.create_todo.validation import (
     validate_create_todo_command,
@@ -14,7 +12,7 @@ def __init__(self, todo_repo: TodoRepository, unit_of_work: UnitOfWork):
         self.todo_repo = todo_repo
         self._unit_of_work = unit_of_work
 
-    async def execute(self, command: CreateTodoCommand, user_id: UUID) -> Todo:
+    async def execute(self, command: CreateTodoCommand, user_id: int) -> Todo:
         validate_create_todo_command(command)
 
         todo = Todo.create(

src/modules/todo/application/delete_todo/handler.py

@@ -1,5 +1,3 @@
-from uuid import UUID
-
 from src.modules.todo.domain.exceptions.todo_exception import (
     TodoNotFoundError,
     UnauthorizedTodoAccessError,
@@ -13,7 +11,7 @@ def __init__(self, todo_repo: TodoRepository, unit_of_work: UnitOfWork):
         self.todo_repo = todo_repo
         self._unit_of_work = unit_of_work
 
-    async def execute(self, todo_id: UUID, user_id: UUID) -> None:
+    async def execute(self, todo_id: int, user_id: int) -> None:
         todo = await self.todo_repo.get_by_id(todo_id)
         if not todo:
             raise TodoNotFoundError("Todo not found")

src/modules/todo/application/detail_todo/handler.py

@@ -1,5 +1,3 @@
-from uuid import UUID
-
 from src.modules.todo import (
     TodoNotFoundError,
     TodoRepository,
@@ -19,7 +17,7 @@ def __init__(
         self._todo_repo = todo_repo
         self._user_provider = user_provider
 
-    async def execute(self, todo_id: UUID, user_id: UUID) -> TodoWithOwnerResponse:
+    async def execute(self, todo_id: int, user_id: int) -> TodoWithOwnerResponse:
         todo = await self._todo_repo.get_by_id(todo_id)
         if not todo:
             raise TodoNotFoundError("Todo not found")

src/modules/todo/application/list_todo/handler.py

@@ -1,5 +1,4 @@
 from datetime import datetime
-from uuid import UUID
 
 from src.modules.todo.application.list_todo.query import GetTodosQuery
 from src.modules.todo.application.list_todo.validation import validate_get_todos_query
@@ -24,9 +23,9 @@ def __init__(self, todo_repo: TodoRepository):
 
     async def execute(
         self,
-        user_id: UUID,
+        user_id: int,
         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[Todo], bool]:

src/modules/todo/application/list_todo/query.py

@@ -1,7 +1,5 @@
-from uuid import UUID
-
 from pydantic import BaseModel
 
 
 class GetTodosQuery(BaseModel):
-    user_id: UUID
+    user_id: int

src/modules/todo/application/update_todo/handler.py

@@ -1,5 +1,3 @@
-from uuid import UUID
-
 from src.modules.todo.application.update_todo.command import UpdateTodoCommand
 from src.modules.todo.application.update_todo.validation import (
     validate_update_todo_command,
@@ -19,7 +17,7 @@ def __init__(self, todo_repo: TodoRepository, unit_of_work: UnitOfWork):
         self._unit_of_work = unit_of_work
 
     async def execute(
-        self, todo_id: UUID, command: UpdateTodoCommand, user_id: UUID
+        self, todo_id: int, command: UpdateTodoCommand, user_id: int
     ) -> Todo:
         validate_update_todo_command(command)
 

src/modules/todo/domain/entities/todo.py

@@ -1,21 +1,20 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from uuid import UUID, uuid4
 
 
 @dataclass
 class Todo:
-    id: UUID
-    title: str
-    description: str | None
-    is_completed: bool
-    user_id: UUID
+    id: int | None = None
+    title: str = ""
+    description: str | None = None
+    is_completed: bool = False
+    user_id: int = 0
 
     @classmethod
-    def create(cls, title: str, user_id: UUID, description: str | None = None) -> Todo:
+    def create(cls, title: str, user_id: int, description: str | None = None) -> Todo:
         return cls(
-            id=uuid4(),
+            id=None,
             title=title,
             description=description,
             is_completed=False,

src/modules/todo/domain/repositories/todo_repository.py

@@ -1,26 +1,25 @@
 from abc import ABC, abstractmethod
 from datetime import datetime
-from uuid import UUID
 
 from src.modules.todo.domain.entities.todo import Todo
 from src.shared.utils.cursor import CursorDirection
 
 
 class TodoRepository(ABC):
     @abstractmethod
-    async def get_by_id(self, todo_id: UUID) -> Todo | None:
+    async def get_by_id(self, todo_id: int) -> Todo | None:
         pass
 
     @abstractmethod
-    async def get_all_by_user(self, user_id: UUID) -> list[Todo]:
+    async def get_all_by_user(self, user_id: int) -> list[Todo]:
         pass
 
     @abstractmethod
     async def get_by_user_cursor(
         self,
-        user_id: UUID,
+        user_id: int,
         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[Todo], bool]:
@@ -35,5 +34,5 @@ async def save(self, todo: Todo) -> Todo:
         pass
 
     @abstractmethod
-    async def delete(self, todo_id: UUID) -> None:
+    async def delete(self, todo_id: int) -> None:
         pass

src/modules/todo/infrastructure/models/todo_model.py

@@ -1,5 +1,3 @@
-import uuid
-
 from sqlalchemy import Boolean, ForeignKey, String
 from sqlalchemy.orm import Mapped, mapped_column
 
@@ -14,4 +12,4 @@ class TodoModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
     title: Mapped[str] = mapped_column(String(255))
     description: Mapped[str | None] = mapped_column(String(500), nullable=True)
     is_completed: Mapped[bool] = mapped_column(Boolean, default=False)
-    user_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("users.id"))
+    user_id: Mapped[int] = mapped_column(ForeignKey("users.id"))

src/modules/todo/infrastructure/repositories/todo_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
@@ -11,11 +10,11 @@
 
 
 class SQLAlchemyTodoRepository(TodoRepository):
-    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
 
-    async def get_by_id(self, todo_id: UUID) -> Todo | None:
+    async def get_by_id(self, todo_id: int) -> Todo | None:
         stmt = select(TodoModel).where(TodoModel.id == todo_id)
         if self._tenant_id:
             stmt = stmt.where(TodoModel.tenant_id == self._tenant_id)
@@ -33,9 +32,9 @@ async def get_by_id(self, todo_id: UUID) -> Todo | None:
 
     async def get_by_user_cursor(
         self,
-        user_id: UUID,
+        user_id: int,
         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[Todo], bool]:
@@ -97,7 +96,7 @@ async def get_by_user_cursor(
 
         return [self._to_entity(m) for m in models], has_more
 
-    async def get_all_by_user(self, user_id: UUID) -> list[Todo]:
+    async def get_all_by_user(self, user_id: int) -> list[Todo]:
         stmt = select(TodoModel).where(TodoModel.user_id == user_id)
         if self._tenant_id:
             stmt = stmt.where(TodoModel.tenant_id == self._tenant_id)
@@ -115,14 +114,16 @@ async def get_all_by_user(self, user_id: UUID) -> list[Todo]:
         ]
 
     async def save(self, todo: Todo) -> Todo:
-        model = TodoModel(
-            id=todo.id,
-            title=todo.title,
-            description=todo.description,
-            is_completed=todo.is_completed,
-            user_id=todo.user_id,
-            tenant_id=self._tenant_id,
-        )
+        model_kwargs = {
+            "title": todo.title,
+            "description": todo.description,
+            "is_completed": todo.is_completed,
+            "user_id": todo.user_id,
+            "tenant_id": self._tenant_id,
+        }
+        if todo.id is not None:
+            model_kwargs["id"] = todo.id
+        model = TodoModel(**model_kwargs)
         model = await self.db.merge(model)
         await self.db.flush()
         await self.db.refresh(model)
@@ -134,7 +135,7 @@ async def save(self, todo: Todo) -> Todo:
             user_id=model.user_id,
         )
 
-    async def delete(self, todo_id: UUID) -> None:
+    async def delete(self, todo_id: int) -> None:
         stmt = delete(TodoModel).where(TodoModel.id == todo_id)
         if self._tenant_id:
             stmt = stmt.where(TodoModel.tenant_id == self._tenant_id)
@@ -143,7 +144,7 @@ async def delete(self, todo_id: UUID) -> None:
 
     def _to_entity(self, model: TodoModel) -> Todo:
         return Todo(
-            id=str(model.id),
+            id=model.id,
             description=model.description,
             is_completed=model.is_completed,
             title=model.title,