最新の main ブランチを feature/fix-sequence-factory にマージします

CHANGELOG.md

@@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
       Note that the upgrade doesn't break already-persisted data since the Cassandra database schema to use is not changed.  
       Though we have to migrate code and settings, we can continue to use already-persisted data.
 
+### Fixed
+- `lerna-util-sequence`
+    - Reserving an unnecessary extra sequence value when resetting [PR#65](https://github.com/lerna-stack/lerna-app-library/pull/65)
 
 ## [v2.0.0] - 2021-07-16
 [v2.0.0]: https://github.com/lerna-stack/lerna-app-library/compare/v1.0.0...v2.0.0

lerna-util-sequence/src/main/scala/lerna/util/sequence/SequenceStore.scala

@@ -401,7 +401,7 @@ private[sequence] final class SequenceStore(
       reservationAmount: BigInt,
       sequenceSubId: Option[String],
   )(implicit sessionContext: SessionContext): Future[SequenceReset] = {
-    reserve(maxReservedValue = firstValue, reservationAmount, sequenceSubId)
+    reserve(maxReservedValue = firstValue, reservationAmount - 1, sequenceSubId)
       .map(r => SequenceReset(r.maxReservedValue))
   }
 

lerna-util-sequence/src/test/scala/lerna/util/sequence/SequenceFactoryWorkerSpec.scala

@@ -141,7 +141,7 @@ class SequenceFactoryWorkerSpec
 
           val maxReservedValue = firstValue
           result.replyTo ! SequenceStore.SequenceReset(
-            maxReservedValue = maxReservedValue + (incrementStep * reservationAmount),
+            maxReservedValue = maxReservedValue + (incrementStep * (reservationAmount - 1)),
           )
       }
 

lerna-util-sequence/src/test/scala/lerna/util/sequence/SequenceStoreSpec.scala

@@ -147,6 +147,35 @@ class SequenceStoreSpec extends ScalaTestWithTypedActorTestKit(SequenceStoreSpec
       testKit.stop(store)
     }
 
+    "リセット時は reservationAmount で指定した分だけの採番値が予約される" in {
+      val store = spawn(
+        SequenceStore.apply(sequenceId = generateUniqueId(), nodeId = 1, incrementStep = 3, cassandraConfig),
+      )
+      val testProbe = createTestProbe[SequenceStore.ReservationResponse]()
+
+      store ! SequenceStore.InitialReserveSequence(
+        firstValue = 1,
+        reservationAmount = 101,
+        sequenceSubId,
+        testProbe.ref,
+      )
+      testProbe.expectMessage(
+        SequenceStore.InitialSequenceReserved(initialValue = 1, maxReservedValue = 301),
+      )
+
+      store ! SequenceStore.ResetReserveSequence(
+        firstValue = 1,
+        reservationAmount = 101,
+        sequenceSubId,
+        testProbe.ref,
+      )
+      // reservationAmount = ((maxReservedValue - firstValue) / incrementStep) + 1
+      // 101 = ((301 - 1) / 3) + 1
+      testProbe.expectMessage(SequenceStore.SequenceReset(maxReservedValue = 301))
+
+      testKit.stop(store)
+    }
+
     "再起動したときに保存した予約値が復元できる" in {
       val sequenceId    = generateUniqueId()
       val nodeId        = 1