Merge pull request #12 from dalbodeule/develop

debug with eagerLoading

common/src/main/kotlin/space/mori/chzzk_bot/common/services/ManagerService.kt

@@ -26,10 +26,8 @@ object ManagerService {
         if (user.liveAlertGuild == null)
             throw RuntimeException("${user.username} has no liveAlertGuild")
 
-        val manager = getUser(user.liveAlertGuild!!, discordId)
+        val manager = getUser(user.liveAlertGuild!!, discordId) ?: throw RuntimeException("$name isn't manager.")
 
-        if (manager == null)
-            throw RuntimeException("$name isn't manager.")
         manager.lastUserName = name
 
         return manager
@@ -38,16 +36,23 @@ object ManagerService {
     fun getUser(guildId: Long, discordId: Long): Manager? {
         return transaction {
             val manager = Manager.find(
-                (Managers.discordGuildId eq guildId) and (Managers.managerId eq discordId)
+                (Managers.discordGuildId eq guildId) and (Managers.managerId eq discordId),
             )
 
-            manager.firstOrNull()
+            val result = manager.firstOrNull()
+
+            result?.eagerLoad()
+            result
         }
     }
 
     fun getAllUsers(guildId: Long): List<Manager> {
         return transaction {
-            Manager.find(Managers.discordGuildId eq guildId).toList()
+            val result = Manager.find(Managers.discordGuildId eq guildId).toList()
+
+            result.forEach { it.eagerLoad() }
+
+            result
         }
     }
 
@@ -67,4 +72,8 @@ object ManagerService {
             managerRow
         }
     }
+
+    fun Manager.eagerLoad() {
+        this.user
+    }
 }

gradle.properties

@@ -1,6 +1,6 @@
 kotlin.code.style=official
 group = space.mori
-version = 1.1.0
+version = 1.1.1
 
 org.gradle.jvmargs=-Dfile.encoding=UTF-8
 org.gradle.console=plain