Fix bet status update and createdBy

Sources/src/main/kotlin/allin/data/mock/MockBetDataSource.kt

@@ -1,15 +1,8 @@
 package allin.data.mock
 
 import allin.data.BetDataSource
-import allin.data.postgres.entities.BetsEntity
-import allin.data.postgres.entities.bets
-import allin.data.postgres.entities.participations
 import allin.model.*
 import allin.model.BetStatus.*
-import org.ktorm.dsl.and
-import org.ktorm.dsl.eq
-import org.ktorm.dsl.update
-import org.ktorm.entity.*
 import java.time.ZonedDateTime
 import kotlin.math.roundToInt
 
@@ -99,7 +92,7 @@ class MockBetDataSource(private val mockData: MockDataSource.MockData) : BetData
                     if (date >= bet.endBet) {
                         bets[idx] = bet.copy(status = CLOSING)
                     } else {
-                        bets[idx] = bet.copy(status = IN_PROGRESS)
+                        bets[idx] = bet.copy(status = WAITING)
                     }
                 }
             }

Sources/src/main/kotlin/allin/data/postgres/PostgresBetDataSource.kt

@@ -60,12 +60,12 @@ class PostgresBetDataSource(private val database: Database) : BetDataSource {
             .map { it.toBet(database) }
     }
 
-    override fun getToConfirm(username: String): List<BetDetail> {
+    override fun getToConfirm(id: String): List<BetDetail> {
         return database.bets
             .filter {
-                (it.createdBy eq username) and (BetsEntity.status eq BetStatus.CLOSING)
+                (it.createdBy eq id) and (BetsEntity.status eq BetStatus.CLOSING)
             }
-            .map { it.toBetDetail(database, username) }
+            .map { it.toBetDetail(database, id) }
     }
 
     override fun confirmBet(betId: String, result: String) {
@@ -144,11 +144,11 @@ class PostgresBetDataSource(private val database: Database) : BetDataSource {
     }
 
     override fun getMostPopularBet(): Bet? {
-        val max=database.bets.filter { (it.isPrivate eq false) and (it.status eq BetStatus.WAITING) }.maxBy { it.popularityscore }
-        if(max!=null){
-            return database.bets.filter { (it.popularityscore eq max) and (it.isPrivate eq false) and (it.status eq BetStatus.WAITING) }.map { it.toBet(database) }.first()
-        }
-        return null
+        return database.bets
+            .filter { (it.isPrivate eq false) and (it.status eq BetStatus.IN_PROGRESS) }
+            .sortedByDescending { it.popularityscore }
+            .firstOrNull()
+            ?.toBet(database)
     }
 
     override fun updatePopularityScore(betId: String) {
@@ -204,7 +204,7 @@ class PostgresBetDataSource(private val database: Database) : BetDataSource {
 
     override fun updateBetStatuses(date: ZonedDateTime) {
         database.update(BetsEntity) {
-            set(BetsEntity.status, BetStatus.IN_PROGRESS)
+            set(BetsEntity.status, BetStatus.WAITING)
             where {
                 (date.toInstant() greaterEq BetsEntity.endRegistration) and
                         (date.toInstant() less BetsEntity.endBet) and

Sources/src/main/kotlin/allin/data/postgres/entities/BetEntity.kt

@@ -5,7 +5,6 @@ import org.ktorm.database.Database
 import org.ktorm.dsl.eq
 import org.ktorm.entity.*
 import org.ktorm.schema.*
-import org.postgresql.util.ByteConverter.numeric
 import java.time.Instant
 import java.time.ZoneId
 import java.time.ZonedDateTime

Sources/src/main/kotlin/allin/model/Bet.kt

@@ -1,6 +1,6 @@
 package allin.model
 
-import allin.model.BetStatus.WAITING
+import allin.model.BetStatus.IN_PROGRESS
 import allin.serializer.ZonedDateTimeSerializer
 import kotlinx.serialization.Serializable
 import java.time.ZonedDateTime
@@ -13,7 +13,7 @@ data class Bet(
     val id: String = "",
     val theme: String,
     val sentenceBet: String,
-    val status: BetStatus = WAITING,
+    val status: BetStatus = IN_PROGRESS,
     val type: BetType,
     @Serializable(ZonedDateTimeSerializer::class) val endRegistration: ZonedDateTime,
     @Serializable(ZonedDateTimeSerializer::class) var endBet: ZonedDateTime,

Sources/src/main/kotlin/allin/routing/betRouter.kt

@@ -53,7 +53,7 @@ fun Application.betRouter() {
                     betDataSource.getBetById(id)?.let {
                         call.respond(HttpStatusCode.Conflict, ApiMessage.BET_ALREADY_EXIST)
                     } ?: run {
-                        val betWithId = bet.copy(id = id, createdBy = user.first?.id.toString())
+                        val betWithId = bet.copy(id = id, createdBy = user.first?.username.toString())
                         betDataSource.addBet(betWithId)
                         call.respond(HttpStatusCode.Created, betWithId)
                     }