optimize lock provider & storage service lock decorator

Author: rez1dent3

src/Internal/Decorator/StorageServiceLockDecorator.php

@@ -43,9 +43,6 @@ public function sync(string $uuid, float|int|string $value): bool
      */
     public function increase(string $uuid, float|int|string $value): string
     {
-        return $this->lockService->block(
-            $uuid . '::increase',
-            fn () => $this->storageService->increase($uuid, $value)
-        );
+        return $this->lockService->block($uuid, fn () => $this->storageService->increase($uuid, $value));
     }
 }

src/Internal/Service/LockService.php

@@ -12,6 +12,8 @@
 
 final class LockService implements LockServiceInterface
 {
+    private const PREFIX = 'wallet_lock::';
+
     /**
      * @var array<string, bool>
      */
@@ -32,19 +34,21 @@ public function __construct(CacheFactory $cacheFactory)
      */
     public function block(string $key, callable $callback): mixed
     {
-        if (array_key_exists($key, $this->lockedKeys)) {
+        $lockKey = self::PREFIX . $key;
+
+        if (array_key_exists($lockKey, $this->lockedKeys)) {
             return $callback();
         }
 
-        $this->lockedKeys[$key] = true;
+        $this->lockedKeys[$lockKey] = true;
 
         try {
             return $this->getLockProvider()
-                ->lock($key)
+                ->lock($lockKey)
                 ->block($this->seconds, $callback)
             ;
         } finally {
-            unset($this->lockedKeys[$key]);
+            unset($this->lockedKeys[$lockKey]);
         }
     }
 

src/Services/AtomicService.php

@@ -17,8 +17,6 @@
  */
 final class AtomicService implements AtomicServiceInterface
 {
-    private const PREFIX = 'wallet_atomic::';
-
     public function __construct(
         private DatabaseServiceInterface $databaseService,
         private LockServiceInterface $lockService,
@@ -38,7 +36,8 @@ public function blocks(array $objects, callable $callback): mixed
     {
         $callable = fn () => $this->databaseService->transaction($callback);
         foreach ($objects as $object) {
-            $callable = fn () => $this->lockService->block($this->key($object), $callable);
+            $wallet = $this->castService->getWallet($object);
+            $callable = fn () => $this->lockService->block($wallet->uuid, $callable);
         }
 
         return $callable();
@@ -54,11 +53,4 @@ public function block(Wallet $object, callable $callback): mixed
     {
         return $this->blocks([$object], $callback);
     }
-
-    private function key(Wallet $object): string
-    {
-        $wallet = $this->castService->getWallet($object);
-
-        return self::PREFIX . '::' . $wallet::class . '::' . $wallet->uuid;
-    }
 }