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

Sort gql queries by multiple columns (#963)

Browse Source
This commit is contained in:
schroda
2024-06-28 02:34:21 +02:00
committed by GitHub
parent aee9f1032c
commit 7c54ad54fc
8 changed files with 227 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@
package suwayomi.tachidesk.graphql.queries
import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
import graphql.schema.DataFetchingEnvironment
import org.jetbrains.exposed.sql.Column
@@ -30,6 +31,7 @@ import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
import suwayomi.tachidesk.graphql.queries.filter.applyOps
import suwayomi.tachidesk.graphql.queries.util.distinctOn
import suwayomi.tachidesk.graphql.server.primitives.Cursor
import suwayomi.tachidesk.graphql.server.primitives.Order
import suwayomi.tachidesk.graphql.server.primitives.OrderBy
import suwayomi.tachidesk.graphql.server.primitives.PageInfo
import suwayomi.tachidesk.graphql.server.primitives.QueryResults
@@ -89,6 +91,11 @@ class MangaQuery {
}
}
data class MangaOrder(
override val by: MangaOrderBy,
override val byType: SortOrder? = null,
) : Order<MangaOrderBy>
data class MangaCondition(
val id: Int? = null,
val sourceId: Long? = null,
@@ -208,8 +215,17 @@ class MangaQuery {
fun mangas(
condition: MangaCondition? = null,
filter: MangaFilter? = null,
@GraphQLDeprecated(
"Replaced with order",
replaceWith = ReplaceWith("order"),
)
orderBy: MangaOrderBy? = null,
@GraphQLDeprecated(
"Replaced with order",
replaceWith = ReplaceWith("order"),
)
orderByType: SortOrder? = null,
order: List<MangaOrder>? = null,
before: Cursor? = null,
after: Cursor? = null,
first: Int? = null,
@@ -227,17 +243,15 @@ class MangaQuery {
res.applyOps(condition, filter)
if (orderBy != null || (last != null || before != null)) {
val orderByColumn = orderBy?.column ?: MangaTable.id
val orderType = orderByType.maybeSwap(last ?: before)
if (order != null || (last != null || before != null)) {
val baseSort = listOf(MangaOrder(MangaOrderBy.ID, SortOrder.ASC))
val deprecatedSort = listOfNotNull(orderBy?.let { MangaOrder(orderBy, orderByType) })
val actualSort = (order.orEmpty() + deprecatedSort + baseSort)
actualSort.forEach { (orderBy, orderByType) ->
val orderByColumn = orderBy.column
val orderType = orderByType.maybeSwap(last ?: before)
if (orderBy == MangaOrderBy.ID || orderBy == null) {
res.orderBy(orderByColumn to orderType)
} else {
res.orderBy(
orderByColumn to orderType,
MangaTable.id to SortOrder.ASC,
)
}
}
@@ -248,8 +262,8 @@ class MangaQuery {
res.applyBeforeAfter(
before = before,
after = after,
orderBy = orderBy ?: MangaOrderBy.ID,
orderByType = orderByType,
orderBy = order?.firstOrNull()?.by ?: MangaOrderBy.ID,
orderByType = order?.firstOrNull()?.byType,
)
if (first != null) {
@@ -261,7 +275,7 @@ class MangaQuery {
QueryResults(total, firstResult, lastResult, res.toList())
}
val getAsCursor: (MangaType) -> Cursor = (orderBy ?: MangaOrderBy.ID)::asCursor
val getAsCursor: (MangaType) -> Cursor = (order?.firstOrNull()?.by ?: MangaOrderBy.ID)::asCursor
val resultsAsType = queryResults.results.map { MangaType(it) }