Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2025-12-21 16:03:03 +01:00
Code Issues Projects Releases Wiki Activity

fix(api): incorrect number of books returned

Browse source 
when books have authors set in metadata, the query would return an incorrect number of books

closes #177
This commit is contained in:
Gauthier Roebroeck 2020-06-03 21:34:59 +08:00
parent 0d0b9985c0
commit 544c873141
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/BookDtoDao.kt
View file

@ -8,7 +8,6 @@ import org.gotson.komga.interfaces.rest.dto.MediaDto
import org.gotson.komga.interfaces.rest.dto.ReadProgressDto
import org.gotson.komga.interfaces.rest.persistence.BookDtoRepository
import org.gotson.komga.jooq.Tables
import org.gotson.komga.jooq.tables.records.BookMetadataAuthorRecord
import org.gotson.komga.jooq.tables.records.BookMetadataRecord
import org.gotson.komga.jooq.tables.records.BookRecord
import org.gotson.komga.jooq.tables.records.MediaRecord
@ -109,24 +108,28 @@ class BookDtoDao(
*b.fields(),
*mediaFields,
*d.fields(),
*a.fields(),
*r.fields()
).from(b)
.leftJoin(m).on(b.ID.eq(m.BOOK_ID))
.leftJoin(d).on(b.ID.eq(d.BOOK_ID))
.leftJoin(a).on(d.BOOK_ID.eq(a.BOOK_ID))
.leftJoin(r).on(b.ID.eq(r.BOOK_ID))
private fun ResultQuery<Record>.fetchAndMap() =
fetchGroups(
{ it.into(*b.fields(), *mediaFields, *d.fields(), *r.fields()) }, { it.into(a) }
).map { (rec, ar) ->
val br = rec.into(b)
val mr = rec.into(m)
val dr = rec.into(d)
val rr = rec.into(r)
br.toDto(mr.toDto(), dr.toDto(ar), if (rr.userId != null) rr.toDto() else null)
}
fetch()
.map { rec ->
val br = rec.into(b)
val mr = rec.into(m)
val dr = rec.into(d)
val rr = rec.into(r)
val authors = dsl.selectFrom(a)
.where(a.BOOK_ID.eq(br.id))
.fetchInto(a)
.filter { it.name != null }
.map { AuthorDto(it.name, it.role) }
br.toDto(mr.toDto(), dr.toDto(authors), if (rr.userId != null) rr.toDto() else null)
}
private fun BookSearch.toCondition(): Condition {
var c: Condition = DSL.trueCondition()
@ -164,7 +167,7 @@ class BookDtoDao(
comment = comment ?: ""
)
private fun BookMetadataRecord.toDto(ar: Collection<BookMetadataAuthorRecord>) =
private fun BookMetadataRecord.toDto(authors: List<AuthorDto>) =
BookMetadataDto(
title = title,
titleLock = titleLock,
@ -182,7 +185,7 @@ class BookDtoDao(
ageRatingLock = ageRatingLock,
releaseDate = releaseDate,
releaseDateLock = releaseDateLock,
authors = ar.filter { it.name != null }.map { AuthorDto(it.name, it.role) },
authors = authors,
authorsLock = authorsLock
)