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

Fix rounds ordering in import

Browse Source
This commit is contained in:
Claude Brisson
2023-09-21 10:20:39 +02:00
parent e7ae74712f
commit 47665c18a1
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api-webapp/src/main/kotlin/org/jeudego/pairgoth/ext/OpenGotha.kt
View File

@@ -9,9 +9,7 @@ import org.jeudego.pairgoth.opengotha.ObjectFactory
import org.jeudego.pairgoth.store.Store import org.jeudego.pairgoth.store.Store
import org.w3c.dom.Element import org.w3c.dom.Element
import java.util.* import java.util.*
import javax.xml.XMLConstants
import javax.xml.datatype.XMLGregorianCalendar import javax.xml.datatype.XMLGregorianCalendar
import javax.xml.validation.SchemaFactory
private const val MILLISECONDS_PER_DAY = 86400000 private const val MILLISECONDS_PER_DAY = 86400000
fun XMLGregorianCalendar.toLocalDate() = LocalDate.fromEpochDays((toGregorianCalendar().time.time / MILLISECONDS_PER_DAY).toInt()) fun XMLGregorianCalendar.toLocalDate() = LocalDate.fromEpochDays((toGregorianCalendar().time.time / MILLISECONDS_PER_DAY).toInt())
@@ -21,14 +19,14 @@ object OpenGotha {
val context = JAXBContext.newInstance(ObjectFactory::class.java) val context = JAXBContext.newInstance(ObjectFactory::class.java)
val parsed = context.createUnmarshaller().unmarshal(element) as JAXBElement<TournamentType> val parsed = context.createUnmarshaller().unmarshal(element) as JAXBElement<TournamentType>
val ogt = parsed.value val ogTournament = parsed.value
// import tournament parameters // import tournament parameters
val genParams = ogt.tournamentParameterSet.generalParameterSet val genParams = ogTournament.tournamentParameterSet.generalParameterSet
val handParams = ogt.tournamentParameterSet.handicapParameterSet val handParams = ogTournament.tournamentParameterSet.handicapParameterSet
val placmtParams = ogt.tournamentParameterSet.placementParameterSet val placmtParams = ogTournament.tournamentParameterSet.placementParameterSet
val pairParams = ogt.tournamentParameterSet.pairingParameterSet val pairParams = ogTournament.tournamentParameterSet.pairingParameterSet
val tournament = StandardTournament( val tournament = StandardTournament(
id = Store.nextTournamentId, id = Store.nextTournamentId,
@@ -74,7 +72,7 @@ object OpenGotha {
val canonicMap = mutableMapOf<String, Int>() val canonicMap = mutableMapOf<String, Int>()
// import players // import players
ogt.players.player.map { player -> ogTournament.players.player.map { player ->
Player( Player(
id = Store.nextPlayerId, id = Store.nextPlayerId,
name = player.name, name = player.name,
@@ -87,10 +85,10 @@ object OpenGotha {
canonicMap.put("${player.name}${player.firstName}".uppercase(Locale.ENGLISH), it.id) canonicMap.put("${player.name}${player.firstName}".uppercase(Locale.ENGLISH), it.id)
} }
}.associateByTo(tournament.players) { it.id } }.associateByTo(tournament.players) { it.id }
val gamesPerRound = ogt.games.game.groupBy { val gamesPerRound = ogTournament.games.game.groupBy {
it.roundNumber it.roundNumber
}.values.map { }.entries.sortedBy { it.key }.map {
it.map { game -> it.value.map { game ->
Game( Game(
id = Store.nextGameId, id = Store.nextGameId,
black = canonicMap[game.blackPlayer] ?: throw Error("player not found: ${game.blackPlayer}"), black = canonicMap[game.blackPlayer] ?: throw Error("player not found: ${game.blackPlayer}"),