refactor: user repositories persist integer ids

Author: fiqrikm18

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

@@ -66,6 +66,7 @@ class User:
 
     created_at: Optional[str] = None
     updated_at: Optional[str] = None
+    tenant_id: int | None = None
 
     @classmethod
     def create(

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

@@ -1,5 +1,3 @@
-from uuid import UUID
-
 from sqlalchemy import select, update
 
 from src.modules.user.domain.entities.refresh_token import RefreshToken
@@ -12,7 +10,7 @@
 
 
 class SQLAlchemyRefreshTokenRepository(RefreshTokenRepository):
-    def __init__(self, db, tenant_id: UUID | None = None):
+    def __init__(self, db, tenant_id: int | None = None):
         self.db = db
         self._tenant_id = tenant_id
 
@@ -36,14 +34,13 @@ async def get_by_token_hash(self, token_hash: str) -> RefreshToken | None:
 
     async def save(self, refresh_token: RefreshToken) -> RefreshToken:
         model = RefreshTokenModel(
-            id=refresh_token.id,
             user_id=refresh_token.user_id,
             tenant_id=self._tenant_id,
             refresh_token_hash=refresh_token.token_hash,
             expires_at=refresh_token.expires_at,
             is_revoked=refresh_token.is_revoked,
         )
-        model = await self.db.merge(model)
+        self.db.add(model)
         await self.db.flush()
         await self.db.refresh(model)
         return RefreshToken(
@@ -54,7 +51,7 @@ async def save(self, refresh_token: RefreshToken) -> RefreshToken:
             is_revoked=model.is_revoked,
         )
 
-    async def revoke_by_user_id(self, user_id: UUID) -> None:
+    async def revoke_by_user_id(self, user_id: int) -> None:
         stmt = (
             update(RefreshTokenModel)
             .where(

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

@@ -1,5 +1,4 @@
 from typing import Optional
-from uuid import UUID
 
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -19,7 +18,7 @@
 
 
 class SQLAlchemyUserRepository(UserRepository):
-    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
 
@@ -34,7 +33,7 @@ async def get_by_email(self, email: str) -> Optional[User]:
 
         return self._map_to_entity(user_model)
 
-    async def get_by_id(self, user_id: UUID) -> Optional[User]:
+    async def get_by_id(self, user_id: int) -> Optional[User]:
         stmt = select(UserModel).where(UserModel.id == user_id)
         if self._tenant_id:
             stmt = stmt.where(UserModel.tenant_id == self._tenant_id)
@@ -44,7 +43,7 @@ async def get_by_id(self, user_id: UUID) -> Optional[User]:
             return None
         return self._map_to_entity(user_model)
 
-    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 eagerly loaded."""
         stmt = (
             select(UserModel)
@@ -78,16 +77,18 @@ async def save(self, user: User) -> User:
             user_model.external_id = user.external_id
         else:
             # Create new user
-            user_model = UserModel(
-                id=user.id,
-                email=user.email,
-                username=user.username,
-                password_hash=user.password_hash,
-                auth_provider=user.auth_provider,
-                status=user.status,
-                external_id=user.external_id,
-                tenant_id=self._tenant_id or user.tenant_id,
-            )
+            model_kwargs = {
+                "email": user.email,
+                "username": user.username,
+                "password_hash": user.password_hash,
+                "auth_provider": user.auth_provider,
+                "status": user.status,
+                "external_id": user.external_id,
+                "tenant_id": self._tenant_id or user.tenant_id,
+            }
+            if user.id is not None:
+                model_kwargs["id"] = user.id
+            user_model = UserModel(**model_kwargs)
             self._db.add(user_model)
 
             # Create default related records
@@ -181,14 +182,14 @@ async def save_security(self, security: UserSecurity) -> UserSecurity:
         await self._db.refresh(security_model)
         return self._map_security_to_entity(security_model)
 
-    async def _get_user_model(self, user_id: UUID) -> UserModel:
+    async def _get_user_model(self, user_id: int) -> UserModel:
         stmt = select(UserModel).where(UserModel.id == user_id)
         if self._tenant_id:
             stmt = stmt.where(UserModel.tenant_id == self._tenant_id)
         result = await self._db.execute(stmt)
         return result.scalar_one()
 
-    async def _create_default_related_records(self, user_id: UUID) -> None:
+    async def _create_default_related_records(self, user_id: int) -> None:
         """Create default profile, settings, and security records for a new user."""
         # Default profile
         profile_model = UserProfileModel(user_id=user_id, tenant_id=self._tenant_id)