[Feat] 저장한 책,피드 조회 api 개발

.github/workflows/cd-workflow-prod.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - 'main'
-      - 'develop'
 
 permissions:
   contents: read

src/main/java/konkuk/thip/book/adapter/in/web/BookQueryController.java

@@ -5,10 +5,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.constraints.Pattern;
 import konkuk.thip.book.adapter.in.web.response.*;
-import konkuk.thip.book.application.port.in.BookMostSearchUseCase;
-import konkuk.thip.book.application.port.in.BookRecruitingRoomsUseCase;
-import konkuk.thip.book.application.port.in.BookSearchUseCase;
-import konkuk.thip.book.application.port.in.BookSelectableListUseCase;
+import konkuk.thip.book.application.port.in.*;
 import konkuk.thip.book.application.port.in.dto.BookSelectableType;
 import konkuk.thip.common.dto.BaseResponse;
 import konkuk.thip.common.security.annotation.UserId;
@@ -32,6 +29,7 @@ public class BookQueryController {
     private final BookMostSearchUseCase bookMostSearchUseCase;
     private final BookRecruitingRoomsUseCase bookRecruitingRoomsUseCase;
     private final BookSelectableListUseCase bookSelectableListUseCase;
+    private final BookShowSavedListUseCase bookShowSavedListUseCase;
 
     @Operation(
             summary = "책 검색결과 조회",
@@ -103,4 +101,13 @@ public BaseResponse<BookSelectableListResponse> showSelectableBookList(
         );
     }
 
+    @Operation(
+            summary = "저장한 책 조회",
+            description = "사용자가 저장한 책을 조회 합니다."
+    )
+    @GetMapping("/books/saved")
+    public BaseResponse<BookShowSavedListResponse> showSavedBookList(@Parameter(hidden = true) @UserId final Long userId) {
+        return BaseResponse.ok(BookShowSavedListResponse.of(bookShowSavedListUseCase.getSavedBookList(userId)));
+    }
+
 }

src/main/java/konkuk/thip/book/adapter/in/web/response/BookShowSavedListResponse.java

@@ -0,0 +1,13 @@
+package konkuk.thip.book.adapter.in.web.response;
+
+import konkuk.thip.book.application.port.in.dto.BookShowSavedInfoResult;
+
+import java.util.List;
+
+public record BookShowSavedListResponse(
+        List<BookShowSavedInfoResult> bookList
+) {
+    public static BookShowSavedListResponse of(List<BookShowSavedInfoResult> bookSavedInfoResultList) {
+        return new BookShowSavedListResponse(bookSavedInfoResultList);
+    }
+}

src/main/java/konkuk/thip/book/application/mapper/BookQueryMapper.java

@@ -2,6 +2,7 @@
 
 import konkuk.thip.book.adapter.in.web.response.BookRecruitingRoomsResponse;
 import konkuk.thip.book.application.port.in.dto.BookSelectableResult;
+import konkuk.thip.book.application.port.in.dto.BookShowSavedInfoResult;
 import konkuk.thip.book.domain.Book;
 import konkuk.thip.common.util.DateUtil;
 import konkuk.thip.room.application.port.out.dto.RoomQueryDto;
@@ -35,4 +36,16 @@ public interface BookQueryMapper {
     BookSelectableResult toBookSelectableResult(Book book);
 
     List<BookSelectableResult> toBookSelectableResultList(List<Book> books);
+
+
+    @Mapping(target = "bookId", source = "book.id")
+    @Mapping(target = "bookTitle", source = "book.title")
+    @Mapping(target = "authorName", source = "book.authorName")
+    @Mapping(target = "publisher", source = "book.publisher")
+    @Mapping(target = "bookImageUrl", source = "book.imageUrl")
+    @Mapping(target = "isbn", source = "book.isbn")
+    @Mapping(target = "isSaved", constant = "true")
+    BookShowSavedInfoResult toBookShowSavedInfoResult(Book book);
+
+    List<BookShowSavedInfoResult> toBookShowSavedInfoResultList(List<Book> savedBookList);
 }

src/main/java/konkuk/thip/book/application/port/in/BookShowSavedListUseCase.java

@@ -0,0 +1,9 @@
+package konkuk.thip.book.application.port.in;
+
+import konkuk.thip.book.application.port.in.dto.BookShowSavedInfoResult;
+
+import java.util.List;
+
+public interface BookShowSavedListUseCase {
+    List<BookShowSavedInfoResult> getSavedBookList(Long userId);
+}

src/main/java/konkuk/thip/book/application/port/in/dto/BookShowSavedInfoResult.java

@@ -0,0 +1,12 @@
+package konkuk.thip.book.application.port.in.dto;
+
+public record BookShowSavedInfoResult(
+        Long bookId,
+        String bookTitle,
+        String authorName,
+        String publisher,
+        String bookImageUrl,
+        String isbn,
+        boolean isSaved
+) {
+}

src/main/java/konkuk/thip/book/application/service/BookSavedListService.java

@@ -0,0 +1,27 @@
+package konkuk.thip.book.application.service;
+
+import konkuk.thip.book.application.mapper.BookQueryMapper;
+import konkuk.thip.book.application.port.in.BookShowSavedListUseCase;
+import konkuk.thip.book.application.port.in.dto.BookShowSavedInfoResult;
+import konkuk.thip.book.application.port.out.BookQueryPort;
+import konkuk.thip.book.domain.Book;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class BookSavedListService implements BookShowSavedListUseCase {
+
+    private final BookQueryPort bookQueryPort;
+    private final BookQueryMapper bookQueryMapper;
+
+    @Override
+    @Transactional(readOnly = true)
+    public List<BookShowSavedInfoResult> getSavedBookList(Long userId) {
+        List<Book> savedBookList = bookQueryPort.findSavedBooksByUserId(userId);
+        return bookQueryMapper.toBookShowSavedInfoResultList(savedBookList);
+    }
+}

src/main/java/konkuk/thip/feed/adapter/in/web/FeedQueryController.java

@@ -31,6 +31,7 @@ public class FeedQueryController {
     private final FeedShowSingleUseCase feedShowSingleUseCase;
     private final FeedShowWriteInfoUseCase feedShowWriteInfoUseCase;
     private final FeedRelatedWithBookUseCase feedRelatedWithBookUseCase;
+    private final FeedSavedListUseCase feedSavedListUseCase;
 
     @Operation(
             summary = "피드 전체 조회",
@@ -134,4 +135,18 @@ public BaseResponse<FeedRelatedWithBookResponse> showFeedsByBook(
                 .build())
         );
     }
+
+    @Operation(
+            summary = "저장한 피드 조회",
+            description = "사용자가 저장한 피드를 조회합니다."
+    )
+    @GetMapping("/feeds/saved")
+    public BaseResponse<FeedShowSavedListResponse> showSavedFeedList(
+            @Parameter(description = "커서 (첫번째 요청시 : null, 다음 요청시 : 이전 요청에서 반환받은 nextCursor 값)")
+            @RequestParam(required = false) final String cursor,
+            @Parameter(hidden = true) @UserId final Long userId
+    ) {
+        return BaseResponse.ok(feedSavedListUseCase.getSavedFeedList(userId,cursor));
+    }
+
 }

src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedShowSavedListResponse.java

@@ -0,0 +1,29 @@
+package konkuk.thip.feed.adapter.in.web.response;
+
+import java.util.List;
+
+public record FeedShowSavedListResponse(
+        List<FeedShowSavedInfoDto> feedList,
+        String nextCursor,
+        boolean isLast
+) {
+    public record FeedShowSavedInfoDto(
+            Long feedId,
+            Long creatorId,
+            String creatorNickname,
+            String creatorProfileImageUrl,
+            String aliasName,
+            String aliasColor,
+            String postDate,
+            String isbn,
+            String bookTitle,
+            String bookAuthor,
+            String contentBody,
+            String[] contentUrls,
+            int likeCount,
+            int commentCount,
+            boolean isSaved,
+            boolean isLiked,
+            boolean isWriter
+    ) { }
+}

src/main/java/konkuk/thip/feed/adapter/out/persistence/FeedQueryPersistenceAdapter.java

@@ -109,6 +109,19 @@ public boolean existsSavedFeedByUserIdAndFeedId(Long userId, Long feedId) {
         return savedFeedJpaRepository.existsByUserIdAndFeedId(userId, feedId);
     }
 
+    @Override
+    public CursorBasedList<FeedQueryDto> findSavedFeedsByCreatedAt(Long userId, Cursor cursor) {
+        LocalDateTime lastCreatedAt = cursor.isFirstRequest() ? null : cursor.getLocalDateTime(0);
+        int size = cursor.getPageSize();
+
+        List<FeedQueryDto> feedQueryDtos = feedJpaRepository.findSavedFeedsByCreatedAt(userId, lastCreatedAt, size);
+
+        return CursorBasedList.of(feedQueryDtos, size, feedQueryDto -> {
+            Cursor nextCursor = new Cursor(List.of(feedQueryDto.savedCreatedAt().toString()));
+            return nextCursor.toEncodedString();
+        });
+    }
+
     @Override
     public List<TagCategoryQueryDto> findAllTags() {
         return feedJpaRepository.findAllTags();

src/main/java/konkuk/thip/feed/adapter/out/persistence/repository/FeedQueryRepository.java

@@ -25,4 +25,6 @@ public interface FeedQueryRepository {
     List<FeedQueryDto> findFeedsByBookIsbnOrderByCreatedAt(String isbn, Long userId, LocalDateTime lastCreatedAt, int size);
 
     List<Long> findLatestPublicFeedCreatorsIn(Set<Long> userIds, int size);
+
+    List<FeedQueryDto> findSavedFeedsByCreatedAt(Long userId, LocalDateTime lastCreatedAt, int size);
 }

src/main/java/konkuk/thip/feed/adapter/out/persistence/repository/FeedQueryRepositoryImpl.java

@@ -38,6 +38,7 @@ public class FeedQueryRepositoryImpl implements FeedQueryRepository {
     private final QAliasJpaEntity alias = QAliasJpaEntity.aliasJpaEntity;
     private final QBookJpaEntity book = QBookJpaEntity.bookJpaEntity;
     private final QFollowingJpaEntity following = QFollowingJpaEntity.followingJpaEntity;
+    private final QSavedFeedJpaEntity savedFeed = QSavedFeedJpaEntity.savedFeedJpaEntity;
 
     @Override
     public Set<Long> findUserIdsByBookId(Long bookId) {
@@ -364,6 +365,7 @@ private QFeedQueryDto toQueryDto() {
                 feed.likeCount,
                 feed.commentCount,
                 feed.isPublic,
+                Expressions.nullExpression(),
                 Expressions.nullExpression()
         );
     }
@@ -399,4 +401,58 @@ public List<Long> findLatestPublicFeedCreatorsIn(Set<Long> userIds, int size) {
                 .limit(size)
                 .fetch();
     }
+
+    @Override
+    public List<FeedQueryDto> findSavedFeedsByCreatedAt(Long userId, LocalDateTime lastSavedAt, int size) {
+
+        BooleanExpression where = savedFeed.userJpaEntity.userId.eq(userId)
+                .and(savedFeed.feedJpaEntity.status.eq(StatusType.ACTIVE))
+                .and(
+                        savedFeed.feedJpaEntity.userJpaEntity.userId.eq(userId)
+                                .or(savedFeed.feedJpaEntity.isPublic.eq(true))
+                );
+
+        if (lastSavedAt != null) {
+            where = where.and(savedFeed.createdAt.lt(lastSavedAt));
+        }
+
+        return jpaQueryFactory
+                .select(toSavedFeedQueryDto())
+                .from(savedFeed)
+                .join(savedFeed.feedJpaEntity, feed)
+                .join(feed.userJpaEntity, user)
+                .join(feed.bookJpaEntity, book)
+                .where(where)
+                .orderBy(savedFeed.createdAt.desc())
+                .limit(size + 1)
+                .fetch();
+    }
+
+    /**
+     * SavedFeed 전용 DTO 매핑
+     */
+    private QFeedQueryDto toSavedFeedQueryDto() {
+        return new QFeedQueryDto(
+                feed.postId,
+                feed.userJpaEntity.userId,
+                user.nickname,
+                user.aliasForUserJpaEntity.imageUrl,
+                user.aliasForUserJpaEntity.value,
+                feed.createdAt,
+                book.isbn,
+                book.title,
+                book.authorName,
+                feed.content,
+                // Content는 N:1 방지 위해 서브쿼리 사용
+                JPAExpressions
+                        .select(contentUrlAggExpr())
+                        .from(content)
+                        .where(content.postJpaEntity.postId.eq(feed.postId)),
+                feed.likeCount,
+                feed.commentCount,
+                feed.isPublic,
+                Expressions.nullExpression(),
+                savedFeed.createdAt
+        );
+    }
 }

src/main/java/konkuk/thip/feed/application/mapper/FeedQueryMapper.java

@@ -174,4 +174,14 @@ default List<FeedRelatedWithBookResponse.FeedRelatedWithBookDto> toFeedRelatedWi
                 .collect(Collectors.toList());
     }
 
-}
+    @Mapping(target = "aliasName", source = "dto.alias")
+    @Mapping(target = "aliasColor", expression = "java(Alias.from(dto.alias()).getColor())")
+    @Mapping(target = "isSaved",  constant = "true")
+    @Mapping(target = "isLiked", expression = "java(likedFeedIds.contains(dto.feedId()))")
+    @Mapping(
+            target = "postDate",
+            expression = "java(DateUtil.formatBeforeTime(dto.createdAt()))"
+    )
+    @Mapping(target = "isWriter", source = "dto.creatorId", qualifiedByName = "isWriter")
+    FeedShowSavedListResponse.FeedShowSavedInfoDto toFeedShowSavedListResponse(FeedQueryDto dto, Set<Long> likedFeedIds, @Context Long userId);
+}

src/main/java/konkuk/thip/feed/application/port/in/FeedSavedListUseCase.java

@@ -0,0 +1,7 @@
+package konkuk.thip.feed.application.port.in;
+
+import konkuk.thip.feed.adapter.in.web.response.FeedShowSavedListResponse;
+
+public interface FeedSavedListUseCase {
+    FeedShowSavedListResponse getSavedFeedList(Long userId, String cursor);
+}

src/main/java/konkuk/thip/feed/application/port/out/FeedQueryPort.java

@@ -37,8 +37,8 @@ public interface FeedQueryPort {
      */
 
     Set<Long> findSavedFeedIdsByUserIdAndFeedIds(Set<Long> feedIds, Long userId);
-
      boolean existsSavedFeedByUserIdAndFeedId(Long userId, Long feedId);
+    CursorBasedList<FeedQueryDto> findSavedFeedsByCreatedAt(Long userId, Cursor cursor);
 
     /**
      * 특정 책으로 작성된 피드 조회

src/main/java/konkuk/thip/feed/application/port/out/dto/FeedQueryDto.java

@@ -22,7 +22,8 @@ public record FeedQueryDto(
         Integer likeCount,
         Integer commentCount,
         boolean isPublic,
-        @Nullable Boolean isPriorityFeed
+        @Nullable Boolean isPriorityFeed,
+        @Nullable LocalDateTime savedCreatedAt
 ) {
     @QueryProjection
     public FeedQueryDto(
@@ -40,7 +41,8 @@ public FeedQueryDto(
             Integer likeCount,
             Integer commentCount,
             Boolean isPublic,
-            @Nullable Boolean isPriorityFeed
+            @Nullable Boolean isPriorityFeed,
+            @Nullable LocalDateTime savedCreatedAt
     ) {
         this(
                 feedId,
@@ -57,7 +59,8 @@ public FeedQueryDto(
                 likeCount == null ? 0 : likeCount,
                 commentCount == null ? 0 : commentCount,
                 isPublic,
-                isPriorityFeed
+                isPriorityFeed,
+                savedCreatedAt
         );
     }