[Feat] 댓글 좋아요 상태변경 api 개발

build.gradle

@@ -68,6 +68,9 @@ dependencies {
 	// MapStruct
 	implementation 'org.mapstruct:mapstruct:1.5.5.Final'
 	annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
+
+	//Google Guava
+	implementation 'com.google.guava:guava:33.2.0-jre'
 }
 
 def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile

src/main/java/konkuk/thip/comment/adapter/in/web/CommentCommandController.java

@@ -1,10 +1,42 @@
 package konkuk.thip.comment.adapter.in.web;
 
+import jakarta.validation.Valid;
+import konkuk.thip.comment.adapter.in.web.request.CommentCreateRequest;
+import konkuk.thip.comment.adapter.in.web.request.CommentIsLikeRequest;
+import konkuk.thip.comment.adapter.in.web.response.CommentIdResponse;
+import konkuk.thip.comment.adapter.in.web.response.CommentIsLikeResponse;
+import konkuk.thip.comment.application.port.in.CommentCreateUseCase;
+import konkuk.thip.comment.application.port.in.CommentLikeUseCase;
+import konkuk.thip.common.dto.BaseResponse;
+import konkuk.thip.common.security.annotation.UserId;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequiredArgsConstructor
 public class CommentCommandController {
 
+    private final CommentCreateUseCase commentCreateUseCase;
+    private final CommentLikeUseCase commentLikeUseCase;
+
+    /**
+     * 댓글/답글 작성
+     * parentId:{Long},isReplyRequest:true 답글
+     * parentId:null,isReplyRequest:false 댓글
+     */
+    @PostMapping("/comments/{postId}")
+    public BaseResponse<CommentIdResponse> createComment(@RequestBody @Valid final CommentCreateRequest request,
+                                                         @PathVariable("postId") final Long postId,
+                                                         @UserId final Long userId) {
+        return BaseResponse.ok(CommentIdResponse.of(commentCreateUseCase.createComment(request.toCommand(userId,postId))));
+    }
+
+    //댓글 좋아요 상태 변경: true -> 좋아요, false -> 좋아요 취소
+    @PostMapping("/comments/{commentId}/likes")
+    public BaseResponse<CommentIsLikeResponse> likeComment(@RequestBody @Valid final CommentIsLikeRequest request,
+                                                           @PathVariable("commentId") final Long commentId,
+                                                           @UserId final Long userId) {
+        return BaseResponse.ok(CommentIsLikeResponse.of(commentLikeUseCase.changeLikeStatusComment(request.toCommand(userId, commentId))));
+    }
+
 }

src/main/java/konkuk/thip/comment/adapter/in/web/request/CommentCreateRequest.java

@@ -0,0 +1,31 @@
+package konkuk.thip.comment.adapter.in.web.request;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import konkuk.thip.comment.application.port.in.dto.CommentCreateCommand;
+
+public record CommentCreateRequest(
+
+        @NotBlank(message = "댓글 내용은 필수입니다.")
+        String content,
+
+        @NotNull(message = "답글 여부는 필수입니다.")
+        Boolean isReplyRequest,
+
+        Long parentId,
+
+        @NotBlank(message = "게시물 타입은 필수입니다.")
+        String postType
+
+) {
+        public CommentCreateCommand toCommand(Long userId, Long postId) {
+                return new CommentCreateCommand(
+                        content,
+                        isReplyRequest,
+                        parentId,
+                        postType,
+                        postId,
+                        userId
+                );
+        }
+}

src/main/java/konkuk/thip/comment/adapter/in/web/request/CommentIsLikeRequest.java

@@ -0,0 +1,13 @@
+package konkuk.thip.comment.adapter.in.web.request;
+
+import jakarta.validation.constraints.NotNull;
+import konkuk.thip.comment.application.port.in.dto.CommentIsLikeCommand;
+
+public record CommentIsLikeRequest(
+        @NotNull(message = "좋아요 여부는 필수입니다.")
+        Boolean type
+) {
+    public CommentIsLikeCommand toCommand(Long userId, Long commentId) {
+        return new CommentIsLikeCommand(userId, commentId, type);
+    }
+}

src/main/java/konkuk/thip/comment/adapter/in/web/response/CommentIdResponse.java

@@ -0,0 +1,7 @@
+package konkuk.thip.comment.adapter.in.web.response;
+
+public record CommentIdResponse(Long commentId) {
+    public static CommentIdResponse of(Long commentId) {
+        return new CommentIdResponse(commentId);
+    }
+}

src/main/java/konkuk/thip/comment/adapter/in/web/response/CommentIsLikeResponse.java

@@ -0,0 +1,12 @@
+package konkuk.thip.comment.adapter.in.web.response;
+
+import konkuk.thip.comment.application.port.in.dto.CommentIsLikeResult;
+
+public record CommentIsLikeResponse(
+        Long commentId,
+        boolean isLiked
+) {
+        public static CommentIsLikeResponse of(CommentIsLikeResult commentIsLikeResult) {
+                return new CommentIsLikeResponse(commentIsLikeResult.commentId(), commentIsLikeResult.isLiked());
+        }
+}

src/main/java/konkuk/thip/comment/adapter/out/jpa/CommentJpaEntity.java

@@ -1,7 +1,10 @@
 package konkuk.thip.comment.adapter.out.jpa;
 
+import com.google.common.annotations.VisibleForTesting;
 import jakarta.persistence.*;
+import konkuk.thip.comment.domain.Comment;
 import konkuk.thip.common.entity.BaseJpaEntity;
+import konkuk.thip.common.post.PostType;
 import konkuk.thip.post.adapter.out.jpa.PostJpaEntity;
 import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
 import lombok.*;
@@ -26,10 +29,19 @@ public class CommentJpaEntity extends BaseJpaEntity {
     @Column(name = "report_count", nullable = false)
     private int reportCount = 0;
 
+    @Builder.Default
+    @Column(name = "like_count", nullable = false)
+    private int likeCount = 0;
+
+    //TODO 상속구조 해지하면서 postType만 가질지, postId + postType가질지 논의 필요
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "post_id", nullable = false)
     private PostJpaEntity postJpaEntity;
 
+    @Enumerated(EnumType.STRING)
+    @Column(name = "post_type", nullable = false, length = 10)
+    private PostType postType;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id", nullable = false)
     private UserJpaEntity userJpaEntity;
@@ -38,4 +50,15 @@ public class CommentJpaEntity extends BaseJpaEntity {
     @JoinColumn(name = "parent_id")
     private CommentJpaEntity parent;
 
+    public CommentJpaEntity updateFrom(Comment comment) {
+        this.reportCount = comment.getReportCount();
+        this.likeCount = comment.getLikeCount();
+        return this;
+    }
+
+    @VisibleForTesting
+    public void updateLikeCount(int likeCount) {
+        this.likeCount = likeCount;
+    }
+
 }

src/main/java/konkuk/thip/comment/adapter/out/mapper/CommentMapper.java

@@ -12,8 +12,10 @@ public class CommentMapper {
     public CommentJpaEntity toJpaEntity(Comment comment, PostJpaEntity postJpaEntity, UserJpaEntity userJpaEntity, CommentJpaEntity commentJpaEntity) {
         return CommentJpaEntity.builder()
                 .content(comment.getContent())
+                .likeCount(comment.getLikeCount())
                 .reportCount(comment.getReportCount())
                 .postJpaEntity(postJpaEntity)
+                .postType(comment.getPostType())
                 .userJpaEntity(userJpaEntity)
                 .parent(commentJpaEntity)
                 .build();
@@ -24,7 +26,9 @@ public Comment toDomainEntity(CommentJpaEntity commentJpaEntity) {
                 .id(commentJpaEntity.getCommentId())
                 .content(commentJpaEntity.getContent())
                 .reportCount(commentJpaEntity.getReportCount())
+                .likeCount(commentJpaEntity.getLikeCount())
                 .targetPostId(commentJpaEntity.getPostJpaEntity().getPostId())
+                .postType(commentJpaEntity.getPostType())
                 .creatorId(commentJpaEntity.getUserJpaEntity().getUserId())
                 .parentCommentId(commentJpaEntity.getParent() != null ? commentJpaEntity.getParent().getCommentId() : null)
                 .createdAt(commentJpaEntity.getCreatedAt())

src/main/java/konkuk/thip/comment/adapter/out/persistence/CommentCommandPersistenceAdapter.java

@@ -1,12 +1,84 @@
 package konkuk.thip.comment.adapter.out.persistence;
 
+import konkuk.thip.comment.adapter.out.jpa.CommentJpaEntity;
+import konkuk.thip.comment.adapter.out.mapper.CommentMapper;
+import konkuk.thip.comment.adapter.out.persistence.repository.CommentJpaRepository;
 import konkuk.thip.comment.application.port.out.CommentCommandPort;
+import konkuk.thip.comment.domain.Comment;
+import konkuk.thip.common.exception.EntityNotFoundException;
+import konkuk.thip.common.post.PostType;
+import konkuk.thip.feed.adapter.out.persistence.repository.FeedJpaRepository;
+import konkuk.thip.post.adapter.out.jpa.PostJpaEntity;
+import konkuk.thip.record.adapter.out.persistence.repository.RecordJpaRepository;
+import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
+import konkuk.thip.user.adapter.out.persistence.repository.UserJpaRepository;
+import konkuk.thip.vote.adapter.out.persistence.repository.VoteJpaRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
+import java.util.Optional;
+
+import static konkuk.thip.common.exception.code.ErrorCode.*;
+
 @Repository
 @RequiredArgsConstructor
 public class CommentCommandPersistenceAdapter implements CommentCommandPort {
 
+    private final CommentJpaRepository commentJpaRepository;
+    private final FeedJpaRepository feedJpaRepository;
+    private final RecordJpaRepository recordJpaRepository;
+    private final VoteJpaRepository voteJpaRepository;
+    private final UserJpaRepository userJpaRepository;
+    private final CommentMapper commentMapper;
+
+    @Override
+    public Long save(Comment comment) {
+
+        // 1. 작성자(User) 조회 및 존재 검증
+        UserJpaEntity userJpaEntity = userJpaRepository.findById(comment.getCreatorId()).orElseThrow(
+                () -> new EntityNotFoundException(USER_NOT_FOUND)
+        );
+
+        // 2. 게시물(Post) 조회 및 존재 검증
+        PostJpaEntity postJpaEntity = findPostJpaEntity(comment.getPostType(), comment.getTargetPostId());
+
+        // 3. 부모 댓글 조회 (있을 경우)
+        CommentJpaEntity parentCommentJpaEntity = null;
+        if (comment.getParentCommentId() != null) {
+            parentCommentJpaEntity = commentJpaRepository.findById(comment.getParentCommentId())
+                    .orElseThrow(() -> new EntityNotFoundException(COMMENT_NOT_FOUND));
+        }
+
+        return commentJpaRepository.save(
+                commentMapper.toJpaEntity(comment, postJpaEntity, userJpaEntity,parentCommentJpaEntity)
+        ).getCommentId();
+    }
+
+    private PostJpaEntity findPostJpaEntity(PostType postType, Long postId) {
+        return switch (postType) {
+            case FEED -> feedJpaRepository.findById(postId)
+                    .orElseThrow(() -> new EntityNotFoundException(FEED_NOT_FOUND));
+            case RECORD -> recordJpaRepository.findById(postId)
+                    .orElseThrow(() -> new EntityNotFoundException(RECORD_NOT_FOUND));
+            case VOTE -> voteJpaRepository.findById(postId)
+                    .orElseThrow(() -> new EntityNotFoundException(VOTE_NOT_FOUND));
+        };
+    }
+
+    @Override
+    public Optional<Comment> findById(Long id) {
+        return commentJpaRepository.findById(id)
+                .map(commentMapper::toDomainEntity);
+    }
+
+    @Override
+    public void update(Comment comment) {
+
+        CommentJpaEntity commentJpaEntity = commentJpaRepository.findById(comment.getId()).orElseThrow(
+                () -> new EntityNotFoundException(COMMENT_NOT_FOUND)
+        );
+
+        commentJpaRepository.save(commentJpaEntity.updateFrom(comment));
+    }
 
 }

src/main/java/konkuk/thip/comment/adapter/out/persistence/CommentLikeCommandPersistenceAdapter.java

@@ -0,0 +1,44 @@
+package konkuk.thip.comment.adapter.out.persistence;
+
+import konkuk.thip.comment.adapter.out.jpa.CommentJpaEntity;
+import konkuk.thip.comment.adapter.out.jpa.CommentLikeJpaEntity;
+import konkuk.thip.comment.adapter.out.persistence.repository.CommentJpaRepository;
+import konkuk.thip.comment.adapter.out.persistence.repository.CommentLikeJpaRepository;
+import konkuk.thip.comment.application.port.out.CommentLikeCommandPort;
+import konkuk.thip.common.exception.EntityNotFoundException;
+import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
+import konkuk.thip.user.adapter.out.persistence.repository.UserJpaRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+import static konkuk.thip.common.exception.code.ErrorCode.*;
+
+@Repository
+@RequiredArgsConstructor
+public class CommentLikeCommandPersistenceAdapter implements CommentLikeCommandPort {
+
+    private final CommentLikeJpaRepository commentLikeJpaRepository;
+    private final CommentJpaRepository commentJpaRepository;
+    private final UserJpaRepository userJpaRepository;
+
+    @Override
+    public void save(Long userId, Long commentId) {
+
+        UserJpaEntity user = userJpaRepository.findById(userId)
+                .orElseThrow(() -> new EntityNotFoundException(USER_NOT_FOUND));
+        CommentJpaEntity comment = commentJpaRepository.findById(commentId)
+                .orElseThrow(() -> new EntityNotFoundException(COMMENT_NOT_FOUND));
+
+        CommentLikeJpaEntity commentLike = CommentLikeJpaEntity.builder()
+                .userJpaEntity(user)
+                .commentJpaEntity(comment)
+                .build();
+
+        commentLikeJpaRepository.save(commentLike);
+    }
+
+    @Override
+    public void delete(Long userId, Long commentId) {
+        commentLikeJpaRepository.deleteByUserIdAndCommentId(userId, commentId);
+    }
+}

src/main/java/konkuk/thip/comment/adapter/out/persistence/CommentLikeQueryPersistenceAdapter.java

@@ -0,0 +1,24 @@
+package konkuk.thip.comment.adapter.out.persistence;
+
+import konkuk.thip.comment.adapter.out.mapper.CommentLikeMapper;
+import konkuk.thip.comment.adapter.out.mapper.CommentMapper;
+import konkuk.thip.comment.adapter.out.persistence.repository.CommentLikeJpaRepository;
+import konkuk.thip.comment.application.port.out.CommentLikeQueryPort;
+import konkuk.thip.user.adapter.out.persistence.repository.UserJpaRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class CommentLikeQueryPersistenceAdapter implements CommentLikeQueryPort {
+
+    private final CommentLikeJpaRepository commentLikeJpaRepository;
+    private final UserJpaRepository userJpaRepository;
+    private final CommentMapper commentMapper;
+    private final CommentLikeMapper commentLikeMapper;
+
+    @Override
+    public boolean isLikedCommentByUser(Long userId, Long commentId) {
+        return commentLikeJpaRepository.existsByUserIdAndCommentId(userId, commentId);
+    }
+}

src/main/java/konkuk/thip/comment/adapter/out/persistence/CommentQueryPersistenceAdapter.java

@@ -13,8 +13,4 @@ public class CommentQueryPersistenceAdapter implements CommentQueryPort {
     private final CommentJpaRepository jpaRepository;
     private final CommentMapper userMapper;
 
-    @Override
-    public int countByPostId(Long postId) {
-        return jpaRepository.countByPostJpaEntity_PostId(postId);
-    }
 }

src/main/java/konkuk/thip/comment/adapter/out/persistence/repository/CommentLikeJpaRepository.java

@@ -0,0 +1,21 @@
+package konkuk.thip.comment.adapter.out.persistence.repository;
+
+import konkuk.thip.comment.adapter.out.jpa.CommentLikeJpaEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface CommentLikeJpaRepository extends JpaRepository<CommentLikeJpaEntity, Long> {
+    @Query(value = "SELECT * FROM comment_likes WHERE user_id = :userId", nativeQuery = true)
+    List<CommentLikeJpaEntity> findAllByUserId(Long userId);
+
+    @Modifying
+    @Query(value = "DELETE FROM comment_likes WHERE user_id = :userId AND comment_id = :commentId", nativeQuery = true)
+    void deleteByUserIdAndCommentId(@Param("userId") Long userId, @Param("commentId") Long commentId);
+
+    @Query(value = "SELECT EXISTS(SELECT 1 FROM comment_likes WHERE user_id = :userId AND comment_id = :commentId)", nativeQuery = true)
+    boolean existsByUserIdAndCommentId(@Param("userId") Long userId, @Param("commentId") Long commentId);
+}