From 6b657de563e67d85490f1b1c82ef0d86c7283201 Mon Sep 17 00:00:00 2001 From: luevard <99143550+saucepommefrite@users.noreply.github.com> Date: Tue, 4 Jun 2024 16:13:48 +0200 Subject: [PATCH] :sparkles: [no_ci] Remove private bet when you can't see it --- .../main/kotlin/allin/data/postgres/PostgresBetDataSource.kt | 3 ++- Sources/src/main/kotlin/allin/routing/betRouter.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Sources/src/main/kotlin/allin/data/postgres/PostgresBetDataSource.kt b/Sources/src/main/kotlin/allin/data/postgres/PostgresBetDataSource.kt index 87554bc..0309a47 100644 --- a/Sources/src/main/kotlin/allin/data/postgres/PostgresBetDataSource.kt +++ b/Sources/src/main/kotlin/allin/data/postgres/PostgresBetDataSource.kt @@ -15,7 +15,7 @@ class PostgresBetDataSource(private val database: Database) : BetDataSource { override fun getAllBets(filters: List): List { return when { - filters.isEmpty() -> database.bets.map { it.toBet(database) } + filters.isEmpty() -> database.bets.filter { it.isPrivate eq false }.map { it.toBet(database) } filters.size == 1 -> { val filter = filters.first() @@ -253,6 +253,7 @@ class PostgresBetDataSource(private val database: Database) : BetDataSource { } } } + override fun addPrivateBet(bet: Bet) { addBet(bet) bet.userInvited?.forEach{ diff --git a/Sources/src/main/kotlin/allin/routing/betRouter.kt b/Sources/src/main/kotlin/allin/routing/betRouter.kt index 01ff733..f736017 100644 --- a/Sources/src/main/kotlin/allin/routing/betRouter.kt +++ b/Sources/src/main/kotlin/allin/routing/betRouter.kt @@ -87,7 +87,7 @@ fun Application.betRouter() { }) { logManager.log("Routing","POST /bets/gets") hasToken { principal -> - verifyUserFromToken(userDataSource, principal) { _, _ -> + verifyUserFromToken(userDataSource, principal) { user , _ -> val filtersRequest = kotlin.runCatching { call.receiveNullable() }.getOrNull() val filters =