🔨 Refactor/#173 - 좋아요 수와 댓글 수를 Board의 필드로 추가 및, 필드에서 값 읽어오도록 로직 변경

http/onjung/OnjungControllerHttpRequest.http

@@ -50,7 +50,6 @@ Authorization: Bearer {{access_token}}
 Content-Type: application/json
 
 {
-  "event_id": {{onjung.API_4_7.event_id}},
   "donation_amount": {{onjung.API_4_7.donation_amount}}
 }
 

src/main/java/com/daon/onjung/suggestion/application/dto/response/ReadBoardDetailResponseDto.java

@@ -126,8 +126,6 @@ public BoardInfoDto(Long id, String imgUrl, String title, String content, String
 
         public static BoardInfoDto of(
                 Board board,
-                Integer likeCount,
-                Integer commentCount,
                 Boolean isLiked
         ) {
             return BoardInfoDto.builder()
@@ -136,17 +134,17 @@ public static BoardInfoDto of(
                     .title(board.getTitle())
                     .content(board.getContent())
                     .postedAgo(DateTimeUtil.calculatePostedAgo(board.getCreatedAt()))
-                    .likeCount(likeCount)
-                    .commentCount(commentCount)
+                    .likeCount(board.getLikeCount())
+                    .commentCount(board.getCommentCount())
                     .isLiked(isLiked)
                     .build();
         }
     }
 
-    public static ReadBoardDetailResponseDto of(Board board, User user, Boolean isMe, Integer likeCount, Integer commentCount, Boolean isLiked) {
+    public static ReadBoardDetailResponseDto of(Board board, User user, Boolean isMe, Boolean isLiked) {
         return ReadBoardDetailResponseDto.builder()
                 .writerInfo(WriterInfoDto.of(user, isMe))
-                .boardInfo(BoardInfoDto.of(board, likeCount, commentCount, isLiked))
+                .boardInfo(BoardInfoDto.of(board, isLiked))
                 .build();
     }
 

src/main/java/com/daon/onjung/suggestion/application/dto/response/ReadBoardOverviewResponseDto.java

@@ -73,19 +73,15 @@ public BoardListDto(Long id, String imgUrl, String titleSummary, String contentS
             this.validateSelf();
         }
 
-        public static BoardListDto of(
-                Board board,
-                Integer likeCount,
-                Integer commentCount
-        ) {
+        public static BoardListDto fromEntity(Board board) {
             return BoardListDto.builder()
                     .id(board.getId())
                     .imgUrl(board.getImgUrl())
                     .titleSummary(board.getTitle().length() > 15 ? board.getTitle().substring(0, 15) + "..." : board.getTitle())
                     .contentSummary(board.getContent().length() > 30 ? board.getContent().substring(0, 30) + "..." : board.getContent())
                     .postedAgo(DateTimeUtil.calculatePostedAgo(board.getCreatedAt()))
-                    .likeCount(likeCount)
-                    .commentCount(commentCount)
+                    .likeCount(board.getLikeCount())
+                    .commentCount(board.getCommentCount())
                     .build();
         }
     }

src/main/java/com/daon/onjung/suggestion/application/service/CreateCommentService.java

@@ -8,6 +8,7 @@
 import com.daon.onjung.suggestion.application.usecase.CreateCommentUseCase;
 import com.daon.onjung.suggestion.domain.Board;
 import com.daon.onjung.suggestion.domain.Comment;
+import com.daon.onjung.suggestion.domain.service.BoardService;
 import com.daon.onjung.suggestion.domain.service.CommentService;
 import com.daon.onjung.suggestion.repository.mysql.BoardRepository;
 import com.daon.onjung.suggestion.repository.mysql.CommentRepository;
@@ -26,6 +27,7 @@ public class CreateCommentService implements CreateCommentUseCase {
     private final CommentRepository commentRepository;
 
     private final CommentService commentService;
+    private final BoardService boardService;
 
     @Override
     @Transactional
@@ -46,5 +48,9 @@ public void execute(UUID accountId, Long boardId, CreateCommentRequestDto reques
                 board
         );
         commentRepository.save(comment);
+
+        // 게시글 댓글 수 증가
+        board = boardService.addCommentCount(board);
+        boardRepository.save(board);
     }
 }

src/main/java/com/daon/onjung/suggestion/application/service/CreateOrDeleteLikeService.java

@@ -7,6 +7,7 @@
 import com.daon.onjung.suggestion.application.usecase.CreateOrDeleteLikeUseCase;
 import com.daon.onjung.suggestion.domain.Board;
 import com.daon.onjung.suggestion.domain.Like;
+import com.daon.onjung.suggestion.domain.service.BoardService;
 import com.daon.onjung.suggestion.domain.service.LikeService;
 import com.daon.onjung.suggestion.repository.mysql.BoardRepository;
 import com.daon.onjung.suggestion.repository.mysql.LikeRepository;
@@ -23,8 +24,11 @@ public class CreateOrDeleteLikeService implements CreateOrDeleteLikeUseCase {
     private final BoardRepository boardRepository;
     private final UserRepository userRepository;
     private final LikeRepository likeRepository;
+
+    private final BoardService boardService;
     private final LikeService likeService;
 
+
     @Override
     @Transactional
     public Boolean execute(UUID accountId, Long boardId) {
@@ -43,10 +47,24 @@ public Boolean execute(UUID accountId, Long boardId) {
 
         // 좋아요 생성 또는 삭제
         if (like != null) {
+
+            // 좋아요가 이미 존재하면 삭제
             likeRepository.delete(like);
+
+            // 게시글 좋아요 수 감소
+            board = boardService.subtractLikeCount(board);
+            boardRepository.save(board);
+
             return false;
         } else {
+
+            // 좋아요가 존재하지 않으면 생성
             likeRepository.save(likeService.createLike(user,board));
+
+            // 게시글 좋아요 수 증가
+            board = boardService.addLikeCount(board);
+            boardRepository.save(board);
+
             return true;
         }
     }

src/main/java/com/daon/onjung/suggestion/application/service/ReadBoardDetailService.java

@@ -8,7 +8,6 @@
 import com.daon.onjung.suggestion.application.usecase.ReadBoardDetailUseCase;
 import com.daon.onjung.suggestion.domain.Board;
 import com.daon.onjung.suggestion.repository.mysql.BoardRepository;
-import com.daon.onjung.suggestion.repository.mysql.CommentRepository;
 import com.daon.onjung.suggestion.repository.mysql.LikeRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -22,7 +21,6 @@ public class ReadBoardDetailService implements ReadBoardDetailUseCase {
 
     private final BoardRepository boardRepository;
     private final LikeRepository likeRepository;
-    private final CommentRepository commentRepository;
     private final UserRepository userRepository;
 
     @Override
@@ -37,12 +35,6 @@ public ReadBoardDetailResponseDto execute(UUID accountId, Long boardId) {
         Board board = boardRepository.findById(boardId)
                 .orElseThrow(() -> new CommonException(ErrorCode.NOT_FOUND_RESOURCE));
 
-        // 좋아요 개수 조회
-        Integer likeCount = likeRepository.countByBoard(board);
-
-        // 댓글 개수 조회
-        Integer commentCount = commentRepository.countByBoard(board);
-
         // 좋아요 여부 조회
         Boolean isLiked = likeRepository.existsByBoardAndUser(board, user);
 
@@ -56,8 +48,6 @@ public ReadBoardDetailResponseDto execute(UUID accountId, Long boardId) {
                 board,
                 writer,
                 isMe,
-                likeCount,
-                commentCount,
                 isLiked
         );
     }

src/main/java/com/daon/onjung/suggestion/application/service/ReadBoardOverviewService.java

@@ -4,8 +4,6 @@
 import com.daon.onjung.suggestion.application.usecase.ReadBoardOverviewUseCase;
 import com.daon.onjung.suggestion.domain.Board;
 import com.daon.onjung.suggestion.repository.mysql.BoardRepository;
-import com.daon.onjung.suggestion.repository.mysql.CommentRepository;
-import com.daon.onjung.suggestion.repository.mysql.LikeRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -20,8 +18,6 @@
 public class ReadBoardOverviewService implements ReadBoardOverviewUseCase {
 
     private final BoardRepository boardRepository;
-    private final CommentRepository commentRepository;
-    private final LikeRepository likeRepository;
 
     @Override
     @Transactional(readOnly = true)
@@ -31,21 +27,9 @@ public ReadBoardOverviewResponseDto execute(Integer page, Integer size) {
         Pageable pageable = PageRequest.of(page-1, size);
         Page<Board> boardsPage = boardRepository.findAllByOrderByCreatedAtDesc(pageable);
 
+        // BoardListDto 생성
         List<ReadBoardOverviewResponseDto.BoardListDto> boardList = boardsPage.getContent().stream()
-                .map(board -> {
-
-                    // 각 게시글에 대해 댓글 수 조회
-                    Integer commentCount = commentRepository.countByBoard(board);
-
-                    // 각 게시글에 대해 좋아요 수 조회
-                    Integer likeCount = likeRepository.countByBoard(board);
-
-                    // BoardListDto 생성
-                    ReadBoardOverviewResponseDto.BoardListDto boardListDto =
-                            ReadBoardOverviewResponseDto.BoardListDto.of(board, commentCount, likeCount);
-
-                    return boardListDto;
-                })
+                .map(ReadBoardOverviewResponseDto.BoardListDto::fromEntity)
                 .toList();
 
         // ResponseDto 생성

src/main/java/com/daon/onjung/suggestion/domain/Board.java

@@ -36,6 +36,9 @@ public class Board {
     @Column(name = "like_count", nullable = false)
     private Integer likeCount;
 
+    @Column(name = "comment_count", nullable = false)
+    private Integer commentCount;
+
     /* -------------------------------------------- */
     /* Timestamp Column --------------------------- */
     /* -------------------------------------------- */
@@ -58,10 +61,20 @@ public Board(String title, String content, User user) {
         this.content = content;
         this.user = user;
         this.likeCount = 0;
+        this.commentCount = 0;
         this.createdAt = LocalDateTime.now();
     }
 
     public void updateImgUrl(String imgUrl) {
         this.imgUrl = imgUrl;
     }
+
+    public void updateLikeCount(Integer likeCount) {
+        this.likeCount = likeCount;
+    }
+
+    public void
+    updateCommentCount(Integer commentCount) {
+        this.commentCount = commentCount;
+    }
 }

src/main/java/com/daon/onjung/suggestion/domain/service/BoardService.java

@@ -23,4 +23,24 @@ public Board updateBoardFile(Board board, String imgUrl) {
         board.updateImgUrl(imgUrl);
         return board;
     }
+
+    public Board addLikeCount(Board board) {
+        board.updateLikeCount(board.getLikeCount() + 1);
+        return board;
+    }
+
+    public Board subtractLikeCount(Board board) {
+        board.updateLikeCount(board.getLikeCount() - 1);
+        return board;
+    }
+
+    public Board addCommentCount(Board board) {
+        board.updateCommentCount(board.getCommentCount() + 1);
+        return board;
+    }
+
+    public Board subtractCommentCount(Board board) {
+        board.updateCommentCount(board.getCommentCount() - 1);
+        return board;
+    }
 }