From a211a4143be90cedb572e746e975ab975bb009a3 Mon Sep 17 00:00:00 2001
From: Syer10 <syer10@users.noreply.github.com>
Date: Sat, 3 Apr 2021 16:57:03 -0400
Subject: [PATCH] Revert source id to long

---
 server/src/main/kotlin/ir/armor/tachidesk/impl/Source.kt      | 4 ++--
 .../ir/armor/tachidesk/model/dataclass/SourceDataClass.kt     | 2 +-
 server/src/test/kotlin/ir/armor/tachidesk/TestExtensions.kt   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/main/kotlin/ir/armor/tachidesk/impl/Source.kt b/server/src/main/kotlin/ir/armor/tachidesk/impl/Source.kt
index d7e9f48..9fec2bf 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Source.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Source.kt
@@ -24,7 +24,7 @@ object Source {
         return transaction {
             SourceTable.selectAll().map {
                 SourceDataClass(
-                    it[SourceTable.id].value,
+                    it[SourceTable.id].value.toString(),
                     it[SourceTable.name],
                     it[SourceTable.lang],
                     getExtensionIconUrl(ExtensionTable.select { ExtensionTable.id eq it[SourceTable.extension] }.first()[ExtensionTable.apkName]),
@@ -39,7 +39,7 @@ object Source {
             val source = SourceTable.select { SourceTable.id eq sourceId }.firstOrNull()
 
             SourceDataClass(
-                sourceId,
+                sourceId.toString(),
                 source?.get(SourceTable.name),
                 source?.get(SourceTable.lang),
                 source?.let { ExtensionTable.select { ExtensionTable.id eq source[SourceTable.extension] }.first()[ExtensionTable.iconUrl] },
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/model/dataclass/SourceDataClass.kt b/server/src/main/kotlin/ir/armor/tachidesk/model/dataclass/SourceDataClass.kt
index 17df592..6e22584 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/model/dataclass/SourceDataClass.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/model/dataclass/SourceDataClass.kt
@@ -8,7 +8,7 @@ package ir.armor.tachidesk.model.dataclass
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 data class SourceDataClass(
-    val id: Long,
+    val id: String,
     val name: String?,
     val lang: String?,
     val iconUrl: String?,
diff --git a/server/src/test/kotlin/ir/armor/tachidesk/TestExtensions.kt b/server/src/test/kotlin/ir/armor/tachidesk/TestExtensions.kt
index cc3aad6..000ad35 100644
--- a/server/src/test/kotlin/ir/armor/tachidesk/TestExtensions.kt
+++ b/server/src/test/kotlin/ir/armor/tachidesk/TestExtensions.kt
@@ -58,7 +58,7 @@ class TestExtensions {
                     }
                 }
             }
-            sources = getSourceList().map { getHttpSource(it.id) }
+            sources = getSourceList().map { getHttpSource(it.id.toLong()) }
         }
         setLoggingEnabled(true)
         File("tmp/TestDesk/sources.txt").writeText(sources.joinToString("\n") { "${it.name} - ${it.lang.toUpperCase()} - ${it.id}" })