Merge pull request #118 from bavix/dbs

rez1dent3 · web-flow · commit 158a9b7fce08 · 2019-10-01T17:59:14.000+03:00
add support select database
diff --git a/src/Commands/RefreshBalance.php b/src/Commands/RefreshBalance.php
@@ -3,11 +3,11 @@
 namespace Bavix\Wallet\Commands;
 
 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;
-use Illuminate\Support\Facades\DB;
 use function config;
 
 /**
@@ -38,11 +38,14 @@ class RefreshBalance extends Command
     public function handle(): void
     {
         app(ProxyService::class)->fresh();
-        DB::transaction(function () {
+        app(DbService::class)->transaction(function () {
             $wallet = config('wallet.wallet.table');
-            DB::table($wallet)->update(['balance' => 0]);
+            app(DbService::class)
+                ->connection()
+                ->table($wallet)
+                ->update(['balance' => 0]);
 
-            if (DB::connection() instanceof SQLiteConnection) {
+            if (app(DbService::class)->connection() instanceof SQLiteConnection) {
                 $this->sqliteUpdate();
             } else {
                 $this->multiUpdate();
@@ -71,18 +74,22 @@ protected function multiUpdate(): void
     {
         $wallet = config('wallet.wallet.table');
         $trans = config('wallet.transaction.table');
-        $availableBalance = DB::table($trans)
-            ->select('wallet_id', DB::raw('sum(amount) balance'))
+        $availableBalance = app(DbService::class)
+            ->connection()
+            ->table($trans)
+            ->select('wallet_id', app(DbService::class)->raw('sum(amount) balance'))
             ->where('confirmed', true)
             ->groupBy('wallet_id');
 
         $joinClause = static function (JoinClause $join) use ($wallet) {
             $join->on("$wallet.id", '=', 'b.wallet_id');
         };
 
-        DB::table($wallet)
+        app(DbService::class)
+            ->connection()
+            ->table($wallet)
             ->joinSub($availableBalance, 'b', $joinClause, null, null, 'left')
-            ->update(['balance' => DB::raw('b.balance')]);
+            ->update(['balance' => app(DbService::class)->raw('b.balance')]);
     }
 
 }
diff --git a/src/Services/CommonService.php b/src/Services/CommonService.php
@@ -12,7 +12,6 @@
 use Bavix\Wallet\Objects\Bring;
 use Bavix\Wallet\Objects\Operation;
 use Bavix\Wallet\Traits\HasWallet;
-use Illuminate\Support\Facades\DB;
 use function app;
 use function compact;
 
@@ -186,7 +185,7 @@ public function assemble(array $brings): array
     {
         return app(LockService::class)->lock($this, __FUNCTION__, function () use ($brings) {
             $self = $this;
-            return DB::transaction(static function () use ($self, $brings) {
+            return app(DbService::class)->transaction(static function () use ($self, $brings) {
                 return $self->multiBrings($brings);
             });
         });
diff --git a/src/Services/DbService.php b/src/Services/DbService.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Bavix\Wallet\Services;
+
+use Closure;
+use Illuminate\Database\ConnectionInterface;
+use Illuminate\Database\Query\Expression;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * Class DbService
+ * @package Bavix\Wallet\Services
+ * @codeCoverageIgnore
+ */
+class DbService
+{
+
+    /**
+     * @return ConnectionInterface
+     */
+    public function connection(): ConnectionInterface
+    {
+        return DB::connection(config('wallet.database.connection'));
+    }
+
+    /**
+     * Execute a Closure within a transaction.
+     *
+     * @param Closure $callback
+     * @param int $attempts
+     * @return mixed
+     *
+     * @throws \Throwable
+     */
+    public function transaction(Closure $callback, $attempts = 1)
+    {
+        return $this->connection()->transaction($callback, $attempts);
+    }
+
+    /**
+     * Get a new raw query expression.
+     *
+     * @param mixed $value
+     * @return Expression
+     */
+    public function raw($value): Expression
+    {
+        return $this->connection()->raw($value);
+    }
+
+}
diff --git a/src/Traits/CanConfirm.php b/src/Traits/CanConfirm.php
@@ -6,9 +6,9 @@
 use Bavix\Wallet\Exceptions\WalletOwnerInvalid;
 use Bavix\Wallet\Models\Transaction;
 use Bavix\Wallet\Services\CommonService;
+use Bavix\Wallet\Services\DbService;
 use Bavix\Wallet\Services\LockService;
 use Bavix\Wallet\Services\WalletService;
-use Illuminate\Support\Facades\DB;
 
 trait CanConfirm
 {
@@ -22,7 +22,7 @@ public function confirm(Transaction $transaction): bool
     {
         return app(LockService::class)->lock($this, __FUNCTION__, function () use ($transaction) {
             $self = $this;
-            return DB::transaction(static function () use ($self, $transaction) {
+            return app(DbService::class)->transaction(static function () use ($self, $transaction) {
                 $wallet = app(WalletService::class)
                     ->getWallet($self);
 
@@ -65,7 +65,7 @@ public function forceConfirm(Transaction $transaction): bool
     {
         return app(LockService::class)->lock($this, __FUNCTION__, function () use ($transaction) {
             $self = $this;
-            return DB::transaction(static function () use ($self, $transaction) {
+            return app(DbService::class)->transaction(static function () use ($self, $transaction) {
 
                 $wallet = app(WalletService::class)
                     ->getWallet($self);
diff --git a/src/Traits/CanExchange.php b/src/Traits/CanExchange.php
@@ -6,10 +6,10 @@
 use Bavix\Wallet\Models\Transfer;
 use Bavix\Wallet\Objects\Bring;
 use Bavix\Wallet\Services\CommonService;
+use Bavix\Wallet\Services\DbService;
 use Bavix\Wallet\Services\ExchangeService;
 use Bavix\Wallet\Services\LockService;
 use Bavix\Wallet\Services\WalletService;
-use Illuminate\Support\Facades\DB;
 
 trait CanExchange
 {
@@ -51,7 +51,7 @@ public function forceExchange(Wallet $to, int $amount, ?array $meta = null): Tra
         $from = app(WalletService::class)->getWallet($this);
 
         return app(LockService::class)->lock($this, __FUNCTION__, function () use ($from, $to, $amount, $meta) {
-            return DB::transaction(static function () use ($from, $to, $amount, $meta) {
+            return app(DbService::class)->transaction(static function () use ($from, $to, $amount, $meta) {
                 $rate = app(ExchangeService::class)->rate($from, $to);
                 $fee = app(WalletService::class)->fee($to, $amount);
 
diff --git a/src/Traits/CartPay.php b/src/Traits/CartPay.php
@@ -7,8 +7,8 @@
 use Bavix\Wallet\Models\Transfer;
 use Bavix\Wallet\Objects\Cart;
 use Bavix\Wallet\Services\CommonService;
+use Bavix\Wallet\Services\DbService;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Support\Facades\DB;
 use Throwable;
 use function array_unique;
 use function count;
@@ -32,7 +32,7 @@ public function payFreeCart(Cart $cart): array
             ->verifyWithdraw($this, 0, true);
 
         $self = $this;
-        return DB::transaction(static function () use ($self, $cart) {
+        return app(DbService::class)->transaction(static function () use ($self, $cart) {
             $results = [];
             foreach ($cart->getItems() as $product) {
                 $results[] = app(CommonService::class)->forceTransfer(
@@ -75,7 +75,7 @@ public function payCart(Cart $cart, bool $force = null): array
         }
 
         $self = $this;
-        return DB::transaction(static function () use ($self, $cart, $force) {
+        return app(DbService::class)->transaction(static function () use ($self, $cart, $force) {
             $results = [];
             foreach ($cart->getItems() as $product) {
                 if ($force) {
@@ -138,7 +138,7 @@ public function safeRefundCart(Cart $cart, bool $force = null, bool $gifts = nul
     public function refundCart(Cart $cart, bool $force = null, bool $gifts = null): bool
     {
         $self = $this;
-        return DB::transaction(static function () use ($self, $cart, $force, $gifts) {
+        return app(DbService::class)->transaction(static function () use ($self, $cart, $force, $gifts) {
             $results = [];
             $transfers = $cart->alreadyBuy($self, $gifts);
             if (count($transfers) !== count($cart)) {
diff --git a/src/Traits/HasGift.php b/src/Traits/HasGift.php
@@ -7,9 +7,9 @@
 use Bavix\Wallet\Models\Transfer;
 use Bavix\Wallet\Objects\Bring;
 use Bavix\Wallet\Services\CommonService;
+use Bavix\Wallet\Services\DbService;
 use Bavix\Wallet\Services\LockService;
 use Bavix\Wallet\Services\WalletService;
-use Illuminate\Support\Facades\DB;
 use Throwable;
 use function app;
 
@@ -63,7 +63,7 @@ public function gift(Wallet $to, Product $product, bool $force = null): Transfer
              * I think it is wrong to make the "assemble" method public.
              * That's why I address him like this!
              */
-            return DB::transaction(static function () use ($santa, $to, $product, $force) {
+            return app(DbService::class)->transaction(static function () use ($santa, $to, $product, $force) {
                 $amount = $product->getAmountProduct();
                 $meta = $product->getMetaProduct();
                 $fee = app(WalletService::class)
diff --git a/src/Traits/HasWallet.php b/src/Traits/HasWallet.php
@@ -8,10 +8,10 @@
 use Bavix\Wallet\Models\Transfer;
 use Bavix\Wallet\Models\Wallet as WalletModel;
 use Bavix\Wallet\Services\CommonService;
+use Bavix\Wallet\Services\DbService;
 use Bavix\Wallet\Services\WalletService;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
 use Throwable;
 use function app;
 use function config;
@@ -37,11 +37,12 @@ trait HasWallet
      * @param bool $confirmed
      *
      * @return Transaction
+     * @throws
      */
     public function deposit(int $amount, ?array $meta = null, bool $confirmed = true): Transaction
     {
         $self = $this;
-        return DB::transaction(static function () use ($self, $amount, $meta, $confirmed) {
+        return app(DbService::class)->transaction(static function () use ($self, $amount, $meta, $confirmed) {
             return app(CommonService::class)
                 ->deposit($self, $amount, $meta, $confirmed);
         });
@@ -161,11 +162,12 @@ public function canWithdraw(int $amount, bool $allowZero = null): bool
      * @param bool $confirmed
      *
      * @return Transaction
+     * @throws
      */
     public function forceWithdraw(int $amount, ?array $meta = null, bool $confirmed = true): Transaction
     {
         $self = $this;
-        return DB::transaction(static function () use ($self, $amount, $meta, $confirmed) {
+        return app(DbService::class)->transaction(static function () use ($self, $amount, $meta, $confirmed) {
             return app(CommonService::class)
                 ->forceWithdraw($self, $amount, $meta, $confirmed);
         });
@@ -179,11 +181,12 @@ public function forceWithdraw(int $amount, ?array $meta = null, bool $confirmed
      * @param int $amount
      * @param array|null $meta
      * @return Transfer
+     * @throws
      */
     public function forceTransfer(Wallet $wallet, int $amount, ?array $meta = null): Transfer
     {
         $self = $this;
-        return DB::transaction(static function () use ($self, $amount, $wallet, $meta) {
+        return app(DbService::class)->transaction(static function () use ($self, $amount, $wallet, $meta) {
             return app(CommonService::class)
                 ->forceTransfer($self, $wallet, $amount, $meta);
         });
diff --git a/src/WalletServiceProvider.php b/src/WalletServiceProvider.php
@@ -13,6 +13,7 @@
 use Bavix\Wallet\Objects\EmptyLock;
 use Bavix\Wallet\Objects\Operation;
 use Bavix\Wallet\Services\CommonService;
+use Bavix\Wallet\Services\DbService;
 use Bavix\Wallet\Services\ExchangeService;
 use Bavix\Wallet\Services\LockService;
 use Bavix\Wallet\Services\ProxyService;
@@ -84,6 +85,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(DbService::class, config('wallet.services.db'));
         $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/SingletonTest.php b/tests/SingletonTest.php
@@ -8,6 +8,7 @@
 use Bavix\Wallet\Objects\EmptyLock;
 use Bavix\Wallet\Objects\Operation;
 use Bavix\Wallet\Services\CommonService;
+use Bavix\Wallet\Services\DbService;
 use Bavix\Wallet\Services\ExchangeService;
 use Bavix\Wallet\Services\LockService;
 use Bavix\Wallet\Services\ProxyService;
@@ -124,6 +125,14 @@ public function testWalletService(): void
         $this->assertEquals($this->getRefId(WalletService::class), $this->getRefId(WalletService::class));
     }
 
+    /**
+     * @return void
+     */
+    public function testDbService(): void
+    {
+        $this->assertEquals($this->getRefId(DbService::class), $this->getRefId(DbService::class));
+    }
+
     /**
      * @return void
      */
