unique ids when generating tournament pairings

Author: niklasf

modules/tournament/src/main/Pairing.scala

@@ -60,22 +60,25 @@ private[tournament] object Pairing {
 
   case class LastOpponents(hash: Map[User.ID, User.ID]) extends AnyVal
 
-  def apply(tourId: Tournament.ID, u1: User.ID, u2: User.ID): Pairing = new Pairing(
-    id = IdGenerator.uncheckedGame,
-    tourId = tourId,
-    status = chess.Status.Created,
-    user1 = u1,
-    user2 = u2,
-    winner = none,
-    turns = none,
-    berserk1 = false,
-    berserk2 = false
-  )
+  private def make(tourId: Tournament.ID, u1: User.ID, u2: User.ID): Fu[Pairing] =
+    fuccess(IdGenerator.uncheckedGame) dmap { id =>
+      new Pairing(
+        id = id,
+        tourId = tourId,
+        status = chess.Status.Created,
+        user1 = u1,
+        user2 = u2,
+        winner = none,
+        turns = none,
+        berserk1 = false,
+        berserk2 = false
+      )
+    }
 
   case class Prep(tourId: Tournament.ID, user1: User.ID, user2: User.ID) {
-    def toPairing(firstGetsWhite: Boolean) =
-      if (firstGetsWhite) Pairing(tourId, user1, user2)
-      else Pairing(tourId, user2, user1)
+    def toPairing(firstGetsWhite: Boolean): Fu[Pairing] =
+      if (firstGetsWhite) Pairing.make(tourId, user1, user2)
+      else Pairing.make(tourId, user2, user1)
   }
 
   def prep(tour: Tournament, ps: (Player, Player)) = Pairing.Prep(tour.id, ps._1.userId, ps._2.userId)

modules/tournament/src/main/arena/PairingSystem.scala

@@ -64,11 +64,9 @@ private[tournament] object PairingSystem extends AbstractPairingSystem {
 
   private def prepsToPairings(preps: List[Pairing.Prep]): Fu[List[Pairing]] =
     if (preps.size < 50) preps.map { prep =>
-      UserRepo.firstGetsWhite(prep.user1.some, prep.user2.some) map prep.toPairing
+      UserRepo.firstGetsWhite(prep.user1.some, prep.user2.some) flatMap prep.toPairing
     }.sequenceFu
-    else fuccess {
-      preps.map(_ toPairing Random.nextBoolean)
-    }
+    else preps.map(_ toPairing Random.nextBoolean).sequenceFu
 
   private def naivePairings(tour: Tournament, players: RankedPlayers): List[Pairing.Prep] =
     players grouped 2 collect {