diff --git a/src/main/java/com/ikdaman/domain/mybook/repository/MyBookRepository.java b/src/main/java/com/ikdaman/domain/mybook/repository/MyBookRepository.java index 9b138e8..5ce310b 100644 --- a/src/main/java/com/ikdaman/domain/mybook/repository/MyBookRepository.java +++ b/src/main/java/com/ikdaman/domain/mybook/repository/MyBookRepository.java @@ -83,7 +83,7 @@ Page searchMyBooksWithoutMemberId( LEFT JOIN m.book b LEFT JOIN m.bookLogs bl WHERE m.memberId = :memberId - AND bl.booklogType = 'IMPRESSION' + AND (bl.booklogType = 'IMPRESSION' OR bl.booklogType IS NULL) AND m.isReading = true AND m.status = 'ACTIVE'""") List findByMemberIdAndIsReading(UUID memberId, boolean isReading); @@ -93,7 +93,7 @@ Page searchMyBooksWithoutMemberId( LEFT JOIN m.book b LEFT JOIN m.bookLogs bl WHERE - bl.booklogType = 'IMPRESSION' + (bl.booklogType = 'IMPRESSION' OR bl.booklogType IS NULL) AND m.isReading = true AND m.status = 'ACTIVE' """, @@ -102,7 +102,7 @@ SELECT COUNT(m) FROM MyBook m LEFT JOIN m.book b LEFT JOIN m.bookLogs bl WHERE - bl.booklogType = 'IMPRESSION' + (bl.booklogType = 'IMPRESSION' OR bl.booklogType IS NULL) AND m.isReading = true AND m.status = 'ACTIVE' """ diff --git a/src/main/java/com/ikdaman/domain/mybook/service/MyBookServiceImpl.java b/src/main/java/com/ikdaman/domain/mybook/service/MyBookServiceImpl.java index 91b66a4..0e39044 100644 --- a/src/main/java/com/ikdaman/domain/mybook/service/MyBookServiceImpl.java +++ b/src/main/java/com/ikdaman/domain/mybook/service/MyBookServiceImpl.java @@ -213,7 +213,7 @@ public InProgressBooksRes searchInProgressBooks() { .title(book.getTitle()) .author(authorNames) .coverImage(book.getCoverImage()) - .progress(String.format("%.2f", (double) myBook.getNowPage() / book.getPage() * 100) + "%") + .progress(String.format("%d", myBook.getNowPage() * 100 / book.getPage())) .firstImpression(myBook.getBookLogs().isEmpty() ? null : myBook.getBookLogs().get(0).getContent()) .recentEdit(String.valueOf(myBook.getUpdatedAt())) .build();