[db] Merge pull request 'privateBet' (#18) from privateBet into master

Reviewed-on: #18

Sources/src/main/kotlin/allin/data/BetDataSource.kt

@@ -1,10 +1,11 @@
 package allin.data
 
+import allin.dto.UserDTO
 import allin.model.*
 import java.time.ZonedDateTime
 
 interface BetDataSource {
-    fun getAllBets(filters: List<BetFilter>): List<Bet>
+    fun getAllBets(filters: List<BetFilter>, userDTO: UserDTO): List<Bet>
     fun getBetById(id: String): Bet?
     fun getBetDetailById(id: String, username: String): BetDetail?
     fun getBetsNotFinished(): List<Bet>
@@ -19,4 +20,6 @@ interface BetDataSource {
     fun getCurrent(username: String): List<BetDetail>
     fun getMostPopularBet(): Bet?
     fun updatePopularityScore(betId: String)
+    fun addPrivateBet(bet: Bet)
+    fun isInvited(betid: String, userId: String): Boolean
 }

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

@@ -1,6 +1,7 @@
 package allin.data.mock
 
 import allin.data.BetDataSource
+import allin.dto.UserDTO
 import allin.model.*
 import allin.model.BetStatus.*
 import java.time.ZonedDateTime
@@ -15,7 +16,7 @@ class MockBetDataSource(private val mockData: MockDataSource.MockData) : BetData
     private val betInfos get() = mockData.betInfos
     private val answerInfos get() = mockData.answerInfos
 
-    override fun getAllBets(filters: List<BetFilter>): List<Bet> {
+    override fun getAllBets(filters: List<BetFilter>, userDTO: UserDTO): List<Bet> {
         return when {
             filters.isEmpty() -> bets
 
@@ -233,4 +234,12 @@ class MockBetDataSource(private val mockData: MockDataSource.MockData) : BetData
         bet.popularityscore = score
     }
 
+    override fun addPrivateBet(bet: Bet) {
+        TODO()
+    }
+
+    override fun isInvited(betid: String, userId: String): Boolean {
+        TODO("Not yet implemented")
+    }
+
 }

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

@@ -2,6 +2,7 @@ package allin.data.postgres
 
 import allin.data.BetDataSource
 import allin.data.postgres.entities.*
+import allin.dto.UserDTO
 import allin.model.*
 import org.ktorm.database.Database
 import org.ktorm.dsl.*
@@ -13,9 +14,10 @@ import kotlin.math.roundToInt
 
 class PostgresBetDataSource(private val database: Database) : BetDataSource {
 
-    override fun getAllBets(filters: List<BetFilter>): List<Bet> {
+    override fun getAllBets(filters: List<BetFilter>, userDTO: UserDTO): List<Bet> {
         return when {
             filters.isEmpty() -> database.bets.map { it.toBet(database) }
+                .filter { (!it.isPrivate) or (isInvited(it.id, userDTO.id)) or (it.createdBy == userDTO.id) }
 
             filters.size == 1 -> {
                 val filter = filters.first()
@@ -28,6 +30,7 @@ class PostgresBetDataSource(private val database: Database) : BetDataSource {
                         it.status inList listOf(BetStatus.IN_PROGRESS, BetStatus.WAITING, BetStatus.CLOSING)
                     }
                 }.map { it.toBet(database) }
+                    .filter { (!it.isPrivate) or (isInvited(it.id, userDTO.id)) or (it.createdBy == userDTO.id) }
             }
 
             else -> {
@@ -44,11 +47,11 @@ class PostgresBetDataSource(private val database: Database) : BetDataSource {
 
                     (public or invitation) and (finished or inProgress)
                 }.map { it.toBet(database) }
+                    .filter { (!it.isPrivate) or (isInvited(it.id, userDTO.id)) or (it.createdBy == userDTO.id) }
             }
         }
     }
 
-
     override fun getBetById(id: String): Bet? =
         database.bets.find { it.id eq id }?.toBet(database)
 
@@ -269,4 +272,17 @@ class PostgresBetDataSource(private val database: Database) : BetDataSource {
             }
     }
 
+    override fun addPrivateBet(bet: Bet) {
+        addBet(bet)
+        bet.userInvited?.forEach {
+            database.privatebets.add(PrivateBetEntity {
+                betId = bet.id
+                userId = it
+            })
+        }
+    }
+
+    override fun isInvited(betid: String, userId: String): Boolean {
+        return database.privatebets.filter { (it.betid eq betid) and (it.userId eq userId) }.isNotEmpty()
+    }
 }

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

@@ -144,6 +144,17 @@ class PostgresDataSource : AllInDataSource() {
                 )
             """.trimIndent()
         )
+
+        database.execute(
+            """
+                CREATE TABLE IF NOT EXISTS privatebet
+                (
+                    betid VARCHAR(255),
+                    userid VARCHAR(255),
+                    CONSTRAINT pk_privatebet PRIMARY KEY (betid,userid)
+                )
+            """.trimIndent()
+        )
     }
 
     override val userDataSource: UserDataSource by lazy { PostgresUserDataSource(database) }

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

@@ -41,7 +41,7 @@ interface BetEntity : Entity<BetEntity> {
             } else {
                 database.responses.filter { it.betId eq id }.map { it.response }
             },
-            createdBy = createdBy,
+            createdBy = database.users.first { it.id eq createdBy }.username,
             popularityscore = popularityscore,
             totalStakes = betInfo?.totalStakes ?: 0,
             totalParticipants = betInfo?.totalParticipants ?: 0

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

@@ -0,0 +1,21 @@
+package allin.data.postgres.entities
+
+import org.ktorm.database.Database
+import org.ktorm.entity.Entity
+import org.ktorm.entity.sequenceOf
+import org.ktorm.schema.Table
+import org.ktorm.schema.varchar
+
+interface PrivateBetEntity : Entity<PrivateBetEntity> {
+    companion object : Entity.Factory<PrivateBetEntity>()
+
+    var betId: String
+    var userId: String
+}
+
+object PrivateBetsEntity : Table<PrivateBetEntity>("privatebet") {
+    val betid = varchar("betid").bindTo { it.betId }
+    val userId = varchar("userid").bindTo { it.userId }
+}
+
+val Database.privatebets get() = this.sequenceOf(PrivateBetsEntity)

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

@@ -22,7 +22,8 @@ data class Bet(
     val createdBy: String = "",
     var popularityscore: Int = 0,
     val totalStakes: Int = 0,
-    val totalParticipants: Int = 0
+    val totalParticipants: Int = 0,
+    val userInvited: List<String>? = null
 )
 
 @Serializable

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

@@ -58,8 +58,11 @@ fun Application.betRouter() {
                         logManager.log("Routing", "${ApiMessage.BET_ALREADY_EXIST} /bets/add")
                         call.respond(HttpStatusCode.Conflict, ApiMessage.BET_ALREADY_EXIST)
                     } ?: run {
-                        val betWithId = bet.copy(id = id, createdBy = user.first?.username.toString())
+                        val betWithId = bet.copy(id = id, createdBy = user.first?.id.toString())
-                        betDataSource.addBet(betWithId)
+
+                        if (bet.isPrivate && bet.userInvited?.isNotEmpty() == true) {
+                            betDataSource.addPrivateBet(betWithId)
+                        } else betDataSource.addBet(betWithId)
                         logManager.log("Routing", "CREATED /bets/add\t${betWithId}")
                         call.respond(HttpStatusCode.Created, betWithId)
                     }
@@ -86,13 +89,13 @@ fun Application.betRouter() {
             }) {
                 logManager.log("Routing", "POST /bets/gets")
                 hasToken { principal ->
-                    verifyUserFromToken(userDataSource, principal) { _, _ ->
+                    verifyUserFromToken(userDataSource, principal) { user, _ ->
                         val filtersRequest =
                             kotlin.runCatching { call.receiveNullable<BetFiltersRequest>() }.getOrNull()
                         val filters =
                             filtersRequest?.filters ?: emptyList() // Use provided filters or empty list if null
                         logManager.log("Routing", "ACCEPTED /bets/gets\t${filters}")
-                        call.respond(HttpStatusCode.Accepted, betDataSource.getAllBets(filters))
+                        call.respond(HttpStatusCode.Accepted, betDataSource.getAllBets(filters, user))
                     }
                 }
             }
@@ -151,8 +154,7 @@ fun Application.betRouter() {
             betDataSource.getBetById(id)?.let { bet ->
                 logManager.log("Routing", "ACCEPTED /bets/get/{id}\t ${bet}")
                 call.respond(HttpStatusCode.Accepted, bet)
-            } ?:
+            } ?: logManager.log("Routing", "${ApiMessage.BET_NOT_FOUND} /bets/get/{id}")
-            logManager.log("Routing","${ApiMessage.BET_NOT_FOUND} /bets/get/{id}")
             call.respond(HttpStatusCode.NotFound, ApiMessage.BET_NOT_FOUND)
         }
 
@@ -281,7 +283,10 @@ fun Application.betRouter() {
                 logManager.log("Routing", "GET /bets/history")
                 hasToken { principal ->
                     verifyUserFromToken(userDataSource, principal) { user, _ ->
-                        logManager.log("Routing","ACCEPTED /bets/toConfirm\t${betDataSource.getHistory(user.username)}")
+                        logManager.log(
+                            "Routing",
+                            "ACCEPTED /bets/toConfirm\t${betDataSource.getHistory(user.username)}"
+                        )
                         call.respond(HttpStatusCode.Accepted, betDataSource.getHistory(user.username))
                     }
                 }
@@ -306,7 +311,10 @@ fun Application.betRouter() {
                 logManager.log("Routing", "GET /bets/current")
                 hasToken { principal ->
                     verifyUserFromToken(userDataSource, principal) { user, _ ->
-                        logManager.log("Routing","ACCEPTED /bets/toConfirm\t${betDataSource.getCurrent(user.username)}")
+                        logManager.log(
+                            "Routing",
+                            "ACCEPTED /bets/toConfirm\t${betDataSource.getCurrent(user.username)}"
+                        )
                         call.respond(HttpStatusCode.Accepted, betDataSource.getCurrent(user.username))
                     }
                 }