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

Fix empty results errors

Browse Source
This commit is contained in:
Syer10
2023-04-07 00:02:00 -04:00
parent 671466a737
commit 0b88207ad5
11 changed files with 197 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@ class CategoryQuery {
andFilterWithCompareEntity(CategoryTable.id, id),
andFilterWithCompare(CategoryTable.order, order),
andFilterWithCompareString(CategoryTable.name, name),
andFilterWithCompare(CategoryTable.isDefault, default),
andFilterWithCompare(CategoryTable.isDefault, default)
)
}
}
@@ -191,15 +191,29 @@ class CategoryQuery {
return CategoryNodeList(
resultsAsType,
CategoryNodeList.CategoryEdges(
cursor = getAsCursor(orderBy, resultsAsType.last()),
node = resultsAsType.last()
),
if (resultsAsType.isEmpty()) {
emptyList()
} else {
listOf(
resultsAsType.first().let {
CategoryNodeList.CategoryEdge(
getAsCursor(orderBy, it),
it
)
},
resultsAsType.last().let {
CategoryNodeList.CategoryEdge(
getAsCursor(orderBy, it),
it
)
}
)
},
pageInfo = PageInfo(
hasNextPage = queryResults.lastKey != resultsAsType.last().id,
hasPreviousPage = queryResults.firstKey != resultsAsType.first().id,
startCursor = getAsCursor(orderBy, resultsAsType.first()),
endCursor = getAsCursor(orderBy, resultsAsType.last())
startCursor = resultsAsType.firstOrNull()?.let { getAsCursor(orderBy, it) },
endCursor = resultsAsType.lastOrNull()?.let { getAsCursor(orderBy, it) }
),
totalCount = queryResults.total.toInt()
)

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

@@ -259,15 +259,29 @@ class MangaQuery {
return MangaNodeList(
resultsAsType,
MangaNodeList.MangaEdges(
cursor = getAsCursor(orderBy, resultsAsType.last()),
node = resultsAsType.last()
),
if (resultsAsType.isEmpty()) {
emptyList()
} else {
listOf(
resultsAsType.first().let {
MangaNodeList.MangaEdge(
getAsCursor(orderBy, it),
it
)
},
resultsAsType.last().let {
MangaNodeList.MangaEdge(
getAsCursor(orderBy, it),
it
)
}
)
},
pageInfo = PageInfo(
hasNextPage = queryResults.lastKey != resultsAsType.last().id,
hasPreviousPage = queryResults.firstKey != resultsAsType.first().id,
startCursor = getAsCursor(orderBy, resultsAsType.first()),
endCursor = getAsCursor(orderBy, resultsAsType.last())
startCursor = resultsAsType.firstOrNull()?.let { getAsCursor(orderBy, it) },
endCursor = resultsAsType.lastOrNull()?.let { getAsCursor(orderBy, it) }
),
totalCount = queryResults.total.toInt()
)