AllDev
/
Api
6
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

✨ [no_ci] Allow users to get only authorized bets
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build was killed Details

Browse Source
pull/18/head
Lucas EVARD 9 months ago
parent 6b657de563
commit 30334c63cb
5 changed files with 59 additions and 40 deletions
Show Stats Download Patch File Download Diff File

4
Sources/src/main/kotlin/allin/data/BetDataSource.kt
Unescape View File

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

7
Sources/src/main/kotlin/allin/data/mock/MockBetDataSource.kt
Unescape View File

@ -1,6 +1,7 @@
package allin.data.mock package allin.data.mock
import allin.data.BetDataSource import allin.data.BetDataSource
import allin.dto.UserDTO
import allin.model.* import allin.model.*
import allin.model.BetStatus.* import allin.model.BetStatus.*
import java.time.ZonedDateTime import java.time.ZonedDateTime
@ -15,7 +16,7 @@ class MockBetDataSource(private val mockData: MockDataSource.MockData) : BetData
private val betInfos get() = mockData.betInfos private val betInfos get() = mockData.betInfos
private val answerInfos get() = mockData.answerInfos 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 { return when {
filters.isEmpty() -> bets filters.isEmpty() -> bets
@ -237,4 +238,8 @@ class MockBetDataSource(private val mockData: MockDataSource.MockData) : BetData
TODO() TODO()
} }
override fun isInvited(betid: String, userId: String): Boolean {
TODO("Not yet implemented")
}
} }

21
Sources/src/main/kotlin/allin/data/postgres/PostgresBetDataSource.kt
Unescape View File

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

2
Sources/src/main/kotlin/allin/data/postgres/entities/BetEntity.kt
Unescape View File

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

65
Sources/src/main/kotlin/allin/routing/betRouter.kt
Unescape View File

@ -46,22 +46,22 @@ fun Application.betRouter() {
} }
} }
}) { }) {
logManager.log("Routing","POST /bets/add") logManager.log("Routing", "POST /bets/add")
hasToken { principal -> hasToken { principal ->
val bet = call.receive<Bet>() val bet = call.receive<Bet>()
val id = UUID.randomUUID().toString() val id = UUID.randomUUID().toString()
val username = tokenManagerBet.getUsernameFromToken(principal) val username = tokenManagerBet.getUsernameFromToken(principal)
val user = userDataSource.getUserByUsername(username) val user = userDataSource.getUserByUsername(username)
betDataSource.getBetById(id)?.let { betDataSource.getBetById(id)?.let {
logManager.log("Routing","${ApiMessage.BET_ALREADY_EXIST} /bets/add") logManager.log("Routing", "${ApiMessage.BET_ALREADY_EXIST} /bets/add")
call.respond(HttpStatusCode.Conflict, ApiMessage.BET_ALREADY_EXIST) call.respond(HttpStatusCode.Conflict, ApiMessage.BET_ALREADY_EXIST)
} ?: run { } ?: run {
val betWithId = bet.copy(id = id, createdBy = user.first?.username.toString()) val betWithId = bet.copy(id = id, createdBy = user.first?.id.toString())
if(bet.isPrivate && bet.userInvited?.isNotEmpty() == true){ if (bet.isPrivate && bet.userInvited?.isNotEmpty() == true) {
betDataSource.addPrivateBet(betWithId) betDataSource.addPrivateBet(betWithId)
} else betDataSource.addBet(betWithId) } else betDataSource.addBet(betWithId)
logManager.log("Routing","CREATED /bets/add\t${betWithId}") logManager.log("Routing", "CREATED /bets/add\t${betWithId}")
call.respond(HttpStatusCode.Created, betWithId) call.respond(HttpStatusCode.Created, betWithId)
} }
} }
@ -85,15 +85,15 @@ fun Application.betRouter() {
} }
} }
}) { }) {
logManager.log("Routing","POST /bets/gets") logManager.log("Routing", "POST /bets/gets")
hasToken { principal -> hasToken { principal ->
verifyUserFromToken(userDataSource, principal) { user , _ -> verifyUserFromToken(userDataSource, principal) { user, _ ->
val filtersRequest = val filtersRequest =
kotlin.runCatching { call.receiveNullable<BetFiltersRequest>() }.getOrNull() kotlin.runCatching { call.receiveNullable<BetFiltersRequest>() }.getOrNull()
val filters = val filters =
filtersRequest?.filters ?: emptyList() // Use provided filters or empty list if null filtersRequest?.filters ?: emptyList() // Use provided filters or empty list if null
logManager.log("Routing","ACCEPTED /bets/gets\t${filters}") logManager.log("Routing", "ACCEPTED /bets/gets\t${filters}")
call.respond(HttpStatusCode.Accepted, betDataSource.getAllBets(filters)) call.respond(HttpStatusCode.Accepted, betDataSource.getAllBets(filters, user))
} }
} }
} }
@ -114,15 +114,15 @@ fun Application.betRouter() {
} }
} }
}) { }) {
logManager.log("Routing","GET /bets/popular") logManager.log("Routing", "GET /bets/popular")
hasToken { principal -> hasToken { principal ->
verifyUserFromToken(userDataSource, principal) { _, _ -> verifyUserFromToken(userDataSource, principal) { _, _ ->
val bet = betDataSource.getMostPopularBet() val bet = betDataSource.getMostPopularBet()
if (bet != null) { if (bet != null) {
logManager.log("Routing","ACCEPTED /bets/popular\t${bet}") logManager.log("Routing", "ACCEPTED /bets/popular\t${bet}")
call.respond(HttpStatusCode.Accepted, bet) call.respond(HttpStatusCode.Accepted, bet)
} }
logManager.log("Routing","${ApiMessage.BET_NOT_FOUND} /bets/popular") logManager.log("Routing", "${ApiMessage.BET_NOT_FOUND} /bets/popular")
call.respond(HttpStatusCode.NotFound, ApiMessage.BET_NOT_FOUND) call.respond(HttpStatusCode.NotFound, ApiMessage.BET_NOT_FOUND)
} }
} }
@ -147,13 +147,12 @@ fun Application.betRouter() {
} }
} }
}) { }) {
logManager.log("Routing","GET /bets/get/{id}") logManager.log("Routing", "GET /bets/get/{id}")
val id = call.parameters["id"] ?: "" val id = call.parameters["id"] ?: ""
betDataSource.getBetById(id)?.let { bet -> betDataSource.getBetById(id)?.let { bet ->
logManager.log("Routing","ACCEPTED /bets/get/{id}\t ${bet}") logManager.log("Routing", "ACCEPTED /bets/get/{id}\t ${bet}")
call.respond(HttpStatusCode.Accepted, 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) call.respond(HttpStatusCode.NotFound, ApiMessage.BET_NOT_FOUND)
} }
@ -174,13 +173,13 @@ fun Application.betRouter() {
} }
} }
}) { }) {
logManager.log("Routing","POST /bets/delete") logManager.log("Routing", "POST /bets/delete")
val id = call.receive<Map<String, String>>()["id"] ?: "" val id = call.receive<Map<String, String>>()["id"] ?: ""
if (betDataSource.removeBet(id)) { if (betDataSource.removeBet(id)) {
logManager.log("Routing","ACCEPTED /bets/delete") logManager.log("Routing", "ACCEPTED /bets/delete")
call.respond(HttpStatusCode.Accepted) call.respond(HttpStatusCode.Accepted)
} else { } else {
logManager.log("Routing","${ApiMessage.BET_NOT_FOUND} /bets/delete") logManager.log("Routing", "${ApiMessage.BET_NOT_FOUND} /bets/delete")
call.respond(HttpStatusCode.NotFound, ApiMessage.BET_NOT_FOUND) call.respond(HttpStatusCode.NotFound, ApiMessage.BET_NOT_FOUND)
} }
} }
@ -202,13 +201,13 @@ fun Application.betRouter() {
} }
} }
}) { }) {
logManager.log("Routing","POST /bets/update") logManager.log("Routing", "POST /bets/update")
val updatedBetData = call.receive<UpdatedBetData>() val updatedBetData = call.receive<UpdatedBetData>()
if (betDataSource.updateBet(updatedBetData)) { if (betDataSource.updateBet(updatedBetData)) {
logManager.log("Routing","ACCEPTED /bets/delete") logManager.log("Routing", "ACCEPTED /bets/delete")
call.respond(HttpStatusCode.Accepted) call.respond(HttpStatusCode.Accepted)
} else { } else {
logManager.log("Routing","${ApiMessage.BET_NOT_FOUND} /bets/delete") logManager.log("Routing", "${ApiMessage.BET_NOT_FOUND} /bets/delete")
call.respond(HttpStatusCode.NotFound, ApiMessage.BET_NOT_FOUND) call.respond(HttpStatusCode.NotFound, ApiMessage.BET_NOT_FOUND)
} }
} }
@ -228,11 +227,11 @@ fun Application.betRouter() {
} }
} }
}) { }) {
logManager.log("Routing","GET /bets/toConfirm") logManager.log("Routing", "GET /bets/toConfirm")
hasToken { principal -> hasToken { principal ->
verifyUserFromToken(userDataSource, principal) { user, _ -> verifyUserFromToken(userDataSource, principal) { user, _ ->
val response = betDataSource.getToConfirm(user.username) val response = betDataSource.getToConfirm(user.username)
logManager.log("Routing","ACCEPTED /bets/toConfirm\t${response}") logManager.log("Routing", "ACCEPTED /bets/toConfirm\t${response}")
call.respond(HttpStatusCode.Accepted, response) call.respond(HttpStatusCode.Accepted, response)
} }
} }
@ -254,10 +253,10 @@ fun Application.betRouter() {
} }
} }
}) { }) {
logManager.log("Routing","GET /bets/getWon") logManager.log("Routing", "GET /bets/getWon")
hasToken { principal -> hasToken { principal ->
verifyUserFromToken(userDataSource, principal) { user, _ -> verifyUserFromToken(userDataSource, principal) { user, _ ->
logManager.log("Routing","ACCEPTED /bets/getWon") logManager.log("Routing", "ACCEPTED /bets/getWon")
call.respond(HttpStatusCode.Accepted, betDataSource.getWonNotifications(user.username)) call.respond(HttpStatusCode.Accepted, betDataSource.getWonNotifications(user.username))
} }
} }
@ -279,10 +278,13 @@ fun Application.betRouter() {
} }
} }
}) { }) {
logManager.log("Routing","GET /bets/history") logManager.log("Routing", "GET /bets/history")
hasToken { principal -> hasToken { principal ->
verifyUserFromToken(userDataSource, principal) { user, _ -> 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)) call.respond(HttpStatusCode.Accepted, betDataSource.getHistory(user.username))
} }
} }
@ -304,10 +306,13 @@ fun Application.betRouter() {
} }
} }
}) { }) {
logManager.log("Routing","GET /bets/current") logManager.log("Routing", "GET /bets/current")
hasToken { principal -> hasToken { principal ->
verifyUserFromToken(userDataSource, principal) { user, _ -> 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)) call.respond(HttpStatusCode.Accepted, betDataSource.getCurrent(user.username))
} }
} }

Write Preview
Loading…
Cancel
Save