drop addBalance

Author: rez1dent3

src/Internal/Service/DatabaseService.php

@@ -43,6 +43,8 @@ public function transaction(callable $callback)
                 return $callback();
             }
 
+            $this->stateService->purge();
+
             return $this->connection->transaction(function () use ($callback) {
                 $result = $callback();
                 $this->stateService->commit();

src/Services/CommonServiceLegacy.php

@@ -15,7 +15,6 @@
 use Bavix\Wallet\Internal\Service\DatabaseServiceInterface;
 use Bavix\Wallet\Models\Transaction;
 use Bavix\Wallet\Models\Transfer;
-use Bavix\Wallet\Models\Wallet as WalletModel;
 use Illuminate\Database\RecordsNotFoundException;
 
 /** @deprecated */
@@ -119,42 +118,6 @@ public function applyTransfers(array $objects): array
         });
     }
 
-    /**
-     * @param int|string $amount
-     *
-     * @deprecated
-     *
-     * @throws LockProviderNotFoundException
-     * @throws RecordsNotFoundException
-     * @throws TransactionFailedException
-     * @throws ExceptionInterface
-     */
-    public function addBalance(Wallet $wallet, $amount): bool
-    {
-        return $this->databaseService->transaction(function () use ($wallet, $amount) {
-            /** @var WalletModel $wallet */
-            $walletObject = $this->castService->getWallet($wallet);
-            $balance = $this->regulatorService->increase($walletObject, $amount);
-            $this->stateService->persist($wallet);
-            $result = 0;
-
-            try {
-                $result = $walletObject->newQuery()
-                    ->whereKey($walletObject->getKey())
-                    ->update(['balance' => $balance])
-                ;
-            } finally {
-                if ($result === 0) {
-                    $this->regulatorService->decrease($walletObject, $amount);
-                } else {
-                    $walletObject->fill(['balance' => $balance])->syncOriginalAttribute('balance');
-                }
-            }
-
-            return (bool) $result;
-        });
-    }
-
     /**
      * @param float|int|string $amount
      *

src/Traits/CanConfirm.php

@@ -18,8 +18,8 @@
 use Bavix\Wallet\Models\Transaction;
 use Bavix\Wallet\Services\AtomicServiceInterface;
 use Bavix\Wallet\Services\CastServiceInterface;
-use Bavix\Wallet\Services\CommonServiceLegacy;
 use Bavix\Wallet\Services\ConsistencyServiceInterface;
+use Bavix\Wallet\Services\RegulatorServiceInterface;
 use Illuminate\Database\RecordsNotFoundException;
 
 trait CanConfirm
@@ -76,15 +76,12 @@ public function resetConfirm(Transaction $transaction): bool
                 );
             }
 
-            $wallet = app(CastServiceInterface::class)->getWallet($this);
-            $mathService = app(MathServiceInterface::class);
-            $negativeAmount = $mathService->negative($transaction->amount);
+            app(RegulatorServiceInterface::class)->decrease(
+                app(CastServiceInterface::class)->getWallet($this),
+                $transaction->amount
+            );
 
-            return $transaction->update(['confirmed' => false]) &&
-                // update balance
-                app(CommonServiceLegacy::class)
-                    ->addBalance($wallet, $negativeAmount)
-                ;
+            return $transaction->update(['confirmed' => false]);
         });
     }
 
@@ -124,11 +121,9 @@ public function forceConfirm(Transaction $transaction): bool
                 );
             }
 
-            return $transaction->update(['confirmed' => true]) &&
-                // update balance
-                app(CommonServiceLegacy::class)
-                    ->addBalance($wallet, $transaction->amount)
-                ;
+            app(RegulatorServiceInterface::class)->increase($wallet, $transaction->amount);
+
+            return $transaction->update(['confirmed' => true]);
         });
     }
 }

tests/Units/Domain/BalanceTest.php

@@ -7,8 +7,8 @@
 use function app;
 use Bavix\Wallet\Models\Wallet;
 use Bavix\Wallet\Services\BookkeeperServiceInterface;
-use Bavix\Wallet\Services\CommonServiceLegacy;
 use Bavix\Wallet\Services\RegulatorServiceInterface;
+use Bavix\Wallet\Services\StateServiceInterface;
 use Bavix\Wallet\Test\Infra\Factories\BuyerFactory;
 use Bavix\Wallet\Test\Infra\Models\Buyer;
 use Bavix\Wallet\Test\Infra\TestCase;
@@ -77,7 +77,7 @@ public function testWithdrawWalletExists(): void
     /**
      * @throws
      */
-    public function testSimple(): void
+    public function testSimpleLLLL(): void
     {
         /** @var Buyer $buyer */
         $buyer = BuyerFactory::new()->create();
@@ -92,8 +92,10 @@ public function testSimple(): void
         $wallet->deposit(1000);
         self::assertSame(1000, $wallet->balanceInt);
 
-        $result = app(CommonServiceLegacy::class)->addBalance($wallet, 100);
-        self::assertTrue($result);
+        $result = app(RegulatorServiceInterface::class)->increase($wallet, 100);
+        app(StateServiceInterface::class)->persist($wallet);
+
+        self::assertSame(1100, (int) $result);
 
         self::assertSame(1100, $wallet->balanceInt);
         self::assertTrue($wallet->refreshBalance());
@@ -104,8 +106,10 @@ public function testSimple(): void
         self::assertTrue($wallet->delete());
         self::assertFalse($wallet->exists);
         self::assertSame($wallet->getKey(), $key);
-        $result = app(CommonServiceLegacy::class)->addBalance($wallet, 100);
-        self::assertTrue($result); // automatic create default wallet
+        $result = app(RegulatorServiceInterface::class)->increase($wallet, 100);
+        app(StateServiceInterface::class)->persist($wallet);
+
+        self::assertSame(1100, (int) $result); // automatic create default wallet
 
         $wallet->refreshBalance();
         $balance = 0;
@@ -226,40 +230,4 @@ public function testForceUpdate(): void
         self::assertSame(1000, $wallet->balanceInt);
         self::assertSame(1000, (int) $wallet->getRawOriginal('balance'));
     }
-
-    public function testFailUpdate(): void
-    {
-        /** @var Buyer $buyer */
-        $buyer = BuyerFactory::new()->create();
-        self::assertFalse($buyer->relationLoaded('wallet'));
-        $wallet = $buyer->wallet;
-
-        self::assertFalse($wallet->exists);
-        self::assertSame(0, $wallet->balanceInt);
-        self::assertTrue($wallet->exists);
-
-        /** @var MockObject|Wallet $mockQuery */
-        $mockQuery = $this->createMock(\get_class($wallet->newQuery()));
-        $mockQuery->method('whereKey')->willReturn($mockQuery);
-        $mockQuery->method('update')->willReturn(0);
-
-        /** @var MockObject|Wallet $mockWallet */
-        $mockWallet = $this->createMock(\get_class($wallet));
-        $mockWallet->method('newQuery')->willReturn($mockQuery);
-        $mockWallet->method('getKey')->willReturn($wallet->getKey());
-        $mockWallet->method('fill')->willReturn($mockWallet);
-        $mockWallet->method('syncOriginalAttribute')->willReturn($mockWallet);
-        $mockWallet->method('__get')->with('uuid')->willReturn($wallet->uuid);
-
-        $bookkeeper = app(BookkeeperServiceInterface::class);
-        $regulator = app(RegulatorServiceInterface::class);
-        $result = app(CommonServiceLegacy::class)
-            ->addBalance($mockWallet, 100)
-        ;
-
-        self::assertFalse($result);
-        self::assertSame('0', $regulator->amount($wallet));
-        self::assertSame('0', $bookkeeper->amount($wallet));
-        self::assertSame('0', $wallet->balance);
-    }
 }