refactor: api_key module uses integer ids

Author: fiqrikm18

src/modules/api_key/domain/entities.py

@@ -1,11 +1,10 @@
 from dataclasses import dataclass, field
 from datetime import datetime
-from uuid import UUID, uuid4
 
 
 @dataclass
 class ApiKey:
-    id: UUID = field(default_factory=uuid4)
+    id: int | None = None
     key_prefix: str = ""
     key_hash: str = ""
     name: str = ""

src/modules/api_key/domain/repository.py

@@ -1,5 +1,4 @@
 from abc import ABC, abstractmethod
-from uuid import UUID
 
 from src.modules.api_key.domain.entities import ApiKey
 
@@ -9,7 +8,7 @@ class ApiKeyRepository(ABC):
     async def create(self, api_key: ApiKey) -> ApiKey: ...
 
     @abstractmethod
-    async def get_by_id(self, id: UUID) -> ApiKey | None: ...
+    async def get_by_id(self, id: int) -> ApiKey | None: ...
 
     @abstractmethod
     async def get_by_key_hash(self, key_hash: str) -> ApiKey | None: ...
@@ -23,7 +22,7 @@ async def list(
     async def count(self) -> int: ...
 
     @abstractmethod
-    async def revoke(self, id: UUID) -> None: ...
+    async def revoke(self, id: int) -> None: ...
 
     @abstractmethod
-    async def update_last_used(self, id: UUID) -> None: ...
+    async def update_last_used(self, id: int) -> None: ...

src/modules/api_key/infrastructure/models.py

@@ -10,7 +10,6 @@
 class ApiKeyModel(Base, TenantMixin):
     __tablename__ = "api_keys"
 
-    id: Mapped[str] = mapped_column(String(36), primary_key=True)
     key_prefix: Mapped[str] = mapped_column(String(8), nullable=False)
     key_hash: Mapped[str] = mapped_column(String(128), nullable=False)
     name: Mapped[str] = mapped_column(String(255), nullable=False)

src/modules/api_key/infrastructure/repository.py

@@ -1,6 +1,5 @@
 import json
 from datetime import datetime, timezone
-from uuid import UUID
 
 from sqlalchemy import func, select
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -11,13 +10,12 @@
 
 
 class SQLAlchemyApiKeyRepository(ApiKeyRepository):
-    def __init__(self, session: AsyncSession, tenant_id: UUID | None = None):
+    def __init__(self, session: AsyncSession, tenant_id: int | None = None):
         self._session = session
         self._tenant_id = tenant_id
 
     async def create(self, api_key: ApiKey) -> ApiKey:
         model = ApiKeyModel(
-            id=str(api_key.id),
             key_prefix=api_key.key_prefix,
             key_hash=api_key.key_hash,
             name=api_key.name,
@@ -28,10 +26,12 @@ async def create(self, api_key: ApiKey) -> ApiKey:
         )
         self._session.add(model)
         await self._session.flush()
+        await self._session.refresh(model)
+        api_key.id = model.id
         return api_key
 
-    async def get_by_id(self, id: UUID) -> ApiKey | None:
-        stmt = select(ApiKeyModel).where(ApiKeyModel.id == str(id))
+    async def get_by_id(self, id: int) -> ApiKey | None:
+        stmt = select(ApiKeyModel).where(ApiKeyModel.id == id)
         if self._tenant_id:
             stmt = stmt.where(ApiKeyModel.tenant_id == self._tenant_id)
         result = await self._session.execute(stmt)
@@ -60,20 +60,20 @@ async def count(self) -> int:
         result = await self._session.execute(stmt)
         return result.scalar() or 0
 
-    async def revoke(self, id: UUID) -> None:
-        model = await self._session.get(ApiKeyModel, str(id))
+    async def revoke(self, id: int) -> None:
+        model = await self._session.get(ApiKeyModel, id)
         if model:
             model.is_active = False
 
-    async def update_last_used(self, id: UUID) -> None:
-        model = await self._session.get(ApiKeyModel, str(id))
+    async def update_last_used(self, id: int) -> None:
+        model = await self._session.get(ApiKeyModel, id)
         if model:
             model.last_used_at = datetime.now(timezone.utc)
 
     @staticmethod
     def _to_entity(model: ApiKeyModel) -> ApiKey:
         return ApiKey(
-            id=UUID(model.id),
+            id=model.id,
             key_prefix=model.key_prefix,
             key_hash=model.key_hash,
             name=model.name,

src/modules/api_key/presentation/dependencies.py

@@ -1,5 +1,3 @@
-from uuid import UUID
-
 from fastapi import Depends
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -14,7 +12,7 @@
 
 async def get_api_key_repository(
     db: AsyncSession = Depends(get_db),
-    tenant_id: UUID = Depends(get_current_tenant_id),
+    tenant_id: int = Depends(get_current_tenant_id),
 ) -> ApiKeyRepository:
     return SQLAlchemyApiKeyRepository(db, tenant_id)
 

src/modules/api_key/presentation/routers.py

@@ -1,5 +1,3 @@
-from uuid import UUID
-
 from fastapi import APIRouter, Depends, HTTPException, status
 
 from src.modules.api_key.application.service import ApiKeyService
@@ -33,7 +31,7 @@ async def create_api_key(
         expires_at=request.expires_at,
     )
     return ApiKeyCreatedResponse(
-        id=str(api_key.id),
+        id=api_key.id,
         name=api_key.name,
         key_prefix=api_key.key_prefix,
         key=raw_key,
@@ -53,7 +51,7 @@ async def list_api_keys(
     return ApiKeyListResponse(
         items=[
             ApiKeyResponse(
-                id=str(k.id),
+                id=k.id,
                 key_prefix=k.key_prefix,
                 name=k.name,
                 permissions=k.permissions,
@@ -70,7 +68,7 @@ async def list_api_keys(
 
 @router.delete("/{api_key_id}", status_code=status.HTTP_204_NO_CONTENT)
 async def revoke_api_key(
-    api_key_id: UUID,
+    api_key_id: int,
     repo: ApiKeyRepository = Depends(get_api_key_repository),
 ):
     existing = await repo.get_by_id(api_key_id)