Save state for /start quizoji command

madhead · madhead · commit ff874bc18d23 · 2021-06-28T19:53:20.000+02:00
diff --git a/quizoji/build.gradle.kts b/quizoji/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 dependencies {
     api(project.projects.core)
     api(libs.tgbotapi.core)
+    implementation(project.projects.dialogs)
     implementation(libs.log4j.api)
     implementation(libs.tgbotapi.extensions.api)
     implementation(libs.tgbotapi.extensions.utils)
diff --git a/quizoji/src/main/kotlin/by/jprof/telegram/bot/quizoji/QuizojiStartCommandUpdateProcessor.kt b/quizoji/src/main/kotlin/by/jprof/telegram/bot/quizoji/QuizojiStartCommandUpdateProcessor.kt
@@ -1,6 +1,8 @@
 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.WaitingForQuestion
 import dev.inmo.tgbotapi.bot.RequestsExecutor
 import dev.inmo.tgbotapi.extensions.api.send.sendMessage
 import dev.inmo.tgbotapi.extensions.utils.asMessageUpdate
@@ -11,6 +13,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
 import org.apache.logging.log4j.LogManager
 
 class QuizojiStartCommandUpdateProcessor(
+    private val dialogStateDAO: DialogStateDAO,
     private val bot: RequestsExecutor,
 ) : UpdateProcessor {
     companion object {
@@ -26,6 +29,8 @@ class QuizojiStartCommandUpdateProcessor(
             return
         }
 
+        dialogStateDAO.save(WaitingForQuestion(chat.id.chatId, message.user.id.chatId))
+
         bot.sendMessage(
             chat = chat,
             text = "Let's create a Quizoji! First, send me the message. It can be anything — a text, photo, video, even a sticker."
diff --git a/quizoji/src/test/kotlin/by/jprof/telegram/bot/quizoji/QuizojiStartCommandUpdateProcessorTest.kt b/quizoji/src/test/kotlin/by/jprof/telegram/bot/quizoji/QuizojiStartCommandUpdateProcessorTest.kt
@@ -1,10 +1,13 @@
 package by.jprof.telegram.bot.quizoji
 
+import by.jprof.telegram.bot.dialogs.dao.DialogStateDAO
+import by.jprof.telegram.bot.dialogs.model.quizoji.WaitingForQuestion
 import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.bot.RequestsExecutor
 import dev.inmo.tgbotapi.extensions.api.send.sendMessage
 import dev.inmo.tgbotapi.types.Bot
 import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.CommonUser
 import dev.inmo.tgbotapi.types.chat.PrivateChatImpl
 import dev.inmo.tgbotapi.types.chat.abstracts.PrivateChat
 import dev.inmo.tgbotapi.types.message.PrivateContentMessageImpl
@@ -26,11 +29,15 @@ internal class QuizojiStartCommandUpdateProcessorTest {
     @MockK(relaxed = true)
     private lateinit var bot: RequestsExecutor
 
+    @MockK(relaxed = true)
+    private lateinit var dialogStateDAO: DialogStateDAO
+
     lateinit var sut: QuizojiStartCommandUpdateProcessor
 
     @BeforeEach
     fun setUp() {
         sut = QuizojiStartCommandUpdateProcessor(
+            dialogStateDAO = dialogStateDAO,
             bot = bot,
         )
     }
@@ -44,7 +51,7 @@ internal class QuizojiStartCommandUpdateProcessorTest {
             )
         )
 
-        verify { listOf(bot) wasNot called }
+        verify { listOf(dialogStateDAO, bot) wasNot called }
 
         clearAllMocks()
     }
@@ -58,7 +65,7 @@ internal class QuizojiStartCommandUpdateProcessorTest {
             )
         )
 
-        verify { listOf(bot) wasNot called }
+        verify { listOf(dialogStateDAO, bot) wasNot called }
 
         clearAllMocks()
     }
@@ -84,7 +91,7 @@ internal class QuizojiStartCommandUpdateProcessorTest {
             )
         )
 
-        verify { listOf(bot) wasNot called }
+        verify { listOf(dialogStateDAO, bot) wasNot called }
 
         clearAllMocks()
     }
@@ -110,7 +117,7 @@ internal class QuizojiStartCommandUpdateProcessorTest {
             )
         )
 
-        verify { listOf(bot) wasNot called }
+        verify { listOf(dialogStateDAO, bot) wasNot called }
 
         clearAllMocks()
     }
@@ -138,7 +145,7 @@ internal class QuizojiStartCommandUpdateProcessorTest {
             )
         )
 
-        verify { listOf(bot) wasNot called }
+        verify { listOf(dialogStateDAO, bot) wasNot called }
 
         clearAllMocks()
     }
@@ -154,7 +161,7 @@ internal class QuizojiStartCommandUpdateProcessorTest {
                 updateId = 1,
                 data = PrivateContentMessageImpl(
                     messageId = 1,
-                    user = mockk(),
+                    user = CommonUser(id = ChatId(2), "Test"),
                     chat = chat,
                     content = TextContent(
                         text = "/start quizoji"
@@ -170,6 +177,11 @@ internal class QuizojiStartCommandUpdateProcessorTest {
             )
         )
 
+        coVerify(exactly = 1) {
+            dialogStateDAO.save(
+                WaitingForQuestion(chatId = 1, userId = 2)
+            )
+        }
         coVerify(exactly = 1) {
             bot.sendMessage(
                 chat = chat,
diff --git a/runners/lambda/build.gradle.kts b/runners/lambda/build.gradle.kts
@@ -13,5 +13,6 @@ dependencies {
     implementation(project.projects.jep)
     implementation(project.projects.youtube.dynamodb)
     implementation(project.projects.kotlin.dynamodb)
+    implementation(project.projects.dialogs.dynamodb)
     implementation(project.projects.quizoji)
 }
diff --git a/runners/lambda/src/main/kotlin/by/jprof/telegram/bot/runners/lambda/config/database.kt b/runners/lambda/src/main/kotlin/by/jprof/telegram/bot/runners/lambda/config/database.kt
@@ -1,11 +1,13 @@
 package by.jprof.telegram.bot.runners.lambda.config
 
+import by.jprof.telegram.bot.dialogs.dao.DialogStateDAO
 import by.jprof.telegram.bot.kotlin.dao.KotlinMentionsDAO
 import by.jprof.telegram.bot.votes.dao.VotesDAO
 import by.jprof.telegram.bot.youtube.dao.YouTubeChannelsWhitelistDAO
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
+import by.jprof.telegram.bot.dialogs.dynamodb.dao.DialogStateDAO as DynamoDBDialogStateDAO
 import by.jprof.telegram.bot.kotlin.dynamodb.dao.KotlinMentionsDAO as DynamoDBKotlinMentionsDAO
 import by.jprof.telegram.bot.votes.dynamodb.dao.VotesDAO as DynamoDBVotesDAO
 import by.jprof.telegram.bot.youtube.dynamodb.dao.YouTubeChannelsWhitelistDAO as DynamoDBYouTubeChannelsWhitelistDAO
@@ -35,4 +37,11 @@ val databaseModule = module {
             get(named(TABLE_KOTLIN_MENTIONS))
         )
     }
+
+    single<DialogStateDAO> {
+        DynamoDBDialogStateDAO(
+            get(),
+            get(named(TABLE_DIALOG_STATES))
+        )
+    }
 }
diff --git a/runners/lambda/src/main/kotlin/by/jprof/telegram/bot/runners/lambda/config/pipeline.kt b/runners/lambda/src/main/kotlin/by/jprof/telegram/bot/runners/lambda/config/pipeline.kt
@@ -48,6 +48,7 @@ val pipelineModule = module {
 
     single<UpdateProcessor>(named("QuizojiStartCommandUpdateProcessor")) {
         QuizojiStartCommandUpdateProcessor(
+            dialogStateDAO = get(),
             bot = get(),
         )
     }

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,13 @@`
`1`	`1`	`package by.jprof.telegram.bot.quizoji`
`2`	`2`
	`3`	`+import by.jprof.telegram.bot.dialogs.dao.DialogStateDAO`
	`4`	`+import by.jprof.telegram.bot.dialogs.model.quizoji.WaitingForQuestion`
`3`	`5`	`import com.soywiz.klock.DateTime`
`4`	`6`	`import dev.inmo.tgbotapi.bot.RequestsExecutor`
`5`	`7`	`import dev.inmo.tgbotapi.extensions.api.send.sendMessage`
`6`	`8`	`import dev.inmo.tgbotapi.types.Bot`
`7`	`9`	`import dev.inmo.tgbotapi.types.ChatId`
	`10`	`+import dev.inmo.tgbotapi.types.CommonUser`
`8`	`11`	`import dev.inmo.tgbotapi.types.chat.PrivateChatImpl`
`9`	`12`	`import dev.inmo.tgbotapi.types.chat.abstracts.PrivateChat`
`10`	`13`	`import dev.inmo.tgbotapi.types.message.PrivateContentMessageImpl`
`@@ -26,11 +29,15 @@ internal class QuizojiStartCommandUpdateProcessorTest {`
`26`	`29`	`@MockK(relaxed = true)`
`27`	`30`	`private lateinit var bot: RequestsExecutor`
`28`	`31`
	`32`	`+ @MockK(relaxed = true)`
	`33`	`+ private lateinit var dialogStateDAO: DialogStateDAO`
	`34`	`+`
`29`	`35`	`lateinit var sut: QuizojiStartCommandUpdateProcessor`
`30`	`36`
`31`	`37`	`@BeforeEach`
`32`	`38`	`fun setUp() {`
`33`	`39`	`sut = QuizojiStartCommandUpdateProcessor(`
	`40`	`+ dialogStateDAO = dialogStateDAO,`
`34`	`41`	`bot = bot,`
`35`	`42`	`)`
`36`	`43`	`}`
`@@ -44,7 +51,7 @@ internal class QuizojiStartCommandUpdateProcessorTest {`
`44`	`51`	`)`
`45`	`52`	`)`
`46`	`53`
`47`		`- verify { listOf(bot) wasNot called }`
	`54`	`+ verify { listOf(dialogStateDAO, bot) wasNot called }`
`48`	`55`
`49`	`56`	`clearAllMocks()`
`50`	`57`	`}`
`@@ -58,7 +65,7 @@ internal class QuizojiStartCommandUpdateProcessorTest {`
`58`	`65`	`)`
`59`	`66`	`)`
`60`	`67`
`61`		`- verify { listOf(bot) wasNot called }`
	`68`	`+ verify { listOf(dialogStateDAO, bot) wasNot called }`
`62`	`69`
`63`	`70`	`clearAllMocks()`
`64`	`71`	`}`
`@@ -84,7 +91,7 @@ internal class QuizojiStartCommandUpdateProcessorTest {`
`84`	`91`	`)`
`85`	`92`	`)`
`86`	`93`
`87`		`- verify { listOf(bot) wasNot called }`
	`94`	`+ verify { listOf(dialogStateDAO, bot) wasNot called }`
`88`	`95`
`89`	`96`	`clearAllMocks()`
`90`	`97`	`}`
`@@ -110,7 +117,7 @@ internal class QuizojiStartCommandUpdateProcessorTest {`
`110`	`117`	`)`
`111`	`118`	`)`
`112`	`119`
`113`		`- verify { listOf(bot) wasNot called }`
	`120`	`+ verify { listOf(dialogStateDAO, bot) wasNot called }`
`114`	`121`
`115`	`122`	`clearAllMocks()`
`116`	`123`	`}`
`@@ -138,7 +145,7 @@ internal class QuizojiStartCommandUpdateProcessorTest {`
`138`	`145`	`)`
`139`	`146`	`)`
`140`	`147`
`141`		`- verify { listOf(bot) wasNot called }`
	`148`	`+ verify { listOf(dialogStateDAO, bot) wasNot called }`
`142`	`149`
`143`	`150`	`clearAllMocks()`
`144`	`151`	`}`
`@@ -154,7 +161,7 @@ internal class QuizojiStartCommandUpdateProcessorTest {`
`154`	`161`	`updateId = 1,`
`155`	`162`	`data = PrivateContentMessageImpl(`
`156`	`163`	`messageId = 1,`
`157`		`- user = mockk(),`
	`164`	`+ user = CommonUser(id = ChatId(2), "Test"),`
`158`	`165`	`chat = chat,`
`159`	`166`	`content = TextContent(`
`160`	`167`	`text = "/start quizoji"`
`@@ -170,6 +177,11 @@ internal class QuizojiStartCommandUpdateProcessorTest {`
`170`	`177`	`)`
`171`	`178`	`)`
`172`	`179`
	`180`	`+ coVerify(exactly = 1) {`
	`181`	`+ dialogStateDAO.save(`
	`182`	`+ WaitingForQuestion(chatId = 1, userId = 2)`
	`183`	`+ )`
	`184`	`+ }`
`173`	`185`	`coVerify(exactly = 1) {`
`174`	`186`	`bot.sendMessage(`
`175`	`187`	`chat = chat,`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@ dependencies {`
`13`	`13`	`implementation(project.projects.jep)`
`14`	`14`	`implementation(project.projects.youtube.dynamodb)`
`15`	`15`	`implementation(project.projects.kotlin.dynamodb)`
	`16`	`+ implementation(project.projects.dialogs.dynamodb)`
`16`	`17`	`implementation(project.projects.quizoji)`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ val pipelineModule = module {`
`48`	`48`
`49`	`49`	`single<UpdateProcessor>(named("QuizojiStartCommandUpdateProcessor")) {`
`50`	`50`	`QuizojiStartCommandUpdateProcessor(`
	`51`	`+ dialogStateDAO = get(),`
`51`	`52`	`bot = get(),`
`52`	`53`	`)`
`53`	`54`	`}`