/done command processor

madhead · madhead · commit c1f4280a1873 · 2021-06-30T22:17:27.000+02:00
diff --git a/quizoji/build.gradle.kts b/quizoji/build.gradle.kts
@@ -6,6 +6,8 @@ dependencies {
     api(project.projects.core)
     api(libs.tgbotapi.core)
     implementation(project.projects.dialogs)
+    implementation(project.projects.votes)
+    implementation(project.projects.votes.tgbotapiExtensions)
     implementation(libs.log4j.api)
     implementation(libs.tgbotapi.extensions.api)
     implementation(libs.tgbotapi.extensions.utils)
diff --git a/quizoji/dynamodb/src/main/kotlin/by/jprof/telegram/bot/quizoji/dynamodb/dao/QuizojiDAO.kt b/quizoji/dynamodb/src/main/kotlin/by/jprof/telegram/bot/quizoji/dynamodb/dao/QuizojiDAO.kt
@@ -42,13 +42,9 @@ private val json = Json { serializersModule = TgBotAPI.module }
 fun Quizoji.toAttributes(): Map<String, AttributeValue> = mapOf(
     "id" to this.id.toAttributeValue(),
     "question" to json.encodeToString(this.question).toAttributeValue(),
-    "options" to this.options.map { it.toAttributeValue() }.toAttributeValue(),
 )
 
 fun Map<String, AttributeValue>.toQuizoji(): Quizoji = Quizoji(
     id = this["id"].toString("id"),
     question = json.decodeFromString(this["question"].toString("value")),
-    options = this["options"]?.l()
-        ?.mapNotNull { it.s() }
-        ?: emptyList(),
 )
diff --git a/quizoji/dynamodb/src/test/kotlin/by/jprof/telegram/bot/quizoji/dynamodb/dao/QuizojiDAOTest.kt b/quizoji/dynamodb/src/test/kotlin/by/jprof/telegram/bot/quizoji/dynamodb/dao/QuizojiDAOTest.kt
@@ -46,6 +46,5 @@ internal class QuizojiDAOTest {
                 text = "Choose the door",
                 textSources = listOf(RegularTextSource("Choose the door")),
             ),
-            options = listOf("1", "2", "3"),
         )
 }
diff --git a/quizoji/dynamodb/src/test/kotlin/by/jprof/telegram/bot/quizoji/dynamodb/dao/QuizojiTest.kt b/quizoji/dynamodb/src/test/kotlin/by/jprof/telegram/bot/quizoji/dynamodb/dao/QuizojiTest.kt
@@ -31,18 +31,12 @@ internal class QuizojiTest {
                 text = "Choose the door",
                 textSources = listOf(RegularTextSource("Choose the door")),
             ),
-            options = listOf("1", "2", "3"),
         )
     private val attributes
         get() = mapOf(
             "id" to AttributeValue.builder().s("test").build(),
             "question" to AttributeValue.builder()
                 .s("{\"type\":\"TextContent\",\"text\":\"Choose the door\",\"textSources\":[{\"type\":\"regular\",\"value\":{\"source\":\"Choose the door\"}}]}")
                 .build(),
-            "options" to AttributeValue.builder().l(
-                AttributeValue.builder().s("1").build(),
-                AttributeValue.builder().s("2").build(),
-                AttributeValue.builder().s("3").build(),
-            ).build(),
         )
 }
diff --git a/quizoji/dynamodb/src/test/resources/quizoji.items.json b/quizoji/dynamodb/src/test/resources/quizoji.items.json
@@ -8,19 +8,6 @@
           },
           "question": {
             "S": "{\"type\":\"TextContent\",\"text\":\"Choose the door\",\"textSources\":[{\"type\":\"regular\",\"value\":{\"source\":\"Choose the door\"}}]}"
-          },
-          "options": {
-            "L": [
-              {
-                "S": "1"
-              },
-              {
-                "S": "2"
-              },
-              {
-                "S": "3"
-              }
-            ]
           }
         }
       }
diff --git a/quizoji/src/main/kotlin/by/jprof/telegram/bot/quizoji/QuizojiDoneCommandUpdateProcessor.kt b/quizoji/src/main/kotlin/by/jprof/telegram/bot/quizoji/QuizojiDoneCommandUpdateProcessor.kt
@@ -0,0 +1,98 @@
+package by.jprof.telegram.bot.quizoji
+
+import by.jprof.telegram.bot.core.UpdateProcessor
+import by.jprof.telegram.bot.dialogs.dao.DialogStateDAO
+import by.jprof.telegram.bot.dialogs.model.quizoji.WaitingForOptions
+import by.jprof.telegram.bot.quizoji.dao.QuizojiDAO
+import by.jprof.telegram.bot.quizoji.model.Quizoji
+import by.jprof.telegram.bot.votes.dao.VotesDAO
+import by.jprof.telegram.bot.votes.model.Votes
+import by.jprof.telegram.bot.votes.tgbotapi_extensions.toInlineKeyboardMarkup
+import dev.inmo.tgbotapi.bot.RequestsExecutor
+import dev.inmo.tgbotapi.extensions.api.send.sendMessage
+import dev.inmo.tgbotapi.extensions.utils.asMessageUpdate
+import dev.inmo.tgbotapi.extensions.utils.asPrivateChat
+import dev.inmo.tgbotapi.extensions.utils.asPrivateContentMessage
+import dev.inmo.tgbotapi.extensions.utils.asTextContent
+import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.SwitchInlineQueryInlineKeyboardButton
+import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
+import dev.inmo.tgbotapi.types.message.content.TextContent
+import dev.inmo.tgbotapi.types.update.abstracts.Update
+import org.apache.logging.log4j.LogManager
+
+class QuizojiDoneCommandUpdateProcessor(
+    private val dialogStateDAO: DialogStateDAO,
+    private val quizojiDAO: QuizojiDAO,
+    private val votesDAO: VotesDAO,
+    private val bot: RequestsExecutor,
+) : UpdateProcessor {
+    companion object {
+        private val logger = LogManager.getLogger(QuizojiDoneCommandUpdateProcessor::class.java)!!
+        private val idChars = ('0'..'9') + ('a'..'z') + ('A'..'Z')
+        private const val idLength = 20
+    }
+
+    override suspend fun process(update: Update) {
+        val message = update.asMessageUpdate()?.data?.asPrivateContentMessage() ?: return
+        val chat = message.chat.asPrivateChat() ?: return
+        val state = dialogStateDAO.get(chat.id.chatId, message.user.id.chatId)
+
+        if (state !is WaitingForOptions) {
+            return
+        }
+
+        val content = message.content.asTextContent() ?: return
+
+        if (content.text != "/done") {
+            return
+        }
+
+        logger.debug("{} finished his Quizoji", chat.id.chatId)
+
+        val quizoji = Quizoji(
+            id = generateQuizojiID(),
+            question = state.question,
+        )
+        val votes = Votes(
+            id = "QUIZOJI-${quizoji.id}",
+            options = state.options
+        )
+
+        votesDAO.save(votes)
+        quizojiDAO.save(quizoji)
+        dialogStateDAO.delete(chatId = chat.id.chatId, userId = message.user.id.chatId)
+
+        bot.sendMessage(
+            chat = chat,
+            text = "Quizoji created! Use the 'Publish' button to send it."
+        )
+
+        when (val question = state.question) {
+            is TextContent -> {
+                bot.sendMessage(
+                    chat = chat,
+                    entities = question.textSources,
+                    replyMarkup = InlineKeyboardMarkup(
+                        votes
+                            .toInlineKeyboardMarkup(8)
+                            .keyboard
+                            .plus(
+                                listOf(
+                                    listOf(
+                                        SwitchInlineQueryInlineKeyboardButton(
+                                            text = "Publish",
+                                            switchInlineQuery = "quizoji ${quizoji.id}",
+                                        )
+                                    )
+                                )
+                            )
+                    )
+                )
+            }
+        }
+    }
+
+    private fun generateQuizojiID(): String {
+        return (0 until idLength).map { idChars.random() }.joinToString(separator = "")
+    }
+}
diff --git a/quizoji/src/main/kotlin/by/jprof/telegram/bot/quizoji/model/Quizoji.kt b/quizoji/src/main/kotlin/by/jprof/telegram/bot/quizoji/model/Quizoji.kt
@@ -5,5 +5,4 @@ import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
 data class Quizoji(
     val id: String,
     val question: MessageContent,
-    val options: List<String>,
 )
diff --git a/quizoji/src/test/kotlin/by/jprof/telegram/bot/quizoji/QuizojiDoneCommandUpdateProcessorTest.kt b/quizoji/src/test/kotlin/by/jprof/telegram/bot/quizoji/QuizojiDoneCommandUpdateProcessorTest.kt

Original file line number	Diff line number	Diff line change
`@@ -42,13 +42,9 @@ private val json = Json { serializersModule = TgBotAPI.module }`
`42`	`42`	`fun Quizoji.toAttributes(): Map<String, AttributeValue> = mapOf(`
`43`	`43`	`"id" to this.id.toAttributeValue(),`
`44`	`44`	`"question" to json.encodeToString(this.question).toAttributeValue(),`
`45`		`- "options" to this.options.map { it.toAttributeValue() }.toAttributeValue(),`
`46`	`45`	`)`
`47`	`46`
`48`	`47`	`fun Map<String, AttributeValue>.toQuizoji(): Quizoji = Quizoji(`
`49`	`48`	`id = this["id"].toString("id"),`
`50`	`49`	`question = json.decodeFromString(this["question"].toString("value")),`
`51`		`- options = this["options"]?.l()`
`52`		`- ?.mapNotNull { it.s() }`
`53`		`- ?: emptyList(),`
`54`	`50`	`)`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,5 @@ internal class QuizojiDAOTest {`
`46`	`46`	`text = "Choose the door",`
`47`	`47`	`textSources = listOf(RegularTextSource("Choose the door")),`
`48`	`48`	`),`
`49`		`- options = listOf("1", "2", "3"),`
`50`	`49`	`)`
`51`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,18 +31,12 @@ internal class QuizojiTest {`
`31`	`31`	`text = "Choose the door",`
`32`	`32`	`textSources = listOf(RegularTextSource("Choose the door")),`
`33`	`33`	`),`
`34`		`- options = listOf("1", "2", "3"),`
`35`	`34`	`)`
`36`	`35`	`private val attributes`
`37`	`36`	`get() = mapOf(`
`38`	`37`	`"id" to AttributeValue.builder().s("test").build(),`
`39`	`38`	`"question" to AttributeValue.builder()`
`40`	`39`	`.s("{\"type\":\"TextContent\",\"text\":\"Choose the door\",\"textSources\":[{\"type\":\"regular\",\"value\":{\"source\":\"Choose the door\"}}]}")`
`41`	`40`	`.build(),`
`42`		`- "options" to AttributeValue.builder().l(`
`43`		`- AttributeValue.builder().s("1").build(),`
`44`		`- AttributeValue.builder().s("2").build(),`
`45`		`- AttributeValue.builder().s("3").build(),`
`46`		`- ).build(),`
`47`	`41`	`)`
`48`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,4 @@ import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent`
`5`	`5`	`data class Quizoji(`
`6`	`6`	`val id: String,`
`7`	`7`	`val question: MessageContent,`
`8`		`- val options: List<String>,`
`9`	`8`	`)`