🐛 기록 조회 조건 에러 해결

- 책장 조회시 status 기준 추가
- 마이페이지 통계시 총읽은책에 status 기준 추가
- 기본서재명 오타 수정

Author: cheshireHYUN

src/main/java/com/boggle_boggle/bbegok/enums/LibraryByStatus.java

@@ -7,7 +7,7 @@
 @RequiredArgsConstructor
 public enum LibraryByStatus {
     reading("읽는 중인 책"),
-    pending("읽고 있는 책"),
+    pending("읽고 싶은 책"),
     completed("다 읽은 책"),
     all("전체보기");
 

src/main/java/com/boggle_boggle/bbegok/repository/ReadingRecordRepository.java

@@ -22,6 +22,17 @@ public interface ReadingRecordRepository extends JpaRepository<ReadingRecord, Lo
 
     Optional<ReadingRecord> findByreadingRecordSeqAndUserOrderByReadingRecordSeq(Long id, User user);
 
+    @Query(value = """
+    SELECT COUNT(DISTINCT r)
+    FROM ReadingRecord r
+    JOIN r.readDateList rd
+    WHERE r.user = :user
+      AND rd.status = :status
+    """)
+    int findTotalyReadingCnt(
+            @Param("user") User user,
+            @Param("status") ReadStatus status
+    );
 
     @Query(value = """
     SELECT COUNT(DISTINCT r)
@@ -46,11 +57,14 @@ int findMonthlyReadingCnt(
     AND r.isBooksVisible = true
     AND (:year IS NULL OR EXTRACT(YEAR FROM rd.endReadDate) = :year)
     AND (:month IS NULL OR EXTRACT(MONTH FROM rd.endReadDate) = :month)
+    AND rd.status = :status
     """)
     List<ReadingRecord> findBooksByUserAndReadDate(
             @Param("user") User user,
             @Param("year") Integer year,
-            @Param("month") Integer month
+            @Param("month") Integer month,
+            @Param("status") ReadStatus status
+
     );
 
 

src/main/java/com/boggle_boggle/bbegok/service/LibraryService.java

@@ -136,7 +136,7 @@ public LibraryBookListResponse findAll(int pageNum, String userId, int pageSize,
 
     public BookShelfResponse findBookshelfByEndDate(Integer year, Integer month, String userId) {
         User user = getUser(userId);
-        List<ReadingRecord> booksPage = readingRecordRepository.findBooksByUserAndReadDate(user, year, month);
+        List<ReadingRecord> booksPage = readingRecordRepository.findBooksByUserAndReadDate(user, year, month, ReadStatus.completed);
         return BookShelfResponse.fromPage(booksPage);
     }
 }

src/main/java/com/boggle_boggle/bbegok/service/MyPageService.java

@@ -36,7 +36,7 @@ public User getUser(String userId) {
     public MyPageResponse getMyPage(String userId) {
         User user = getUser(userId);
         //총 읽은 권수 - ReadingRecord 갯수
-        int totalReadingCnt = readingRecordRepository.findByUser(user).size();
+        int totalReadingCnt = readingRecordRepository.findTotalyReadingCnt(user, ReadStatus.completed);
         //이번달 읽은 권수 - 이번달에 다 읽은 ReadingRecord 갯수(상태 상관없이 둘다?)
         int monthlyReadingCnt = readingRecordRepository.findMonthlyReadingCnt(user, ReadStatus.completed);
         //작성한 독서노트 - 작성한 모든 독서노트 갯수