fix

Author: dlekdns08

main.py

@@ -1,13 +1,22 @@
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from prometheus_fastapi_instrumentator import Instrumentator
+from sqlalchemy import text
 
 from database import engine, Base
 from routes import comments, likes, subscribe, reactions, views
 
 # 테이블 자동 생성
 Base.metadata.create_all(bind=engine)
 
+# 기존 DB에 parent_id 컬럼 추가 (없는 경우에만)
+with engine.connect() as conn:
+    try:
+        conn.execute(text("ALTER TABLE comments ADD COLUMN parent_id INTEGER REFERENCES comments(id)"))
+        conn.commit()
+    except Exception:
+        pass  # 이미 존재하는 컬럼
+
 app = FastAPI(title="코알라 오딧세이 Blog API", version="1.0.0")
 
 Instrumentator().instrument(app).expose(app)

models.py

@@ -12,6 +12,9 @@ class Comment(Base):
     nickname: Mapped[str] = mapped_column(String(50), nullable=False)
     password_hash: Mapped[str] = mapped_column(String(255), nullable=False)
     content: Mapped[str] = mapped_column(Text, nullable=False)
+    parent_id: Mapped[int | None] = mapped_column(
+        Integer, nullable=True, index=True, default=None
+    )
     created_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True),
         default=lambda: datetime.now(timezone.utc),

routes/comments.py

@@ -18,30 +18,75 @@ def _verify_password(password: str, hashed: str) -> bool:
     return bcrypt.checkpw(password.encode(), hashed.encode())
 
 
+def _build_response(comment: Comment, replies: list[Comment]) -> CommentResponse:
+    return CommentResponse(
+        id=comment.id,
+        post_slug=comment.post_slug,
+        nickname=comment.nickname,
+        content=comment.content,
+        created_at=comment.created_at,
+        parent_id=comment.parent_id,
+        replies=[
+            CommentResponse(
+                id=r.id,
+                post_slug=r.post_slug,
+                nickname=r.nickname,
+                content=r.content,
+                created_at=r.created_at,
+                parent_id=r.parent_id,
+                replies=[],
+            )
+            for r in replies
+        ],
+    )
+
+
 @router.get("/{slug:path}/comments", response_model=list[CommentResponse])
 def get_comments(slug: str, db: Session = Depends(get_db)):
-    """특정 포스트의 댓글 목록 조회"""
-    return (
+    """특정 포스트의 댓글 목록 조회 (대댓글 포함 중첩 구조)"""
+    all_comments = (
         db.query(Comment)
         .filter(Comment.post_slug == slug)
         .order_by(Comment.created_at.asc())
         .all()
     )
 
+    replies_map: dict[int, list[Comment]] = {}
+    top_level: list[Comment] = []
+
+    for c in all_comments:
+        if c.parent_id is None:
+            top_level.append(c)
+            replies_map[c.id] = []
+        else:
+            replies_map.setdefault(c.parent_id, []).append(c)
+
+    return [_build_response(c, replies_map.get(c.id, [])) for c in top_level]
+
 
 @router.post("/{slug:path}/comments", response_model=CommentResponse, status_code=status.HTTP_201_CREATED)
 def create_comment(slug: str, body: CommentCreate, db: Session = Depends(get_db)):
-    """댓글 작성"""
+    """댓글/대댓글 작성"""
+    if body.parent_id is not None:
+        parent = db.query(Comment).filter(
+            Comment.id == body.parent_id,
+            Comment.post_slug == slug,
+            Comment.parent_id == None,  # noqa: E711  대댓글의 대댓글 방지
+        ).first()
+        if not parent:
+            raise HTTPException(status_code=404, detail="원댓글을 찾을 수 없습니다.")
+
     comment = Comment(
         post_slug=slug,
         nickname=body.nickname,
         password_hash=_hash_password(body.password),
         content=body.content,
+        parent_id=body.parent_id,
     )
     db.add(comment)
     db.commit()
     db.refresh(comment)
-    return comment
+    return _build_response(comment, [])
 
 
 @router.delete("/{slug:path}/comments/{comment_id}", status_code=status.HTTP_204_NO_CONTENT)
@@ -51,7 +96,7 @@ def delete_comment(
     body: CommentDelete,
     db: Session = Depends(get_db),
 ):
-    """비밀번호 확인 후 댓글 삭제"""
+    """비밀번호 확인 후 댓글 삭제 (대댓글도 함께 삭제)"""
     comment = (
         db.query(Comment)
         .filter(Comment.id == comment_id, Comment.post_slug == slug)
@@ -63,5 +108,9 @@ def delete_comment(
     if not _verify_password(body.password, comment.password_hash):
         raise HTTPException(status_code=403, detail="비밀번호가 올바르지 않습니다.")
 
+    # 원댓글이면 대댓글도 함께 삭제
+    if comment.parent_id is None:
+        db.query(Comment).filter(Comment.parent_id == comment_id).delete()
+
     db.delete(comment)
     db.commit()

schemas.py

@@ -8,6 +8,7 @@ class CommentCreate(BaseModel):
     nickname: str
     password: str
     content: str
+    parent_id: int | None = None
 
     @field_validator("nickname")
     @classmethod
@@ -43,6 +44,8 @@ class CommentResponse(BaseModel):
     nickname: str
     content: str
     created_at: datetime
+    parent_id: int | None = None
+    replies: list["CommentResponse"] = []
 
     model_config = {"from_attributes": True}