Feat: 게시글에 이미지 업로드, 삭제 기능 추가 #36

- create_post : 게시글 작성 및 s3 이미지 업로드
- update_post : 게시글 이미지 url 수정 및 업데이트
- delete_post : s3에서 이미지 삭제

Author: ddoed

app/handlers/post_handler.py

@@ -1,4 +1,4 @@
-from fastapi import APIRouter, Depends, HTTPException, Query
+from fastapi import APIRouter, Depends, File, Form, Query, UploadFile
 from sqlmodel import Session, select
 from typing import List, Optional
 
@@ -12,13 +12,22 @@
 router = APIRouter()
 
 @router.post("/posts", response_model=PostRead)
-def create_post(
-    post_data: PostCreate,
+async def create_post(
+    title: str = Form(...),
+    content: str = Form(...),
+    region_id: int = Form(...),
+    files: Optional[List[UploadFile]] = File(None),
     current_user: User = Depends(get_current_user),
     session: Session = Depends(get_db_session)
 ):
+    
+    post_data = PostCreate(
+        title=title,
+        content=content,
+        region_id=region_id,
+    )
     service = PostService(session)
-    return service.create_post(post_data, current_user.id)
+    return await service.create_post(post_data, current_user.id, files)
 
 @router.get("/posts", response_model=List[PostRead])
 def read_posts(
@@ -47,14 +56,24 @@ def read_post(post_id: int, session: Session = Depends(get_db_session)):
     return service.increment_view_count(post_id)
 
 @router.patch("/posts/{post_id}", response_model=PostRead)
-def update_post(
+async def update_post(
     post_id: int,
-    post_data: PostUpdate,
+    title: Optional[str] = Form(None),  
+    content: Optional[str] = Form(None),
+    region_id: Optional[int] = Form(None),
+    post_imageURLs: Optional[List[str]] = Form(None),
+    files: Optional[List[UploadFile]] = File(None),
     current_user: User = Depends(get_current_user),
     session: Session = Depends(get_db_session)
 ):
+    post_data = PostUpdate(
+        title=title or None,
+        content=content or None,
+        region_id=region_id,
+        post_imageURLs = [url for url in post_imageURLs or [] if url] or None
+    )
     service = PostService(session)
-    return service.update_post(post_id, post_data, current_user.id)
+    return await service.update_post(post_id, post_data, current_user.id, files)
 
 @router.delete("/posts/{post_id}")
 def delete_post(

app/services/post_service.py

@@ -1,15 +1,31 @@
 from datetime import datetime
+from typing import List, Optional
+from fastapi.concurrency import run_in_threadpool
 from sqlmodel import Session, select
-from fastapi import HTTPException
+from fastapi import HTTPException, UploadFile
 
 from app.models.post_model import Post
 from app.schemas.post_schemas import PostCreate, PostUpdate
+from app.utils.s3_util import delete_file_from_s3, upload_file_to_s3
 
 class PostService:
     def __init__(self, session: Session):
         self.session = session
 
-    def create_post(self, post_data: PostCreate, user_id: int) -> Post:
+    async def create_post(
+        self, 
+        post_data: PostCreate, 
+        user_id: int, 
+        files: Optional[List[UploadFile]] = None
+    ) -> Post:
+        image_urls = []
+        if files:
+            for file in files:
+                file_bytes = await file.read()
+                image_url = await run_in_threadpool(upload_file_to_s3, file_bytes, file.filename, "uploads/post")
+                image_urls.append(image_url)
+        post_data.post_imageURLs = image_urls
+
         post = Post(
             **post_data.dict(),
             user_id=user_id
@@ -25,14 +41,32 @@ def get_post(self, post_id: int, raise_exception: bool = True) -> Post:
             raise HTTPException(status_code=404, detail="Post not found")
         return post
 
-    def update_post(self, post_id: int, post_data: PostUpdate, current_user_id: int) -> Post:
+    async def update_post(
+        self,
+        post_id: int,
+        post_data: PostUpdate,
+        current_user_id: int,
+        files: Optional[List[UploadFile]] = None
+    ) -> Post:
         post = self.get_post(post_id)
         if post.user_id != current_user_id:
             raise HTTPException(status_code=403, detail="작성자만 수정할 수 있습니다.")
-
-        for key, value in post_data.dict(exclude_unset=True).items():
+        
+        existing_urls = set(post.post_imageURLs or [])
+        requested_urls = set(post_data.post_imageURLs or [])
+        if files:
+            for file in files:
+                file_bytes = await file.read()
+                image_url = await run_in_threadpool(upload_file_to_s3, file_bytes, file.filename, "uploads/post")
+                requested_urls.add(image_url)
+        
+        urls_to_delete = existing_urls - requested_urls
+        for url in urls_to_delete:
+            delete_file_from_s3(url)
+        post_data.post_imageURLs = list(requested_urls)
+
+        for key, value in post_data.dict(exclude_none=True).items():
             setattr(post, key, value)
-
         self.session.add(post)
         self.session.commit()
         self.session.refresh(post)
@@ -42,7 +76,10 @@ def delete_post(self, post_id: int, current_user_id: int):
         post = self.get_post(post_id)
         if post.user_id != current_user_id:
             raise HTTPException(status_code=403, detail="작성자만 삭제할 수 있습니다.")
-
+        
+        if post.post_imageURLs:
+            for url in post.post_imageURLs:
+                delete_file_from_s3(url)
         self.session.delete(post)
         self.session.commit()
         return {"ok": True}