feat: 일지 comments 프로퍼티 추가

T1F5 · Apr 6, 2024 · 6c4f701 · 6c4f701
1 parent e18875c
commit 6c4f701
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 8 deletions.
diff --git a/src/main/java/com/unit/daybook/domain/board/dto/response/FindOneBoardResponse.java b/src/main/java/com/unit/daybook/domain/board/dto/response/FindOneBoardResponse.java
@@ -5,6 +5,7 @@
 
 import com.unit.daybook.domain.board.entity.Board;
 import com.unit.daybook.domain.board.entity.Hashtag;
+import com.unit.daybook.domain.comment.dto.response.FindOneCommentResponse;
 import com.unit.daybook.domain.reaction.dto.response.ReactionTypeAndCount;
 import com.unit.daybook.domain.reaction.entity.Reaction;
 
@@ -19,9 +20,10 @@ public record FindOneBoardResponse(
 	List<String> hashtags,
 	String paperType,
 	List<ReactionTypeAndCount> reactions,
+	List<FindOneCommentResponse> comments,
 	LocalDateTime createdAt
 ) {
-	public static FindOneBoardResponse of(Board board, List<ReactionTypeAndCount> reactions) {
+	public static FindOneBoardResponse of(Board board, List<ReactionTypeAndCount> reactions, List<FindOneCommentResponse> comments) {
 		List<String> hashContents = board.getHashtags().stream().map(Hashtag::getContent).toList();
 		Long heartsFromReactions = reactions.stream().mapToLong(ReactionTypeAndCount::count).sum();
 		return new FindOneBoardResponse(
@@ -34,6 +36,7 @@ public static FindOneBoardResponse of(Board board, List<ReactionTypeAndCount> re
 			hashContents,
 			board.getPaperType(),
 			reactions,
+			comments,
 			board.getCreatedAt()
 		);
 	}

diff --git a/src/main/java/com/unit/daybook/domain/board/entity/Hashtag.java b/src/main/java/com/unit/daybook/domain/board/entity/Hashtag.java
@@ -2,6 +2,7 @@
 
 
 import com.unit.daybook.domain.board.dto.request.AddBoardRequestDto;
+import com.unit.daybook.domain.common.model.BaseTimeEntity;
 import com.unit.daybook.domain.member.domain.Member;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
@@ -15,7 +16,7 @@
 @Entity
 @Table(name = "hashtag")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class Hashtag {
+public class Hashtag extends BaseTimeEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "hashtag_id")

diff --git a/src/main/java/com/unit/daybook/domain/board/service/BoardService.java b/src/main/java/com/unit/daybook/domain/board/service/BoardService.java
@@ -10,6 +10,9 @@
 import com.unit.daybook.domain.board.entity.ReadBoard;
 import com.unit.daybook.domain.board.repository.*;
 
+import com.unit.daybook.domain.comment.dto.response.FindOneCommentResponse;
+import com.unit.daybook.domain.comment.entity.Comment;
+import com.unit.daybook.domain.comment.repository.CommentRepository;
 import com.unit.daybook.domain.member.domain.Member;
 import com.unit.daybook.domain.member.repository.MemberRepository;
 import com.unit.daybook.domain.reaction.dto.response.ReactionTypeAndCount;
@@ -33,6 +36,7 @@ public class BoardService {
     private final ReadBoardRepository readBoardRepository;
     private final HashtagRepository hashtagRepository;
     private final ReactionRepository reactionRepository;
+    private final CommentRepository commentRepository;
 
     public BoardResponseDto addBoard(AddBoardRequestDto addBoardRequestDto, Long memberId) {
         Member member = memberRepository
@@ -60,8 +64,11 @@ public FindOneBoardResponse getBoard(Long boardId) {
         Board board = boardRepository.findById(boardId)
             .orElseThrow(() -> new CustomException(ErrorCode.BOARD_NOT_FOUND));
         List<ReactionTypeAndCount> reactions = reactionRepository.findAllByBoardGroupByReactionType(board);
-
-        return FindOneBoardResponse.of(board, reactions);
+        List<FindOneCommentResponse> comments = commentRepository.findCommentByBoard(boardId)
+            .stream()
+            .map(FindOneCommentResponse::from)
+            .toList();
+        return FindOneBoardResponse.of(board, reactions, comments);
     }
 
     @Transactional(readOnly = true)

diff --git a/src/main/java/com/unit/daybook/domain/comment/dto/response/FindOneCommentResponse.java b/src/main/java/com/unit/daybook/domain/comment/dto/response/FindOneCommentResponse.java
@@ -0,0 +1,12 @@
+package com.unit.daybook.domain.comment.dto.response;
+
+import com.unit.daybook.domain.comment.entity.Comment;
+
+public record FindOneCommentResponse(
+	Long commentId,
+	String content
+) {
+	public static FindOneCommentResponse from(Comment comment) {
+		return new FindOneCommentResponse(comment.getCommentId(), comment.getContent());
+	}
+}
diff --git a/src/main/java/com/unit/daybook/domain/comment/entity/Comment.java b/src/main/java/com/unit/daybook/domain/comment/entity/Comment.java
@@ -1,6 +1,7 @@
 package com.unit.daybook.domain.comment.entity;
 
 import com.unit.daybook.domain.board.entity.Board;
+import com.unit.daybook.domain.common.model.BaseTimeEntity;
 import com.unit.daybook.domain.member.domain.Member;
 
 import jakarta.persistence.Column;
@@ -21,7 +22,7 @@
 @Entity
 @Table(name = "comment")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class Comment {
+public class Comment extends BaseTimeEntity {
 
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)

diff --git a/src/main/java/com/unit/daybook/domain/comment/repository/CommentRepositoryCustom.java b/src/main/java/com/unit/daybook/domain/comment/repository/CommentRepositoryCustom.java
@@ -1,4 +1,10 @@
 package com.unit.daybook.domain.comment.repository;
 
+import java.util.List;
+
+import com.unit.daybook.domain.comment.dto.response.FindOneCommentResponse;
+import com.unit.daybook.domain.comment.entity.Comment;
+
 public interface CommentRepositoryCustom {
+	List<Comment> findCommentByBoard(Long boardId);
 }
diff --git a/src/main/java/com/unit/daybook/domain/comment/repository/CommentRepositoryImpl.java b/src/main/java/com/unit/daybook/domain/comment/repository/CommentRepositoryImpl.java
@@ -1,16 +1,30 @@
 package com.unit.daybook.domain.comment.repository;
 
+import static com.unit.daybook.domain.board.entity.QBoard.*;
+import static com.unit.daybook.domain.comment.entity.QComment.*;
+
+import java.util.List;
+
 import org.springframework.stereotype.Repository;
 
 import com.querydsl.jpa.impl.JPAQueryFactory;
+import com.unit.daybook.domain.comment.entity.Comment;
 
 import lombok.RequiredArgsConstructor;
 
 @Repository
 @RequiredArgsConstructor
-public class CommentRepositoryImpl {
+public class CommentRepositoryImpl implements CommentRepositoryCustom{
 
 	private final JPAQueryFactory jpaQueryFactory;
 
-
+	@Override
+	public List<Comment> findCommentByBoard(Long boardId) {
+		return jpaQueryFactory.selectFrom(comment)
+			.leftJoin(comment.board, board)
+			.fetchJoin()
+			.where(board.boardId.eq(boardId))
+			.orderBy(comment.createdAt.desc())
+			.fetch();
+	}
 }
diff --git a/src/main/java/com/unit/daybook/domain/reaction/entity/Reaction.java b/src/main/java/com/unit/daybook/domain/reaction/entity/Reaction.java
@@ -1,6 +1,7 @@
 package com.unit.daybook.domain.reaction.entity;
 
 import com.unit.daybook.domain.board.entity.Board;
+import com.unit.daybook.domain.common.model.BaseTimeEntity;
 import com.unit.daybook.domain.member.domain.Member;
 
 import jakarta.persistence.*;
@@ -14,7 +15,7 @@
 @Entity
 @Table(name = "reaction")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class Reaction {
+public class Reaction extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)