temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-07-04 03:14:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix keyset pagination for non-unique order by modes

Browse Source
This commit is contained in:
Syer10
2023-04-08 13:37:09 -04:00
parent 0e84b8a154
commit 58a623d44d
2 changed files with 78 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/CategoryQuery.kt
View File

@@ -12,9 +12,12 @@ import graphql.schema.DataFetchingEnvironment
import org.jetbrains.exposed.sql.Column import org.jetbrains.exposed.sql.Column
import org.jetbrains.exposed.sql.Op import org.jetbrains.exposed.sql.Op
import org.jetbrains.exposed.sql.SortOrder import org.jetbrains.exposed.sql.SortOrder
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
import org.jetbrains.exposed.sql.SqlExpressionBuilder.less import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
import org.jetbrains.exposed.sql.and
import org.jetbrains.exposed.sql.andWhere import org.jetbrains.exposed.sql.andWhere
import org.jetbrains.exposed.sql.or
import org.jetbrains.exposed.sql.selectAll import org.jetbrains.exposed.sql.selectAll
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.sql.transactions.transaction
import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
@@ -39,7 +42,6 @@ import java.util.concurrent.CompletableFuture
/** /**
* TODO Queries * TODO Queries
* - Paged queries
* *
* TODO Mutations * TODO Mutations
* - Name * - Name
@@ -63,24 +65,40 @@ class CategoryQuery {
override fun greater(cursor: Cursor): Op<Boolean> { override fun greater(cursor: Cursor): Op<Boolean> {
return when (this) { return when (this) {
ID -> CategoryTable.id greater cursor.value.toInt() ID -> CategoryTable.id greater cursor.value.toInt()
NAME -> CategoryTable.name greater cursor.value NAME -> {
ORDER -> CategoryTable.order greater cursor.value.toInt() val id = cursor.value.substringBefore('-').toInt()
val value = cursor.value.substringAfter('-')
(CategoryTable.name greater value) or ((CategoryTable.name eq value) and (CategoryTable.id greater id))
}
ORDER -> {
val id = cursor.value.substringBefore('-').toInt()
val value = cursor.value.substringAfter('-').toInt()
(CategoryTable.order greater value) or ((CategoryTable.order eq value) and (CategoryTable.id greater id))
}
} }
} }
override fun less(cursor: Cursor): Op<Boolean> { override fun less(cursor: Cursor): Op<Boolean> {
return when (this) { return when (this) {
ID -> CategoryTable.id less cursor.value.toInt() ID -> CategoryTable.id less cursor.value.toInt()
NAME -> CategoryTable.name less cursor.value NAME -> {
ORDER -> CategoryTable.order less cursor.value.toInt() val id = cursor.value.substringBefore('-').toInt()
val value = cursor.value.substringAfter('-')
(CategoryTable.name less value) or ((CategoryTable.name eq value) and (CategoryTable.id less id))
}
ORDER -> {
val id = cursor.value.substringBefore('-').toInt()
val value = cursor.value.substringAfter('-').toInt()
(CategoryTable.order less value) or ((CategoryTable.order eq value) and (CategoryTable.id less id))
}
} }
} }
override fun asCursor(type: CategoryType): Cursor { override fun asCursor(type: CategoryType): Cursor {
val value = when (this) { val value = when (this) {
ID -> type.id.toString() ID -> type.id.toString()
NAME -> type.name NAME -> type.id.toString() + "-" + type.name
ORDER -> type.order.toString() ORDER -> type.id.toString() + "-" + type.order
} }
return Cursor(value) return Cursor(value)
} }
@@ -142,7 +160,14 @@ class CategoryQuery {
val orderByColumn = orderBy?.column ?: CategoryTable.id val orderByColumn = orderBy?.column ?: CategoryTable.id
val orderType = orderByType.maybeSwap(last ?: before) val orderType = orderByType.maybeSwap(last ?: before)
res.orderBy(orderByColumn, order = orderType) if (orderBy == CategoryOrderBy.ID || orderBy == null) {
res.orderBy(orderByColumn to orderType)
} else {
res.orderBy(
orderByColumn to orderType,
CategoryTable.id to SortOrder.ASC
)
}
} }
val total = res.count() val total = res.count()

57
server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt
View File

@@ -12,9 +12,12 @@ import graphql.schema.DataFetchingEnvironment
import org.jetbrains.exposed.sql.Column import org.jetbrains.exposed.sql.Column
import org.jetbrains.exposed.sql.Op import org.jetbrains.exposed.sql.Op
import org.jetbrains.exposed.sql.SortOrder import org.jetbrains.exposed.sql.SortOrder
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
import org.jetbrains.exposed.sql.SqlExpressionBuilder.less import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
import org.jetbrains.exposed.sql.and
import org.jetbrains.exposed.sql.andWhere import org.jetbrains.exposed.sql.andWhere
import org.jetbrains.exposed.sql.or
import org.jetbrains.exposed.sql.select import org.jetbrains.exposed.sql.select
import org.jetbrains.exposed.sql.selectAll import org.jetbrains.exposed.sql.selectAll
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.sql.transactions.transaction
@@ -35,7 +38,6 @@ import suwayomi.tachidesk.graphql.server.primitives.OrderBy
import suwayomi.tachidesk.graphql.server.primitives.PageInfo import suwayomi.tachidesk.graphql.server.primitives.PageInfo
import suwayomi.tachidesk.graphql.server.primitives.QueryResults import suwayomi.tachidesk.graphql.server.primitives.QueryResults
import suwayomi.tachidesk.graphql.server.primitives.maybeSwap import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
import suwayomi.tachidesk.graphql.types.CategoryType
import suwayomi.tachidesk.graphql.types.MangaNodeList import suwayomi.tachidesk.graphql.types.MangaNodeList
import suwayomi.tachidesk.graphql.types.MangaType import suwayomi.tachidesk.graphql.types.MangaType
import suwayomi.tachidesk.manga.model.table.CategoryMangaTable import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
@@ -71,27 +73,51 @@ class MangaQuery {
override fun greater(cursor: Cursor): Op<Boolean> { override fun greater(cursor: Cursor): Op<Boolean> {
return when (this) { return when (this) {
ID -> MangaTable.id greater cursor.value.toInt() ID -> MangaTable.id greater cursor.value.toInt()
TITLE -> MangaTable.title greater cursor.value TITLE -> {
IN_LIBRARY_AT -> MangaTable.inLibraryAt greater cursor.value.toLong() val id = cursor.value.substringBefore('-').toInt()
LAST_FETCHED_AT -> MangaTable.lastFetchedAt greater cursor.value.toLong() val value = cursor.value.substringAfter('-')
(MangaTable.title greater value) or ((MangaTable.title eq value) and (MangaTable.id greater id))
}
IN_LIBRARY_AT -> {
val id = cursor.value.substringBefore('-').toInt()
val value = cursor.value.substringAfter('-').toLong()
(MangaTable.inLibraryAt greater value) or ((MangaTable.inLibraryAt eq value) and (MangaTable.id greater id))
}
LAST_FETCHED_AT -> {
val id = cursor.value.substringBefore('-').toInt()
val value = cursor.value.substringAfter('-').toLong()
(MangaTable.lastFetchedAt greater value) or ((MangaTable.lastFetchedAt eq value) and (MangaTable.id greater id))
}
} }
} }
override fun less(cursor: Cursor): Op<Boolean> { override fun less(cursor: Cursor): Op<Boolean> {
return when (this) { return when (this) {
ID -> MangaTable.id less cursor.value.toInt() ID -> MangaTable.id less cursor.value.toInt()
TITLE -> MangaTable.title less cursor.value TITLE -> {
IN_LIBRARY_AT -> MangaTable.inLibraryAt less cursor.value.toLong() val id = cursor.value.substringBefore('-').toInt()
LAST_FETCHED_AT -> MangaTable.lastFetchedAt less cursor.value.toLong() val value = cursor.value.substringAfter('-')
(MangaTable.title less value) or ((MangaTable.title eq value) and (MangaTable.id less id))
}
IN_LIBRARY_AT -> {
val id = cursor.value.substringBefore('-').toInt()
val value = cursor.value.substringAfter('-').toLong()
(MangaTable.inLibraryAt less value) or ((MangaTable.inLibraryAt eq value) and (MangaTable.id less id))
}
LAST_FETCHED_AT -> {
val id = cursor.value.substringBefore('-').toInt()
val value = cursor.value.substringAfter('-').toLong()
(MangaTable.lastFetchedAt less value) or ((MangaTable.lastFetchedAt eq value) and (MangaTable.id less id))
}
} }
} }
override fun asCursor(type: MangaType): Cursor { override fun asCursor(type: MangaType): Cursor {
val value = when (this) { val value = when (this) {
ID -> type.id.toString() ID -> type.id.toString()
TITLE -> type.title TITLE -> type.id.toString() + "-" + type.title
IN_LIBRARY_AT -> type.inLibraryAt.toString() IN_LIBRARY_AT -> type.id.toString() + "-" + type.inLibraryAt.toString()
LAST_FETCHED_AT -> type.lastFetchedAt.toString() LAST_FETCHED_AT -> type.id.toString() + "-" + type.lastFetchedAt.toString()
} }
return Cursor(value) return Cursor(value)
} }
@@ -161,7 +187,7 @@ class MangaQuery {
lessThan = lessThan?.value, lessThan = lessThan?.value,
lessThanOrEqualTo = lessThanOrEqualTo?.value, lessThanOrEqualTo = lessThanOrEqualTo?.value,
greaterThan = greaterThan?.value, greaterThan = greaterThan?.value,
greaterThanOrEqualTo = greaterThanOrEqualTo?.value, greaterThanOrEqualTo = greaterThanOrEqualTo?.value
) )
} }
@@ -237,7 +263,14 @@ class MangaQuery {
val orderByColumn = orderBy?.column ?: MangaTable.id val orderByColumn = orderBy?.column ?: MangaTable.id
val orderType = orderByType.maybeSwap(last ?: before) val orderType = orderByType.maybeSwap(last ?: before)
res.orderBy(orderByColumn, order = orderType) if (orderBy == MangaOrderBy.ID || orderBy == null) {
res.orderBy(orderByColumn to orderType)
} else {
res.orderBy(
orderByColumn to orderType,
MangaTable.id to SortOrder.ASC
)
}
} }
val total = res.count() val total = res.count()