Skip to content

release: 0.0.9 #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hajin-Lee0406 merged 2 commits into from
Jun 15, 2025
Merged

release: 0.0.9 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c259af6
fix: 첫인상 없으면 나의책 안뜨는 오류
Jun 15, 2025
3d74fd9
Merge pull request #40 from ikdaman/feature/fix_error_mybook
Hajin-Lee0406 Jun 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/main/java/com/ikdaman/domain/mybook/repository/MyBookRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,20 +93,18 @@ Page<MyBook> searchMyBooksWithoutMemberId(
LEFT JOIN m.book b
LEFT JOIN m.bookLogs bl
WHERE
(bl.booklogType = 'IMPRESSION' OR bl.booklogType IS NULL)
AND m.isReading = true
m.isReading = true
AND m.status = 'ACTIVE'
""",
countQuery = """
SELECT COUNT(m) FROM MyBook m
LEFT JOIN m.book b
LEFT JOIN m.bookLogs bl
WHERE
(bl.booklogType = 'IMPRESSION' OR bl.booklogType IS NULL)
AND m.isReading = true
m.isReading = true
AND m.status = 'ACTIVE'
"""
)
List<MyBook> findByMemberIdAndIsReadingWithoutMemberId();
List<MyBook> findAllActiveReadingBooks();

}
10 changes: 8 additions & 2 deletions src/main/java/com/ikdaman/domain/mybook/service/MyBookServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public InProgressBooksRes searchInProgressBooks() {
//UUID memberId = request.getMemberId();
//UUID memberId = UUID.fromString("d290f1ee-6c54-4b01-90e6-d701748f0851");

List<MyBook> myBooks = myBookRepository.findByMemberIdAndIsReadingWithoutMemberId();
List<MyBook> myBooks = myBookRepository.findAllActiveReadingBooks();

List<InProgressBooksRes.BookDto> bookDtos = myBooks.stream()
.map(myBook -> {
Expand All @@ -209,13 +209,19 @@ public InProgressBooksRes searchInProgressBooks() {
.map(author -> author.getWriter().getWriterName())
.collect(Collectors.joining(", ")); // 여러 작가면 ,로 구분

String firstImpression = myBook.getBookLogs().stream()
.filter(bookLog -> bookLog.getBooklogType().equals("IMPRESSION"))
.findFirst()
.map(BookLog::getContent)
.orElse(null);

return InProgressBooksRes.BookDto.builder()
.mybookId(myBook.getMybookId())
.title(book.getTitle())
.author(authorNames)
.coverImage(book.getCoverImage())
.progress(String.format("%d", myBook.getNowPage() * 100 / book.getPage()))
.firstImpression(myBook.getBookLogs().isEmpty() ? null : myBook.getBookLogs().get(0).getContent())
.firstImpression(firstImpression)
.recentEdit(String.valueOf(myBook.getUpdatedAt()))
.build();
})
Expand Down