Merge pull request #21 from bullet-true/KTB-25-database-migration

KTB-25 migrate to database

Author: bullet-true

build.gradle.kts

@@ -15,6 +15,7 @@ repositories {
 dependencies {
     testImplementation(kotlin("test"))
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
+    implementation("org.xerial:sqlite-jdbc:3.50.3.0")
 }
 
 tasks.test {
@@ -25,5 +26,5 @@ kotlin {
 }
 
 application {
-    mainClass.set("org.example.TelegramKt")
+    mainClass.set("ru.ifedorov.telegrambot.telegram.TelegramKt")
 }

src/main/kotlin/LearnWordsTrainer.kt

@@ -1,22 +1,31 @@
-package org.example
+package ru.ifedorov.telegrambot.console
+
+import ru.ifedorov.telegrambot.data.db.DatabaseConnection
+import ru.ifedorov.telegrambot.data.db.DatabaseUserDictionary
+import ru.ifedorov.telegrambot.trainer.LearnWordsTrainer
 
 fun main() {
+    val chatId = 0L
+
+    Runtime.getRuntime().addShutdownHook(Thread {
+        DatabaseConnection.close()
+    })
 
     val trainer = try {
-        LearnWordsTrainer()
+        LearnWordsTrainer(DatabaseUserDictionary(chatId))
     } catch (e: Exception) {
-        println("Невозможно загрузить словарь. $e")
+        println("Невозможно подключиться к БД. $e")
         return
     }
 
     while (true) {
         println(
             """
-            Меню: 
-            1 – Учить слова
-            2 – Статистика
-            0 – Выход
-        """.trimIndent()
+               Меню: 
+               1 – Учить слова
+               2 – Статистика
+               0 – Выход
+            """.trimIndent()
         )
 
         when (readln().toIntOrNull()) {
@@ -50,11 +59,4 @@ fun main() {
             else -> println("Введите число 1, 2 или 0")
         }
     }
-}
-
-fun Question.asConsoleString(): String {
-    val variants = this.variants
-        .mapIndexed { index, word -> " ${index + 1} - ${word.translate}" }
-        .joinToString(separator = "\n")
-    return "\n" + this.correctAnswer.original + ":" + "\n" + variants + "\n ---------- \n 0 - Меню"
 }

src/main/kotlin/Telegram.kt

@@ -0,0 +1,12 @@
+package ru.ifedorov.telegrambot.console
+
+import ru.ifedorov.telegrambot.trainer.model.Question
+
+fun Question.asConsoleString(): String =
+    this.variants
+        .mapIndexed { index, word -> " ${index + 1} - ${word.translate}" }
+        .joinToString(
+            prefix = "\n ${correctAnswer.original}:\n",
+            separator = "\n",
+            postfix = "\n ---------- \n 0 - Меню"
+        )