Extract VotingProcessor to a separate module for reuse

Author: madhead

core/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    api(libs.bundles.tgbotapi)
+    api(libs.tgbotapi.core)
     implementation(libs.log4j.api)
 
     testImplementation(libs.junit.jupiter.api)

jep/build.gradle.kts

@@ -5,7 +5,10 @@ plugins {
 dependencies {
     api(project(":core"))
     api(project(":votes"))
+    api(libs.tgbotapi.core)
     implementation(project(":votes:tgbotapi-extensions"))
+    implementation(project(":votes:voting-processor"))
+    implementation(libs.tgbotapi.extensions.api)
     implementation(libs.log4j.api)
     implementation(libs.jsoup)
 

jep/src/main/kotlin/by/jprof/telegram/bot/jep/JEPUpdateProcessor.kt

@@ -4,13 +4,10 @@ import by.jprof.telegram.bot.core.UpdateProcessor
 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 by.jprof.telegram.bot.votes.voting_processor.VotingProcessor
 import dev.inmo.tgbotapi.CommonAbstracts.justTextSources
 import dev.inmo.tgbotapi.bot.RequestsExecutor
-import dev.inmo.tgbotapi.extensions.api.answers.answerCallbackQuery
-import dev.inmo.tgbotapi.extensions.api.edit.ReplyMarkup.editMessageReplyMarkup
 import dev.inmo.tgbotapi.extensions.api.send.reply
-import dev.inmo.tgbotapi.types.CallbackQuery.CallbackQuery
-import dev.inmo.tgbotapi.types.CallbackQuery.MessageDataCallbackQuery
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextLinkTextSource
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.URLTextSource
 import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2ParseMode
@@ -26,11 +23,18 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
 import org.apache.logging.log4j.LogManager
 
+private fun votesConstructor(votesId: String): Votes = Votes(votesId, listOf("\uD83D\uDC4D", "\uD83D\uDC4E"))
+
 class JEPUpdateProcessor(
     private val jepSummary: JEPSummary,
     private val votesDAO: VotesDAO,
     private val bot: RequestsExecutor,
-) : UpdateProcessor {
+) : VotingProcessor(
+    "JEP",
+    votesDAO,
+    ::votesConstructor,
+    bot,
+), UpdateProcessor {
     companion object {
         val logger = LogManager.getLogger(JEPUpdateProcessor::class.java)!!
         val linkRegex = "https?://openjdk\\.java\\.net/jeps/(\\d+)/?".toRegex()
@@ -57,27 +61,6 @@ class JEPUpdateProcessor(
         }
     }
 
-    private suspend fun processCallbackQuery(callbackQuery: CallbackQuery) {
-        logger.debug("Processing callback query: {}", callbackQuery)
-
-        (callbackQuery as? MessageDataCallbackQuery)?.data?.takeIf { it.startsWith("JEP") }?.let { data ->
-            val (votesId, vote) = data.split(":").takeIf { it.size == 2 } ?: return
-            val fromUserId = callbackQuery.user.id.chatId.toString()
-
-            logger.debug("Tracking {}'s '{}' vote for {}", fromUserId, vote, votesId)
-
-            val votes = votesDAO.get(votesId) ?: votesId.toVotes()
-            val updatedVotes = votes.copy(votes = votes.votes + (fromUserId to vote))
-
-            votesDAO.save(updatedVotes)
-            bot.answerCallbackQuery(callbackQuery)
-            bot.editMessageReplyMarkup(
-                message = callbackQuery.message,
-                replyMarkup = updatedVotes.toInlineKeyboardMarkup()
-            )
-        }
-    }
-
     private fun extractJEPs(message: Message): List<String>? =
         (message as? ContentMessage<*>)?.let { contentMessage ->
             (contentMessage.content as? TextContent)?.let { content ->
@@ -107,7 +90,7 @@ class JEPUpdateProcessor(
             "Cast your vote for *JEP $jep* now ⤵️"
         }
         val votesId = jep.toVotesID()
-        val votes = votesDAO.get(votesId) ?: votesId.toVotes()
+        val votes = votesDAO.get(votesId) ?: votesConstructor(votesId)
 
         bot.reply(
             to = message,
@@ -118,6 +101,4 @@ class JEPUpdateProcessor(
     }
 
     private fun String.toVotesID() = "JEP-$this"
-
-    private fun String.toVotes() = Votes(this, listOf("\uD83D\uDC4D", "\uD83D\uDC4E"))
 }

settings.gradle.kts

@@ -6,6 +6,7 @@ include(":utils:dynamodb")
 include(":votes")
 include(":votes:dynamodb")
 include(":votes:tgbotapi-extensions")
+include(":votes:voting-processor")
 include(":core")
 include(":jep")
 include(":runners:lambda")

votes/voting-processor/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    kotlin("jvm")
+}
+
+dependencies {
+    api(libs.tgbotapi.core)
+    implementation(project(":votes"))
+    implementation(project(":votes:tgbotapi-extensions"))
+    implementation(libs.tgbotapi.extensions.api)
+    implementation(libs.log4j.api)
+
+    testImplementation(libs.junit.jupiter.api)
+    testImplementation(libs.junit.jupiter.params)
+    testImplementation(libs.mockk)
+    testRuntimeOnly(libs.junit.jupiter.engine)
+    testRuntimeOnly(libs.log4j.core)
+}

votes/voting-processor/src/main/kotlin/by/jprof/telegram/bot/votes/voting_processor/VotingProcessor.kt

@@ -0,0 +1,43 @@
+package by.jprof.telegram.bot.votes.voting_processor
+
+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.answers.answerCallbackQuery
+import dev.inmo.tgbotapi.extensions.api.edit.ReplyMarkup.editMessageReplyMarkup
+import dev.inmo.tgbotapi.types.CallbackQuery.CallbackQuery
+import dev.inmo.tgbotapi.types.CallbackQuery.MessageDataCallbackQuery
+import org.apache.logging.log4j.LogManager
+
+abstract class VotingProcessor(
+    private val prefix: String,
+    private val votesDAO: VotesDAO,
+    private val votesConstructor: (String) -> Votes,
+    private val bot: RequestsExecutor,
+) {
+    companion object {
+        val logger = LogManager.getLogger(VotingProcessor::class.java)!!
+    }
+
+    suspend fun processCallbackQuery(callbackQuery: CallbackQuery) {
+        logger.debug("Processing callback query: {}", callbackQuery)
+
+        (callbackQuery as? MessageDataCallbackQuery)?.data?.takeIf { it.startsWith(prefix) }?.let { data ->
+            val (votesId, vote) = data.split(":").takeIf { it.size == 2 } ?: return
+            val fromUserId = callbackQuery.user.id.chatId.toString()
+
+            logger.debug("Tracking {}'s '{}' vote for {}", fromUserId, vote, votesId)
+
+            val votes = votesDAO.get(votesId) ?: votesConstructor(votesId)
+            val updatedVotes = votes.copy(votes = votes.votes + (fromUserId to vote))
+
+            votesDAO.save(updatedVotes)
+            bot.answerCallbackQuery(callbackQuery)
+            bot.editMessageReplyMarkup(
+                message = callbackQuery.message,
+                replyMarkup = updatedVotes.toInlineKeyboardMarkup()
+            )
+        }
+    }
+}

votes/voting-processor/src/test/kotlin/by/jprof/telegram/bot/votes/voting_processor/VotingProcessorTest.kt

@@ -0,0 +1,10 @@
+package by.jprof.telegram.bot.votes.voting_processor
+
+import org.junit.jupiter.api.Test
+
+internal class VotingProcessorTest {
+    @Test
+    fun processCallbackQuery() {
+        TODO()
+    }
+}