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

fix(api): page.sort had incorrect value

Browse source
This commit is contained in:
Gauthier Roebroeck 2021-09-09 10:08:48 +08:00
parent 8787de2e15
commit 57f601b8dd
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/AuthenticationActivityDao.kt
View file

@ -64,7 +64,7 @@ class AuthenticationActivityDao(
.fetchInto(aa) .fetchInto(aa)
.map { it.toDomain() } .map { it.toDomain() }
val pageSort = if (orderBy.size > 1) pageable.sort else Sort.unsorted() val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted()
return PageImpl( return PageImpl(
items, items,
if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/BookDao.kt
View file

@ -128,7 +128,7 @@ class BookDao(
.fetchInto(b) .fetchInto(b)
.map { it.toDomain() } .map { it.toDomain() }
val pageSort = if (orderBy.size > 1) pageable.sort else Sort.unsorted() val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted()
return PageImpl( return PageImpl(
items, items,
if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)

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

@ -131,7 +131,7 @@ class BookDtoDao(
.apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) } .apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) }
.fetchAndMap() .fetchAndMap()
val pageSort = if (orderBy.size > 1) pageable.sort else Sort.unsorted() val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted()
return PageImpl( return PageImpl(
dtos, dtos,
if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)

4
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReadListDao.kt
View file

@ -69,7 +69,7 @@ class ReadListDao(
.apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) } .apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) }
.fetchAndMap(null) .fetchAndMap(null)
val pageSort = if (orderBy.size > 1) pageable.sort else Sort.unsorted() val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted()
return PageImpl( return PageImpl(
items, items,
if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)
@ -108,7 +108,7 @@ class ReadListDao(
.apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) } .apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) }
.fetchAndMap(filterOnLibraryIds) .fetchAndMap(filterOnLibraryIds)
val pageSort = if (orderBy.size > 1) pageable.sort else Sort.unsorted() val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted()
return PageImpl( return PageImpl(
items, items,
if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)

4
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesCollectionDao.kt
View file

@ -68,7 +68,7 @@ class SeriesCollectionDao(
.apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) } .apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) }
.fetchAndMap(null) .fetchAndMap(null)
val pageSort = if (orderBy.size > 1) pageable.sort else Sort.unsorted() val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted()
return PageImpl( return PageImpl(
items, items,
if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)
@ -107,7 +107,7 @@ class SeriesCollectionDao(
.apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) } .apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) }
.fetchAndMap(filterOnLibraryIds) .fetchAndMap(filterOnLibraryIds)
val pageSort = if (orderBy.size > 1) pageable.sort else Sort.unsorted() val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted()
return PageImpl( return PageImpl(
items, items,
if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)

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

@ -200,7 +200,7 @@ class SeriesDtoDao(
.apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) } .apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) }
.fetchAndMap() .fetchAndMap()
val pageSort = if (orderBy.size > 1) pageable.sort else Sort.unsorted() val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted()
return PageImpl( return PageImpl(
dtos, dtos,
if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)