Remove lastAcquiredKey, reuse key from acquired

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

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/app/src/main/scala/Executor.scala b/app/src/main/scala/Executor.scala
@@ -126,7 +126,6 @@ object Executor:
         level = req.level,
         clock = req.clock,
         tries = 0,
-        lastTryByKey = None,
         acquired = None,
         createdAt = now,
       )
diff --git a/app/src/main/scala/Work.scala b/app/src/main/scala/Work.scala
@@ -22,7 +22,6 @@ object Work:
       level: Int,
       clock: Option[Work.Clock],
       tries: Int,
-      lastTryByKey: Option[ClientKey],
       acquired: Option[Acquired],
       createdAt: Instant,
   ):
@@ -33,7 +32,7 @@ object Work:
     def isAcquiredBy(clientKey: ClientKey) = acquiredByKey contains clientKey
     def isAcquired                         = acquired.isDefined
     def nonAcquired                        = !isAcquired
-    def canAcquire(clientKey: ClientKey)   = lastTryByKey.fold(true)(clientKey.!=)
+    def canAcquire(clientKey: ClientKey)   = acquired.fold(true)(_.clientKey != clientKey)
     def acquiredBefore(date: Instant)      = acquiredAt.fold(false)(_.isBefore(date))
 
     def assignTo(clientKey: ClientKey, at: Instant) =
@@ -44,7 +43,6 @@ object Work:
             date = at,
           )
         ),
-        lastTryByKey = Some(clientKey),
         tries = tries + 1,
       )
 

diff --git a/app/src/test/scala/ExecutorTest.scala b/app/src/test/scala/ExecutorTest.scala
@@ -22,17 +22,6 @@ object ExecutorTest extends SimpleIOSuite with Checkers:
     clock = None,
   )
 
-  // val work = Work.Move(
-  //   _id = workId,
-  //   game = game,
-  //   level = 1,
-  //   clock = None,
-  //   tries = 0,
-  //   lastTryByKey = None,
-  //   acquired = None,
-  //   createdAt = Instant.now,
-  // )
-
   val key = ClientKey("key")
 
   val acquiredKey = MoveDb.Acquire(key)
@@ -54,7 +43,7 @@ object ExecutorTest extends SimpleIOSuite with Checkers:
       acquired = acquiredOption.get
     yield assert(acquired.acquired.get.clientKey == key)
       `and` assert(acquired.tries == 1)
-      `and` assert(acquired.lastTryByKey == key.some)
+      `and` assert(acquired.acquired.get.clientKey == key)
       `and` assert(acquired.toRequest == request)
 
   test("after acquire the only work, acquire again should return none"):
@@ -124,7 +113,7 @@ object ExecutorTest extends SimpleIOSuite with Checkers:
       acquired = acquiredOption.get
     yield assert(acquired.acquired.get.clientKey == key)
       `and` assert(acquired.tries == 2)
-      `and` assert(acquired.lastTryByKey == key.some)
+      `and` assert(acquired.acquired.get.clientKey == key)
       `and` assert(acquired.toRequest == request)
 
   test("should not give up after 2 tries"):