- Fixed db error because of discord id

- Added logs of RatingDBApi - Increased version
Astra-Interactive · May 18, 2023 · 10e8cb9 · 10e8cb9
1 parent 6ac3406
commit 10e8cb9
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 15 deletions.
diff --git a/domain/src/main/kotlin/com/astrainteractive/astrarating/domain/api/impl/RatingDBApiImpl.kt b/domain/src/main/kotlin/com/astrainteractive/astrarating/domain/api/impl/RatingDBApiImpl.kt
@@ -18,16 +18,32 @@ import ru.astrainteractive.astralibs.orm.mapNotNull
 import ru.astrainteractive.astralibs.orm.query.CountQuery
 import ru.astrainteractive.astralibs.orm.query.SelectQuery
 import ru.astrainteractive.astralibs.orm.with
+import java.io.File
+import java.text.SimpleDateFormat
+import java.time.Instant
+import java.util.Date
+
+class RatingDBApiImpl(private val database: Database, private val pluginFolder: File) : RatingDBApi {
+    private fun <T> Result<T>.logStackTrace(): Result<T> {
+        return this.onFailure {
+            it.printStackTrace()
+            val logsFolder = File(pluginFolder, "logs")
+            if (!logsFolder.exists()) logsFolder.mkdirs()
+            val fileName = SimpleDateFormat("dd.MM.yyyy").format(Date.from(Instant.now()))
+            val logFile = File(logsFolder, "$fileName.log")
+            if (!logFile.exists()) logFile.createNewFile()
+            logFile.appendText(it.stackTraceToString() + "\n")
+        }
+    }
 
-class RatingDBApiImpl(private val database: Database) : RatingDBApi {
     private val String.sqlString: String
         get() = "\"$this\""
 
     override suspend fun selectUser(playerName: String): Result<UserDTO> = kotlin.runCatching {
         UserTable.find(database, constructor = UserEntity) {
             UserTable.minecraftName.eq(playerName.uppercase())
         }.map(UserMapper::toDTO).first()
-    }
+    }.logStackTrace()
 
     override suspend fun updateUser(user: UserDTO) = kotlin.runCatching {
         val userEntity = UserTable.find(database, constructor = UserEntity) {
@@ -36,16 +52,16 @@ class RatingDBApiImpl(private val database: Database) : RatingDBApi {
         userEntity?.lastUpdated = System.currentTimeMillis()
         user.discordID?.let { userEntity?.discordID = it }
         userEntity?.let { UserTable.update(database, entity = it) }
-    }
+    }.logStackTrace()
 
     override suspend fun insertUser(user: UserModel) = kotlin.runCatching {
         UserTable.insert(database) {
             this[UserTable.lastUpdated] = System.currentTimeMillis()
             this[UserTable.minecraftUUID] = user.minecraftUUID.toString()
             this[UserTable.minecraftName] = user.minecraftName.uppercase()
-            this[UserTable.discordID] = user.discordID
+            this[UserTable.discordID] = null
         }
-    }
+    }.logStackTrace()
 
     override suspend fun insertUserRating(
         reporter: UserDTO?,
@@ -62,13 +78,13 @@ class RatingDBApiImpl(private val database: Database) : RatingDBApi {
             this[UserRatingTable.time] = System.currentTimeMillis()
             this[UserRatingTable.ratingTypeIndex] = type.ordinal
         }
-    }
+    }.logStackTrace()
 
     override suspend fun deleteUserRating(it: UserRatingDTO) = kotlin.runCatching {
         UserRatingTable.delete<UserRatingEntity>(database) {
             UserRatingTable.id.eq(it.id)
         }
-    }
+    }.logStackTrace()
 
     override suspend fun fetchUserRatings(playerName: String) = kotlin.runCatching {
         val query = """
@@ -91,7 +107,7 @@ class RatingDBApiImpl(private val database: Database) : RatingDBApi {
         }
         statement?.close()
         result ?: emptyList()
-    }
+    }.logStackTrace()
 
     override suspend fun fetchUsersTotalRating() = kotlin.runCatching {
         val query = """
@@ -110,7 +126,7 @@ class RatingDBApiImpl(private val database: Database) : RatingDBApi {
         }
         statement?.close()
         result ?: emptyList()
-    }
+    }.logStackTrace()
 
     override suspend fun countPlayerTotalDayRated(playerName: String) = kotlin.runCatching {
         val query = CountQuery(UserRatingTable) {
@@ -127,7 +143,7 @@ class RatingDBApiImpl(private val database: Database) : RatingDBApi {
                 it.getInt("total")
             } ?: 0
         } ?: 0
-    }
+    }.logStackTrace()
 
     override suspend fun countPlayerOnPlayerDayRated(playerName: String, ratedPlayerName: String) = kotlin.runCatching {
         val query = CountQuery(UserRatingTable) {
@@ -146,5 +162,5 @@ class RatingDBApiImpl(private val database: Database) : RatingDBApi {
                 it.getInt("total")
             } ?: 0
         } ?: 0
-    }
+    }.logStackTrace()
 }
diff --git a/domain/src/main/kotlin/com/astrainteractive/astrarating/domain/mapping/UserMapper.kt b/domain/src/main/kotlin/com/astrainteractive/astrarating/domain/mapping/UserMapper.kt
@@ -13,7 +13,7 @@ object UserMapper : Mapper<UserEntity, UserDTO> {
         id = it.id,
         minecraftUUID = it.minecraftUUID,
         minecraftName = it.minecraftName,
-        discordID = it.discordID,
+        discordID = null,
         lastUpdated = it.lastUpdated
     )
 }
diff --git a/domain/src/test/java/AuctionsTests.kt b/domain/src/test/java/AuctionsTests.kt
@@ -43,7 +43,7 @@ class AuctionsTests : ORMTest() {
         database.openConnection()
         UserTable.create(database)
         UserRatingTable.create(database)
-        api = RatingDBApiImpl(database)
+        api = RatingDBApiImpl(database,File("."))
     }
 
     @Test

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 # Plugin core
-project-version = "1.7.3"
+project-version = "1.7.4"
 project-name = "AstraRating"
 project-group = "com.astrainteractive.astrarating"
 project-url = "EmpireProjekt.ru"

diff --git a/spigot/src/main/kotlin/com/astrainteractive/astrarating/modules/impl/RootModuleImpl.kt b/spigot/src/main/kotlin/com/astrainteractive/astrarating/modules/impl/RootModuleImpl.kt
@@ -68,7 +68,7 @@ object RootModuleImpl : RootModule {
     }
 
     override val dbApi = Single {
-        RatingDBApiImpl(database.value) as RatingDBApi
+        RatingDBApiImpl(database.value, plugin.value.dataFolder) as RatingDBApi
     }
     override val cachedApi = Single {
         val scope by scope