Merge branch 'dev' of https://github.com/SKT-FlyAI-BoraMettugi/BE into dev

Author: bokyeong0405

api/routes/user.py

@@ -28,43 +28,23 @@ async def update_nickname(nickname: Nickname, db: Session = Depends(get_db)):
     update_user_nickname(nickname, db)
     return nickname
 
-# 카카오 로그인 url 반환
-@router.get("/auth/kakao/login-url")
-def get_kakao_login_url():
-    return {"login_url": kakao_api.get_auth_url()}
-
-# 카카오 로그인 후 받은 code를 JSON으로 반환
-@router.get("/auth/kakao/callback")
-async def kakao_callback(code: str):
-    return {"code": code}
-
 # 프론트에서 code 보냄
 @router.patch("/login")
 async def kakao_login(request: KakaoLoginRequest, db: Session = Depends(get_db)):
-    
-    # 카카오 액세스 토큰 요청
-    token_data = await kakao_api.get_access_token(request.code)
-    access_token = token_data.get("access_token")
-
-    if not access_token:
-        raise HTTPException(status_code=400, detail="카카오 액세스 토큰 발급 실패")
-
-    # 카카오 유저 정보 요청
-    user_data = await kakao_api.get_user_info(access_token)
-    kakao_id = user_data["id"]
-    nickname = user_data["kakao_account"]["profile"].get("nickname", f"카카오유저{random.randint(1000, 9999)}")
-    profile_image = user_data["kakao_account"]["profile"].get("profile_image_url", None)
+    kakao_id = request.kakao_id
+    nickname = request.nickname
+    profile_image = request.profile_img
 
     # DB에서 기존 유저 확인
     user = get_user_by_kakao_id(db, kakao_id)
 
     if user:
-        # 기존 유저: 로그인 처리
-        update_kakao_login(db, user.user_id, access_token, nickname, profile_image)
+        # 기존 유저: 로그인 처리 
+        update_kakao_login(db, user.user_id, None, nickname, profile_image)
         return {"message": "카카오 로그인 성공", "user_id": user.user_id, "nickname": nickname}
-    
+
     # 신규 유저: 회원가입 후 로그인 처리
-    new_user = create_user(db, kakao_id, nickname, profile_image, access_token)
+    new_user = create_user(db, kakao_id, nickname, profile_image, None)
 
     return {"message": "회원가입 및 로그인 성공", "user_id": new_user.user_id, "nickname": nickname}
 

core/kakao_api.py

@@ -4,7 +4,7 @@
 from dotenv import load_dotenv
 
 # 환경 변수 로드
-load_dotenv(override=True)
+load_dotenv()
 
 class KakaoAPI:
     def __init__(self):
@@ -14,45 +14,6 @@ def __init__(self):
         self.kakao_token_url = "https://kauth.kakao.com/oauth/token"
         self.kakao_user_info_url = "https://kapi.kakao.com/v2/user/me"
 
-    # 카카오 로그인 url 생성 
-    def get_auth_url(self):
-        return {
-             f"{self.kakao_auth_url}?response_type=code"
-             f"&client_id={self.client_id}"
-             f"&redirect_uri={self.redirect_uri}"
-        }
-    # 인가 코드로 액세스 토큰 요청
-    async def get_access_token(self, code: str):
-        async with httpx.AsyncClient() as client:
-            response = await client.post(
-                self.kakao_token_url,
-                data={
-                    "grant_type": "authorization_code",
-                    "client_id": self.client_id,
-                    "redirect_uri": self.redirect_uri,
-                    "code": code,
-                },
-                headers={"Content-Type": "application/x-www-form-urlencoded"},
-            )
-
-        # 🔹 카카오 API 응답 로그 출력
-        print("카카오 토큰 응답:", response.json())
-
-        # ✅ HTTP 상태 코드 체크 추가 (잘못된 응답 처리)
-        if response.status_code != 200:
-            raise HTTPException(status_code=400, detail=f"카카오 액세스 토큰 요청 실패: {response.text}")
-
-        return response.json()
-
-    # 액세스 토큰으로 사용자 정보 요청
-    async def get_user_info(self, access_token: str):
-        async with httpx.AsyncClient() as client:
-            response = await client.get(
-                self.kakao_user_info_url,
-                headers={"Authorization": f"Bearer {access_token}"},
-            )
-        return response.json()
-    
     # 카카오 로그아웃 
     async def logout_user(self, access_token: str):
         async with httpx.AsyncClient() as client:

crud/comment.py

@@ -1,5 +1,5 @@
 from sqlalchemy.orm import Session
-from models.comment import Comment
+from models.comment import Comment, CommentLike
 from schemas.comment import CommentCreate
 from datetime import datetime
 from typing import List
@@ -22,23 +22,33 @@ def create_comment(db: Session, user_id: int, discussion_id: int, comment_data:
 def add_like_to_comment(db: Session, comment_id: int, user_id: int):
     comment = db.query(Comment).filter(Comment.comment_id == comment_id).first()
 
-    if not comment:
-        return None  # 댓글이 존재하지 않음
-
-    # 좋아요 토글: 0이면 +1, 1 이상이면 -1
-    if comment.like == 0:
-        comment.like += 1  # 좋아요 추가
+    # 사용자가 이미 좋아요를 눌렀는지 확인
+    existing_like = db.query(CommentLike).filter(
+        CommentLike.comment_id == comment_id,
+        CommentLike.user_id == user_id
+    ).first()
+
+    if existing_like:
+        # 이미 눌렀다면 삭제 (좋아요 취소)
+        db.delete(existing_like)
+        comment.like -= 1
+        liked = False
     else:
-        comment.like -= 1  # 좋아요 취소
+        # 좋아요 추가
+        new_like = CommentLike(comment_id=comment_id, user_id=user_id)
+        db.add(new_like)
+        comment.like += 1
+        liked = True
 
     db.commit()
     db.refresh(comment)
 
-    return comment
+    return {"comment_id": comment_id, "like": comment.like, "liked": liked}
 
 # 사용자가 좋아요 누른 답글 조회
 def get_liked_comments_by_user(db: Session, user_id: int):
-    return db.query(Comment).filter(Comment.user_id == user_id, Comment.like > 0).all()
+    return db.query(Comment).join(CommentLike, Comment.comment_id == CommentLike.comment_id)\
+        .filter(CommentLike.user_id == user_id).all()
 
 # 토론에 대한 모든 답글 조회
 def get_comments_by_discussion_id(db: Session, discussion_id: int) -> List[Comment]:

crud/discussion.py

@@ -1,5 +1,5 @@
 from sqlalchemy.orm import Session
-from models.discussion import Discussion
+from models.discussion import Discussion, DiscussionLike
 from schemas.discussion import DiscussionCreate, DiscussionLikeResponse
 from typing import List
 
@@ -19,20 +19,32 @@ def get_discussions_by_question(db: Session, question_id: int):
 
 # 토론 좋아요 추가
 def add_like_to_discussion(db: Session, discussion_id: int, user_id: int):
-    discussion = discussion = db.query(Discussion).filter(Discussion.discussion_id == discussion_id).first()
-    # 좋아요 토글: 좋아요가 1 이상이면 취소, 0이면 추가
-    if discussion.like > 0:
-        discussion.like -= 1  # 좋아요 취소
+    discussion = db.query(Discussion).filter(Discussion.discussion_id == discussion_id).first()
+    
+    # 사용자가 이미 좋아요를 눌렀는지 확인
+    existing_like = db.query(DiscussionLike).filter(
+        DiscussionLike.discussion_id == discussion_id,
+        DiscussionLike.user_id == user_id
+    ).first()
+
+    if existing_like:
+        # 이미 눌렀다면 삭제 (좋아요 취소)
+        db.delete(existing_like)
+        discussion.like -= 1
         liked = False
     else:
-        discussion.like += 1  # 좋아요 추가
+        # 좋아요 추가
+        new_like = DiscussionLike(discussion_id=discussion_id, user_id=user_id)
+        db.add(new_like)
+        discussion.like += 1
         liked = True
 
     db.commit()
     db.refresh(discussion)
 
-    return {"discussion_id": discussion_id, "like": discussion.like, "liked": liked}    
+    return {"discussion_id": discussion_id, "like": discussion.like, "liked": liked}
 
 # 좋아요 누른 토론 조회
 def get_liked_discussions_by_user(db: Session, user_id: int) -> List[Discussion]:
-    return db.query(Discussion).filter(Discussion.user_id == user_id, Discussion.like > 0).all()
+    return db.query(Discussion).join(DiscussionLike, Discussion.discussion_id == DiscussionLike.discussion_id)\
+        .filter(DiscussionLike.user_id == user_id).all()

crud/user.py

@@ -54,17 +54,16 @@ def create_user(db: Session, kakao_id: int, nickname: str, profile_image: str, a
 def update_kakao_login(db: Session, user_id: int, access_token: str, nickname: str, profile_image: str):
     db_user = db.query(User).filter(User.user_id == user_id).first()
 
-    print("db 업데이트 전 access token: ", access_token)
-    db_user.social_token = access_token if access_token else "INVALID TOKEN"
+    if access_token:  # 액세스 토큰이 있을 경우에만 업데이트
+        db_user.social_token = access_token
+        
     db_user.login_channel = "KAKAO"
     db_user.nickname = nickname
     db_user.profile_image = profile_image
     db_user.updated_date = datetime.utcnow()
 
     db.commit()
     db.refresh(db_user)
-    
-    print("db에 저장된 social_token:", db_user.social_token)
     return db_user
 
 # 카카오 로그아웃 

models/comment.py

@@ -12,3 +12,10 @@ class Comment(Base):
     like = Column(Integer, default=0, nullable=False)
     created_date = Column(DateTime, server_default=func.now(), nullable=False)
     updated_date = Column(DateTime, onupdate=func.now(), nullable=True)
+
+class CommentLike(Base):
+    __tablename__ = "comment_likes"
+
+    comment_likes_id = Column(BigInteger, primary_key=True, autoincrement=True, nullable=False)
+    comment_id = Column(BigInteger, ForeignKey("comments.comment_id", ondelete="CASCADE"), nullable=False)
+    user_id = Column(BigInteger, ForeignKey("users.user_id", ondelete="CASCADE"), nullable=False)

models/discussion.py

@@ -13,3 +13,10 @@ class Discussion(Base):
     comment_exist = Column(Boolean, default=False, nullable=False)
     created_date = Column(DateTime, server_default=func.now(), nullable=False)
     updated_date = Column(DateTime, onupdate=func.now(), nullable=True)
+
+class DiscussionLike(Base):
+    __tablename__ = "discussion_likes"
+
+    discussion_likes_id = Column(BigInteger, primary_key=True, autoincrement=True)
+    discussion_id = Column(BigInteger, ForeignKey("discussions.discussion_id"), nullable=False)
+    user_id = Column(BigInteger, ForeignKey("users.user_id"), nullable=False)

models/user.py

@@ -18,6 +18,6 @@ class User(Base):
     login_channel = Column(Enum(LoginChannel), nullable=True)
     kakao_id = Column(BigInteger, unique=True, nullable=False)
     score = Column(Integer, nullable=False)
-    social_token = Column(String(255), nullable=False)
+    social_token = Column(String(255), nullable=True)
     created_date = Column(DateTime, server_default=func.now())
     updated_date = Column(DateTime, onupdate=func.now())

schemas/login.py

@@ -1,4 +1,6 @@
 from pydantic import BaseModel
 
 class KakaoLoginRequest(BaseModel):
-    code: str
+    kakao_id: int
+    nickname: str
+    profile_img: str