Merge remote-tracking branch 'origin/master'

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

@@ -8,6 +8,7 @@ import java.time.ZonedDateTime
 class MockBetDataSource(mockData: MockDataSource.MockData) : BetDataSource {
     private val bets = mockData.bets
     private val results = mockData.results
+    private val users = mockData.users
     private val participations = mockData.participations
     private val resultNotifications = mockData.resultNotifications
 
@@ -33,11 +34,13 @@ 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)
-                } else {
                         bets[idx] = bet.copy(status = CLOSING)
+                    } else {
+                        bets[idx] = bet.copy(status = WAITING)
+                    }
                 }
             }
         }
@@ -60,8 +63,13 @@ class MockBetDataSource(mockData: MockDataSource.MockData) : BetDataSource {
         }
 
         participations.filter { it.betId == betId && it.answer == result }
-            .forEach {
+            .forEach { participation ->
-                resultNotifications.add(Pair(betId, it.username))
+                users.replaceAll {
+                    if (it.username == participation.username) {
+                        it.copy(nbCoins = it.nbCoins + participation.stake)
+                    } else it
+                }
+                resultNotifications.add(Pair(betId, participation.username))
             }
     }
 

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

@@ -7,7 +7,7 @@ class MockParticipationDataSource(mockData: MockDataSource.MockData) : Participa
     private val participations = mockData.participations
 
     override fun addParticipation(participation: Participation) {
-        participations += participations
+        participations += participation
     }
 
     override fun getParticipationFromBetId(betid: String): List<Participation> =

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

@@ -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)
             }
         }
 
@@ -212,7 +214,9 @@ class PostgresBetDataSource(private val database: Database) : BetDataSource {
             set(BetsEntity.status, BetStatus.CLOSING)
             where {
                 (date.toInstant() greaterEq BetsEntity.endRegistration) and
-                        (date.toInstant() greaterEq BetsEntity.endBet)
+                        (date.toInstant() greaterEq BetsEntity.endBet) and
+                        (BetsEntity.status notEq BetStatus.FINISHED) and
+                        (BetsEntity.status notEq BetStatus.CANCELLED)
             }
         }
     }

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

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

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

@@ -59,7 +59,6 @@ fun Application.ParticipationRouter() {
                             )
 
                             userDataSource.removeCoins(username = user.username, amount = participation.stake)
-
                             call.respond(HttpStatusCode.Created)
                         } else {
                             call.respond(HttpStatusCode.Forbidden, ApiMessage.NOT_ENOUGH_COINS)