wow

Author: snu-BuMinSeong

carrot/app/product/repositories.py

@@ -1,16 +1,14 @@
-from typing import Annotated, List
+from typing import List
 
-from fastapi import Depends
-from sqlalchemy import select, and_, text, or_
+from sqlalchemy import select, or_
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from carrot.app.user.models import LocalAccount, SocialAccount, User
 from carrot.app.product.models import Product
-from carrot.db.connection import get_db_session
+from carrot.app.auction.models import Auction
 
 
 class ProductRepository:
-    def __init__(self, session: Annotated[AsyncSession, Depends(get_db_session)]) -> None:
+    def __init__(self, session: AsyncSession) -> None:
         self.session = session
 
     async def create_post(self, product: Product) -> Product:
@@ -19,24 +17,30 @@ async def create_post(self, product: Product) -> Product:
         await self.session.refresh(product)
         return product
 
+    async def create_auction(self, product: Product, auction: Auction) -> Product:
+        auction.product_id = product.id
+        self.session.add(auction)
+        await self.session.commit()
+        await self.session.refresh(auction)
+        return product
+
     async def update_post(self, product: Product) -> Product:
         merged = await self.session.merge(product)
         await self.session.commit()
         await self.session.refresh(merged)
         return merged
-        
+
     async def get_post_by_product_id(self, product_id: str) -> Product:
         query = select(Product).where(Product.id == product_id)
         posts = await self.session.execute(query)
-        
         return posts.scalars().one_or_none()
-    
+
     async def get_posts_by_query(self, user_id: str, keyword: str, region_id: str) -> List[Product]:
         query = select(Product)
-        
+
         if user_id:
             query = query.where(Product.owner_id == user_id)
-            
+
         if keyword:
             search_pattern = f"%{keyword}%"
             query = query.where(
@@ -45,20 +49,18 @@ async def get_posts_by_query(self, user_id: str, keyword: str, region_id: str) -
                     Product.content.ilike(search_pattern)
                 )
             )
-        
+
         if region_id:
             query = query.where(Product.region_id == region_id)
-        
+
         posts = await self.session.execute(query)
-        
         return posts.scalars().all()
-    
+
     async def get_posts_all(self) -> List[Product]:
         query = select(Product)
         posts = await self.session.execute(query)
-        
         return posts.scalars().all()
-    
+
     async def remove_post(self, product: Product):
         await self.session.delete(product)
-        await self.session.commit()
+        await self.session.commit()

carrot/app/product/services.py

@@ -9,25 +9,32 @@
 from carrot.app.image.services import ImageService
 from carrot.common.exceptions import InvalidFormatException
 
+from carrot.app.product.schemas import ProductPostRequest
+from carrot.app.auction.schemas import AuctionCreate
+
 class ProductService:
     def __init__(self, product_repository: Annotated[ProductRepository, Depends()], image_service: Annotated[ImageService, Depends()]) -> None:
         self.repository = product_repository
         self.image_service = image_service
 
-    async def create_post(self, user_id: str, title: str, image_ids: list, content: str, price: int, category_id: str, region_id: str) -> Product:
+    async def create_post(self, user_id: str, product_request: ProductPostRequest, region_id: str, auction_data: AuctionCreate) -> Product:
         product = Product(
             owner_id = user_id,
-            title = title,
-            image_ids = image_ids,
-            content = content,
-            price = price,
-            category_id = category_id,
+            title = product_request.title,
+            image_ids = product_request.image_ids,
+            content = product_request.content,
+            price = product_request.price,
+            category_id = product_request.category_id,
             region_id = region_id,
         )
-        
-        new = await self.repository.create_post(product)
-        return new
 
+        new_product = await self.repository.create_post(product)
+
+        if auction_data is not None:
+            await self.repository.create_auction(new_product, auction_data)
+
+        return new_product
+    
     async def update_post(self, user_id: str, id: str, title: str, image_ids: list, content: str, price: int, category_id: str, region_id: str) -> Product:
         product = await self.repository.get_post_by_product_id(id)