[feat] 저장한 책 또는 참여 중 모임의 책 조회 api 구현 및 패키지 정리

.github/workflows/ci-workflow.yml

@@ -8,6 +8,8 @@ on:
 
 permissions:
   contents: read
+  checks: write
+  pull-requests: write
 
 env:
   RESOURCE_PATH: src/main/resources
@@ -19,13 +21,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-#      - name: Cache Gradle packages
-#        uses: actions/cache@v3
-#        with:
-#          path: ~/.gradle/caches
-#          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-#          restore-keys: gradle-${{ runner.os }}-
-
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
@@ -50,4 +45,17 @@ jobs:
           redis-version: 7
 
       - name: 🐘 build with Gradle
-        run: ./gradlew build
+        run: ./gradlew build --parallel --stacktrace
+
+      - name: ✉️ Post test results as a comment on the PR
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        if: always()
+        with:
+          files: '**/build/test-results/test/TEST-*.xml'
+
+      - name: 🙁 Annotate failed test cases on changed lines
+        uses: mikepenz/action-junit-report@v3
+        if: always()
+        with:
+          report_paths: '**/build/test-results/test/TEST-*.xml'
+          token: ${{ github.token }}

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

@@ -4,13 +4,12 @@
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.constraints.Pattern;
-import konkuk.thip.book.adapter.in.web.response.BookDetailSearchResponse;
-import konkuk.thip.book.adapter.in.web.response.BookMostSearchResponse;
-import konkuk.thip.book.adapter.in.web.response.BookRecruitingRoomsResponse;
-import konkuk.thip.book.adapter.in.web.response.BookSearchListResponse;
+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.dto.BookSelectableType;
 import konkuk.thip.common.dto.BaseResponse;
 import konkuk.thip.common.security.annotation.UserId;
 import konkuk.thip.common.swagger.annotation.ExceptionDescription;
@@ -32,6 +31,7 @@ public class BookQueryController {
     private final BookSearchUseCase bookSearchUseCase;
     private final BookMostSearchUseCase bookMostSearchUseCase;
     private final BookRecruitingRoomsUseCase bookRecruitingRoomsUseCase;
+    private final BookSelectableListUseCase bookSelectableListUseCase;
 
     @Operation(
             summary = "책 검색결과 조회",
@@ -87,4 +87,19 @@ public BaseResponse<BookRecruitingRoomsResponse> showRecruitingRoomsWithBook(
         return BaseResponse.ok(bookRecruitingRoomsUseCase.getRecruitingRoomsWithBook(isbn, cursor));
     }
 
+    @Operation(
+            summary = "저장한 책 또는 참여 중 모임의 책 조회",
+            description = "저장한 책 또는 참여 중인 모임의 책을 조회합니다. (방 생성시 책 선택 화면 페이지)"
+    )
+    @ExceptionDescription(BOOK_SELECTABLE_LIST)
+    @GetMapping("/books/selectable-list")
+    public BaseResponse<BookSelectableListResponse> showSelectableBookList(
+            @Parameter(description = "저장한 책 또는 참여 중인 모임의 책을 구분하는 필드 (SAVED : 저장한 책 / JOINING : 모임 방의 책)", example = "SAVED") @RequestParam final String type,
+            @Parameter(hidden = true) @UserId final Long userId
+    ) {
+        return BaseResponse.ok(
+                BookSelectableListResponse.of(bookSelectableListUseCase.getSelectableBookList(BookSelectableType.from(type), userId))
+        );
+    }
+
 }

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

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

src/main/java/konkuk/thip/saved/adapter/out/jpa/SavedBookJpaEntity.java → src/main/java/konkuk/thip/book/adapter/out/jpa/SavedBookJpaEntity.java

@@ -1,7 +1,6 @@
-package konkuk.thip.saved.adapter.out.jpa;
+package konkuk.thip.book.adapter.out.jpa;
 
 import jakarta.persistence.*;
-import konkuk.thip.book.adapter.out.jpa.BookJpaEntity;
 import konkuk.thip.common.entity.BaseJpaEntity;
 import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
 import lombok.*;

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

@@ -7,20 +7,25 @@
 import konkuk.thip.book.domain.Book;
 import konkuk.thip.common.exception.EntityNotFoundException;
 import konkuk.thip.room.adapter.out.persistence.repository.RoomJpaRepository;
+import konkuk.thip.book.adapter.out.jpa.SavedBookJpaEntity;
+import konkuk.thip.book.adapter.out.persistence.repository.SavedBookJpaRepository;
+import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
+import konkuk.thip.user.adapter.out.persistence.repository.UserJpaRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
 
-import static konkuk.thip.common.exception.code.ErrorCode.BOOK_NOT_FOUND;
-import static konkuk.thip.common.exception.code.ErrorCode.ROOM_NOT_FOUND;
+import static konkuk.thip.common.exception.code.ErrorCode.*;
 
 @Repository
 @RequiredArgsConstructor
 public class BookCommandPersistenceAdapter implements BookCommandPort {
 
+    private final UserJpaRepository userJpaRepository;
     private final RoomJpaRepository roomJpaRepository;
     private final BookJpaRepository bookJpaRepository;
+    private final SavedBookJpaRepository savedBookJpaRepository;
     private final BookMapper bookMapper;
 
     @Override
@@ -61,4 +66,24 @@ public Book findBookByRoomId(Long roomId) {
         ).getBookJpaEntity();
         return bookMapper.toDomainEntity(bookJpaEntity);
     }
+
+    // 사용자가 책을 저장
+    @Override
+    public void saveSavedBook(Long userId, Long bookId) {
+        UserJpaEntity user = userJpaRepository.findById(userId)
+                .orElseThrow(() -> new EntityNotFoundException(USER_NOT_FOUND));
+        BookJpaEntity book = bookJpaRepository.findById(bookId)
+                .orElseThrow(() -> new EntityNotFoundException(BOOK_NOT_FOUND));
+        SavedBookJpaEntity entity = SavedBookJpaEntity.builder()
+                .userJpaEntity(user)
+                .bookJpaEntity(book)
+                .build();
+        savedBookJpaRepository.save(entity);
+    }
+
+    // 사용자가 저장한 책을 삭제
+    @Override
+    public void deleteSavedBook(Long userId, Long bookId) {
+        savedBookJpaRepository.deleteByUserIdAndBookId(userId, bookId);
+    }
 }

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

@@ -2,15 +2,52 @@
 
 import konkuk.thip.book.adapter.out.mapper.BookMapper;
 import konkuk.thip.book.adapter.out.persistence.repository.BookJpaRepository;
+import konkuk.thip.book.adapter.out.persistence.repository.SavedBookJpaRepository;
 import konkuk.thip.book.application.port.out.BookQueryPort;
+import konkuk.thip.book.domain.Book;
+import konkuk.thip.common.exception.EntityNotFoundException;
+import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
+import konkuk.thip.user.adapter.out.persistence.repository.UserJpaRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static konkuk.thip.common.exception.code.ErrorCode.USER_NOT_FOUND;
+
 @Repository
 @RequiredArgsConstructor
 public class BookQueryPersistenceAdapter implements BookQueryPort {
 
+    private final UserJpaRepository userJpaRepository;
     private final BookJpaRepository bookJpaRepository;
+    private final SavedBookJpaRepository savedBookJpaRepository;
     private final BookMapper bookMapper;
 
+    @Override
+    public boolean existsSavedBookByUserIdAndBookId(Long userId, Long bookId) {
+        return savedBookJpaRepository.existsByUserIdAndBookId(userId, bookId);
+    }
+
+    @Override
+    public List<Book> findSavedBooksByUserId(Long userId) {
+        UserJpaEntity user = userJpaRepository.findById(userId)
+                .orElseThrow(() -> new EntityNotFoundException(USER_NOT_FOUND));
+
+        return bookJpaRepository.findSavedBooksByUserId(user.getUserId()).stream()
+                .map(bookMapper::toDomainEntity)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<Book> findJoiningRoomsBooksByUserId(Long userId) {
+        UserJpaEntity user = userJpaRepository.findById(userId)
+                .orElseThrow(() -> new EntityNotFoundException(USER_NOT_FOUND));
+
+        return bookJpaRepository.findJoiningRoomsBooksByUserId(user.getUserId())
+                .stream()
+                .map(bookMapper::toDomainEntity)
+                .collect(Collectors.toList());
+    }
 }

src/main/java/konkuk/thip/book/adapter/out/persistence/repository/BookJpaRepository.java

@@ -2,11 +2,26 @@
 
 import konkuk.thip.book.adapter.out.jpa.BookJpaEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 import java.util.Optional;
 
 public interface BookJpaRepository extends JpaRepository<BookJpaEntity, Long> {
     Optional<BookJpaEntity> findByIsbn(String isbn);
-    List<BookJpaEntity> findByIsbnIn(List<String> isbnList);
+
+    @Query("SELECT DISTINCT b FROM BookJpaEntity b " +
+            "JOIN SavedBookJpaEntity s ON s.bookJpaEntity.bookId = b.bookId " +
+            "WHERE s.userJpaEntity.userId = :userId " +
+            "ORDER BY s.createdAt DESC")
+    List<BookJpaEntity> findSavedBooksByUserId(Long userId);
+
+    @Query("SELECT DISTINCT b FROM BookJpaEntity b " +
+            "JOIN RoomJpaEntity r ON r.bookJpaEntity.bookId = b.bookId " +
+            "JOIN RoomParticipantJpaEntity rp ON rp.roomJpaEntity.roomId = r.roomId " +
+            "WHERE rp.userJpaEntity.userId = :userId " +
+            "AND r.status = 'ACTIVE' " +
+            "AND r.startDate <= CURRENT_TIMESTAMP " + // 진행 중인 방만 조회 (모집 중 / 만료된 방 x)
+            "ORDER BY r.roomPercentage DESC")  // 방의 진행률이 높은 순서로 정렬
+    List<BookJpaEntity> findJoiningRoomsBooksByUserId(Long userId);
 }

src/main/java/konkuk/thip/book/adapter/out/persistence/repository/SavedBookJpaRepository.java

@@ -0,0 +1,16 @@
+package konkuk.thip.book.adapter.out.persistence.repository;
+
+import konkuk.thip.book.adapter.out.jpa.SavedBookJpaEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+public interface SavedBookJpaRepository extends JpaRepository<SavedBookJpaEntity, Long> {
+    @Query("SELECT CASE WHEN COUNT(s) > 0 THEN true ELSE false END FROM SavedBookJpaEntity s " +
+           "WHERE s.userJpaEntity.userId = :userId AND s.bookJpaEntity.bookId = :bookId")
+    boolean existsByUserIdAndBookId(Long userId, Long bookId);
+
+    @Modifying
+    @Query("DELETE FROM SavedBookJpaEntity s WHERE s.userJpaEntity.userId = :userId AND s.bookJpaEntity.bookId = :bookId")
+    void deleteByUserIdAndBookId(Long userId, Long bookId);
+}

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

@@ -1,6 +1,8 @@
 package konkuk.thip.book.application.mapper;
 
 import konkuk.thip.book.adapter.in.web.response.BookRecruitingRoomsResponse;
+import konkuk.thip.book.application.port.in.dto.BookSelectableResult;
+import konkuk.thip.book.domain.Book;
 import konkuk.thip.common.util.DateUtil;
 import konkuk.thip.room.application.port.out.dto.RoomQueryDto;
 import org.mapstruct.Mapper;
@@ -23,4 +25,14 @@ public interface BookQueryMapper {
     BookRecruitingRoomsResponse.RecruitingRoomDto toRecruitingRoomDto(RoomQueryDto dto);
 
     List<BookRecruitingRoomsResponse.RecruitingRoomDto> toRecruitingRoomDtoList(List<RoomQueryDto> roomDtos);
+
+    @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")
+    BookSelectableResult toBookSelectableResult(Book book);
+
+    List<BookSelectableResult> toBookSelectableResultList(List<Book> books);
 }

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

@@ -0,0 +1,10 @@
+package konkuk.thip.book.application.port.in;
+
+import konkuk.thip.book.application.port.in.dto.BookSelectableResult;
+import konkuk.thip.book.application.port.in.dto.BookSelectableType;
+
+import java.util.List;
+
+public interface BookSelectableListUseCase {
+    List<BookSelectableResult> getSelectableBookList(BookSelectableType bookSelectableType, Long userId);
+}

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

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

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

@@ -0,0 +1,27 @@
+package konkuk.thip.book.application.port.in.dto;
+
+import konkuk.thip.common.exception.InvalidStateException;
+import konkuk.thip.common.exception.code.ErrorCode;
+import lombok.Getter;
+
+@Getter
+public enum BookSelectableType {
+    SAVED("SAVED"),  // 저장된 책
+    JOINING("JOINING") // 참여 중인 모임 방의 책
+    ;
+
+    private final String type;
+
+    BookSelectableType(String type) {
+        this.type = type;
+    }
+
+    public static BookSelectableType from(String type) {
+        for (BookSelectableType bookSelectableType : BookSelectableType.values()) {
+            if (bookSelectableType.type.equals(type)) {
+                return bookSelectableType;
+            }
+        }
+        throw new InvalidStateException(ErrorCode.API_INVALID_PARAM, new IllegalArgumentException("타입은 SAVED 또는 JOINING이어야 합니다. 현재 타입: " + type));
+    }
+}

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

@@ -23,4 +23,8 @@ default Book getByIsbnOrThrow(String isbn){
     void updateForPageCount(Book book);
 
     Book findBookByRoomId(Long roomId);
+
+    void saveSavedBook(Long userId, Long bookId);
+    void deleteSavedBook(Long userId, Long bookId);
+
 }

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

@@ -1,4 +1,14 @@
 package konkuk.thip.book.application.port.out;
 
+import konkuk.thip.book.domain.Book;
+
+import java.util.List;
+
 public interface BookQueryPort {
+
+    boolean existsSavedBookByUserIdAndBookId(Long userId, Long bookId);
+
+    List<Book> findSavedBooksByUserId(Long userId);
+
+    List<Book> findJoiningRoomsBooksByUserId(Long userId);
 }