Merge pull request #104 from bavix/storable

rez1dent3 · web-flow · commit 62f82830efa4 · 2019-09-20T10:31:31.000+03:00
#103 add storable
diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
@@ -3,6 +3,7 @@
 namespace PHPSTORM_META {
 
     use Bavix\Wallet\Interfaces\Rateable;
+    use Bavix\Wallet\Interfaces\Storable;
     use Bavix\Wallet\Models\Transaction;
     use Bavix\Wallet\Models\Transfer;
     use Bavix\Wallet\Models\Wallet;
@@ -28,6 +29,7 @@
         Transfer::class => Transfer::class,
         Transaction::class => Transaction::class,
         Rateable::class => Rateable::class,
+        Storable::class => Storable::class,
     ]));
 
 }
diff --git a/composer.json b/composer.json
@@ -24,6 +24,7 @@
   ],
   "require": {
     "php": "^7.1|^8.0",
+    "ext-pdo": "*",
     "illuminate/database": "^5.5|^6.0",
     "nesbot/carbon": "^1.20|^2.0",
     "doctrine/dbal": "^2.8",
diff --git a/config/config.php b/config/config.php
@@ -13,6 +13,7 @@
 use Bavix\Wallet\Models\Transfer;
 use Bavix\Wallet\Models\Wallet;
 use Bavix\Wallet\Simple\Rate;
+use Bavix\Wallet\Simple\Store;
 
 return [
     /**
@@ -21,6 +22,7 @@
      */
     'package' => [
         'rateable' => Rate::class,
+        'storable' => Store::class,
     ],
 
     /**
diff --git a/src/Interfaces/Storable.php b/src/Interfaces/Storable.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Bavix\Wallet\Interfaces;
+
+interface Storable
+{
+    /**
+     * @param Wallet $object
+     * @return int
+     */
+    public function getBalance($object): int;
+
+    /**
+     * @param Wallet $object
+     * @param int $amount
+     * @return int
+     */
+    public function incBalance($object, int $amount): int;
+
+    /**
+     * @param Wallet $object
+     * @param int $amount
+     * @return bool
+     */
+    public function setBalance($object, int $amount): bool;
+}
diff --git a/src/Services/CommonService.php b/src/Services/CommonService.php
@@ -4,6 +4,7 @@
 
 use Bavix\Wallet\Exceptions\BalanceIsEmpty;
 use Bavix\Wallet\Exceptions\InsufficientFunds;
+use Bavix\Wallet\Interfaces\Storable;
 use Bavix\Wallet\Interfaces\Wallet;
 use Bavix\Wallet\Models\Transaction;
 use Bavix\Wallet\Models\Transfer;
@@ -219,17 +220,24 @@ public function addBalance(Wallet $wallet, int $amount): bool
     {
         return app(LockService::class)->lock($this, __FUNCTION__, static function () use ($wallet, $amount) {
             /**
-             * @var ProxyService $proxy
              * @var WalletModel $wallet
              */
-            $proxy = app(ProxyService::class);
-            $balance = $wallet->balance + $amount;
-            if ($proxy->has($wallet->getKey())) {
-                $balance = $proxy->get($wallet->getKey()) + $amount;
+            $balance = app(Storable::class)
+                ->incBalance($wallet, $amount);
+
+            try {
+                $result = $wallet->update(compact('balance'));
+            } catch (\Throwable $throwable) {
+                app(Storable::class)
+                    ->setBalance($wallet, $wallet->getAvailableBalance());
+
+                throw $throwable;
             }
 
-            $result = $wallet->update(compact('balance'));
-            $proxy->set($wallet->getKey(), $balance);
+            if (!$result) {
+                app(Storable::class)
+                    ->setBalance($wallet, $wallet->getAvailableBalance());
+            }
 
             return $result;
         });
diff --git a/src/Services/ProxyService.php b/src/Services/ProxyService.php
@@ -3,12 +3,14 @@
 namespace Bavix\Wallet\Services;
 
 use ArrayAccess;
+use Bavix\Wallet\Interfaces\Storable;
 use function array_key_exists;
 
 /**
  * Class ProxyService
  * @package Bavix\Wallet\Services
  * @codeCoverageIgnore
+ * @deprecated
  */
 class ProxyService implements ArrayAccess
 {
@@ -94,6 +96,7 @@ public function offsetUnset($offset): void
      */
     public function fresh(): void
     {
+        app()->instance(Storable::class, null);
         $this->data = [];
     }
 
diff --git a/src/Services/WalletService.php b/src/Services/WalletService.php
@@ -4,6 +4,7 @@
 
 use Bavix\Wallet\Exceptions\AmountInvalid;
 use Bavix\Wallet\Interfaces\MinimalTaxable;
+use Bavix\Wallet\Interfaces\Storable;
 use Bavix\Wallet\Interfaces\Taxable;
 use Bavix\Wallet\Interfaces\Wallet;
 use Bavix\Wallet\Models\Wallet as WalletModel;
@@ -45,7 +46,7 @@ public function fee(Wallet $wallet, int $amount): int
         if ($wallet instanceof MinimalTaxable) {
             $minimal = $wallet->getMinimalFee();
             if ($fee < $minimal) {
-                $fee = $wallet->getMinimalFee();
+                $fee = $minimal;
             }
         }
 
@@ -94,16 +95,12 @@ public function getWallet(Wallet $object, bool $autoSave = true): WalletModel
     /**
      * @param Wallet $object
      * @return int
+     * @deprecated use Storable::getBalance
      */
     public function getBalance(Wallet $object): int
     {
-        $wallet = $this->getWallet($object);
-        $proxy = app(ProxyService::class);
-        if (!$proxy->has($wallet->getKey())) {
-            $proxy->set($wallet->getKey(), (int)$wallet->getOriginal('balance', 0));
-        }
-
-        return $proxy[$wallet->getKey()];
+        return app(Storable::class)
+            ->getBalance($object);
     }
 
     /**
@@ -112,15 +109,13 @@ public function getBalance(Wallet $object): int
      */
     public function refresh(WalletModel $wallet): bool
     {
-        return app(LockService::class)->lock($this, __FUNCTION__, function () use ($wallet) {
-            $this->getBalance($wallet);
+        return app(LockService::class)->lock($this, __FUNCTION__, static function () use ($wallet) {
+            app(Storable::class)->getBalance($wallet);
             $balance = $wallet->getAvailableBalance();
             $wallet->balance = $balance;
 
-            $proxy = app(ProxyService::class);
-            $proxy->set($wallet->getKey(), $balance);
-
-            return $wallet->save();
+            return app(Storable::class)->setBalance($wallet, $balance) &&
+                $wallet->save();
         });
     }
 
diff --git a/src/Simple/Store.php b/src/Simple/Store.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Bavix\Wallet\Simple;
+
+use Bavix\Wallet\Interfaces\Storable;
+use Bavix\Wallet\Services\WalletService;
+
+class Store implements Storable
+{
+
+    /**
+     * @var array
+     */
+    protected $balanceSheets = [];
+
+    /**
+     * @inheritDoc
+     */
+    public function getBalance($object): int
+    {
+        $wallet = app(WalletService::class)->getWallet($object);
+        if (!\array_key_exists($wallet->getKey(), $this->balanceSheets)) {
+            $this->balanceSheets[$wallet->getKey()] = (int)$wallet->getOriginal('balance', 0);
+        }
+
+        return $this->balanceSheets[$wallet->getKey()];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function incBalance($object, int $amount): int
+    {
+        $balance = $this->getBalance($object) + $amount;
+        $this->setBalance($object, $balance);
+        return $balance;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setBalance($object, int $amount): bool
+    {
+        $wallet = app(WalletService::class)->getWallet($object);
+        $this->balanceSheets[$wallet->getKey()] = $amount;
+        return true;
+    }
+
+}
diff --git a/src/Traits/HasWallet.php b/src/Traits/HasWallet.php
@@ -2,6 +2,7 @@
 
 namespace Bavix\Wallet\Traits;
 
+use Bavix\Wallet\Interfaces\Storable;
 use Bavix\Wallet\Interfaces\Wallet;
 use Bavix\Wallet\Models\Transaction;
 use Bavix\Wallet\Models\Transfer;
@@ -72,7 +73,7 @@ public function deposit(int $amount, ?array $meta = null, bool $confirmed = true
      */
     public function getBalanceAttribute(): int
     {
-        return app(WalletService::class)->getBalance($this);
+        return app(Storable::class)->getBalance($this);
     }
 
     /**
diff --git a/src/WalletServiceProvider.php b/src/WalletServiceProvider.php
@@ -4,6 +4,7 @@
 
 use Bavix\Wallet\Commands\RefreshBalance;
 use Bavix\Wallet\Interfaces\Rateable;
+use Bavix\Wallet\Interfaces\Storable;
 use Bavix\Wallet\Models\Transaction;
 use Bavix\Wallet\Models\Transfer;
 use Bavix\Wallet\Models\Wallet;
@@ -82,6 +83,7 @@ public function register(): void
 
         // Bind eloquent models to IoC container
         $this->app->singleton(Rateable::class, config('wallet.package.rateable'));
+        $this->app->singleton(Storable::class, config('wallet.package.storable'));
         $this->app->singleton(ExchangeService::class, config('wallet.services.exchange'));
         $this->app->singleton(CommonService::class, config('wallet.services.common'));
         $this->app->singleton(ProxyService::class, config('wallet.services.proxy'));
diff --git a/tests/BalanceTest.php b/tests/BalanceTest.php
@@ -2,13 +2,16 @@
 
 namespace Bavix\Wallet\Test;
 
+use Bavix\Wallet\Interfaces\Storable;
 use Bavix\Wallet\Models\Wallet;
-use Bavix\Wallet\Objects\Cart;
 use Bavix\Wallet\Services\CommonService;
 use Bavix\Wallet\Services\ProxyService;
+use Bavix\Wallet\Services\WalletService;
 use Bavix\Wallet\Test\Models\Buyer;
 use Bavix\Wallet\Test\Models\UserMulti;
 use Illuminate\Support\Facades\DB;
+use PHPUnit\Framework\MockObject\MockObject;
+use PDOException;
 use function app;
 
 class BalanceTest extends TestCase
@@ -106,6 +109,89 @@ public function testSimple(): void
         $this->assertEquals($wallet->balance, 1001);
     }
 
+    /**
+     * @return void
+     * @deprecated
+     * @throws
+     */
+    public function testGetBalance(): void
+    {
+        /**
+         * @var Buyer $buyer
+         */
+        $buyer = factory(Buyer::class)->create();
+        $this->assertFalse($buyer->relationLoaded('wallet'));
+        $wallet = $buyer->wallet;
+
+        $this->assertFalse($wallet->exists);
+        $this->assertEquals($wallet->balance, 0);
+        $this->assertTrue($wallet->exists);
+
+        $this->assertEquals(0, app(Storable::class)->getBalance($wallet));
+        $this->assertEquals(0, app(WalletService::class)->getBalance($wallet));
+    }
+
+    /**
+     * @return void
+     * @throws
+     */
+    public function testFailUpdate(): void
+    {
+        /**
+         * @var Buyer $buyer
+         */
+        $buyer = factory(Buyer::class)->create();
+        $this->assertFalse($buyer->relationLoaded('wallet'));
+        $wallet = $buyer->wallet;
+
+        $this->assertFalse($wallet->exists);
+        $this->assertEquals($wallet->balance, 0);
+        $this->assertTrue($wallet->exists);
+
+        /**
+         * @var Wallet|MockObject $mockWallet
+         */
+        $mockWallet = $this->createMock(\get_class($wallet));
+        $mockWallet->method('update')->willReturn(false);
+        $mockWallet->method('getKey')->willReturn($wallet->getKey());
+
+        $result = app(CommonService::class)
+            ->addBalance($mockWallet, 100);
+
+        $this->assertFalse($result);
+        $this->assertEquals(0, app(Storable::class)->getBalance($wallet));
+    }
+
+    /**
+     * @return void
+     * @throws
+     */
+    public function testThrowUpdate(): void
+    {
+        $this->expectException(PDOException::class);
+
+        /**
+         * @var Buyer $buyer
+         */
+        $buyer = factory(Buyer::class)->create();
+        $this->assertFalse($buyer->relationLoaded('wallet'));
+        $wallet = $buyer->wallet;
+
+        $this->assertFalse($wallet->exists);
+        $this->assertEquals($wallet->balance, 0);
+        $this->assertTrue($wallet->exists);
+
+        /**
+         * @var Wallet|MockObject $mockWallet
+         */
+        $mockWallet = $this->createMock(\get_class($wallet));
+        $mockWallet->method('update')->willThrowException(new PDOException());
+        $mockWallet->method('getKey')->willReturn($wallet->getKey());
+
+        app(CommonService::class)
+            ->addBalance($mockWallet, 100);
+    }
+
     /**
      * @throws
      */
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -3,6 +3,7 @@
 namespace Bavix\Wallet\Test;
 
 use Bavix\Wallet\Services\ProxyService;
+use Bavix\Wallet\Simple\Store;
 use Bavix\Wallet\Test\Common\Models\Transaction;
 use Bavix\Wallet\Test\Common\Models\Transfer;
 use Bavix\Wallet\Test\Common\Models\Wallet;
@@ -46,6 +47,7 @@ protected function getPackageProviders($app): array
     {
         // Bind eloquent models to IoC container
         $app['config']->set('wallet.package.rateable', Rate::class);
+        $app['config']->set('wallet.package.storable', Store::class);
         return [WalletServiceProvider::class];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,14 @@`
`3`	`3`	`namespace Bavix\Wallet\Services;`
`4`	`4`
`5`	`5`	`use ArrayAccess;`
	`6`	`+use Bavix\Wallet\Interfaces\Storable;`
`6`	`7`	`use function array_key_exists;`
`7`	`8`
`8`	`9`	`/**`
`9`	`10`	`* Class ProxyService`
`10`	`11`	`* @package Bavix\Wallet\Services`
`11`	`12`	`* @codeCoverageIgnore`
	`13`	`+ * @deprecated`
`12`	`14`	`*/`
`13`	`15`	`class ProxyService implements ArrayAccess`
`14`	`16`	`{`
`@@ -94,6 +96,7 @@ public function offsetUnset($offset): void`
`94`	`96`	`*/`
`95`	`97`	`public function fresh(): void`
`96`	`98`	`{`
	`99`	`+ app()->instance(Storable::class, null);`
`97`	`100`	`$this->data = [];`
`98`	`101`	`}`
`99`	`102`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Bavix\Wallet\Traits;`
`4`	`4`
	`5`	`+use Bavix\Wallet\Interfaces\Storable;`
`5`	`6`	`use Bavix\Wallet\Interfaces\Wallet;`
`6`	`7`	`use Bavix\Wallet\Models\Transaction;`
`7`	`8`	`use Bavix\Wallet\Models\Transfer;`
`@@ -72,7 +73,7 @@ public function deposit(int $amount, ?array $meta = null, bool $confirmed = true`
`72`	`73`	`*/`
`73`	`74`	`public function getBalanceAttribute(): int`
`74`	`75`	`{`
`75`		`- return app(WalletService::class)->getBalance($this);`
	`76`	`+ return app(Storable::class)->getBalance($this);`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`/**`