Fix place_bid

fix place_bid

Author: snu-BuMinSeong

carrot/app/auction/repositories.py

@@ -17,9 +17,10 @@
 )
 
 class AuctionRepository:
-    def __init__(self, session: Annotated[AsyncSession, Depends(get_db_session)]) -> None:
+    def __init__(self, session: AsyncSession) -> None:
         self.session = session
 
+
     async def create_auction(self, product: Product, auction: Auction) -> Auction:
         self.session.add(product)
         await self.session.flush()  # Ensure product ID is generated
@@ -80,18 +81,12 @@ async def delete_auction(self, auction: Auction) -> None:
     async def update_auction(self, auction: Auction) -> Auction:
         merged = await self.session.merge(auction)
         await self.session.commit()
-        await self.session.refresh(merged)
         return merged
 
     async def update_auction_without_commit(self, auction: Auction) -> Auction:
         merged = await self.session.merge(auction)
-        await self.session.refresh(merged)
         return merged
-
-class BidRepository:
-    def __init__(self, session: Annotated[AsyncSession, Depends(get_db_session)]) -> None:
-        self.session = session
-
+    
     async def add_bid_without_commit(self, bid: Bid) -> Bid:
         self.session.add(bid)
         return bid
@@ -115,4 +110,6 @@ async def gets_user_bids(self, user_id: str) -> List[Bid]:
             .options(joinedload(Bid.auction).joinedload(Auction.product))
         )
         result = await self.session.execute(stmt)
-        return result.scalars().all()
+        return result.scalars().all()
+
+    

carrot/app/auction/router.py

@@ -5,7 +5,7 @@
 from carrot.db.connection import get_db_session
 from carrot.app.auth.utils import login_with_header
 
-from carrot.app.auction.services import AuctionService, BidService
+from carrot.app.auction.services import AuctionService
 from carrot.app.auction.schemas import AuctionCreate, AuctionResponse, BidCreate, BidResponse # Pydantic 모델 가정
 
 from carrot.app.user.models import User
@@ -20,7 +20,7 @@ async def create_new_auction(
     owner: Annotated[User, Depends(login_with_header)],
     product_data: ProductPostRequest,
     auction_data: AuctionCreate,
-    service: Annotated[AuctionService, Depends()],
+    service: Annotated[AuctionService, Depends(AuctionService.create)],
 ) -> AuctionResponse:
     auction = await service.create_auction_with_product(
         owner_id=owner.id,
@@ -33,7 +33,7 @@ async def create_new_auction(
 # 2. 경매 목록 조회 (카테고리, 지역 필터링)
 @auction_router.get("/", response_model=List[AuctionResponse])
 async def get_auctions(
-    service: Annotated[AuctionService, Depends()],
+    service: Annotated[AuctionService, Depends(AuctionService.create)],
     category_id: Optional[str] = Query(None, description="카테고리 ID로 필터링"),
     region_id: Optional[str] = Query(None, description="지역 ID로 필터링"),
 ) -> List[AuctionResponse]:
@@ -45,7 +45,7 @@ async def get_auctions(
 @auction_router.get("/{auction_id}", response_model=AuctionResponse)
 async def get_auction_detail(
     auction_id: str,
-    service: Annotated[AuctionService, Depends()],
+    service: Annotated[AuctionService, Depends(AuctionService.create)],
 ) -> AuctionResponse:
     auction = await service.get_auction_details(auction_id)
     return AuctionResponse.model_validate(auction)
@@ -56,10 +56,10 @@ async def place_bid(
     auction_id: str,
     bid_data: BidCreate,
     bidder: Annotated[User, Depends(login_with_header)],
-    bid_service: Annotated[BidService, Depends()],
+    service: Annotated[AuctionService, Depends(AuctionService.create)],
 ) -> BidResponse:
 
-    bid = await bid_service.place_bid(
+    bid = await service.place_bid(
         auction_id=auction_id,
         bidder_id=bidder.id,
         bid_price=bid_data.bid_price

carrot/app/auction/services.py

@@ -7,7 +7,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from carrot.app.auction.models import Auction, AuctionStatus, Bid
 from carrot.app.auction.schemas import AuctionCreate
-from carrot.app.auction.repositories import AuctionRepository, BidRepository
+from carrot.app.auction.repositories import AuctionRepository
 from carrot.db.connection import get_db_session
 
 from carrot.app.auction.exceptions import (
@@ -20,8 +20,21 @@
 from carrot.app.product.schemas import ProductPostRequest
 
 class AuctionService:
-    def __init__(self, auction_repository: Annotated[AuctionRepository, Depends()]) -> None:
-        self.repository = auction_repository
+    def __init__(
+        self, 
+        repository: AuctionRepository, 
+        db_session: AsyncSession
+    ) -> None:
+        self.repository = repository
+        self.db_session = db_session
+
+    @classmethod
+    def create(cls, db_session: Annotated[AsyncSession, Depends(get_db_session)]) -> "AuctionService":
+        """세션을 공유하는 서비스 인스턴스 생성"""
+        return cls(
+            repository=AuctionRepository(db_session),
+            db_session=db_session
+        )
 
     async def create_auction_with_product(self, owner_id: str, region_id: str, product_data: ProductPostRequest, auction_data: AuctionCreate) -> Auction:
         product = Product(
@@ -52,46 +65,28 @@ async def list_auctions(self, category_id: str | None = None, region_id: str | N
     async def get_auction_details(self, auction_id: str) -> Auction:
         return await self.repository.get_auction_by_id(auction_id)
 
-class BidService:
-    def __init__(
-        self, 
-        bid_repository: Annotated[BidRepository, Depends()], 
-        auction_repository: Annotated[AuctionRepository, Depends()],
-        db_session: Annotated[AsyncSession, Depends(get_db_session)]
-    ) -> None:
-        
-        self.bid_repository = bid_repository
-        self.auction_repository = auction_repository
-        self.db_session = db_session
-
-
     async def place_bid(self, auction_id: str, bidder_id: str, bid_price: int) -> Bid:
-        stmt = select(Auction).where(Auction.id == auction_id).with_for_update()
-        result = await self.db_session.execute(stmt)
-        auction = result.scalar_one_or_none()
-        
-        if not auction:
-            raise AuctionNotFoundError
+        auction = await self.repository.get_auction_by_id(auction_id)
 
         if auction.status != AuctionStatus.ACTIVE:
-            raise NotAllowedActionError
+            raise NotAllowedActionError()
         if auction.end_at <= datetime.now():
-            raise NotAllowedActionError
+            raise NotAllowedActionError()
         if bid_price <= auction.current_price:
-            raise NotAllowedActionError
+            raise NotAllowedActionError()
 
         new_bid = Bid(
             auction_id=auction_id,
             bidder_id=bidder_id,
             bid_price=bid_price
         )
-        await self.bid_repository.add_bid_without_commit(new_bid)
+        await self.repository.add_bid_without_commit(new_bid)
 
         auction.current_price = bid_price
         auction.bid_count += 1
-        await self.auction_repository.update_auction_without_commit(auction)
+        await self.repository.update_auction_without_commit(auction)
 
         await self.db_session.commit()
         await self.db_session.refresh(new_bid)
-
+        await self.db_session.refresh(auction)
         return new_bid