Fixed bug when accepting a new serial

Author: StaticFX

src/main/kotlin/org/vzbot/discord/commands/SerialCommand.kt

@@ -19,6 +19,7 @@ import org.simpleyaml.configuration.file.YamlConfiguration
 import org.vzbot.discord.components.PrinterSelection
 import org.vzbot.discord.restrictions.AdminRestriction
 import org.vzbot.discord.restrictions.TeamMemberRestriction
+import org.vzbot.discord.util.fetchFilesForSerial
 import org.vzbot.io.buildPrettyEmbed
 import org.vzbot.io.respondSuccess
 import org.vzbot.models.*
@@ -49,6 +50,21 @@ class SerialCommand: DiscordCommand() {
         }
     }
 
+    @DSubCommand("returns the files for the given serial number")
+    class SerialFiles: DiscordSubCommand() {
+
+        @DCommandOption("serial id")
+        var serialID: Int = -1
+
+        @Restricted(TeamMemberRestriction::class, "mustBeInTeam")
+        override fun execute(actionSender: ActionSender) {
+            val serialFiles = fetchFilesForSerial(serialID.toLong())
+            actionSender.textChannel.channel.sendFiles(serialFiles.map { FileUpload.fromData(it) }).queue()
+
+            actionSender.respondSuccess("The files have been sent!")
+        }
+    }
+
     @DSubCommand("Imports serial data from a provided .yml")
     class Import(): DiscordSubCommand() {
 

src/main/kotlin/org/vzbot/discord/components/AcceptSerialRequestButton.kt

@@ -7,6 +7,9 @@ import com.zellerfeld.zellerbotapi.discord.components.DiscordButton
 import com.zellerfeld.zellerbotapi.discord.components.PermanentDiscordButton
 import com.zellerfeld.zellerbotapi.discord.components.commands.actionsenders.ActionSender
 import com.zellerfeld.zellerbotapi.discord.components.custom.ConfirmModal
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
 import net.dv8tion.jda.api.entities.Message
 import net.dv8tion.jda.api.entities.emoji.Emoji
 import net.dv8tion.jda.api.interactions.components.ActionRow
@@ -16,13 +19,15 @@ import org.jetbrains.exposed.sql.transactions.transaction
 import org.vzbot.discord.commands.fetchSerialTicket
 import org.vzbot.discord.restrictions.TeamMemberRestriction
 import org.vzbot.discord.restrictions.TicketRestrictions
+import org.vzbot.discord.util.fetchFilesForSerial
 import org.vzbot.io.*
 import org.vzbot.models.SerialNumber
 import java.awt.Color
 import java.io.File
 
 @DCButton
 class AcceptSerialRequestButton: PermanentDiscordButton("vz_accept_serial", DiscordButton(label = "Accept", buttonStyle = ButtonStyle.SUCCESS, emoji = Emoji.fromUnicode("U+1F44D"))) {
+    @OptIn(DelicateCoroutinesApi::class)
     @Restricted(TeamMemberRestriction::class, "mustBeInTeam")
     @Restricted(TicketRestrictions::class, "validTicket")
     override fun execute(actionSender: ActionSender, hook: Message) {
@@ -58,6 +63,15 @@ class AcceptSerialRequestButton: PermanentDiscordButton("vz_accept_serial", Disc
                 }
             }
 
+            GlobalScope.async {
+                val coordinates = ticket.country?.randomCoordinates() ?: return@async
+
+                transaction {
+                    serialNumber.latitude = coordinates.first
+                    serialNumber.longitude = coordinates.second
+                }
+            }
+
             transaction {
                 ticket.open = false
                 ticket.accepted = true
@@ -68,27 +82,23 @@ class AcceptSerialRequestButton: PermanentDiscordButton("vz_accept_serial", Disc
 
             val channel = actionSender.textChannel
 
-            val serialID = serialNumber.id.value
+            val serialID = transaction { serialNumber.id.value }
 
             val embed = prettyEmbed("Application Accepted", "**Congratulations**. Your application has been accepted and you have been granted your new serial id. In the following messages, we will send you the files to print your serial badge. Welcome to the **VZParty!** Feel free to delete your ticket, when you have grabbed your filed.", Color.GREEN)
             embed.addField("Serial ID", serialID.toString(), false)
 
             channel.sendEmbedWithText(ticketOwner.asMention, embed.build(), ActionRow.of(DeleteTicketButton()))
             channel.channel.manager.setName("closed-serial-${ticketOwner.effectiveName}").queue()
 
+            ZellerBot.mainGuild!!.modifyNickname(ticketOwner, "${ticketOwner.effectiveName} VZ.${serialID}").queue()
+
             val announcementEmbed = prettyEmbed("New Serial! #$serialID", "The user ${ticketOwner.effectiveName} has just finished their $printer. Spread some VZLove!", Color.GREEN)
             announcementChannel.sendMessageEmbeds(announcementEmbed.build()).queue {
                 announcementChannel.sendMessage(transaction { ticket.mediaURL }).queue()
             }
 
-            val serialBaseSTL = File(env[EnvVariables.VZ_SERIAL_BASE_PLATE_LOCATION], "plate.stl")
-            val serialNumberSTL = File(env[EnvVariables.VZ_SERIAL_NUMBER_PLATES_LOCATION], "${serialID}.stl")
-
-            if (serialBaseSTL.exists() && serialNumberSTL.exists()) {
-                channel.channel.sendFiles(FileUpload.fromData(serialNumberSTL), FileUpload.fromData(serialBaseSTL)).queue()
-            } else {
-                BotLogger.logError( "The serial application for ID: $serialID was just finished, but one of the files was not found! Please check this.")
-            }
+            val serialFiles = fetchFilesForSerial(serialNumber.serialID)
+            channel.channel.sendFiles(serialFiles.map { FileUpload.fromData(it) }).queue()
 
             sender.respondText("You have accepted this application. You have been rewarded +1 VZSocialCredit", true)
         }

src/main/kotlin/org/vzbot/discord/util/SerialFileFetcher.kt

@@ -0,0 +1,22 @@
+package org.vzbot.discord.util
+
+import net.dv8tion.jda.api.utils.FileUpload
+import org.vzbot.io.BotLogger
+import org.vzbot.io.EnvVariables
+import org.vzbot.io.env
+import java.io.File
+
+fun fetchFilesForSerial(serial: Long): List<File> {
+    val serialBaseSTL = File(env[EnvVariables.VZ_SERIAL_BASE_PLATE_LOCATION], "plate.stl")
+    val serialNumberSTL = File(env[EnvVariables.VZ_SERIAL_NUMBER_PLATES_LOCATION], "${serial}.stl")
+
+    println(serialBaseSTL.absolutePath)
+    println(serialNumberSTL.absoluteFile)
+
+    if (serialBaseSTL.exists() && serialNumberSTL.exists()) {
+        return listOf(serialBaseSTL, serialNumberSTL)
+    } else {
+        BotLogger.logError( "The serial application for ID: $serial was just finished, but one of the files was not found! Please check this.")
+    }
+    return listOf()
+}

src/main/kotlin/org/vzbot/models/Countries.kt

@@ -3,7 +3,9 @@ package org.vzbot.models
 import io.ktor.client.*
 import io.ktor.client.call.*
 import io.ktor.client.request.*
+import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.Serializable
+import org.vzbot.plugins.geoClient
 import kotlin.random.Random
 
 /**
@@ -267,6 +269,24 @@ enum class Country(val code: String, val countryName: String) {
         return null
     }
 
+    fun randomCoordinates(): Pair<Double, Double>? {
+        return runBlocking {
+            val geometry = getLocation(geoClient) ?: run {
+                return@runBlocking null
+            }
+
+            var coordinates: Pair<Double, Double>? = null
+
+            for (geometries in geometry) {
+                coordinates = randomPointInPolygon(geometry.random())
+
+                if (coordinates != null) break
+            }
+
+            return@runBlocking coordinates
+        }
+    }
+
     private fun pointInPolygon(lat: Double, lon: Double, polygon: List<Geometry>): Boolean {
         var inside = false
         val n = polygon.size

taskfile.yml

@@ -16,6 +16,11 @@ tasks:
     cmds:
       - docker compose -f docker-compose.dev.yml up -d
 
+  stop-dev:
+    desc: "Start the Docker Compose development environment"
+    cmds:
+      - docker compose -f docker-compose.dev.yml down
+
   dev:
     desc: "Build the project with Gradle and boot the Docker Compose dev environment"
     cmds: