fix: potential incorrect read progress for series

tahngarth · Aug 27, 2020 · 7b90244 · 7b90244
1 parent dfa6ad0
commit 7b90244
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesDtoDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesDtoDao.kt
@@ -104,21 +104,19 @@ class SeriesDtoDao(
       .from(s)
       .leftJoin(b).on(s.ID.eq(b.SERIES_ID))
       .leftJoin(d).on(s.ID.eq(d.SERIES_ID))
-      .leftJoin(r).on(b.ID.eq(r.BOOK_ID))
+      .leftJoin(r).on(b.ID.eq(r.BOOK_ID)).and(readProgressCondition(userId))
       .leftJoin(g).on(s.ID.eq(g.SERIES_ID))
       .leftJoin(st).on(s.ID.eq(st.SERIES_ID))
-      .and(readProgressCondition(userId))
       .leftJoin(cs).on(s.ID.eq(cs.SERIES_ID))
 
   private fun findAll(conditions: Condition, having: Condition, userId: String, pageable: Pageable, selectCollectionNumber: Boolean = false): Page<SeriesDto> {
     val count = dsl.selectDistinct(s.ID)
       .from(s)
       .leftJoin(b).on(s.ID.eq(b.SERIES_ID))
       .leftJoin(d).on(s.ID.eq(d.SERIES_ID))
-      .leftJoin(r).on(b.ID.eq(r.BOOK_ID))
+      .leftJoin(r).on(b.ID.eq(r.BOOK_ID)).and(readProgressCondition(userId))
       .leftJoin(g).on(s.ID.eq(g.SERIES_ID))
       .leftJoin(st).on(s.ID.eq(st.SERIES_ID))
-      .and(readProgressCondition(userId))
       .leftJoin(cs).on(s.ID.eq(cs.SERIES_ID))
       .where(conditions)
       .groupBy(s.ID)
@@ -159,8 +157,7 @@ class SeriesDtoDao(
           .select(countRead.`as`(BOOKS_READ_COUNT))
           .select(countInProgress.`as`(BOOKS_IN_PROGRESS_COUNT))
           .from(b)
-          .leftJoin(r).on(b.ID.eq(r.BOOK_ID))
-          .and(readProgressCondition(userId))
+          .leftJoin(r).on(b.ID.eq(r.BOOK_ID)).and(readProgressCondition(userId))
           .where(b.SERIES_ID.eq(sr.id))
           .fetch()
           .first()