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

Fix UK/GB problem

Browse Source
This commit is contained in:
Claude Brisson
2024-03-01 11:49:17 +01:00
parent 10482c4494
commit d195064e13
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api-webapp/src/main/kotlin/org/jeudego/pairgoth/model/Pairable.kt
View File

@@ -106,7 +106,10 @@ fun Player.Companion.fromJson(json: Json.Object, default: Player? = null) = Play
firstname = json.getString("firstname") ?: default?.firstname ?: badRequest("missing firstname"), firstname = json.getString("firstname") ?: default?.firstname ?: badRequest("missing firstname"),
rating = json.getInt("rating") ?: default?.rating ?: badRequest("missing rating"), rating = json.getInt("rating") ?: default?.rating ?: badRequest("missing rating"),
rank = json.getInt("rank") ?: default?.rank ?: badRequest("missing rank"), rank = json.getInt("rank") ?: default?.rank ?: badRequest("missing rank"),
country = json.getString("country") ?: default?.country ?: badRequest("missing country"), country = ( json.getString("country") ?: default?.country ?: badRequest("missing country") ).let {
// EGC uses UK, while FFG and browser language use GB
if (it == "UK") "GB" else it
},
club = json.getString("club") ?: default?.club ?: badRequest("missing club"), club = json.getString("club") ?: default?.club ?: badRequest("missing club"),
final = json.getBoolean("final") ?: default?.final ?: true, final = json.getBoolean("final") ?: default?.final ?: true,
mmsCorrection = json.getInt("mmsCorrection") ?: default?.mmsCorrection ?: 0 mmsCorrection = json.getInt("mmsCorrection") ?: default?.mmsCorrection ?: 0

3
view-webapp/src/main/kotlin/org/jeudego/pairgoth/ratings/EGFRatingsHandler.kt
View File

@@ -23,6 +23,9 @@ object EGFRatingsHandler: RatingsHandler(RatingsManager.Ratings.EGF) {
player["rating"]?.toString()?.toIntOrNull()?.let { rating -> player["rating"]?.toString()?.toIntOrNull()?.let { rating ->
player["rank"] = ((rating - 2050)/100).let { if (it < 0) "${-it+1}k" else "${it+1}d" } player["rank"] = ((rating - 2050)/100).let { if (it < 0) "${-it+1}k" else "${it+1}d" }
} }
if ("UK" == player.getString("country")) {
player["country"] = "GB"
}
} }
} }
} }