Move acquiredAt creation to IO

lichess-org · Nov 19, 2023 · 714b0d1 · 714b0d1
1 parent 9666b84
commit 714b0d1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/app/src/main/scala/Executor.scala b/app/src/main/scala/Executor.scala
@@ -47,17 +47,18 @@ object Executor:
               clearIfFull(m) + (move.id -> move)
 
         def acquire(accquire: MoveDb.Acquire): IO[Option[Work.Move]] =
-          ref.modify: coll =>
-            coll.values
-              .foldLeft[Option[Move]](None):
-                case (found, m) if m.nonAcquired =>
-                  Some(found.fold(m): a =>
-                    if m.canAcquire(accquire.clientKey) && m.createdAt.isBefore(a.createdAt) then m else a)
-                case (found, _) => found
-              .map: m =>
-                val move = m.assignTo(accquire.clientKey)
-                (coll + (move.id -> move)) -> move.some
-              .getOrElse(coll -> none[Work.Move])
+          IO.realTimeInstant.flatMap: at =>
+            ref.modify: coll =>
+              coll.values
+                .foldLeft[Option[Move]](None):
+                  case (found, m) if m.nonAcquired =>
+                    Some(found.fold(m): a =>
+                      if m.canAcquire(accquire.clientKey) && m.createdAt.isBefore(a.createdAt) then m else a)
+                  case (found, _) => found
+                .map: m =>
+                  val move = m.assignTo(accquire.clientKey, at)
+                  (coll + (move.id -> move)) -> move.some
+                .getOrElse(coll -> none[Work.Move])
 
         def move(workId: Work.Id, data: Fishnet.PostMove): IO[Unit] =
           ref.flatModify: coll =>

diff --git a/app/src/main/scala/Work.scala b/app/src/main/scala/Work.scala
@@ -36,12 +36,12 @@ object Work:
     def canAcquire(clientKey: ClientKey)   = lastTryByKey.fold(true)(clientKey.!=)
     def acquiredBefore(date: Instant)      = acquiredAt.fold(false)(_.isBefore(date))
 
-    def assignTo(clientKey: ClientKey) =
+    def assignTo(clientKey: ClientKey, at: Instant) =
       copy(
         acquired = Some(
           Acquired(
             clientKey = clientKey,
-            date = Instant.now,
+            date = at,
           )
         ),
         lastTryByKey = Some(clientKey),