Merge branch 'develop' of https://github.com/ResQ-404Found/ResQ-Backend

ddoed · ddoed · commit 39f733fa7a89 · 2025-07-27T17:26:49.000+09:00
diff --git a/app/db/init_db.py b/app/db/init_db.py
@@ -2,7 +2,7 @@
 from app.db.session import db_engine
 from app.models.notification_model import NotificationDisasterType, NotificationRegion
 from app.models.region_model import Region
-from app.models.user_model import User
+from app.models.user_model import User, UserRole
 from app.schemas.user_schema import UserCreate
 from app.services.user_service import UserService
 from sqlalchemy import text
@@ -20,19 +20,19 @@ async def create_db_and_tables():
 
 
     # 3. 테스트 유저 삽입
-    # with Session(db_engine) as session:
-    #     dummy_user = User(
-    #         login_id="test",
-    #         email="test@example.com",
-    #         password=pwd_context.hash("test"),
-    #         username="관리자",
-    #         role="admin",
-    #         profile_imageURL=None,
-    #         status="active"
-    #     )
-    #     session.add(dummy_user)
-    #     session.commit()
-    #     session.refresh(dummy_user)
+    with Session(db_engine) as session:
+        dummy_user = User(
+            login_id="Admin",
+            email="resq.404found@gmail.com",
+            password=pwd_context.hash("Admin"),
+            username="username",
+            role=UserRole.ADMIN,
+            profile_imageURL=None,
+            status="active"
+        )
+        session.add(dummy_user)
+        session.commit()
+        session.refresh(dummy_user)
 
     #     region = Region(
     #         sido="경상북도",
diff --git a/app/handlers/comment_handler.py b/app/handlers/comment_handler.py
@@ -24,7 +24,7 @@ def write_comment(
     session: Session = Depends(get_db_session),
     user=Depends(get_current_user)
 ):
-    return create_comment(session=session, user_id=user.id, req=req)
+    return create_comment(session=session, user=user, req=req)
 
 # 특정 게시물에 달린 댓글 조회
 @router.get("/comments/{post_id}", response_model=List[CommentRead])
diff --git a/app/handlers/post_handler.py b/app/handlers/post_handler.py
@@ -15,6 +15,7 @@
 async def create_post(
     title: str = Form(...),
     content: str = Form(...),
+    type: Optional[str] = Form(None),
     region_id: int = Form(...),
     files: Optional[List[UploadFile]] = File(None),
     current_user: User = Depends(get_current_user),
@@ -24,6 +25,7 @@ async def create_post(
     post_data = PostCreate(
         title=title,
         content=content,
+        type=type,
         region_id=region_id,
     )
     service = PostService(session)
@@ -32,6 +34,7 @@ async def create_post(
 @router.get("/posts", response_model=List[PostRead])
 def read_posts(
     term: Optional[str] = Query(None),
+    type: Optional[str] = Query(None),
     region: Optional[str] = Query(None),
     sort: Optional[str] = Query(None),
     session: Session = Depends(get_db_session)
@@ -40,7 +43,7 @@ def read_posts(
     if region:
         region_ids = session.exec(select(Region.id).where(Region.sido == region)).all()
     service = PostService(session)
-    return service.list_posts(term=term, region_ids=region_ids, sort=sort)
+    return service.list_posts(term=term, type=type, region_ids=region_ids, sort=sort)
 
 @router.get("/posts/me", response_model=List[PostRead])
 def read_my_posts(
@@ -60,6 +63,7 @@ async def update_post(
     post_id: int,
     title: Optional[str] = Form(None),  
     content: Optional[str] = Form(None),
+    type: Optional[str] = Form(None),
     region_id: Optional[int] = Form(None),
     post_imageURLs: Optional[List[str]] = Form(None),
     files: Optional[List[UploadFile]] = File(None),
@@ -69,6 +73,7 @@ async def update_post(
     post_data = PostUpdate(
         title=title or None,
         content=content or None,
+        type=type or None,
         region_id=region_id,
         post_imageURLs = [url for url in post_imageURLs or [] if url] or None
     )
diff --git a/app/handlers/user_handler.py b/app/handlers/user_handler.py
@@ -1,4 +1,5 @@
-from fastapi import APIRouter, Depends, HTTPException, Header
+from typing import Optional
+from fastapi import APIRouter, Depends, File, HTTPException, Header, UploadFile
 from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 from app.models.user_model import User
 from app.schemas.user_schema import UserCreate, UserCreateResponse, UserDeleteResponse, UserLogin, UserLoginResponse, UserReadResponse, UserUpdate, UserUpdateResponse
@@ -60,6 +61,20 @@ def update_user(
     user_service.update(user.id, req)
     return UserUpdateResponse(message="회원정보 수정 성공")
 
+@router.patch("/users/profile-image")
+async def update_profile_image(
+    file: Optional[UploadFile] = File(None), 
+    user: User = Depends(get_current_user),
+    user_service: UserService = Depends()
+):
+    if file:
+        file_bytes = await file.read()
+        image_url = await user_service.update_image(user, file_bytes, file.filename)
+        return {"message": "프로필 이미지가 성공적으로 수정되었습니다.", "image_url": image_url}
+    else:
+        image_url = await user_service.update_image(user, None, None)
+        return {"message": "프로필 이미지가 삭제되었습니다.", "image_url": image_url}
+
 @router.patch("/users/delete", response_model_exclude_none=True)
 def delete_user(
     user: User=Depends(get_current_user), 
diff --git a/app/models/post_model.py b/app/models/post_model.py
@@ -7,6 +7,7 @@
 class Post(SQLModel,table=True):
     id: Optional[int] = Field(default=None, primary_key=True)
     user_id: int = Field(foreign_key="user.id")
+    type: str
     title:str
     content:str
     region_id: int = Field(foreign_key="region.id")
diff --git a/app/schemas/post_schemas.py b/app/schemas/post_schemas.py
@@ -1,23 +1,26 @@
-from typing import List, Optional
+from typing import List, Literal, Optional
 from datetime import datetime
 from pydantic import BaseModel
 
 class PostCreate(BaseModel):
     title: str
     content: str
+    type: Literal["disaster", "normal"]
     region_id: int
     post_imageURLs: List[str] = []
 
 class Author(BaseModel):
     id: int
     username: str
     profile_imageURL: Optional[str] = None
+    point: int
 
 class PostRead(BaseModel):
     id: int
     user_id: int
     title: str
     content: str
+    type: Literal["disaster", "normal"]
     region_id: int
     post_imageURLs: List[str] = []
     created_at: datetime
@@ -32,6 +35,7 @@ class PostRead(BaseModel):
 class PostUpdate(BaseModel):
     title: Optional[str] = None
     content: Optional[str] = None
+    type: Optional[Literal["disaster", "normal"]] = None
     region_id: Optional[int] = None
     post_imageURLs: Optional[List[str]] = None
 
diff --git a/app/schemas/user_schema.py b/app/schemas/user_schema.py
@@ -39,7 +39,6 @@ class PasswordUpdatePair(BaseModel):
 
 class UserUpdate(BaseModel):
     username: Optional[str] = None
-    profile_imageURL: Optional[HttpUrl] = None
     password: Optional[PasswordUpdatePair] = None
 
 UserUpdateResponse = ApiResponse[None]
diff --git a/app/services/comment_service.py b/app/services/comment_service.py
@@ -6,10 +6,11 @@
 
 from app.models.comment_models import Comment
 from app.models.post_model import Post
+from app.models.user_model import User
 from app.schemas.comment_schemas import CommentCreate
 
 # 댓글 생성
-def create_comment(session: Session, user_id: int, req: CommentCreate) -> Comment:
+def create_comment(session: Session, user: User, req: CommentCreate) -> Comment:
     post = session.get(Post, req.post_id)
     if not post:
         raise HTTPException(status_code=404, detail="게시글이 존재하지 않습니다.")
@@ -22,11 +23,13 @@ def create_comment(session: Session, user_id: int, req: CommentCreate) -> Commen
     
     comment = Comment(
         post_id=req.post_id,
-        user_id=user_id,
+        user_id=user.id,
         parent_comment_id=req.parent_comment_id,
         content=req.content,
         last_modified=datetime.utcnow()
     )
+    user.point += 2
+    session.add(user)
     session.add(comment)
     session.commit()
     session.refresh(comment)
diff --git a/app/services/post_service.py b/app/services/post_service.py
@@ -20,6 +20,7 @@ def _serialize_post(self, post: Post, author: Author) -> PostRead:
         user_id=post.user_id,
         title=post.title,
         content=post.content,
+        type=post.type,
         region_id=post.region_id,
         post_imageURLs=post.post_imageURLs,
         created_at=post.created_at,
@@ -46,13 +47,19 @@ async def create_post(
             **post_data.dict(),
             user_id=user.id
         )
+        if post.type == "disaster":
+            user.point += 10
+        elif post.type == "normal":
+            user.point += 5
+        self.session.add(user)
         self.session.add(post)
         self.session.commit()
         self.session.refresh(post)
         author = Author(
             id=user.id,
             username=user.username,
-            profile_imageURL=user.profile_imageURL
+            profile_imageURL=user.profile_imageURL,
+            point=user.point
         )
         return self._serialize_post(post, author)
 
@@ -105,7 +112,8 @@ async def update_post(
         author = Author(
             id=user.id,
             username=user.username,
-            profile_imageURL=user.profile_imageURL
+            profile_imageURL=user.profile_imageURL,
+            point=user.point
         )
         return self._serialize_post(post, author)
 
@@ -123,10 +131,12 @@ def delete_post(self, post_id: int, user: User):
         self.session.commit()
         return {"ok": True}
 
-    def list_posts(self, term: str = None, region_ids: list = None, sort: str = None):
+    def list_posts(self, term: str = None, type: str = None, region_ids: list = None, sort: str = None):
         query = select(Post).options(selectinload(Post.user))
         if term:
             query = query.where(Post.title.contains(term) | Post.content.contains(term))
+        if type:
+            query = query.where(Post.type == type)
         if region_ids:
             query = query.where(Post.region_id.in_(region_ids))
         if sort == "latest":
@@ -140,7 +150,8 @@ def list_posts(self, term: str = None, region_ids: list = None, sort: str = None
             Author(
                 id=post.user.id,
                 username=post.user.username,
-                profile_imageURL=post.user.profile_imageURL
+                profile_imageURL=post.user.profile_imageURL,
+                point=post.user.point
             )
         )
         for post in posts
@@ -151,7 +162,8 @@ def list_user_posts(self, user: User):
         author = Author(
             id=user.id,
             username=user.username,
-            profile_imageURL=user.profile_imageURL
+            profile_imageURL=user.profile_imageURL,
+            point=user.point
         )
         return [self._serialize_post(post, author) for post in posts]
 
@@ -168,6 +180,7 @@ def increment_view_count(self, post_id: int):
         author = Author(
             id=post.user.id,
             username=post.user.username,
-            profile_imageURL=post.user.profile_imageURL
+            profile_imageURL=post.user.profile_imageURL,
+            point=post.user.point
         )
         return self._serialize_post(post, author)
diff --git a/app/services/sponsor_service.py b/app/services/sponsor_service.py
@@ -71,7 +71,7 @@ def delete_sponsor(self, sponsor_id: int) -> bool:
     def donate_to_sponsor(self, sponsor_id: int, amount: int, user: User) -> Sponsor:
         sponsor = self.get_sponsor(sponsor_id)
         sponsor.current_money += amount
-        user.point += amount
+        user.point += (amount // 1000) * 100
         self.session.add_all([sponsor, user])
         self.session.commit()
         self.session.refresh(sponsor)
diff --git a/app/services/user_service.py b/app/services/user_service.py
@@ -1,4 +1,6 @@
 from datetime import datetime
+from typing import Optional
+from fastapi.concurrency import run_in_threadpool
 from redis import Redis
 from sqlmodel import Session, select
 from fastapi import HTTPException, Depends
@@ -9,6 +11,7 @@
 from passlib.context import CryptContext
 from app.db.session import get_db_session
 from app.utils.redis_util import is_email_verified
+from app.utils.s3_util import delete_file_from_s3, upload_file_to_s3
 
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
@@ -49,10 +52,6 @@ def update(self, user_id:int, req: UserUpdate):
             self._exception_if_duplicate("username", req.username)
             user.username = req.username
         
-        # 프로필 이미지 변경
-        if req.profile_imageURL:
-            user.profile_imageURL = req.profile_imageURL
-        
         # 비밀번호 변경
         if req.password:
             if not self._verify_password(req.password.old_password, user.password):
@@ -98,6 +97,24 @@ async def reset_password_with_email(self, email: str, new_password: str):
         self.db.commit()
         self.db.refresh(user)
 
+    async def update_image(self, user: User, file_bytes: Optional[bytes], filename: Optional[str]):
+        if user.profile_imageURL:
+            try:
+                delete_file_from_s3(user.profile_imageURL)
+            except Exception as e:
+                print(f"이전 프로필 이미지 삭제 실패: {e}")
+            user.profile_imageURL = None
+        
+        if file_bytes and filename:
+            image_url = await run_in_threadpool(upload_file_to_s3, file_bytes, filename, "uploads/profile")
+            user.profile_imageURL = image_url
+        else:
+            image_url = None
+        user.updated_at = datetime.utcnow()
+        self.db.commit()
+        self.db.refresh(user)
+        return image_url
+
     # 비밀번호 해시화
     def _hash_password(self, pwd: str) -> str:
         return pwd_context.hash(pwd)
