nikola/pairgoth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Bugfix with generated ids

Browse Source
This commit is contained in:
Claude Brisson
2023-12-21 22:31:51 +01:00
parent 98e07288d2
commit 52f660b1d6
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
api-webapp/src/main/kotlin/org/jeudego/pairgoth/store/FileStore.kt
View File

@@ -10,7 +10,7 @@ import org.jeudego.pairgoth.model.fromJson
import org.jeudego.pairgoth.model.getID import org.jeudego.pairgoth.model.getID
import org.jeudego.pairgoth.model.toFullJson import org.jeudego.pairgoth.model.toFullJson
import org.jeudego.pairgoth.model.toID import org.jeudego.pairgoth.model.toID
import org.jeudego.pairgoth.model.toJson import java.lang.Integer.max
import java.nio.file.Path import java.nio.file.Path
import java.text.DateFormat import java.text.DateFormat
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
@@ -64,11 +64,15 @@ class FileStore(pathStr: String): StoreImplementation {
} }
val json = Json.parse(path.resolve(file).readText())?.asObject() ?: throw Error("could not read tournament") val json = Json.parse(path.resolve(file).readText())?.asObject() ?: throw Error("could not read tournament")
val tournament = Tournament.fromJson(json) val tournament = Tournament.fromJson(json)
var maxPlayerId = 0
var maxGameId = 0
val players = json["players"] as Json.Array? ?: Json.Array() val players = json["players"] as Json.Array? ?: Json.Array()
tournament.players.putAll( tournament.players.putAll(
players.associate { players.associate {
(it as Json.Object).let { player -> (it as Json.Object).let { player ->
Pair(player.getID("id") ?: throw Error("invalid tournament file"), Player.fromJson(player)) Pair(player.getID("id") ?: throw Error("invalid tournament file"), Player.fromJson(player)).also {
maxPlayerId = max(maxPlayerId, it.first)
}
} }
} }
) )
@@ -77,21 +81,28 @@ class FileStore(pathStr: String): StoreImplementation {
tournament.teams.putAll( tournament.teams.putAll(
teams.associate { teams.associate {
(it as Json.Object).let { team -> (it as Json.Object).let { team ->
Pair(team.getID("id") ?: throw Error("invalid tournament file"), tournament.teamFromJson(team)) Pair(team.getID("id") ?: throw Error("invalid tournament file"), tournament.teamFromJson(team)).also {
maxPlayerId = max(maxPlayerId, it.first)
}
} }
} }
) )
} }
val games = json["games"] as Json.Array? ?: Json.Array() val games = json["games"] as Json.Array? ?: Json.Array()
(1..games.size).forEach { round -> (1..games.size).forEach { round ->
val roundGames = games[round - 1] as Json.Array
tournament.games(round).putAll( tournament.games(round).putAll(
games.associate { roundGames.associate {
(it as Json.Object).let { game -> (it as Json.Object).let { game ->
Pair(game.getID("id") ?: throw Error("invalid tournament file"), Game.fromJson(game)) Pair(game.getID("id") ?: throw Error("invalid tournament file"), Game.fromJson(game)).also {
maxGameId = max(maxGameId, it.first)
}
} }
} }
) )
} }
_nextPlayerId.set(maxPlayerId + 1)
_nextGameId.set(maxGameId + 1)
return tournament return tournament
} }