🐛 Fix toConfirm
continuous-integration/drone/push Build is passing Details

pull/12/head
Arthur VALIN 1 year ago
parent ab2c861902
commit 0dd1017e81

@ -33,6 +33,7 @@ class MockBetDataSource(mockData: MockDataSource.MockData) : BetDataSource {
override fun updateBetStatuses(date: ZonedDateTime) {
bets.forEachIndexed { idx, bet ->
if (bet.status != CANCELLED && bet.status != FINISHED) {
if (date >= bet.endRegistration) {
if (date >= bet.endBet) {
bets[idx] = bet.copy(status = WAITING)
@ -42,6 +43,7 @@ class MockBetDataSource(mockData: MockDataSource.MockData) : BetDataSource {
}
}
}
}
override fun getToConfirm(username: String): List<Bet> =
bets.filter { it.createdBy == username && it.status == CLOSING }

@ -204,7 +204,9 @@ class PostgresBetDataSource(private val database: Database) : BetDataSource {
set(BetsEntity.status, BetStatus.WAITING)
where {
(date.toInstant() greaterEq BetsEntity.endRegistration) and
(date.toInstant() less BetsEntity.endBet)
(date.toInstant() less BetsEntity.endBet) and
(BetsEntity.status notEq BetStatus.FINISHED) and
(BetsEntity.status notEq BetStatus.CANCELLED)
}
}

@ -92,8 +92,8 @@ fun Application.BetRouter() {
BetDetail(
it,
getBetAnswerDetail(it, participations),
participations.toList(),
participationDataSource.getParticipationFromUserId(user.username, it.id).lastOrNull()
participations,
participations.find { it.username == user.username }
)
}
call.respond(HttpStatusCode.Accepted, response)

Loading…
Cancel
Save