refactor: user domain entities and commands use integer ids

Author: fiqrikm18

src/modules/user/application/auth/logout_user/validation.py

@@ -1,13 +1,11 @@
-from uuid import UUID
-
 from src.modules.user.application.auth.logout_user.command import LogoutUserCommand
 
 
 def validate_logout_user_command(command: LogoutUserCommand) -> None:
     try:
-        UUID(command.user_id)
+        int(command.user_id)
     except ValueError as exc:
-        raise ValueError("User id must be a valid UUID") from exc
+        raise ValueError("User id must be a valid integer") from exc
 
     if not command.access_token.strip():
         raise ValueError("Access token is required")

src/modules/user/application/auth/two_factor/command.py

@@ -2,45 +2,44 @@
 
 from pydantic import BaseModel
 from typing import Literal
-from uuid import UUID
 
 
 class SetupTOTPCommand(BaseModel):
     """Command to set up TOTP 2FA."""
-    user_id: UUID
+    user_id: int
 
 
 class VerifyTOTPSetupCommand(BaseModel):
     """Command to verify and enable TOTP 2FA."""
-    user_id: UUID
+    user_id: int
     code: str
 
 
 class DisableTOTPCommand(BaseModel):
     """Command to disable TOTP 2FA."""
-    user_id: UUID
+    user_id: int
     code: str
 
 
 class SendEmail2FACodeCommand(BaseModel):
     """Command to send a 2FA code via email."""
-    user_id: UUID
+    user_id: int
 
 
 class VerifyEmail2FACodeCommand(BaseModel):
     """Command to verify an email-based 2FA code."""
-    user_id: UUID
+    user_id: int
     code: str
 
 
 class RegenerateBackupCodesCommand(BaseModel):
     """Command to regenerate backup codes."""
-    user_id: UUID
+    user_id: int
     verify_code: str
 
 
 class Verify2FACommand(BaseModel):
     """Command to verify a 2FA code during login."""
-    user_id: UUID
+    user_id: int
     code: str
     method: Literal["totp", "email", "backup"] = "totp"

src/modules/user/application/detail_user/query.py

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

src/modules/user/domain/entities/refresh_token.py

@@ -2,23 +2,22 @@
 
 from dataclasses import dataclass
 from datetime import datetime
-from uuid import UUID, uuid4
 
 
-@dataclass
+@dataclass(kw_only=True)
 class RefreshToken:
-    id: UUID
-    user_id: UUID
+    id: int | None = None
+    user_id: int
     token_hash: str
     expires_at: datetime
     is_revoked: bool = False
 
     @classmethod
     def create(
-        cls, user_id: UUID, token_hash: str, expires_at: datetime
+        cls, user_id: int, token_hash: str, expires_at: datetime
     ) -> RefreshToken:
         return cls(
-            id=uuid4(),
+            id=None,
             user_id=user_id,
             token_hash=token_hash,
             expires_at=expires_at,

src/modules/user/domain/entities/user.py

@@ -3,14 +3,13 @@
 from dataclasses import dataclass, field
 from datetime import date, datetime
 from typing import Optional
-from uuid import UUID, uuid4
 
 
 @dataclass
 class UserProfile:
     """User profile containing personal information."""
 
-    user_id: UUID
+    user_id: int
     first_name: Optional[str] = None
     last_name: Optional[str] = None
     display_name: Optional[str] = None
@@ -25,7 +24,7 @@ class UserProfile:
 class UserSettings:
     """User preferences and settings."""
 
-    user_id: UUID
+    user_id: int
     preferences: dict = field(default_factory=dict)
     created_at: Optional[str] = None
     updated_at: Optional[str] = None
@@ -35,7 +34,7 @@ class UserSettings:
 class UserSecurity:
     """User security configuration and state."""
 
-    user_id: UUID
+    user_id: int
     failed_login_attempts: int = 0
     locked_until: Optional[datetime] = None
     password_changed_at: Optional[datetime] = None
@@ -46,11 +45,11 @@ class UserSecurity:
     updated_at: Optional[str] = None
 
 
-@dataclass
+@dataclass(kw_only=True)
 class User:
     """Core user identity and authentication aggregate root."""
 
-    id: UUID
+    id: int | None = None
     email: str
     password_hash: str
 
@@ -77,7 +76,7 @@ def create(
         auth_provider: str = "local",
     ) -> User:
         return cls(
-            id=uuid4(),
+            id=None,
             email=email,
             password_hash=password_hash,
             username=username,

src/modules/user/domain/repositories/refresh_token_repository.py

@@ -1,5 +1,4 @@
 from abc import ABC, abstractmethod
-from uuid import UUID
 
 from src.modules.user.domain.entities.refresh_token import RefreshToken
 
@@ -14,6 +13,6 @@ async def save(self, refresh_token: RefreshToken) -> RefreshToken:
         pass
 
     @abstractmethod
-    async def revoke_by_user_id(self, user_id: UUID) -> None:
+    async def revoke_by_user_id(self, user_id: int) -> None:
         """Revokes all refresh tokens for a user (e.g., on password change or logout)"""
         pass

src/modules/user/domain/repositories/user_repository.py

@@ -1,6 +1,5 @@
 from abc import ABC, abstractmethod
 from typing import Optional
-from uuid import UUID
 
 from src.modules.user.domain.entities.user import User, UserProfile, UserSettings, UserSecurity
 
@@ -11,11 +10,11 @@ async def get_by_email(self, email: str) -> Optional[User]:
         pass
 
     @abstractmethod
-    async def get_by_id(self, user_id: UUID) -> Optional[User]:
+    async def get_by_id(self, user_id: int) -> Optional[User]:
         pass
 
     @abstractmethod
-    async def get_by_id_with_relations(self, user_id: UUID) -> Optional[User]:
+    async def get_by_id_with_relations(self, user_id: int) -> Optional[User]:
         """Get user with profile, settings, and security loaded."""
         pass
 

tests/test_application_validation.py

@@ -1,5 +1,3 @@
-from uuid import uuid4
-
 import pytest
 
 from src.modules.todo.application.create_todo.command import CreateTodoCommand
@@ -65,21 +63,21 @@ def test_register_validation_rejects_short_password():
 
 
 def test_logout_validation_rejects_invalid_user_id():
-    with pytest.raises(ValueError, match="User id must be a valid UUID"):
+    with pytest.raises(ValueError, match="User id must be a valid integer"):
         validate_logout_user_command(
-            LogoutUserCommand(user_id="not-a-uuid", access_token="access-token")
+            LogoutUserCommand(user_id="not-an-int", access_token="access-token")
         )
 
 
 def test_logout_validation_rejects_blank_access_token():
     with pytest.raises(ValueError, match="Access token is required"):
         validate_logout_user_command(
-            LogoutUserCommand(user_id=str(uuid4()), access_token=" ")
+            LogoutUserCommand(user_id="1", access_token=" ")
         )
 
 
 def test_query_validation_accepts_valid_queries():
-    user_id = uuid4()
+    user_id = 1
 
     validate_get_todos_query(GetTodosQuery(user_id=user_id))
     validate_detail_user_query(DetailUserQuery(user_id=user_id))