remove ProxyService.php

Author: rez1dent3

.phpstorm.meta.php

@@ -14,7 +14,6 @@
     use Bavix\Wallet\Objects\Operation;
     use Bavix\Wallet\Services\CommonService;
     use Bavix\Wallet\Services\ExchangeService;
-    use Bavix\Wallet\Services\ProxyService;
     use Bavix\Wallet\Services\WalletService;
 
     override(\app(0), map([
@@ -24,7 +23,6 @@
         EmptyLock::class => EmptyLock::class,
         ExchangeService::class => ExchangeService::class,
         CommonService::class => CommonService::class,
-        ProxyService::class => ProxyService::class,
         WalletService::class => WalletService::class,
         Wallet::class => Wallet::class,
         Transfer::class => Transfer::class,

config/config.php

@@ -6,7 +6,6 @@
 use Bavix\Wallet\Objects\Operation;
 use Bavix\Wallet\Services\ExchangeService;
 use Bavix\Wallet\Services\CommonService;
-use Bavix\Wallet\Services\ProxyService;
 use Bavix\Wallet\Services\WalletService;
 use Bavix\Wallet\Services\LockService;
 use Bavix\Wallet\Models\Transaction;
@@ -75,7 +74,6 @@
     'services' => [
         'exchange' => ExchangeService::class,
         'common' => CommonService::class,
-        'proxy' => ProxyService::class,
         'wallet' => WalletService::class,
         'lock' => LockService::class,
     ],

src/Commands/RefreshBalance.php

@@ -4,7 +4,6 @@
 
 use Bavix\Wallet\Models\Wallet;
 use Bavix\Wallet\Services\DbService;
-use Bavix\Wallet\Services\ProxyService;
 use Illuminate\Console\Command;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Database\SQLiteConnection;
@@ -37,7 +36,6 @@ class RefreshBalance extends Command
      */
     public function handle(): void
     {
-        app(ProxyService::class)->fresh();
         app(DbService::class)->transaction(function () {
             $wallet = config('wallet.wallet.table', 'wallets');
             app(DbService::class)

src/Services/ProxyService.php

@@ -134,12 +134,14 @@ public function getWallet(Wallet $object, bool $autoSave = true): WalletModel
     public function refresh(WalletModel $wallet): bool
     {
         return app(LockService::class)->lock($this, __FUNCTION__, static function () use ($wallet) {
+            $math = app(Mathable::class);
             app(Storable::class)->getBalance($wallet);
+            $whatIs = $wallet->balance;
             $balance = $wallet->getAvailableBalance();
             $wallet->balance = $balance;
 
             return app(Storable::class)->setBalance($wallet, $balance) &&
-                $wallet->save();
+                (!$math->compare($whatIs, $balance) || $wallet->save());
         });
     }
 

src/Services/WalletService.php

@@ -18,7 +18,6 @@
 use Bavix\Wallet\Services\ExchangeService;
 use Bavix\Wallet\Services\LockService;
 use Bavix\Wallet\Simple\Math;
-use Bavix\Wallet\Services\ProxyService;
 use Bavix\Wallet\Services\WalletService;
 use Bavix\Wallet\Simple\Rate;
 use Bavix\Wallet\Simple\Store;
@@ -93,7 +92,6 @@ public function register(): void
         $this->app->singleton(DbService::class, config('wallet.services.db', DbService::class));
         $this->app->singleton(ExchangeService::class, config('wallet.services.exchange', ExchangeService::class));
         $this->app->singleton(CommonService::class, config('wallet.services.common', CommonService::class));
-        $this->app->singleton(ProxyService::class, config('wallet.services.proxy', ProxyService::class));
         $this->app->singleton(WalletService::class, config('wallet.services.wallet', WalletService::class));
         $this->app->singleton(LockService::class, config('wallet.services.lock', LockService::class));
 

src/WalletServiceProvider.php

@@ -5,8 +5,7 @@
 use Bavix\Wallet\Interfaces\Storable;
 use Bavix\Wallet\Models\Wallet;
 use Bavix\Wallet\Services\CommonService;
-use Bavix\Wallet\Services\ProxyService;
-use Bavix\Wallet\Services\WalletService;
+use Bavix\Wallet\Simple\Store;
 use Bavix\Wallet\Test\Models\Buyer;
 use Bavix\Wallet\Test\Models\UserMulti;
 use Illuminate\Support\Facades\DB;
@@ -224,7 +223,6 @@ public function testArtisanRefresh(): void
         }
 
         // fresh balance
-        app(ProxyService::class)->fresh();
         DB::table(config('wallet.wallet.table'))
             ->update(['balance' => 0]);
 
@@ -254,13 +252,30 @@ public function testForceUpdate(): void
         Wallet::whereKey($buyer->wallet->getKey())
             ->update(['balance' => 10]);
 
-        app(ProxyService::class)->fresh();
+        /**
+         * Create a state when the cache is empty.
+         * For example, something went wrong and your database has incorrect data.
+         * Unfortunately, the library will work with what is.
+         * But there is an opportunity to recount the balance.
+         *
+         * Here is an example:
+         */
+        app()->singleton(Storable::class, Store::class);
+        $this->assertEquals($wallet->getRawOriginal('balance'), 1000);
 
+        /**
+         * We load the model from the base and our balance is 10.
+         */
         $wallet->refresh();
         $this->assertEquals($wallet->balance, 10);
+        $this->assertEquals($wallet->getRawOriginal('balance'), 10);
 
+        /**
+         * Now we fill the cache with relevant data (PS, the data inside the model will be updated).
+         */
         $wallet->refreshBalance();
         $this->assertEquals($wallet->balance, 1000);
+        $this->assertEquals($wallet->getRawOriginal('balance'), 1000);
     }
 
 }

tests/BalanceTest.php

@@ -11,7 +11,6 @@
 use Bavix\Wallet\Services\DbService;
 use Bavix\Wallet\Services\ExchangeService;
 use Bavix\Wallet\Services\LockService;
-use Bavix\Wallet\Services\ProxyService;
 use Bavix\Wallet\Services\WalletService;
 use Bavix\Wallet\Test\Common\Models\Transaction;
 use Bavix\Wallet\Test\Common\Models\Transfer;
@@ -109,14 +108,6 @@ public function testCommonService(): void
         $this->assertEquals($this->getRefId(CommonService::class), $this->getRefId(CommonService::class));
     }
 
-    /**
-     * @return void
-     */
-    public function testProxyService(): void
-    {
-        $this->assertEquals($this->getRefId(ProxyService::class), $this->getRefId(ProxyService::class));
-    }
-
     /**
      * @return void
      */

tests/ProxyTest.php

@@ -2,7 +2,7 @@
 
 namespace Bavix\Wallet\Test;
 
-use Bavix\Wallet\Services\ProxyService;
+use Bavix\Wallet\Interfaces\Storable;
 use Bavix\Wallet\Simple\BCMath;
 use Bavix\Wallet\Simple\Math;
 use Bavix\Wallet\Simple\Store;
@@ -24,7 +24,6 @@ class TestCase extends OrchestraTestCase
      */
     public function setUp(): void
     {
-        app(ProxyService::class)->fresh();
         parent::setUp();
         $this->withFactories(__DIR__ . '/factories');
         $this->loadMigrationsFrom([