Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2026-02-15 20:02:40 +01:00
Code Issues Projects Releases Wiki Activity

fix(api): incorrect number of books per series

Browse source 
an incorrect number of books could be returned for a series in multiple collections
This commit is contained in:
Gauthier Roebroeck 2020-06-26 17:21:42 +08:00
parent 8f2c4534c8
commit bf2d0ba1fa
1 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesDtoDao.kt
View file

@ -80,14 +80,14 @@ class SeriesDtoDao(
selectBase(userId) selectBase(userId)
.where(s.ID.eq(seriesId)) .where(s.ID.eq(seriesId))
.groupBy(*groupFields) .groupBy(*groupFields)
.fetchAndMap() .fetchAndMap(userId)
.firstOrNull() .firstOrNull()
override fun findByIds(seriesIds: Collection<Long>, userId: Long): List<SeriesDto> = override fun findByIds(seriesIds: Collection<Long>, userId: Long): List<SeriesDto> =
selectBase(userId) selectBase(userId)
.where(s.ID.`in`(seriesIds)) .where(s.ID.`in`(seriesIds))
.groupBy(*groupFields) .groupBy(*groupFields)
.fetchAndMap() .fetchAndMap(userId)
private fun findAll(conditions: Condition, having: Condition, userId: Long, pageable: Pageable): Page<SeriesDto> { private fun findAll(conditions: Condition, having: Condition, userId: Long, pageable: Pageable): Page<SeriesDto> {
@ -112,7 +112,7 @@ class SeriesDtoDao(
.orderBy(orderBy) .orderBy(orderBy)
.limit(pageable.pageSize) .limit(pageable.pageSize)
.offset(pageable.offset) .offset(pageable.offset)
.fetchAndMap() .fetchAndMap(userId)
return PageImpl( return PageImpl(
dtos, dtos,
@ -122,11 +122,8 @@ class SeriesDtoDao(
} }
private fun selectBase(userId: Long): SelectOnConditionStep<Record> = private fun selectBase(userId: Long): SelectOnConditionStep<Record> =
dsl.select(*groupFields) dsl.selectDistinct(*groupFields)
.select(DSL.count(b.ID).`as`(BOOKS_COUNT)) .select(DSL.countDistinct(b.ID).`as`(BOOKS_COUNT))
.select(countUnread.`as`(BOOKS_UNREAD_COUNT))
.select(countRead.`as`(BOOKS_READ_COUNT))
.select(countInProgress.`as`(BOOKS_IN_PROGRESS_COUNT))
.from(s) .from(s)
.leftJoin(b).on(s.ID.eq(b.SERIES_ID)) .leftJoin(b).on(s.ID.eq(b.SERIES_ID))
.leftJoin(d).on(s.ID.eq(d.SERIES_ID)) .leftJoin(d).on(s.ID.eq(d.SERIES_ID))
@ -136,15 +133,27 @@ class SeriesDtoDao(
private fun readProgressCondition(userId: Long): Condition = r.USER_ID.eq(userId).or(r.USER_ID.isNull) private fun readProgressCondition(userId: Long): Condition = r.USER_ID.eq(userId).or(r.USER_ID.isNull)
private fun ResultQuery<Record>.fetchAndMap() = private fun ResultQuery<Record>.fetchAndMap(userId: Long) =
fetch() fetch()
.map { r -> .map { rec ->
val sr = r.into(s) val sr = rec.into(s)
val dr = r.into(d) val dr = rec.into(d)
val booksCount = r.get(BOOKS_COUNT, Int::class.java) val booksCount = rec.get(BOOKS_COUNT, Int::class.java)
val booksUnreadCount = r.get(BOOKS_UNREAD_COUNT, Int::class.java)
val booksReadCount = r.get(BOOKS_READ_COUNT, Int::class.java) val booksCountRecord = dsl
val booksInProgressCount = r.get(BOOKS_IN_PROGRESS_COUNT, Int::class.java) .select(countUnread.`as`(BOOKS_UNREAD_COUNT))
.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))
.where(b.SERIES_ID.eq(sr.id))
.fetch()
.first()
val booksUnreadCount = booksCountRecord.get(BOOKS_UNREAD_COUNT, Int::class.java)
val booksReadCount = booksCountRecord.get(BOOKS_READ_COUNT, Int::class.java)
val booksInProgressCount = booksCountRecord.get(BOOKS_IN_PROGRESS_COUNT, Int::class.java)
sr.toDto(booksCount, booksReadCount, booksUnreadCount, booksInProgressCount, dr.toDto()) sr.toDto(booksCount, booksReadCount, booksUnreadCount, booksInProgressCount, dr.toDto())
} }