refactor: user application and presentation use integer ids

Author: fiqrikm18

src/core/security/two_factor_auth.py

@@ -4,7 +4,6 @@
 
 import secrets
 from typing import Literal
-from uuid import UUID
 
 import pyotp
 
@@ -34,7 +33,7 @@ def __init__(
         self._email_service = email_service
         self._settings = get_settings()
 
-    async def setup_totp(self, user_id: UUID) -> dict[str, str]:
+    async def setup_totp(self, user_id: int) -> dict[str, str]:
         """Set up TOTP for a user.
 
         Returns:
@@ -66,7 +65,7 @@ async def setup_totp(self, user_id: UUID) -> dict[str, str]:
                 "qr_code_data": f"otpauth://totp/{issuer}:{user.email}?secret={secret}&issuer={issuer}",
             }
 
-    async def verify_totp_setup(self, user_id: UUID, code: str) -> dict[str, list[str]]:
+    async def verify_totp_setup(self, user_id: int, code: str) -> dict[str, list[str]]:
         """Verify TOTP setup and enable 2FA.
 
         Args:
@@ -100,7 +99,7 @@ async def verify_totp_setup(self, user_id: UUID, code: str) -> dict[str, list[st
 
             return {"backup_codes": backup_codes}
 
-    async def disable_totp(self, user_id: UUID, code: str) -> bool:
+    async def disable_totp(self, user_id: int, code: str) -> bool:
         """Disable TOTP 2FA for a user.
 
         Args:
@@ -147,7 +146,7 @@ async def disable_totp(self, user_id: UUID, code: str) -> bool:
 
             return True
 
-    async def send_email_2fa_code(self, user_id: UUID) -> bool:
+    async def send_email_2fa_code(self, user_id: int) -> bool:
         """Send a 2FA code via email.
 
         Args:
@@ -199,7 +198,7 @@ async def send_email_2fa_code(self, user_id: UUID) -> bool:
 
             return True
 
-    async def verify_email_2fa_code(self, user_id: UUID, code: str) -> bool:
+    async def verify_email_2fa_code(self, user_id: int, code: str) -> bool:
         """Verify an email-based 2FA code.
 
         Args:
@@ -290,7 +289,7 @@ async def verify_2fa_code(
         return False
 
     async def regenerate_backup_codes(
-        self, user_id: UUID, verify_code: str
+        self, user_id: int, verify_code: str
     ) -> dict[str, list[str]]:
         """Regenerate backup codes for a user.
 

src/modules/user/presentation/dependency.py

@@ -1,8 +1,6 @@
 from fastapi import Depends
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from uuid import UUID
-
 from src.core.database.postgres.session import get_db, get_unit_of_work
 from src.core.dependency.tenant import get_current_tenant_id
 from src.core.email.factory import create_email_service
@@ -55,7 +53,7 @@
 
 def get_user_repository(
     db: AsyncSession = Depends(get_db),
-    tenant_id: UUID = Depends(get_current_tenant_id),
+    tenant_id: int = Depends(get_current_tenant_id),
 ) -> UserRepository:
     return SQLAlchemyUserRepository(db, tenant_id)
 
@@ -66,7 +64,7 @@ def get_email_service() -> EmailService:
 
 def get_refresh_token_repository(
     db: AsyncSession = Depends(get_db),
-    tenant_id: UUID = Depends(get_current_tenant_id),
+    tenant_id: int = Depends(get_current_tenant_id),
 ) -> RefreshTokenRepository:
     return SQLAlchemyRefreshTokenRepository(db, tenant_id)
 
@@ -77,14 +75,14 @@ def get_token_revocation_service() -> TokenRevocationService:
 
 def get_audit_service(
     db: AsyncSession = Depends(get_db),
-    tenant_id: UUID = Depends(get_current_tenant_id),
+    tenant_id: int = Depends(get_current_tenant_id),
 ) -> AuditService:
     return AuditService(SQLAlchemyAuditRepository(db, tenant_id))
 
 
 def get_account_lockout_service(
     db: AsyncSession = Depends(get_db),
-    tenant_id: UUID = Depends(get_current_tenant_id),
+    tenant_id: int = Depends(get_current_tenant_id),
 ) -> AccountLockoutService:
     return AccountLockoutService(SQLAlchemyLoginAttemptRepository(db, tenant_id))
 

src/modules/user/presentation/routers/two_factor_router.py

@@ -60,9 +60,7 @@ async def setup_totp(
     - Microsoft Authenticator
     - Any TOTP-compatible authenticator app
     """
-    from uuid import UUID
-
-    command = SetupTOTPCommand(user_id=UUID(current_user_id))
+    command = SetupTOTPCommand(user_id=int(current_user_id))
     result = await handler.execute(command)
 
     return SuccessResponse(
@@ -88,10 +86,8 @@ async def verify_totp_setup(
     After scanning the QR code, submit the 6-digit code from your authenticator app
     to complete the setup. This will return backup codes - store them safely!
     """
-    from uuid import UUID
-
     command = VerifyTOTPSetupCommand(
-        user_id=UUID(current_user_id),
+        user_id=int(current_user_id),
         code=request.code,
     )
     result = await handler.execute(command)
@@ -118,10 +114,8 @@ async def disable_totp(
 
     Requires either a current TOTP code or a backup code to verify identity.
     """
-    from uuid import UUID
-
     command = DisableTOTPCommand(
-        user_id=UUID(current_user_id),
+        user_id=int(current_user_id),
         code=request.code,
     )
     result = await handler.execute(command)
@@ -152,9 +146,7 @@ async def send_email_2fa_code(
     Alternative to TOTP for users who prefer email-based verification.
     The code will expire in 10 minutes.
     """
-    from uuid import UUID
-
-    command = SendEmail2FACodeCommand(user_id=UUID(current_user_id))
+    command = SendEmail2FACodeCommand(user_id=int(current_user_id))
     result = await handler.execute(command)
 
     if result:
@@ -179,10 +171,8 @@ async def verify_email_2fa_code(
     handler: VerifyEmail2FACodeHandler = Depends(get_verify_email_2fa_code_handler),
 ):
     """Verify an email-based 2FA code."""
-    from uuid import UUID
-
     command = VerifyEmail2FACodeCommand(
-        user_id=UUID(current_user_id),
+        user_id=int(current_user_id),
         code=request.code,
     )
     result = await handler.execute(command)
@@ -215,10 +205,8 @@ async def regenerate_backup_codes(
     This will invalidate all previous backup codes and generate new ones.
     Requires a current TOTP code for verification.
     """
-    from uuid import UUID
-
     command = RegenerateBackupCodesCommand(
-        user_id=UUID(current_user_id),
+        user_id=int(current_user_id),
         verify_code=request.verify_code,
     )
     result = await handler.execute(command)
@@ -246,10 +234,8 @@ async def verify_2fa(
     Used in the login flow when 2FA is required.
     Supports TOTP, email, and backup code methods.
     """
-    from uuid import UUID
-
     command = Verify2FACommand(
-        user_id=UUID(current_user_id),
+        user_id=int(current_user_id),
         code=request.code,
         method=request.method,
     )