Start working on graphql paging

Suwayomi · Apr 3, 2023 · 52bda2c · 52bda2c
1 parent 607919f
commit 52bda2c
Show file tree

Hide file tree

Showing 21 changed files with 369 additions and 60 deletions.
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/CategoryDataLoader.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/CategoryDataLoader.kt
@@ -14,6 +14,8 @@ import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
 import org.jetbrains.exposed.sql.addLogger
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.types.CategoryNodeList
+import suwayomi.tachidesk.graphql.types.CategoryNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.CategoryType
 import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
 import suwayomi.tachidesk.manga.model.table.CategoryTable
@@ -32,9 +34,9 @@ class CategoryDataLoader : KotlinDataLoader<Int, CategoryType> {
     }
 }
 
-class CategoriesForMangaDataLoader : KotlinDataLoader<Int, List<CategoryType>> {
+class CategoriesForMangaDataLoader : KotlinDataLoader<Int, CategoryNodeList> {
     override val dataLoaderName = "CategoriesForMangaDataLoader"
-    override fun getDataLoader(): DataLoader<Int, List<CategoryType>> = DataLoaderFactory.newDataLoader<Int, List<CategoryType>> { ids ->
+    override fun getDataLoader(): DataLoader<Int, CategoryNodeList> = DataLoaderFactory.newDataLoader<Int, CategoryNodeList> { ids ->
         future {
             transaction {
                 addLogger(Slf4jSqlDebugLogger)
@@ -43,7 +45,7 @@ class CategoriesForMangaDataLoader : KotlinDataLoader<Int, List<CategoryType>> {
                     .map { Pair(it[CategoryMangaTable.manga].value, CategoryType(it)) }
                     .groupBy { it.first }
                     .mapValues { it.value.map { pair -> pair.second } }
-                ids.map { itemsByRef[it] ?: emptyList() }
+                ids.map { (itemsByRef[it] ?: emptyList()).toNodeList() }
             }
         }
     }

diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ChapterDataLoader.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ChapterDataLoader.kt
@@ -14,6 +14,8 @@ import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
 import org.jetbrains.exposed.sql.addLogger
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.types.ChapterNodeList
+import suwayomi.tachidesk.graphql.types.ChapterNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.server.JavalinSetup.future
@@ -31,16 +33,16 @@ class ChapterDataLoader : KotlinDataLoader<Int, ChapterType> {
     }
 }
 
-class ChaptersForMangaDataLoader : KotlinDataLoader<Int, List<ChapterType>> {
+class ChaptersForMangaDataLoader : KotlinDataLoader<Int, ChapterNodeList> {
     override val dataLoaderName = "ChaptersForMangaDataLoader"
-    override fun getDataLoader(): DataLoader<Int, List<ChapterType>> = DataLoaderFactory.newDataLoader<Int, List<ChapterType>> { ids ->
+    override fun getDataLoader(): DataLoader<Int, ChapterNodeList> = DataLoaderFactory.newDataLoader<Int, ChapterNodeList> { ids ->
         future {
             transaction {
                 addLogger(Slf4jSqlDebugLogger)
                 val chaptersByMangaId = ChapterTable.select { ChapterTable.manga inList ids }
                     .map { ChapterType(it) }
                     .groupBy { it.mangaId }
-                ids.map { chaptersByMangaId[it] ?: emptyList() }
+                ids.map { (chaptersByMangaId[it] ?: emptyList()).toNodeList() }
             }
         }
     }

diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MangaDataLoader.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MangaDataLoader.kt
@@ -14,6 +14,8 @@ import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
 import org.jetbrains.exposed.sql.addLogger
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.types.MangaNodeList
+import suwayomi.tachidesk.graphql.types.MangaNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.MangaType
 import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
 import suwayomi.tachidesk.manga.model.table.MangaTable
@@ -32,17 +34,17 @@ class MangaDataLoader : KotlinDataLoader<Int, MangaType> {
     }
 }
 
-class MangaForCategoryDataLoader : KotlinDataLoader<Int, List<MangaType>> {
+class MangaForCategoryDataLoader : KotlinDataLoader<Int, MangaNodeList> {
     override val dataLoaderName = "MangaForCategoryDataLoader"
-    override fun getDataLoader(): DataLoader<Int, List<MangaType>> = DataLoaderFactory.newDataLoader<Int, List<MangaType>> { ids ->
+    override fun getDataLoader(): DataLoader<Int, MangaNodeList> = DataLoaderFactory.newDataLoader<Int, MangaNodeList> { ids ->
         future {
             transaction {
                 addLogger(Slf4jSqlDebugLogger)
                 val itemsByRef = CategoryMangaTable.innerJoin(MangaTable).select { CategoryMangaTable.category inList ids }
                     .map { Pair(it[CategoryMangaTable.category].value, MangaType(it)) }
                     .groupBy { it.first }
                     .mapValues { it.value.map { pair -> pair.second } }
-                ids.map { itemsByRef[it] ?: emptyList() }
+                ids.map { (itemsByRef[it] ?: emptyList()).toNodeList() }
             }
         }
     }

diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MetaDataLoader.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MetaDataLoader.kt
@@ -13,7 +13,8 @@ import suwayomi.tachidesk.graphql.types.ChapterMetaItem
 import suwayomi.tachidesk.graphql.types.GlobalMetaItem
 import suwayomi.tachidesk.graphql.types.MangaMetaItem
 import suwayomi.tachidesk.graphql.types.MetaItem
-import suwayomi.tachidesk.graphql.types.MetaType
+import suwayomi.tachidesk.graphql.types.MetaNodeList
+import suwayomi.tachidesk.graphql.types.MetaNodeList.Companion.toNodeList
 import suwayomi.tachidesk.manga.model.table.ChapterMetaTable
 import suwayomi.tachidesk.manga.model.table.MangaMetaTable
 import suwayomi.tachidesk.server.JavalinSetup.future
@@ -33,46 +34,46 @@ class GlobalMetaDataLoader : KotlinDataLoader<String, MetaItem?> {
     }
 }
 
-class ChapterMetaDataLoader : KotlinDataLoader<Int, MetaType> {
+class ChapterMetaDataLoader : KotlinDataLoader<Int, MetaNodeList> {
     override val dataLoaderName = "ChapterMetaDataLoader"
-    override fun getDataLoader(): DataLoader<Int, MetaType> = DataLoaderFactory.newDataLoader<Int, MetaType> { ids ->
+    override fun getDataLoader(): DataLoader<Int, MetaNodeList> = DataLoaderFactory.newDataLoader<Int, MetaNodeList> { ids ->
         future {
             transaction {
                 addLogger(Slf4jSqlDebugLogger)
                 val metasByRefId = ChapterMetaTable.select { ChapterMetaTable.ref inList ids }
                     .map { ChapterMetaItem(it) }
                     .groupBy { it.ref }
-                ids.map { metasByRefId[it] ?: emptyList() }
+                ids.map { (metasByRefId[it] ?: emptyList()).toNodeList() }
             }
         }
     }
 }
 
-class MangaMetaDataLoader : KotlinDataLoader<Int, MetaType> {
+class MangaMetaDataLoader : KotlinDataLoader<Int, MetaNodeList> {
     override val dataLoaderName = "MangaMetaDataLoader"
-    override fun getDataLoader(): DataLoader<Int, MetaType> = DataLoaderFactory.newDataLoader<Int, MetaType> { ids ->
+    override fun getDataLoader(): DataLoader<Int, MetaNodeList> = DataLoaderFactory.newDataLoader<Int, MetaNodeList> { ids ->
         future {
             transaction {
                 addLogger(Slf4jSqlDebugLogger)
                 val metasByRefId = MangaMetaTable.select { MangaMetaTable.ref inList ids }
                     .map { MangaMetaItem(it) }
                     .groupBy { it.ref }
-                ids.map { metasByRefId[it] ?: emptyList() }
+                ids.map { (metasByRefId[it] ?: emptyList()).toNodeList() }
             }
         }
     }
 }
 
-class CategoryMetaDataLoader : KotlinDataLoader<Int, MetaType> {
+class CategoryMetaDataLoader : KotlinDataLoader<Int, MetaNodeList> {
     override val dataLoaderName = "CategoryMetaDataLoader"
-    override fun getDataLoader(): DataLoader<Int, MetaType> = DataLoaderFactory.newDataLoader<Int, MetaType> { ids ->
+    override fun getDataLoader(): DataLoader<Int, MetaNodeList> = DataLoaderFactory.newDataLoader<Int, MetaNodeList> { ids ->
         future {
             transaction {
                 addLogger(Slf4jSqlDebugLogger)
                 val metasByRefId = MangaMetaTable.select { MangaMetaTable.ref inList ids }
                     .map { CategoryMetaItem(it) }
                     .groupBy { it.ref }
-                ids.map { metasByRefId[it] ?: emptyList() }
+                ids.map { (metasByRefId[it] ?: emptyList()).toNodeList() }
             }
         }
     }

diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/SourceDataLoader.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/SourceDataLoader.kt
@@ -14,6 +14,8 @@ import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
 import org.jetbrains.exposed.sql.addLogger
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.types.SourceNodeList
+import suwayomi.tachidesk.graphql.types.SourceNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.SourceType
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.manga.model.table.MangaTable
@@ -63,9 +65,9 @@ class SourceForMangaDataLoader : KotlinDataLoader<Int, SourceType?> {
     }
 }
 
-class SourcesForExtensionDataLoader : KotlinDataLoader<String, List<SourceType>> {
+class SourcesForExtensionDataLoader : KotlinDataLoader<String, SourceNodeList> {
     override val dataLoaderName = "SourcesForExtensionDataLoader"
-    override fun getDataLoader(): DataLoader<String, List<SourceType>> = DataLoaderFactory.newDataLoader { ids ->
+    override fun getDataLoader(): DataLoader<String, SourceNodeList> = DataLoaderFactory.newDataLoader { ids ->
         future {
             transaction {
                 addLogger(Slf4jSqlDebugLogger)
@@ -76,7 +78,7 @@ class SourcesForExtensionDataLoader : KotlinDataLoader<String, List<SourceType>>
                     .groupBy { it.first }
                     .mapValues { it.value.mapNotNull { pair -> pair.second } }
 
-                ids.map { sourcesByExtensionPkg[it] ?: emptyList() }
+                ids.map { (sourcesByExtensionPkg[it] ?: emptyList()).toNodeList() }
             }
         }
     }

diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/CategoryQuery.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/CategoryQuery.kt
@@ -13,6 +13,8 @@ import org.jetbrains.exposed.sql.SortOrder
 import org.jetbrains.exposed.sql.andWhere
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.types.CategoryNodeList
+import suwayomi.tachidesk.graphql.types.CategoryNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.CategoryType
 import suwayomi.tachidesk.manga.model.table.CategoryTable
 import java.util.concurrent.CompletableFuture
@@ -48,7 +50,7 @@ class CategoryQuery {
         val query: String? = null
     )
 
-    fun categories(input: CategoriesQueryInput? = null): List<CategoryType> {
+    fun categories(input: CategoriesQueryInput? = null): CategoryNodeList {
         val results = transaction {
             val res = CategoryTable.selectAll()
 
@@ -72,6 +74,6 @@ class CategoryQuery {
             res.toList()
         }
 
-        return results.map { CategoryType(it) }
+        return results.map { CategoryType(it) }.toNodeList()
     }
 }
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt
@@ -13,6 +13,8 @@ import org.jetbrains.exposed.sql.SortOrder
 import org.jetbrains.exposed.sql.andWhere
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.types.ChapterNodeList
+import suwayomi.tachidesk.graphql.types.ChapterNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.manga.model.table.ChapterTable
 import java.util.concurrent.CompletableFuture
@@ -56,7 +58,7 @@ class ChapterQuery {
         val count: Int? = null
     )
 
-    fun chapters(input: ChapterQueryInput? = null): List<ChapterType> {
+    fun chapters(input: ChapterQueryInput? = null): ChapterNodeList {
         val results = transaction {
             var res = ChapterTable.selectAll()
 
@@ -97,6 +99,6 @@ class ChapterQuery {
             res.toList()
         }
 
-        return results.map { ChapterType(it) }
+        return results.map { ChapterType(it) }.toNodeList() // todo paged
     }
 }
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt
@@ -11,6 +11,8 @@ import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.types.ExtensionNodeList
+import suwayomi.tachidesk.graphql.types.ExtensionNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.ExtensionType
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import java.util.concurrent.CompletableFuture
@@ -37,11 +39,11 @@ class ExtensionQuery {
         return dataFetchingEnvironment.getValueFromDataLoader<String, ExtensionType>("ExtensionDataLoader", pkgName)
     }
 
-    fun extensions(): List<ExtensionType> {
+    fun extensions(): ExtensionNodeList {
         val results = transaction {
             ExtensionTable.selectAll().toList()
         }
 
-        return results.map { ExtensionType(it) }
+        return results.map { ExtensionType(it) }.toNodeList()
     }
 }
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt
@@ -16,6 +16,8 @@ import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.queries.util.GreaterOrLessThanLong
 import suwayomi.tachidesk.graphql.queries.util.andWhereGreaterOrLessThen
+import suwayomi.tachidesk.graphql.types.MangaNodeList
+import suwayomi.tachidesk.graphql.types.MangaNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.MangaType
 import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
 import suwayomi.tachidesk.manga.model.table.MangaTable
@@ -60,7 +62,7 @@ class MangaQuery {
         val count: Int? = null
     )
 
-    fun mangas(input: MangaQueryInput? = null): List<MangaType> {
+    fun mangas(input: MangaQueryInput? = null): MangaNodeList {
         val results = transaction {
             var res = MangaTable.selectAll()
 
@@ -102,6 +104,6 @@ class MangaQuery {
             res.toList()
         }
 
-        return results.map { MangaType(it) }
+        return results.map { MangaType(it) }.toNodeList() // todo paged
     }
 }
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MetaQuery.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MetaQuery.kt
@@ -14,6 +14,8 @@ import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.global.model.table.GlobalMetaTable
 import suwayomi.tachidesk.graphql.types.GlobalMetaItem
 import suwayomi.tachidesk.graphql.types.MetaItem
+import suwayomi.tachidesk.graphql.types.MetaNodeList
+import suwayomi.tachidesk.graphql.types.MetaNodeList.Companion.toNodeList
 import java.util.concurrent.CompletableFuture
 
 /**
@@ -30,11 +32,11 @@ class MetaQuery {
         return dataFetchingEnvironment.getValueFromDataLoader<String, MetaItem?>("GlobalMetaDataLoader", key)
     }
 
-    fun metas(): List<GlobalMetaItem> {
+    fun metas(): MetaNodeList {
         val results = transaction {
             GlobalMetaTable.selectAll().toList()
         }
 
-        return results.map { GlobalMetaItem(it) }
+        return results.map { GlobalMetaItem(it) }.toNodeList()
     }
 }
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt
@@ -11,6 +11,8 @@ import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.types.SourceNodeList
+import suwayomi.tachidesk.graphql.types.SourceNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.SourceType
 import suwayomi.tachidesk.manga.model.table.SourceTable
 import java.util.concurrent.CompletableFuture
@@ -33,11 +35,11 @@ class SourceQuery {
         return dataFetchingEnvironment.getValueFromDataLoader<Long, SourceType?>("SourceDataLoader", id)
     }
 
-    fun sources(): List<SourceType> {
+    fun sources(): SourceNodeList {
         val results = transaction {
             SourceTable.selectAll().toList().mapNotNull { SourceType(it) }
         }
 
-        return results
+        return results.toNodeList()
     }
 }
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/UpdatesQuery.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/UpdatesQuery.kt
@@ -11,6 +11,8 @@ import org.jetbrains.exposed.sql.SortOrder
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
+import suwayomi.tachidesk.graphql.types.UpdatesNodeList
+import suwayomi.tachidesk.graphql.types.UpdatesNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.UpdatesType
 import suwayomi.tachidesk.manga.model.dataclass.PaginationFactor
 import suwayomi.tachidesk.manga.model.table.ChapterTable
@@ -31,7 +33,7 @@ class UpdatesQuery {
         val page: Int
     )
 
-    fun updates(input: UpdatesQueryInput): List<UpdatesType> {
+    fun updates(input: UpdatesQueryInput): UpdatesNodeList {
         val results = transaction {
             ChapterTable.innerJoin(MangaTable)
                 .select { (MangaTable.inLibrary eq true) and (ChapterTable.fetchedAt greater MangaTable.inLibraryAt) }
@@ -42,6 +44,6 @@ class UpdatesQuery {
                 }
         }
 
-        return results
+        return results.toNodeList() // todo paged
     }
 }