merge aigpt

api/app/routes/auth.py

@@ -1,5 +1,6 @@
 """Authentication routes"""
 from datetime import timedelta
+from typing import Optional
 from fastapi import APIRouter, HTTPException, Depends, Response
 from fastapi.responses import JSONResponse
 from pydantic import BaseModel
@@ -12,9 +13,9 @@ from app.auth.dependencies import (
     AuthUser,
     ACCESS_TOKEN_EXPIRE_MINUTES
 )
-from app.db.base import get_db
+from app.db.base import get_session
 from app.repositories.user import UserRepository
-from app.services.atproto import AtprotoService
+# from app.services.atproto import AtprotoService
 
 
 router = APIRouter(prefix="/auth", tags=["auth"])
@@ -45,7 +46,7 @@ class VerifyResponse(BaseModel):
 async def login(
     request: LoginRequest,
     response: Response,
-    db: AsyncSession = Depends(get_db)
+    db: AsyncSession = Depends(get_session)
 ):
     """
     Login with atproto credentials

api/app/routes/cards.py

@@ -7,7 +7,7 @@ from app.models.card import Card, CardDraw, CardDrawResult
 from app.services.gacha import GachaService
 from app.repositories.user import UserRepository
 from app.repositories.card import CardRepository, UniqueCardRepository
-from app.db.base import get_db
+from app.db.base import get_session
 
 router = APIRouter(prefix="/cards", tags=["cards"])
 
@@ -15,7 +15,7 @@ router = APIRouter(prefix="/cards", tags=["cards"])
 @router.post("/draw", response_model=CardDrawResult)
 async def draw_card(
     draw_request: CardDraw,
-    db: AsyncSession = Depends(get_db)
+    db: AsyncSession = Depends(get_session)
 ):
     """
     カードを抽選する
@@ -65,7 +65,7 @@ async def get_user_cards(
     user_did: str,
     skip: int = 0,
     limit: int = 100,
-    db: AsyncSession = Depends(get_db)
+    db: AsyncSession = Depends(get_session)
 ):
     """
     ユーザーの所有カード一覧を取得
@@ -100,7 +100,7 @@ async def get_user_cards(
 
 
 @router.get("/unique")
-async def get_unique_cards(db: AsyncSession = Depends(get_db)):
+async def get_unique_cards(db: AsyncSession = Depends(get_session)):
     """
     全てのuniqueカード一覧を取得（所有者情報付き）
     """

api/app/routes/sync.py

@@ -1,10 +1,11 @@
 """Synchronization routes for atproto"""
+from typing import Optional
 from fastapi import APIRouter, HTTPException, Depends
 from sqlalchemy.ext.asyncio import AsyncSession
 from pydantic import BaseModel
 
 from app.auth.dependencies import require_user, AuthUser
-from app.db.base import get_db
+from app.db.base import get_session
 from app.services.card_sync import CardSyncService
 from app.repositories.user import UserRepository
 
@@ -28,7 +29,7 @@ class SyncResponse(BaseModel):
 async def sync_cards(
     request: SyncRequest,
     current_user: AuthUser = Depends(require_user),
-    db: AsyncSession = Depends(get_db)
+    db: AsyncSession = Depends(get_session)
 ):
     """
     Sync cards between database and atproto PDS
@@ -68,7 +69,7 @@ async def sync_cards(
 async def export_to_pds(
     request: SyncRequest,
     current_user: AuthUser = Depends(require_user),
-    db: AsyncSession = Depends(get_db)
+    db: AsyncSession = Depends(get_session)
 ):
     """
     Export all cards to atproto PDS
@@ -97,7 +98,7 @@ async def export_to_pds(
 async def import_from_pds(
     request: SyncRequest,
     current_user: AuthUser = Depends(require_user),
-    db: AsyncSession = Depends(get_db)
+    db: AsyncSession = Depends(get_session)
 ):
     """
     Import cards from atproto PDS
@@ -125,7 +126,7 @@ async def verify_card_ownership(
     card_id: int,
     unique_id: Optional[str] = None,
     current_user: AuthUser = Depends(require_user),
-    db: AsyncSession = Depends(get_db)
+    db: AsyncSession = Depends(get_session)
 ):
     """
     Verify user owns a specific card