Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2026-05-09 05:10:19 +02:00
Code Issues Projects Releases Wiki Activity

fix(api): add maxNumberSort to TachiyomiReadProgressV2Dto.kt

Browse source
This commit is contained in:
Gauthier Roebroeck 2021-09-15 16:14:06 +08:00
parent 102484ae80
commit 5e9cb43710
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReadProgressDtoDao.kt
View file

@ -58,9 +58,15 @@ class ReadProgressDtoDao(
.fetch() .fetch()
.toList() .toList()
val maxNumberSort = dsl.select(DSL.max(d.NUMBER_SORT))
.from(b)
.leftJoin(d).on(b.ID.eq(d.BOOK_ID))
.where(b.SERIES_ID.eq(seriesId))
.fetchOne(DSL.max(d.NUMBER_SORT)) ?: 0F
val booksCount = getSeriesBooksCount(seriesId, userId) val booksCount = getSeriesBooksCount(seriesId, userId)
return booksCountToDtoV2(booksCount, numberSortReadProgress.lastRead() ?: 0F) return booksCountToDtoV2(booksCount, numberSortReadProgress.lastRead() ?: 0F, maxNumberSort)
} }
private fun getSeriesBooksCount(seriesId: String, userId: String) = dsl private fun getSeriesBooksCount(seriesId: String, userId: String) = dsl
@ -122,13 +128,14 @@ class ReadProgressDtoDao(
lastReadContinuousIndex = lastReadContinuousIndex, lastReadContinuousIndex = lastReadContinuousIndex,
) )
private fun booksCountToDtoV2(booksCount: BooksCount, lastReadContinuousNumberSort: Float): TachiyomiReadProgressV2Dto = private fun booksCountToDtoV2(booksCount: BooksCount, lastReadContinuousNumberSort: Float, maxNumberSort: Float): TachiyomiReadProgressV2Dto =
TachiyomiReadProgressV2Dto( TachiyomiReadProgressV2Dto(
booksCount = booksCount.totalCount, booksCount = booksCount.totalCount,
booksUnreadCount = booksCount.unreadCount, booksUnreadCount = booksCount.unreadCount,
booksInProgressCount = booksCount.inProgressCount, booksInProgressCount = booksCount.inProgressCount,
booksReadCount = booksCount.readCount, booksReadCount = booksCount.readCount,
lastReadContinuousNumberSort = lastReadContinuousNumberSort, lastReadContinuousNumberSort = lastReadContinuousNumberSort,
maxNumberSort = maxNumberSort,
) )
private fun readProgressCondition(userId: String): Condition = r.USER_ID.eq(userId).or(r.USER_ID.isNull) private fun readProgressCondition(userId: String): Condition = r.USER_ID.eq(userId).or(r.USER_ID.isNull)

1
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/TachiyomiReadProgressV2Dto.kt
View file

@ -6,4 +6,5 @@ data class TachiyomiReadProgressV2Dto(
val booksUnreadCount: Int, val booksUnreadCount: Int,
val booksInProgressCount: Int, val booksInProgressCount: Int,
val lastReadContinuousNumberSort: Float, val lastReadContinuousNumberSort: Float,
val maxNumberSort: Float,
) )