From 5475567b485cacc2da8bda5c737dddc2865d3e3e Mon Sep 17 00:00:00 2001
From: Mitchell Syer <Mitchellptbo@gmail.com>
Date: Wed, 24 May 2023 06:30:29 -0400
Subject: [PATCH] Cleanup download type (#553)

---
 .../tachidesk/graphql/types/DownloadType.kt   | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/DownloadType.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/DownloadType.kt
index 37d7e8f3..ab9a1bb1 100644
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/DownloadType.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/DownloadType.kt
@@ -7,7 +7,8 @@
 
 package suwayomi.tachidesk.graphql.types
 
-import com.expediagroup.graphql.generator.annotations.GraphQLIgnore
+import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
+import graphql.schema.DataFetchingEnvironment
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Edge
 import suwayomi.tachidesk.graphql.server.primitives.Node
@@ -15,38 +16,29 @@ import suwayomi.tachidesk.graphql.server.primitives.NodeList
 import suwayomi.tachidesk.graphql.server.primitives.PageInfo
 import suwayomi.tachidesk.manga.impl.download.model.DownloadChapter
 import suwayomi.tachidesk.manga.impl.download.model.DownloadState
-import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
-import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
+import java.util.concurrent.CompletableFuture
 
 class DownloadType(
     val chapterId: Int,
-    val chapterIndex: Int,
     val mangaId: Int,
     var state: DownloadState = DownloadState.Queued,
     var progress: Float = 0f,
-    var tries: Int = 0,
-    @GraphQLIgnore
-    var mangaDataClass: MangaDataClass,
-    @GraphQLIgnore
-    var chapterDataClass: ChapterDataClass
+    var tries: Int = 0
 ) : Node {
     constructor(downloadChapter: DownloadChapter) : this(
         downloadChapter.chapter.id,
-        downloadChapter.chapterIndex,
         downloadChapter.mangaId,
         downloadChapter.state,
         downloadChapter.progress,
-        downloadChapter.tries,
-        downloadChapter.manga,
-        downloadChapter.chapter
+        downloadChapter.tries
     )
 
-    fun manga(): MangaType {
-        return MangaType(mangaDataClass)
+    fun manga(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<MangaType> {
+        return dataFetchingEnvironment.getValueFromDataLoader<Int, MangaType>("MangaDataLoader", mangaId)
     }
 
-    fun chapter(): ChapterType {
-        return ChapterType(chapterDataClass)
+    fun chapter(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<ChapterType> {
+        return dataFetchingEnvironment.getValueFromDataLoader<Int, ChapterType>("ChapterDataLoader", chapterId)
     }
 }