Feat/#101/게시글 댓글

src/main/java/space/space_spring/controller/CommentController.java

@@ -0,0 +1,54 @@
+package space.space_spring.controller;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import space.space_spring.argumentResolver.jwtLogin.JwtLoginAuth;
+import space.space_spring.dto.comment.request.CreateCommentRequest;
+import space.space_spring.dto.comment.response.ReadCommentsResponse;
+import space.space_spring.response.BaseResponse;
+import space.space_spring.service.CommentService;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/space/{spaceId}/board/post/{postId}/comment")
+@Slf4j
+public class CommentController {
+    private final CommentService commentService;
+
+    // 댓글 조회
+    @GetMapping
+    public BaseResponse<List<ReadCommentsResponse>> getComments(
+            @JwtLoginAuth Long userId,
+            @PathVariable Long spaceId,
+            @PathVariable Long postId
+    ) {
+        // TODO 1: 유저가 스페이스에 속하는 지 검증
+        commentService.validateUserInSpace(userId, spaceId);
+
+        // TODO 2: 특정 게시글의 댓글 리스트 get
+        List<ReadCommentsResponse> comments = commentService.getCommentsByPost(postId, userId);
+        return new BaseResponse<>(comments);
+    }
+
+    // 댓글 생성
+    @PostMapping
+    public BaseResponse<CreateCommentRequest.Response> createComment(
+            @JwtLoginAuth Long userId,
+            @PathVariable Long spaceId,
+            @PathVariable Long postId,
+            @RequestBody @Valid CreateCommentRequest.Request createCommentRequest
+            ) {
+        // TODO 1: 유저가 스페이스에 속하는 지 검증
+        commentService.validateUserInSpace(userId, spaceId);
+
+        // TODO 2: 작성한 댓글 저장 및 아이디 반환
+        Long commentId = commentService.createComment(userId, postId, createCommentRequest);
+        CreateCommentRequest.Response response = CreateCommentRequest.Response.of(commentId);
+        return new BaseResponse<>(response);
+    }
+
+}

src/main/java/space/space_spring/controller/LikeController.java

@@ -25,8 +25,8 @@ public BaseResponse<String> likePost(
         // TODO 1: 유저가 스페이스에 속하는지 검증
         likeService.validateUserInSpace(userId, spaceId);
 
-        // TODO 2: 유저가 해당 게시글에 이미 좋아요를 눌렀는지 검증
-        likeService.validateAlreadyLiked(userId, postId);
+        // TODO 2: 유저가 해당 게시글에 좋아요를 눌렀는지 검증
+        likeService.validateAlreadyLikedPost(userId, postId);
 
         // TODO 3: 좋아요 로직 수행
         likeService.likePost(userId, postId);
@@ -46,11 +46,62 @@ public BaseResponse<String> unlikePost(
         likeService.validateUserInSpace(userId, spaceId);
 
         // TODO 2: 유저가 해당 게시글에 좋아요를 눌렀는지 검증
-        likeService.validateNotLikedYet(userId, postId);
+        likeService.validateNotLikedPost(userId, postId);
 
         // TODO 3: 좋아요 취소 로직 수행
         likeService.unlikePost(userId, postId);
 
         return new BaseResponse<>("게시글에 좋아요를 취소하였습니다.");
     }
+
+    // 댓글 좋아요
+    @PostMapping("/comment/{commentId}/like")
+    public BaseResponse<String> likeComment(
+            @JwtLoginAuth Long userId,
+            @PathVariable Long spaceId,
+            @PathVariable Long postId,
+            @PathVariable Long commentId
+    ) {
+        // TODO 1: 유저가 스페이스에 속하는지 검증
+        likeService.validateUserInSpace(userId, spaceId);
+
+        // TODO 2: 댓글이 게시글에 속하는지 검증
+        likeService.validateCommentInPost(postId, commentId);
+
+        // TODO 3: 유저가 해당 댓글에 좋아요를 눌렀는지 검증
+        likeService.validateAlreadyLikedComment(userId, commentId);
+
+        // TODO 4: 좋아요 로직 수행
+        likeService.likeComment(userId, commentId);
+
+
+        return new BaseResponse<>("댓글에 좋아요를 눌렀습니다.");
+    }
+
+
+
+    // 댓글 좋아요 취소
+    @DeleteMapping("/comment/{commentId}/like")
+    public BaseResponse<String> unlikeComment(
+            @JwtLoginAuth Long userId,
+            @PathVariable Long spaceId,
+            @PathVariable Long postId,
+            @PathVariable Long commentId
+    ) {
+        // TODO 1: 유저가 스페이스에 속하는지 검증
+        likeService.validateUserInSpace(userId, spaceId);
+
+        // TODO 2: 댓글이 게시글에 속하는지 검증
+        likeService.validateCommentInPost(postId, commentId);
+
+        // TODO 3: 유저가 해당 댓글에 좋아요를 눌렀는지 검증
+        likeService.validateNotLikedComment(userId, commentId);
+
+        // TODO 4: 좋아요 취소 로직 수행
+        likeService.unlikeComment(userId, commentId);
+
+
+        return new BaseResponse<>("댓글에 좋아요를 취소하였습니다.");
+    }
+
 }

src/main/java/space/space_spring/dao/CommentDao.java

@@ -0,0 +1,25 @@
+package space.space_spring.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+import space.space_spring.entity.Comment;
+import space.space_spring.entity.Post;
+
+import java.util.List;
+
+@Repository
+public interface CommentDao extends JpaRepository<Comment, Long> {
+    // 특정 게시글의 댓글을 가져오는 메서드
+    List<Comment> findByPost(Post post);
+
+    // 대댓글 수를 계산하는 메서드
+    int countByTargetId(Long targetId);
+
+    // 유저가 특정 댓글을 좋아요 했는지 확인하는 메서드
+    @Query("SELECT CASE WHEN COUNT(l) > 0 THEN true ELSE false END " +
+            "FROM CommentLike l WHERE l.comment.commentId = :commentId AND l.user.userId = :userId")
+    boolean isUserLikedComment(@Param("commentId") Long commentId, @Param("userId") Long userId);
+
+}

src/main/java/space/space_spring/dao/CommentLikeDao.java

@@ -0,0 +1,14 @@
+package space.space_spring.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import space.space_spring.entity.Comment;
+import space.space_spring.entity.CommentLike;
+import space.space_spring.entity.User;
+
+import java.util.Optional;
+
+@Repository
+public interface CommentLikeDao extends JpaRepository<CommentLike, Long> {
+    Optional<CommentLike> findByUserAndComment(User user, Comment comment);
+}

src/main/java/space/space_spring/dao/LikeDao.java → src/main/java/space/space_spring/dao/PostLikeDao.java

@@ -1,12 +1,10 @@
 package space.space_spring.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import space.space_spring.entity.Post;
-import space.space_spring.entity.PostLike;
-import space.space_spring.entity.User;
+import space.space_spring.entity.*;
 
 import java.util.Optional;
 
-public interface LikeDao extends JpaRepository<PostLike, Long> {
+public interface PostLikeDao extends JpaRepository<PostLike, Long> {
     Optional<PostLike> findByUserAndPost(User user, Post post);
 }

src/main/java/space/space_spring/dto/comment/request/CreateCommentRequest.java

@@ -0,0 +1,42 @@
+package space.space_spring.dto.comment.request;
+
+import com.mongodb.lang.Nullable;
+import jakarta.validation.constraints.NotBlank;
+import lombok.*;
+import space.space_spring.entity.Comment;
+import space.space_spring.entity.Post;
+import space.space_spring.entity.User;
+
+
+public class CreateCommentRequest {
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Request {
+        @NotBlank
+        private String content;
+        private Long targetId = null;
+
+        @Builder
+        public Comment toEntity(User user, Post post) {
+            return Comment.builder()
+                    .user(user)
+                    .post(post)
+                    .content(content)
+                    .targetId(targetId)
+                    .build();
+        }
+    }
+
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Response {
+        private Long CommentId;
+
+        public static Response of(Long commentId) {
+            return new Response(commentId);
+        }
+    }
+}

src/main/java/space/space_spring/dto/comment/response/ReadCommentsResponse.java

@@ -0,0 +1,41 @@
+package space.space_spring.dto.comment.response;
+
+import lombok.*;
+import space.space_spring.entity.Comment;
+import space.space_spring.entity.UserSpace;
+import space.space_spring.util.post.ConvertCreatedDate;
+
+@Builder
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReadCommentsResponse {
+    private Long commentId;
+
+    private String userProfileImg;
+    private String userName;
+
+    private String content;
+    private String time;
+
+    private int commentCount;
+    private int likeCount;
+    private boolean isLike;
+    private Long targetId;
+
+    public static ReadCommentsResponse of(Comment comment, UserSpace userSpace, boolean isLike, int commentCount) {
+        return ReadCommentsResponse.builder()
+                .commentId(comment.getCommentId())
+                .userName(userSpace != null ? userSpace.getUserName() : null)
+                .userProfileImg(userSpace != null ? userSpace.getUserProfileImg() : null)
+                .content(comment.getContent())
+                .time(ConvertCreatedDate.setCreatedDate(comment.getCreatedAt()))
+                .commentCount(commentCount)
+                .likeCount(comment.getLikeCount())
+                .isLike(isLike)
+                .targetId(comment.getTargetId())
+                .build();
+    }
+
+}

src/main/java/space/space_spring/dto/post/response/ReadPostDetailResponse.java

@@ -1,8 +1,8 @@
 package space.space_spring.dto.post.response;
 
 import lombok.*;
+import space.space_spring.dto.comment.response.ReadCommentsResponse;
 import space.space_spring.entity.Post;
-import space.space_spring.entity.PostComment;
 import space.space_spring.entity.PostImage;
 import space.space_spring.entity.UserSpace;
 import space.space_spring.util.post.ConvertCreatedDate;
@@ -33,11 +33,11 @@ public class ReadPostDetailResponse {
 
     // 댓글 및 좋아요
     private int commentCount;
-    private List<PostComment> postComments;
+    private List<ReadCommentsResponse> Comments;
     private int likeCount;
     private boolean isLike;
 
-    public static ReadPostDetailResponse of(Post post, UserSpace userSpace, boolean isLike) {
+    public static ReadPostDetailResponse of(Post post, UserSpace userSpace, boolean isLike, List<ReadCommentsResponse> comments) {
         List<String> postImageUrls = post.getPostImages().stream()
                 .map(PostImage::getPostImgUrl)
                 .toList();
@@ -52,8 +52,8 @@ public static ReadPostDetailResponse of(Post post, UserSpace userSpace, boolean
                 .content(post.getContent())
                 .time(ConvertCreatedDate.setCreatedDate(post.getCreatedAt()))
                 .type(post.getType())
-                .commentCount(post.getPostComments().size())
-                .postComments(post.getPostComments())
+                .commentCount(post.getComments().size())
+                .Comments(comments)
                 .likeCount(post.getLikeCount())
                 .isLike(isLike)
                 .postImage(postImageUrls)

src/main/java/space/space_spring/dto/post/response/ReadPostsResponse.java

@@ -53,7 +53,7 @@ public static ReadPostsResponse of(Post post, int postCount, UserSpace userSpace
                 .time(ConvertCreatedDate.setCreatedDate(post.getCreatedAt()))
                 .type(post.getType())
                 .postCount(postCount)
-                .commentCount(post.getPostComments().size())
+                .commentCount(post.getComments().size())
                 .likeCount(post.getLikeCount())
                 .isLike(isLike)
                 .postImage(postImageUrls)

src/main/java/space/space_spring/entity/PostComment.java → src/main/java/space/space_spring/entity/Comment.java

@@ -1,12 +1,15 @@
 package space.space_spring.entity;
 
 import jakarta.persistence.*;
+import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Entity
 @Table(name = "Post_Comment")
 @Getter
-public class PostComment extends BaseEntity{
+@NoArgsConstructor
+public class Comment extends BaseEntity{
     @Id
     @GeneratedValue
     @Column(name = "comment_id")
@@ -24,11 +27,25 @@ public class PostComment extends BaseEntity{
     private String content;
 
     @Column(name = "comment_like")
-    private int like;
+    private int likeCount;
 
-    @Column(name = "isReply")
-    private boolean isReply;
 
     @Column(name = "comment_target_id")
-    private String targetId;
+    private Long targetId;
+
+    @Builder
+    public Comment(User user, Post post, String content, Boolean isReply, Long targetId) {
+        this.user = user;
+        this.post = post;
+        this.content = content;
+        this.targetId = targetId;
+    }
+
+    public void increaseLikeCount() {
+        this.likeCount++;
+    }
+
+    public void decreaseLikeCount() {
+        this.likeCount--;
+    }
 }

src/main/java/space/space_spring/entity/CommentLike.java

@@ -1,6 +1,7 @@
 package space.space_spring.entity;
 
 import jakarta.persistence.*;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -15,10 +16,16 @@ public class CommentLike extends BaseEntity{
     private Long commentLikeId;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "space_post_id")
-    private Post post;
+    @JoinColumn(name = "post_comment_id")
+    private Comment comment;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
     private User user;
+
+    @Builder
+    public CommentLike(User user, Comment comment) {
+        this.user = user;
+        this.comment = comment;
+    }
 }

src/main/java/space/space_spring/entity/Post.java

@@ -40,7 +40,7 @@ public class Post extends BaseEntity {
     private List<PostImage> postImages;
 
     @OneToMany(mappedBy = "post", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<PostComment> postComments;
+    private List<Comment> Comments;
 
     @Builder
     public Post(User user, Space space, String title, String content, String type, List<PostImage> postImages) {