show host proper rating with provisional

stanleyjacob · Nov 6, 2023 · 8a7ac01 · 8a7ac01
1 parent 89c648c
commit 8a7ac01
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/modules/simul/src/main/JsonView.scala b/modules/simul/src/main/JsonView.scala
@@ -78,7 +78,8 @@ final class JsonView(
           .obj(
             "id"     -> host.id,
             "name"   -> host.name,
-            "rating" -> simul.hostRating
+            "rating" -> simul.hostRating,
+            "provisional" -> simul.hostProvisional
           )
           .add("gameId" -> simul.hostGameId.ifTrue(simul.isRunning))
           .add("title" -> host.title)

diff --git a/modules/simul/src/main/Simul.scala b/modules/simul/src/main/Simul.scala
@@ -22,6 +22,7 @@ case class Simul(
     estimatedStartAt: Option[Instant] = None,
     hostId: UserId,
     hostRating: IntRating,
+    hostProvisional: Option[RatingProvisional],
     hostGameId: Option[String], // game the host is focusing on
     startedAt: Option[Instant],
     finishedAt: Option[Instant],
@@ -158,11 +159,8 @@ object Simul:
     status = SimulStatus.Created,
     clock = clock,
     hostId = host.id,
-    hostRating = host.perfs.bestRatingIn:
-      variants.map {
-        PerfType(_, Speed(clock.config.some))
-      } ::: List(PerfType.Blitz, PerfType.Rapid, PerfType.Classical)
-    ,
+    hostRating = host.perfs.bestPerf(variants.map { PerfType(_, Speed(clock.config.some)) }).intRating,
+    hostProvisional = host.perfs.bestPerf(variants.map { PerfType(_, Speed(clock.config.some)) }).provisional.some,
     hostGameId = none,
     createdAt = nowInstant,
     estimatedStartAt = estimatedStartAt,

diff --git a/modules/user/src/main/UserPerfs.scala b/modules/user/src/main/UserPerfs.scala
@@ -96,6 +96,14 @@ case class UserPerfs(
       case (ro, _) => ro
     .getOrElse(Perf.default.intRating)
 
+  def bestPerf(types: List[PerfType]): Perf =
+    types
+      .map(apply)
+      .foldLeft(none[Perf]):
+        case (ro, p) if ro.forall(_.intRating < p.intRating) => p.some
+        case (ro, _) => ro
+      .getOrElse(Perf.default)
+
   def bestRatingInWithMinGames(types: List[PerfType], nbGames: Int): Option[IntRating] =
     types
       .map(apply)

diff --git a/ui/simul/src/interfaces.ts b/ui/simul/src/interfaces.ts
@@ -42,6 +42,7 @@ export interface Player extends LightUserOnline {
 
 export interface Host extends LightUserOnline {
   rating: number;
+  provisional?: boolean;
   gameId?: string;
 }