[refactor] 기록장 조회 api 수정

src/main/java/konkuk/thip/book/adapter/out/persistence/BookCommandPersistenceAdapter.java

@@ -5,15 +5,18 @@
 import konkuk.thip.book.application.port.out.BookCommandPort;
 import konkuk.thip.book.domain.Book;
 import konkuk.thip.common.exception.EntityNotFoundException;
+import konkuk.thip.room.adapter.out.persistence.RoomJpaRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
 import static konkuk.thip.common.exception.code.ErrorCode.BOOK_NOT_FOUND;
+import static konkuk.thip.common.exception.code.ErrorCode.ROOM_NOT_FOUND;
 
 @Repository
 @RequiredArgsConstructor
 public class BookCommandPersistenceAdapter implements BookCommandPort {
 
+    private final RoomJpaRepository roomJpaRepository;
     private final BookJpaRepository bookJpaRepository;
     private final BookMapper bookMapper;
 
@@ -49,4 +52,12 @@ public void updateForPageCount(Book book) {
         bookJpaEntity.changePageCount(book.getPageCount());
         bookJpaRepository.save(bookJpaEntity);
     }
+
+    @Override
+    public Book findBookByRoomId(Long roomId) {
+        BookJpaEntity bookJpaEntity = roomJpaRepository.findById(roomId).orElseThrow(
+                () -> new EntityNotFoundException(ROOM_NOT_FOUND)
+        ).getBookJpaEntity();
+        return bookMapper.toDomainEntity(bookJpaEntity);
+    }
 }

src/main/java/konkuk/thip/book/application/port/out/BookCommandPort.java

@@ -12,4 +12,6 @@ public interface BookCommandPort {
     Book findById(Long id);
 
     void updateForPageCount(Book book);
+
+    Book findBookByRoomId(Long roomId);
 }

src/main/java/konkuk/thip/common/util/DateUtil.java

@@ -1,16 +1,13 @@
 package konkuk.thip.common.util;
 
-import org.springframework.stereotype.Component;
-
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-@Component
 public class DateUtil {
 
     //마지막 활동 시간 포맷팅 -> ex. 1분 전, 1시간 전, 1일 전
-    public String formatLastActivityTime(LocalDateTime createdAt) {
+    public static String formatBeforeTime(LocalDateTime createdAt) {
         long minutes = Duration.between(createdAt, LocalDateTime.now()).toMinutes();
         if (minutes < 1) return "방금 전";
         if (minutes < 60) return minutes + "분 전";

src/main/java/konkuk/thip/feed/adapter/out/jpa/FeedJpaEntity.java

@@ -28,8 +28,8 @@ public class FeedJpaEntity extends PostJpaEntity {
     private BookJpaEntity bookJpaEntity;
 
     @Builder
-    public FeedJpaEntity(String content, UserJpaEntity userJpaEntity, Boolean isPublic, int reportCount, BookJpaEntity bookJpaEntity) {
-        super(content, userJpaEntity);
+    public FeedJpaEntity(String content, Integer likeCount, Integer commentCount, UserJpaEntity userJpaEntity, Boolean isPublic, int reportCount, BookJpaEntity bookJpaEntity) {
+        super(content, likeCount, commentCount, userJpaEntity);
         this.isPublic = isPublic;
         this.reportCount = reportCount;
         this.bookJpaEntity = bookJpaEntity;

src/main/java/konkuk/thip/feed/adapter/out/mapper/FeedMapper.java

@@ -19,6 +19,8 @@ public FeedJpaEntity toJpaEntity(Feed feed, UserJpaEntity userJpaEntity, BookJpa
                 .userJpaEntity(userJpaEntity)
                 .isPublic(feed.getIsPublic())
                 .reportCount(feed.getReportCount())
+                .likeCount(feed.getLikeCount())
+                .commentCount(feed.getCommentCount())
                 .bookJpaEntity(bookJpaEntity)
                 .build();
     }
@@ -30,6 +32,8 @@ public Feed toDomainEntity(FeedJpaEntity feedJpaEntity, List<TagJpaEntity> tagJp
                 .creatorId(feedJpaEntity.getUserJpaEntity().getUserId())
                 .isPublic(feedJpaEntity.getIsPublic())
                 .reportCount(feedJpaEntity.getReportCount())
+                .likeCount(feedJpaEntity.getLikeCount())
+                .commentCount(feedJpaEntity.getCommentCount())
                 .targetBookId(feedJpaEntity.getBookJpaEntity().getBookId())
                 .tagList(tagJpaEntityList.stream()
                         .map(TagJpaEntity::getValue)

src/main/java/konkuk/thip/feed/domain/Feed.java

@@ -1,6 +1,7 @@
 package konkuk.thip.feed.domain;
 
 import konkuk.thip.common.entity.BaseDomainEntity;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.experimental.SuperBuilder;
 
@@ -18,19 +19,28 @@ public class Feed extends BaseDomainEntity {
 
     private Boolean isPublic;
 
-    private int reportCount;
+    @Builder.Default
+    private Integer reportCount = 0;
+
+    @Builder.Default
+    private Integer likeCount = 0;
+
+    @Builder.Default
+    private Integer commentCount = 0;
 
     private Long targetBookId;
 
     private List<Tag> tagList;
 
-    public static Feed withoutId(String content, Long creatorId, Boolean isPublic, int reportCount, Long targetBookId, List<Tag> tagList) {
+    public static Feed withoutId(String content, Long creatorId, Boolean isPublic, Long targetBookId, List<Tag> tagList) {
         return Feed.builder()
                 .id(null)
                 .content(content)
                 .creatorId(creatorId)
                 .isPublic(isPublic)
-                .reportCount(reportCount)
+                .reportCount(0)
+                .likeCount(0)
+                .commentCount(0)
                 .targetBookId(targetBookId)
                 .tagList(tagList)
                 .build();

src/main/java/konkuk/thip/post/adapter/out/jpa/PostJpaEntity.java

@@ -23,12 +23,18 @@ public abstract class PostJpaEntity extends BaseJpaEntity {
     @Column(length = 6100, nullable = false)
     private String content;
 
+    private Integer likeCount = 0;
+
+    private Integer commentCount = 0;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id", nullable = false)
     private UserJpaEntity userJpaEntity;
 
-    public PostJpaEntity(String content, UserJpaEntity userJpaEntity) {
+    public PostJpaEntity(String content, Integer likeCount, Integer commentCount, UserJpaEntity userJpaEntity) {
         this.content = content;
+        this.likeCount = likeCount;
+        this.commentCount = commentCount;
         this.userJpaEntity = userJpaEntity;
     }
 }

src/main/java/konkuk/thip/record/adapter/in/web/RecordQueryController.java

@@ -3,7 +3,6 @@
 import konkuk.thip.common.dto.BaseResponse;
 import konkuk.thip.common.security.annotation.UserId;
 import konkuk.thip.record.adapter.in.web.response.RecordSearchResponse;
-import konkuk.thip.record.application.port.in.dto.RecordSearchQuery;
 import konkuk.thip.record.application.port.in.dto.RecordSearchUseCase;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,24 +19,15 @@ public class RecordQueryController {
     @GetMapping("/rooms/{roomId}/posts")
     public BaseResponse<RecordSearchResponse> viewRecordList(
             @PathVariable final Long roomId,
-            @RequestParam final String type,
-            @RequestParam final String sort,
+            @RequestParam(required = false) final String type,
+            @RequestParam(required = false) final String sort,
             @RequestParam(required = false) final Integer pageStart,
             @RequestParam(required = false) final Integer pageEnd,
+            @RequestParam final Boolean isOverview,
             @RequestParam final Integer pageNum,
             @UserId final Long userId
     ) {
-        return BaseResponse.ok(recordSearchUseCase.search(
-                RecordSearchQuery.builder()
-                        .roomId(roomId)
-                        .type(type)
-                        .sort(sort)
-                        .pageStart(pageStart)
-                        .pageEnd(pageEnd)
-                        .pageNum(pageNum)
-                        .userId(userId)
-                        .build()
-        ));
+        return BaseResponse.ok(recordSearchUseCase.search(roomId, type, sort, pageStart, pageEnd, isOverview, pageNum, userId));
     }
 
 }

src/main/java/konkuk/thip/record/adapter/in/web/response/RecordDto.java

@@ -1,7 +1,5 @@
 package konkuk.thip.record.adapter.in.web.response;
 
-import konkuk.thip.record.domain.Record;
-import konkuk.thip.user.domain.User;
 import lombok.Builder;
 
 @Builder
@@ -17,25 +15,25 @@ public record RecordDto(
         boolean isLiked,
         boolean isWriter,
         Long recordId
-) implements RecordSearchResponse.PostDto {
+) implements RecordSearchResponse.RecordSearchResult {
     @Override
     public String type() {
         return "RECORD";
     }
 
-    public static RecordDto of(Record record, String postDate, User user, int likeCount, int commentCount, boolean isLiked, boolean isWriter) {
-        return RecordDto.builder()
-                .postDate(postDate)
-                .page(record.getPage())
-                .userId(record.getCreatorId())
-                .nickName(user.getNickname())
-                .profileImageUrl(user.getAlias().getImageUrl())
-                .content(record.getContent())
-                .likeCount(likeCount)
-                .commentCount(commentCount)
-                .isLiked(isLiked)
-                .isWriter(isWriter)
-                .recordId(record.getId())
-                .build();
+    public RecordDto withIsLiked(boolean isLiked) {
+        return new RecordDto(
+                postDate,
+                page,
+                userId,
+                nickName,
+                profileImageUrl,
+                content,
+                likeCount,
+                commentCount,
+                isLiked,
+                isWriter,
+                recordId
+        );
     }
 }

src/main/java/konkuk/thip/record/adapter/in/web/response/RecordSearchResponse.java

@@ -6,14 +6,14 @@
 import java.util.List;
 
 public record RecordSearchResponse(
-    List<PostDto> recordList,
+    List<RecordSearchResult> recordList,
     Integer page,
     Integer size,
     Boolean first,
     Boolean last
 ){
 
-    public static RecordSearchResponse of(List<PostDto> recordList,
+    public static RecordSearchResponse of(List<RecordSearchResult> recordList,
                                           Integer page,
                                           Integer size,
                                           Boolean first,
@@ -26,7 +26,7 @@ public static RecordSearchResponse of(List<PostDto> recordList,
             @JsonSubTypes.Type(value = RecordDto.class, name = "RECORD"),
             @JsonSubTypes.Type(value = VoteDto.class, name = "VOTE")
     })
-    public sealed interface PostDto permits RecordDto, VoteDto {
+    public sealed interface RecordSearchResult permits RecordDto, VoteDto {
         String type();
         String postDate();
         int page();

src/main/java/konkuk/thip/record/adapter/in/web/response/VoteDto.java

@@ -1,7 +1,5 @@
 package konkuk.thip.record.adapter.in.web.response;
 
-import konkuk.thip.user.domain.User;
-import konkuk.thip.vote.domain.Vote;
 import konkuk.thip.vote.domain.VoteItem;
 import lombok.Builder;
 
@@ -21,30 +19,27 @@ public record VoteDto(
         boolean isWriter,
         Long voteId,
         List<VoteItemDto> voteItems
-) implements RecordSearchResponse.PostDto {
+) implements RecordSearchResponse.RecordSearchResult {
     @Override
     public String type() {
         return "VOTE";
     }
 
-    public static VoteDto of(
-            Vote vote, String postDate, User user, int likeCount, int commentCount, boolean isLiked, boolean isWriter,
-            List<VoteItemDto> voteItems
-    ) {
-        return VoteDto.builder()
-                .postDate(postDate)
-                .page(vote.getPage())
-                .userId(vote.getCreatorId())
-                .nickName(user.getNickname())
-                .profileImageUrl(user.getAlias().getImageUrl())
-                .content(vote.getContent())
-                .likeCount(likeCount)
-                .commentCount(commentCount)
-                .isLiked(isLiked)
-                .isWriter(isWriter)
-                .voteId(vote.getId())
-                .voteItems(voteItems)
-                .build();
+    public VoteDto withIsLikedAndVoteItems(boolean isLiked, List<VoteItemDto> voteItems) {
+        return new VoteDto(
+                postDate,
+                page,
+                userId,
+                nickName,
+                profileImageUrl,
+                content,
+                likeCount,
+                commentCount,
+                isLiked,
+                isWriter,
+                voteId,
+                voteItems
+        );
     }
 
     public record VoteItemDto(

src/main/java/konkuk/thip/record/adapter/out/jpa/RecordJpaEntity.java

@@ -26,8 +26,8 @@ public class RecordJpaEntity extends PostJpaEntity {
     private RoomJpaEntity roomJpaEntity;
 
     @Builder
-    public RecordJpaEntity(String content, UserJpaEntity userJpaEntity, Integer page, boolean isOverview, RoomJpaEntity roomJpaEntity) {
-        super(content, userJpaEntity);
+    public RecordJpaEntity(String content, Integer likeCount, Integer commentCount, UserJpaEntity userJpaEntity, Integer page, boolean isOverview, RoomJpaEntity roomJpaEntity) {
+        super(content, likeCount, commentCount, userJpaEntity);
         this.page = page;
         this.isOverview = isOverview;
         this.roomJpaEntity = roomJpaEntity;

src/main/java/konkuk/thip/record/adapter/out/mapper/RecordMapper.java

@@ -12,6 +12,8 @@ public class RecordMapper {
     public RecordJpaEntity toJpaEntity(Record record, UserJpaEntity userJpaEntity, RoomJpaEntity roomJpaEntity) {
         return RecordJpaEntity.builder()
                 .content(record.getContent())
+                .likeCount(record.getLikeCount())
+                .commentCount(record.getCommentCount())
                 .userJpaEntity(userJpaEntity)
                 .page(record.getPage())
                 .isOverview(record.isOverview())
@@ -27,6 +29,8 @@ public Record toDomainEntity(RecordJpaEntity recordJpaEntity) {
                 .page(recordJpaEntity.getPage())
                 .isOverview(recordJpaEntity.isOverview())
                 .roomId(recordJpaEntity.getRoomJpaEntity().getRoomId())
+                .likeCount(recordJpaEntity.getLikeCount())
+                .commentCount(recordJpaEntity.getCommentCount())
                 .createdAt(recordJpaEntity.getCreatedAt())
                 .modifiedAt(recordJpaEntity.getModifiedAt())
                 .status(recordJpaEntity.getStatus())

src/main/java/konkuk/thip/record/adapter/out/persistence/RecordQueryPersistenceAdapter.java

@@ -1,39 +1,21 @@
 package konkuk.thip.record.adapter.out.persistence;
 
-import konkuk.thip.record.adapter.out.mapper.RecordMapper;
-import konkuk.thip.record.application.port.in.dto.RecordSearchResult;
+import konkuk.thip.record.adapter.in.web.response.RecordSearchResponse;
 import konkuk.thip.record.application.port.out.RecordQueryPort;
-import konkuk.thip.record.domain.Record;
-import konkuk.thip.vote.adapter.out.mapper.VoteMapper;
-import konkuk.thip.vote.adapter.out.persistence.VoteJpaRepository;
-import konkuk.thip.vote.domain.Vote;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
-
 @Repository
 @RequiredArgsConstructor
 public class RecordQueryPersistenceAdapter implements RecordQueryPort {
 
     private final RecordJpaRepository recordJpaRepository;
-    private final VoteJpaRepository voteJpaRepository;
-    private final RecordMapper recordMapper;
-    private final VoteMapper voteMapper;
-
-    private static final Integer PAGE_SIZE = 10;
 
     @Override
-    public RecordSearchResult findRecordsByRoom(Long roomId, String type, Integer pageStart, Integer pageEnd, Long userId, Integer pageNum) {
-        List<Record> records = recordJpaRepository.findRecordsByRoom(roomId, type, pageStart, pageEnd, userId).stream()
-                .map(recordMapper::toDomainEntity)
-                .toList();
-
-        List<Vote> votes = voteJpaRepository.findVotesByRoom(roomId, type, pageStart, pageEnd, userId).stream()
-                .map(voteMapper::toDomainEntity)
-                .toList();
-
-        return RecordSearchResult.of(records, votes);
+    public Page<RecordSearchResponse.RecordSearchResult> findRecordsByRoom(Long roomId, String type, Integer pageStart, Integer pageEnd, Boolean isOverview, Long userId, Pageable pageable) {
+        return recordJpaRepository.findRecordsByRoom(roomId, type, pageStart, pageEnd, isOverview, userId, pageable);
     }
 }