Merge pull request #164 from side-peek/fix/#153-update-comment-count

댓글 생성 및 삭제 시 댓글 수 업데이트 안 되는 버그 해결
side-peek · Mar 14, 2024 · 2524aba · 2524aba
2 parents ee80972 + fca2ebe
commit 2524aba
Show file tree

Hide file tree

Showing 12 changed files with 134 additions and 127 deletions.
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
@@ -9,4 +9,8 @@
     <!-- DOC 패키지 하위에 대한 LineLength 검사를 무시 -->
     <suppress checks="LineLength"
         files="[\\/]common[\\/]doc[\\/]"/>
+
+    <!-- TEST 패키지 하위에 대한 VariableDeclarationUsageDistance 검사를 무시 -->
+    <suppress checks="VariableDeclarationUsageDistance"
+              files=".*src[/\\]test[/\\].*\.java"/>
 </suppressions>
diff --git a/src/main/java/sixgaezzang/sidepeek/comments/domain/Comment.java b/src/main/java/sixgaezzang/sidepeek/comments/domain/Comment.java
@@ -20,6 +20,8 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
 import sixgaezzang.sidepeek.comments.dto.request.UpdateCommentRequest;
 import sixgaezzang.sidepeek.common.domain.BaseTimeEntity;
 import sixgaezzang.sidepeek.projects.domain.Project;
@@ -45,7 +47,7 @@ public class Comment extends BaseTimeEntity {
     @JoinColumn(name = "user_id")
     private User user;
 
-    // TODO: @OnDelete(action = OnDeleteAction.CASCADE) 설정을 안해도 돌아간다. 필요할까!(고민중)
+    @OnDelete(action = OnDeleteAction.CASCADE)
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "parent_id")
     private Comment parent;

diff --git a/src/main/java/sixgaezzang/sidepeek/comments/dto/response/CommentWithCountResponse.java b/src/main/java/sixgaezzang/sidepeek/comments/dto/response/CommentWithCountResponse.java
diff --git a/src/main/java/sixgaezzang/sidepeek/comments/repository/CommentRepositoryCustom.java b/src/main/java/sixgaezzang/sidepeek/comments/repository/CommentRepositoryCustom.java
@@ -10,4 +10,6 @@ public interface CommentRepositoryCustom {
 
     List<Comment> findAllReplies(Comment parent);
 
+    long countRepliesByParent(Comment parent);
+
 }
diff --git a/src/main/java/sixgaezzang/sidepeek/comments/repository/CommentRepositoryCustomImpl.java b/src/main/java/sixgaezzang/sidepeek/comments/repository/CommentRepositoryCustomImpl.java
@@ -34,4 +34,13 @@ public List<Comment> findAllReplies(Comment parent) {
             .where(comment.parent.eq(parent))
             .fetch();
     }
+
+    @Override
+    public long countRepliesByParent(Comment parent) {
+        return queryFactory
+            .select(comment.count())
+            .from(comment)
+            .where(comment.parent.eq(parent))
+            .fetchOne();
+    }
 }
diff --git a/src/main/java/sixgaezzang/sidepeek/comments/service/CommentService.java b/src/main/java/sixgaezzang/sidepeek/comments/service/CommentService.java
@@ -12,15 +12,13 @@
 import jakarta.persistence.EntityNotFoundException;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.atomic.AtomicLong;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import sixgaezzang.sidepeek.comments.domain.Comment;
 import sixgaezzang.sidepeek.comments.dto.request.SaveCommentRequest;
 import sixgaezzang.sidepeek.comments.dto.request.UpdateCommentRequest;
 import sixgaezzang.sidepeek.comments.dto.response.CommentResponse;
-import sixgaezzang.sidepeek.comments.dto.response.CommentWithCountResponse;
 import sixgaezzang.sidepeek.comments.dto.response.ReplyResponse;
 import sixgaezzang.sidepeek.comments.repository.CommentRepository;
 import sixgaezzang.sidepeek.projects.domain.Project;
@@ -60,6 +58,8 @@ public Long save(Long loginId, SaveCommentRequest request) {
         Comment comment = request.toEntity(project, parent, owner);
         commentRepository.save(comment);
 
+        project.increaseCommentCount();    // 댓글 수 증가
+
         return comment.getProject().getId();
     }
 
@@ -68,22 +68,16 @@ public Comment getById(Long id, String message) {
             .orElseThrow(() -> new EntityNotFoundException(message));
     }
 
-    public CommentWithCountResponse findAll(Project project) {
+    public List<CommentResponse> findAll(Project project) {
         List<Comment> comments = commentRepository.findAll(project);
-        AtomicLong commentCount = new AtomicLong((long) comments.size());    // 댓글 개수
 
-        List<CommentResponse> results = comments.stream()
+        return comments.stream()
             .map(comment -> {
                 boolean isOwner = isSameOwner(comment, project);
                 List<ReplyResponse> replies = mapReplies(comment);
-                if (Objects.nonNull(replies)) {
-                    commentCount.addAndGet(replies.size()); // 대댓글 개수 추가
-                }
                 return CommentResponse.from(comment, isOwner, replies);
             })
             .toList();
-
-        return CommentWithCountResponse.from(results, commentCount.get());
     }
 
     @Transactional
@@ -105,6 +99,9 @@ public void delete(Long loginId, Long commentId) {
         Comment comment = getById(commentId, COMMENT_NOT_EXISTING);
 
         validateLoginIdEqualsOwnerId(loginId, comment.getOwnerId());
+
+        decreaseAllCommentCount(comment);    // 댓글 수 감소
+
         commentRepository.delete(comment);
     }
 
@@ -123,4 +120,11 @@ private List<ReplyResponse> mapReplies(Comment comment) {
             .toList();
     }
 
+    private void decreaseAllCommentCount(Comment comment) { // 댓글 삭제 시 대댓글도 삭제하기 위한 메서드
+        Project project = comment.getProject();
+
+        long replyCount = commentRepository.countRepliesByParent(comment);  // 대댓글 수 가져오기
+        project.decreaseCommentCount(replyCount + 1); // 대댓글 수 + 댓글 수(1) 감소
+    }
+
 }
diff --git a/src/main/java/sixgaezzang/sidepeek/projects/domain/Project.java b/src/main/java/sixgaezzang/sidepeek/projects/domain/Project.java
@@ -86,6 +86,9 @@ public class Project extends BaseTimeEntity {
     @Column(name = "view_count", nullable = false)
     private Long viewCount;
 
+    @Column(name = "comment_count", nullable = false)
+    private Long commentCount;
+
     @Column(name = "deleted_at")
     private LocalDateTime deletedAt;
 
@@ -116,6 +119,7 @@ public Project(String name, String subName, String overview, YearMonth startDate
         // Etc
         this.likeCount = 0L;
         this.viewCount = 0L;
+        this.commentCount = 0L;
     }
 
     public void increaseViewCount() {
@@ -130,6 +134,14 @@ public void decreaseLikeCount() {
         this.likeCount--;
     }
 
+    public void increaseCommentCount() {
+        this.commentCount++;
+    }
+
+    public void decreaseCommentCount(long commentCount) {
+        this.commentCount -= commentCount;
+    }
+
     public void softDelete(LocalDateTime now) {
         if (Objects.isNull(this.deletedAt)) {
             this.deletedAt = now;

diff --git a/src/main/java/sixgaezzang/sidepeek/projects/dto/response/ProjectResponse.java b/src/main/java/sixgaezzang/sidepeek/projects/dto/response/ProjectResponse.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import lombok.Builder;
 import sixgaezzang.sidepeek.comments.dto.response.CommentResponse;
-import sixgaezzang.sidepeek.comments.dto.response.CommentWithCountResponse;
 import sixgaezzang.sidepeek.projects.domain.Project;
 
 @Schema(description = "프로젝트 상세 조회 응답")
@@ -60,13 +59,13 @@ public static ProjectResponse from(Project project, List<OverviewImageSummary> o
             overviewImageUrl,
             techStacks,
             members,
-            new CommentWithCountResponse(Collections.emptyList(), 0L)
+            Collections.emptyList()
         );
     }
 
     public static ProjectResponse from(Project project, List<OverviewImageSummary> overviewImageUrl,
         List<ProjectSkillSummary> techStacks, List<MemberSummary> members,
-        CommentWithCountResponse comments
+        List<CommentResponse> comments
     ) {
         return ProjectResponse.builder()
             .id(project.getId())
@@ -79,15 +78,15 @@ public static ProjectResponse from(Project project, List<OverviewImageSummary> o
             .deployUrl(project.getDeployUrl())
             .viewCount(project.getViewCount())
             .likeCount(project.getLikeCount())
-            .commentCount(comments.commentCount())  // 댓글 + 대댓글
+            .commentCount(project.getCommentCount())  // 댓글 + 대댓글
             .techStacks(techStacks)
             .ownerId(project.getOwnerId())
             .startDate(project.getStartDate())
             .endDate(project.getEndDate())
             .members(members)
             .description(project.getDescription())
             .troubleShooting(project.getTroubleshooting())
-            .comments(comments.results())
+            .comments(comments)
             .build();
     }
 

diff --git a/src/main/java/sixgaezzang/sidepeek/projects/service/ProjectService.java b/src/main/java/sixgaezzang/sidepeek/projects/service/ProjectService.java
@@ -20,7 +20,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import sixgaezzang.sidepeek.comments.dto.response.CommentWithCountResponse;
+import sixgaezzang.sidepeek.comments.dto.response.CommentResponse;
 import sixgaezzang.sidepeek.comments.service.CommentService;
 import sixgaezzang.sidepeek.common.dto.request.SaveTechStackRequest;
 import sixgaezzang.sidepeek.common.dto.response.Page;
@@ -106,7 +106,7 @@ public ProjectResponse findById(Long id) {
 
         List<MemberSummary> members = memberService.findAllWithUser(project);
 
-        CommentWithCountResponse comments = commentService.findAll(project);
+        List<CommentResponse> comments = commentService.findAll(project);
 
         return ProjectResponse.from(project, overviewImages, techStacks, members, comments);
     }
@@ -120,7 +120,7 @@ public List<ProjectBannerResponse> findAllPopularLastWeek() {
     }
 
     public Page<ProjectListResponse> findByUser(Long userId, Long loginId,
-                                                UserProjectSearchType type, Pageable pageable) {
+        UserProjectSearchType type, Pageable pageable) {
         User user = userRepository.findById(userId)
             .orElseThrow(() -> new EntityNotFoundException(USER_NOT_EXISTING));
 
@@ -176,19 +176,19 @@ private List<Long> getLikedProjectIds(Long userId) {
     }
 
     private Page<ProjectListResponse> findJoinedProjectsByUser(User user,
-                                                               List<Long> likedProjectIds,
-                                                               Pageable pageable) {
+        List<Long> likedProjectIds,
+        Pageable pageable) {
         return Page.from(projectRepository.findAllByUserJoined(likedProjectIds, user, pageable));
     }
 
     private Page<ProjectListResponse> findLikedProjectsByUser(User user, List<Long> likedProjectIds,
-                                                              Pageable pageable) {
+        Pageable pageable) {
         return Page.from(projectRepository.findAllByUserLiked(likedProjectIds, user, pageable));
     }
 
     private Page<ProjectListResponse> findAllByUserCommentedByUser(User user,
-                                                                   List<Long> likedProjectIds,
-                                                                   Pageable pageable) {
+        List<Long> likedProjectIds,
+        Pageable pageable) {
         return Page.from(projectRepository.findAllByUserCommented(likedProjectIds, user, pageable));
     }