bugs fix

Author: rez1dent3

src/Internal/Decorator/StorageServiceLockDecorator.php

@@ -33,7 +33,11 @@ public function missing(string $uuid): bool
 
     public function get(string $uuid): string
     {
-        return $this->stateService->get($uuid) ?? $this->storageService->get($uuid);
+        if ($this->lockService->isBlocked($uuid)) {
+            return $this->stateService->get($uuid) ?? $this->storageService->get($uuid);
+        }
+
+        return $this->storageService->get($uuid);
     }
 
     public function sync(string $uuid, float|int|string $value): bool

src/Internal/Service/LockService.php

@@ -34,24 +34,27 @@ public function __construct(CacheFactory $cacheFactory)
      */
     public function block(string $key, callable $callback): mixed
     {
-        $lockKey = self::PREFIX . $key;
-
-        if (array_key_exists($lockKey, $this->lockedKeys)) {
+        if ($this->isBlocked($key)) {
             return $callback();
         }
 
-        $this->lockedKeys[$lockKey] = true;
+        $this->lockedKeys[$key] = true;
 
         try {
             return $this->getLockProvider()
-                ->lock($lockKey)
+                ->lock(self::PREFIX . $key)
                 ->block($this->seconds, $callback)
             ;
         } finally {
-            unset($this->lockedKeys[$lockKey]);
+            unset($this->lockedKeys[$key]);
         }
     }
 
+    public function isBlocked(string $key): bool
+    {
+        return $this->lockedKeys[$key] ?? false;
+    }
+
     /**
      * @throws LockProviderNotFoundException
      * @codeCoverageIgnore

src/Internal/Service/LockServiceInterface.php

@@ -17,4 +17,6 @@ interface LockServiceInterface
      * @throws LockProviderNotFoundException
      */
     public function block(string $key, callable $callback): mixed;
+
+    public function isBlocked(string $key): bool;
 }

src/Internal/Service/StateService.php

@@ -13,7 +13,7 @@ final class StateService implements StateServiceInterface
 
     public function fork(string $uuid, string $value): void
     {
-        $this->forks[$uuid] = $value;
+        $this->forks[$uuid] ??= $value;
     }
 
     public function get(string $uuid): ?string

src/Services/AtomicService.php

@@ -19,6 +19,7 @@
 final class AtomicService implements AtomicServiceInterface
 {
     public function __construct(
+        private BookkeeperServiceInterface $bookkeeperService,
         private DatabaseServiceInterface $databaseService,
         private StateServiceInterface $stateService,
         private LockServiceInterface $lockService,
@@ -36,23 +37,35 @@ public function __construct(
      */
     public function blocks(array $objects, callable $callback): mixed
     {
-        $callable = fn () => $this->databaseService->transaction($callback);
+        $blockObjects = [];
         foreach ($objects as $object) {
             $wallet = $this->castService->getWallet($object);
-            $callable = fn () => $this->lockService->block(
-                $wallet->uuid,
-                function () use ($wallet, $callable) {
-                    try {
-                        $this->stateService->fork($wallet->uuid, $wallet->balance);
-                        return $callable();
-                    } finally {
-                        $this->stateService->drop($wallet->uuid);
-                    }
-                }
-            );
+            if (! $this->lockService->isBlocked($wallet->uuid)) {
+                $blockObjects[] = $object;
+            }
         }
 
-        return $callable();
+        $callable = function () use ($blockObjects, $callback) {
+            foreach ($blockObjects as $object) {
+                $wallet = $this->castService->getWallet($object);
+                $this->stateService->fork($wallet->uuid, $this->bookkeeperService->amount($wallet));
+            }
+            return $this->databaseService->transaction($callback);
+        };
+
+        foreach ($blockObjects as $object) {
+            $wallet = $this->castService->getWallet($object);
+            $callable = fn () => $this->lockService->block($wallet->uuid, $callable);
+        }
+
+        try {
+            return $callable();
+        } finally {
+            foreach ($blockObjects as $object) {
+                $wallet = $this->castService->getWallet($object);
+                $this->stateService->drop($wallet->uuid);
+            }
+        }
     }
 
     /**

src/Traits/CanConfirm.php

@@ -40,14 +40,16 @@ trait CanConfirm
      */
     public function confirm(Transaction $transaction): bool
     {
-        if ($transaction->type === Transaction::TYPE_WITHDRAW) {
-            app(ConsistencyServiceInterface::class)->checkPotential(
-                app(CastServiceInterface::class)->getWallet($this),
-                app(MathServiceInterface::class)->negative($transaction->amount)
-            );
-        }
+        return app(AtomicServiceInterface::class)->block($this, function () use ($transaction): bool {
+            if ($transaction->type === Transaction::TYPE_WITHDRAW) {
+                app(ConsistencyServiceInterface::class)->checkPotential(
+                    app(CastServiceInterface::class)->getWallet($this),
+                    app(MathServiceInterface::class)->negative($transaction->amount)
+                );
+            }
 
-        return $this->forceConfirm($transaction);
+            return $this->forceConfirm($transaction);
+        });
     }
 
     public function safeConfirm(Transaction $transaction): bool

src/Traits/CanExchange.php

@@ -41,11 +41,11 @@ trait CanExchange
      */
     public function exchange(Wallet $to, int|string $amount, ExtraDtoInterface|array|null $meta = null): Transfer
     {
-        $wallet = app(CastServiceInterface::class)->getWallet($this);
-
-        app(ConsistencyServiceInterface::class)->checkPotential($wallet, $amount);
+        return app(AtomicServiceInterface::class)->block($this, function () use ($to, $amount, $meta): Transfer {
+            app(ConsistencyServiceInterface::class)->checkPotential($this, $amount);
 
-        return $this->forceExchange($to, $amount, $meta);
+            return $this->forceExchange($to, $amount, $meta);
+        });
     }
 
     public function safeExchange(Wallet $to, int|string $amount, ExtraDtoInterface|array|null $meta = null): ?Transfer

src/Traits/HasWallet.php

@@ -125,10 +125,12 @@ public function safeTransfer(
      */
     public function transfer(Wallet $wallet, int|string $amount, ExtraDtoInterface|array|null $meta = null): Transfer
     {
-        /** @var Wallet $this */
-        app(ConsistencyServiceInterface::class)->checkPotential($this, $amount);
+        return app(AtomicServiceInterface::class)->block($this, function () use ($wallet, $amount, $meta): Transfer {
+            /** @var Wallet $this */
+            app(ConsistencyServiceInterface::class)->checkPotential($this, $amount);
 
-        return $this->forceTransfer($wallet, $amount, $meta);
+            return $this->forceTransfer($wallet, $amount, $meta);
+        });
     }
 
     /**
@@ -144,10 +146,16 @@ public function transfer(Wallet $wallet, int|string $amount, ExtraDtoInterface|a
      */
     public function withdraw(int|string $amount, ?array $meta = null, bool $confirmed = true): Transaction
     {
-        /** @var Wallet $this */
-        app(ConsistencyServiceInterface::class)->checkPotential($this, $amount);
-
-        return $this->forceWithdraw($amount, $meta, $confirmed);
+        return app(AtomicServiceInterface::class)->block($this, function () use (
+            $amount,
+            $meta,
+            $confirmed
+        ): Transaction {
+            /** @var Wallet $this */
+            app(ConsistencyServiceInterface::class)->checkPotential($this, $amount);
+
+            return $this->forceWithdraw($amount, $meta, $confirmed);
+        });
     }
 
     /**