removed unnecessary key generation & add StorageServiceLockDecorator

Author: rez1dent3

deptrac.yaml

@@ -98,6 +98,11 @@ parameters:
         - type: className
           regex: ^Bavix\\.*Internal\\Service\\.*Service$
 
+    - name: ServiceDecorator
+      collectors:
+        - type: className
+          regex: ^Bavix\\.*Decorator\\.*Decorator
+
     # contracts
     - name: Model
       collectors:
@@ -162,6 +167,10 @@ parameters:
       - Config
       - Cache
 
+    ServiceDecorator:
+      - InternalException
+      - ServiceInterface
+
     EventInterface:
     Event:
       - EventInterface

docs/transaction.md

@@ -1,5 +1,7 @@
 ## Transaction
 
+> Since version 9.2 it is safer to use AtomicServiceInterface.
+
 > Is it possible to use laravel's inline transactions? No, It is Immpossible. This limitation is due to the internal architecture of the package. To achieve the maximum speed of work, work with an internal state of balance was needed. Starting with version 8.2, a special error has appeared that will inform you about incorrect work with the `TransactionStartException` package.
 
 Sometimes you need to execute many simple queries. You want to keep the data atomic. To do this, you need `laravel-wallet` v7.1+.

src/Internal/Decorator/StorageServiceLockDecorator.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Internal\Decorator;
+
+use Bavix\Wallet\Internal\Exceptions\LockProviderNotFoundException;
+use Bavix\Wallet\Internal\Exceptions\RecordNotFoundException;
+use Bavix\Wallet\Internal\Service\LockServiceInterface;
+use Bavix\Wallet\Internal\Service\StorageServiceInterface;
+
+final class StorageServiceLockDecorator implements StorageServiceInterface
+{
+    public function __construct(
+        private StorageServiceInterface $storageService,
+        private LockServiceInterface $lockService
+    ) {
+    }
+
+    public function flush(): bool
+    {
+        return $this->storageService->flush();
+    }
+
+    public function missing(string $uuid): bool
+    {
+        return $this->storageService->missing($uuid);
+    }
+
+    public function get(string $uuid): string
+    {
+        return $this->storageService->get($uuid);
+    }
+
+    public function sync(string $uuid, float|int|string $value): bool
+    {
+        return $this->storageService->sync($uuid, $value);
+    }
+
+    /**
+     * @throws LockProviderNotFoundException
+     * @throws RecordNotFoundException
+     */
+    public function increase(string $uuid, float|int|string $value): string
+    {
+        return $this->lockService->block(
+            $uuid . '::increase',
+            fn () => $this->storageService->increase($uuid, $value)
+        );
+    }
+}

src/Internal/Service/StorageService.php

@@ -5,14 +5,12 @@
 namespace Bavix\Wallet\Internal\Service;
 
 use Bavix\Wallet\Internal\Exceptions\ExceptionInterface;
-use Bavix\Wallet\Internal\Exceptions\LockProviderNotFoundException;
 use Bavix\Wallet\Internal\Exceptions\RecordNotFoundException;
 use Illuminate\Contracts\Cache\Repository as CacheRepository;
 
 final class StorageService implements StorageServiceInterface
 {
     public function __construct(
-        private LockServiceInterface $lockService,
         private MathServiceInterface $mathService,
         private CacheRepository $cacheRepository
     ) {
@@ -23,17 +21,17 @@ public function flush(): bool
         return $this->cacheRepository->clear();
     }
 
-    public function missing(string $key): bool
+    public function missing(string $uuid): bool
     {
-        return $this->cacheRepository->forget($key);
+        return $this->cacheRepository->forget($uuid);
     }
 
     /**
      * @throws RecordNotFoundException
      */
-    public function get(string $key): string
+    public function get(string $uuid): string
     {
-        $value = $this->cacheRepository->get($key);
+        $value = $this->cacheRepository->get($uuid);
         if ($value === null) {
             throw new RecordNotFoundException(
                 'The repository did not find the object',
@@ -44,25 +42,19 @@ public function get(string $key): string
         return $this->mathService->round($value);
     }
 
-    public function sync(string $key, float|int|string $value): bool
+    public function sync(string $uuid, float|int|string $value): bool
     {
-        return $this->cacheRepository->set($key, $value);
+        return $this->cacheRepository->set($uuid, $value);
     }
 
     /**
-     * @throws LockProviderNotFoundException
      * @throws RecordNotFoundException
      */
-    public function increase(string $key, float|int|string $value): string
+    public function increase(string $uuid, float|int|string $value): string
     {
-        return $this->lockService->block(
-            $key . '::increase',
-            function () use ($key, $value): string {
-                $result = $this->mathService->add($this->get($key), $value);
-                $this->sync($key, $result);
+        $result = $this->mathService->add($this->get($uuid), $value);
+        $this->sync($uuid, $result);
 
-                return $this->mathService->round($result);
-            }
-        );
+        return $this->mathService->round($result);
     }
 }

src/Internal/Service/StorageServiceInterface.php

@@ -11,18 +11,18 @@ interface StorageServiceInterface
 {
     public function flush(): bool;
 
-    public function missing(string $key): bool;
+    public function missing(string $uuid): bool;
 
     /**
      * @throws RecordNotFoundException
      */
-    public function get(string $key): string;
+    public function get(string $uuid): string;
 
-    public function sync(string $key, float|int|string $value): bool;
+    public function sync(string $uuid, float|int|string $value): bool;
 
     /**
      * @throws LockProviderNotFoundException
      * @throws RecordNotFoundException
      */
-    public function increase(string $key, float|int|string $value): string;
+    public function increase(string $uuid, float|int|string $value): string;
 }

src/Services/BookkeeperService.php

@@ -66,6 +66,6 @@ public function increase(Wallet $wallet, float|int|string $value): string
 
     private function getKey(Wallet $wallet): string
     {
-        return __CLASS__ . '::' . $wallet->uuid;
+        return $wallet->uuid;
     }
 }

src/Services/RegulatorService.php

@@ -9,43 +9,38 @@
 use Bavix\Wallet\Internal\Service\DispatcherServiceInterface;
 use Bavix\Wallet\Internal\Service\MathServiceInterface;
 use Bavix\Wallet\Internal\Service\StorageServiceInterface;
-use Bavix\Wallet\Internal\Service\UuidFactoryServiceInterface;
 use Bavix\Wallet\Models\Wallet;
 
 /**
  * @internal
  */
 final class RegulatorService implements RegulatorServiceInterface
 {
-    private string $idempotentKey;
-
     /**
      * @var Wallet[]
      */
     private array $wallets = [];
 
     public function __construct(
         private BalanceUpdatedEventAssemblerInterface $balanceUpdatedEventAssembler,
-        UuidFactoryServiceInterface $uuidFactoryService,
         private BookkeeperServiceInterface $bookkeeperService,
         private DispatcherServiceInterface $dispatcherService,
         private StorageServiceInterface $storageService,
         private MathServiceInterface $mathService
     ) {
-        $this->idempotentKey = $uuidFactoryService->uuid4();
     }
 
     public function missing(Wallet $wallet): bool
     {
         unset($this->wallets[$wallet->uuid]);
 
-        return $this->storageService->missing($this->getKey($wallet->uuid));
+        return $this->storageService->missing($wallet->uuid);
     }
 
     public function diff(Wallet $wallet): string
     {
         try {
-            return $this->mathService->round($this->storageService->get($this->getKey($wallet->uuid)));
+            return $this->mathService->round($this->storageService->get($wallet->uuid));
         } catch (RecordNotFoundException) {
             return '0';
         }
@@ -63,7 +58,7 @@ public function sync(Wallet $wallet, float|int|string $value): bool
         $this->persist($wallet);
 
         return $this->storageService->sync(
-            $this->getKey($wallet->uuid),
+            $wallet->uuid,
             $this->mathService->round(
                 $this->mathService->negative($this->mathService->sub($this->amount($wallet), $value))
             )
@@ -75,10 +70,10 @@ public function increase(Wallet $wallet, float|int|string $value): string
         $this->persist($wallet);
 
         try {
-            $this->storageService->increase($this->getKey($wallet->uuid), $value);
+            $this->storageService->increase($wallet->uuid, $value);
         } catch (RecordNotFoundException) {
             $value = $this->mathService->round($value);
-            $this->storageService->sync($this->getKey($wallet->uuid), $value);
+            $this->storageService->sync($wallet->uuid, $value);
         }
 
         return $this->amount($wallet);
@@ -129,9 +124,4 @@ private function persist(Wallet $wallet): void
     {
         $this->wallets[$wallet->uuid] = $wallet;
     }
-
-    private function getKey(string $uuid): string
-    {
-        return $this->idempotentKey . '::' . $uuid;
-    }
 }

src/WalletServiceProvider.php

@@ -27,6 +27,7 @@
 use Bavix\Wallet\Internal\Assembler\TransferQueryAssemblerInterface;
 use Bavix\Wallet\Internal\Assembler\WalletCreatedEventAssembler;
 use Bavix\Wallet\Internal\Assembler\WalletCreatedEventAssemblerInterface;
+use Bavix\Wallet\Internal\Decorator\StorageServiceLockDecorator;
 use Bavix\Wallet\Internal\Events\BalanceUpdatedEvent;
 use Bavix\Wallet\Internal\Events\BalanceUpdatedEventInterface;
 use Bavix\Wallet\Internal\Events\TransactionCreatedEvent;
@@ -247,7 +248,7 @@ private function services(array $configure, array $cache): void
             $configure['bookkeeper'] ?? BookkeeperService::class,
             [
                 'storageService' => $this->app->make(
-                    StorageServiceInterface::class,
+                    StorageServiceLockDecorator::class,
                     [
                         'cacheRepository' => $this->app->make(CacheFactory::class)
                             ->store($cache['driver'] ?? 'array'),
@@ -262,7 +263,7 @@ private function services(array $configure, array $cache): void
                 'storageService' => $this->app->make(
                     StorageServiceInterface::class,
                     [
-                        'cacheRepository' => $this->app->make(CacheFactory::class)
+                        'cacheRepository' => clone $this->app->make(CacheFactory::class)
                             ->store('array'),
                     ],
                 ),