Pla 1183 fix multipoint calculation in playerinfo

modules/game/src/main/Game.scala

@@ -501,10 +501,10 @@ case class Game(
   // style "copy pasted" from a ts function
   def multiPointResult: String =
     if (metadata.multiPointState.isEmpty) "-"
-    else if (finished) finalMultiPointScore()
+    else if (finished) finalMultiPointScore
     else metadata.multiPointState.fold("-")(mps => f"${mps.target}%02d${mps.p1Points}%02d${mps.p2Points}%02d")
 
-  def finalMultiPointScore(): String = {
+  def finalMultiPointScore: String = {
     val points2Add: Array[Int] =
       if (pointValue.isDefined && winner.isDefined)
         if (winner.get.playerIndex == P1) Array(pointValue.get, 0)

modules/swiss/src/main/SwissJson.scala

@@ -282,40 +282,39 @@ object SwissJson {
   private def multiPointResultsJson(swissPairingGames: Seq[SwissPairingGames]) =
     JsArray(
       swissPairingGames.flatMap {
-        pairingGame =>
-          Seq(
-            Json.obj(
-              "target" -> pairingGame.game.metadata.multiPointState.fold(0)(_.target),
-              "players" -> Json.obj(
-                "p1" -> Json.obj(
-                  "userId" -> pairingGame.game.p1Player.userId,
-                ),
-                "p2" -> Json.obj(
-                  "userId" -> pairingGame.game.p2Player.userId,
-                )
+        pairingGame => Seq(
+          Json.obj(
+            "target" -> pairingGame.game.metadata.multiPointState.fold(0)(_.target),
+            "players" -> Json.obj(
+              "p1" -> Json.obj(
+                "userId" -> pairingGame.game.p1Player.userId,
               ),
-              "games" -> JsArray(
-                  pairingGame.multiMatchGames.toList.flatten.reverse.map { game =>
-                    Json.obj(
-                      "id"        -> game.id,
-                      "p1UserId"  -> game.p1Player.userId,
-                      "startingScore" -> Json.obj(
-                        "p1" -> game.metadata.multiPointState.fold(0)(_.p1Points),
-                        "p2" -> game.metadata.multiPointState.fold(0)(_.p2Points),
-                      )
-                    )
-                  } :+
+              "p2" -> Json.obj(
+                "userId" -> pairingGame.game.p2Player.userId,
+              )
+            ),
+            "games" -> JsArray(
+                pairingGame.multiMatchGames.toList.flatten.reverse.map { game =>
                   Json.obj(
-                    "id"        -> pairingGame.game.id,
-                    "p1UserId"  -> pairingGame.game.p1Player.userId,
+                    "id"        -> game.id,
+                    "p1UserId"  -> game.p1Player.userId,
                     "startingScore" -> Json.obj(
-                      "p1" -> pairingGame.game.metadata.multiPointState.fold(0)(_.p1Points),
-                      "p2" -> pairingGame.game.metadata.multiPointState.fold(0)(_.p2Points),
+                      "p1" -> (if (game.finished) game.finalMultiPointScore.substring(2,4).toInt.toString else game.metadata.multiPointState.fold(0)(_.p1Points)),
+                      "p2" -> (if (game.finished) game.finalMultiPointScore.substring(4,6).toInt.toString else game.metadata.multiPointState.fold(0)(_.p2Points)),
                     )
                   )
-              )
+                } :+
+                Json.obj(
+                  "id"        -> pairingGame.game.id,
+                  "p1UserId"  -> pairingGame.game.p1Player.userId,
+                  "startingScore" -> Json.obj(
+                    "p1" -> (if (pairingGame.game.finished) pairingGame.game.finalMultiPointScore.substring(2,4).toInt.toString else pairingGame.game.metadata.multiPointState.fold(0)(_.p1Points)),
+                    "p2" -> (if (pairingGame.game.finished) pairingGame.game.finalMultiPointScore.substring(4,6).toInt.toString else pairingGame.game.metadata.multiPointState.fold(0)(_.p2Points)),
+                  )
+                )
             )
           )
+        )
       }
     )
 

ui/swiss/src/view/playerInfo.ts

@@ -221,11 +221,17 @@ function gameResult(p: MultiMatchPairing): string {
 }
 
 function multiPointResult(p: MultiMatchPairing, selectedUserId: string, multiPoints: MultiPoint[]): string {
-  // @TODO: need fix pla-1183-fix-multipoint-calculation-in-playerinfo : pass a ui/game/BaseGame and a ply up to here in order to invoke ui/stratutils/finalMultiPointState() and compute pts correctly (e.g : win multipoint match by timeout but opponent still gets pts by Rule of Gin)
   const edgeCasesDisplay = '(*)';
   if (!multiPoints) return edgeCasesDisplay;
   const round = multiPoints.find(round => round.games?.find(game => game.id === p.g));
-  if (p.mmGameNb === undefined || !round || round.games.length < 1 || !round.target) return edgeCasesDisplay;
+  if (
+    p.mmGameNb === undefined ||
+    !round ||
+    round.games.length < 1 ||
+    !round.target ||
+    (p.w === undefined && p.mmGameNb == round.games.length)
+  )
+    return edgeCasesDisplay;
 
   if (p.isFinalGame && p.w !== undefined) {
     return p.w === true
@@ -237,7 +243,7 @@ function multiPointResult(p: MultiMatchPairing, selectedUserId: string, multiPoi
         : round.games[0].startingScore.p2 + ' - ' + round.target;
   }
 
-  const multiPointMatchIndex = round.games.length - p.mmGameNb - 1;
+  const multiPointMatchIndex = round.games.length - p.mmGameNb;
   if (!round.games[multiPointMatchIndex]) return edgeCasesDisplay;
   const [selectedPlayerScore, opponentScore] =
     round.games[multiPointMatchIndex].p1UserId === selectedUserId