Merge pull request bavix#159 from bavix/develop

Postgres 12
davodsaraei · Mar 26, 2020 · 7a5fabe · 7a5fabe
2 parents 40d7f46 + 7baaaa1
commit 7a5fabe
Show file tree

Hide file tree

Showing 15 changed files with 100 additions and 53 deletions.
diff --git a/changelog.md b/changelog.md
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [5.1.0] - 2020-03-26
+### Added
+- Added support `ramsey/uuid ^4.0`
+
+### Fixed
+- pg12 support
+
 ## [5.0.2] - 2020-03-22
 ### Fixed
 - fix `bindTo` method (v4.1)
@@ -493,7 +500,8 @@ The operation is now executed in the transaction and updates the new `refund` fi
 - Exceptions: AmountInvalid, BalanceIsEmpty.
 - Models: Transfer, Transaction.
 
-[Unreleased]: https://github.com/bavix/laravel-wallet/compare/5.0.2...develop
+[Unreleased]: https://github.com/bavix/laravel-wallet/compare/5.1.0...develop
+[5.1.0]: https://github.com/bavix/laravel-wallet/compare/5.0.2...5.1.0
 [5.0.2]: https://github.com/bavix/laravel-wallet/compare/5.0.1...5.0.2
 [5.0.1]: https://github.com/bavix/laravel-wallet/compare/5.0.0...5.0.1
 [5.0.0]: https://github.com/bavix/laravel-wallet/compare/4.2.2...5.0.0

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
     "ext-pdo": "*",
     "illuminate/database": "^6.0|^7.0",
     "doctrine/dbal": "^2.8",
-    "ramsey/uuid": "^3.0"
+    "ramsey/uuid": "^3.0|^4.0"
   },
   "require-dev": {
     "infection/infection": "^0.15",

diff --git a/database/migrations_v1/2018_11_06_222923_create_transactions_table.php b/database/migrations_v1/2018_11_06_222923_create_transactions_table.php
@@ -21,7 +21,7 @@ public function up(): void
             $table->bigIncrements('id');
             $table->morphs('payable');
             $table->enum('type', ['deposit', 'withdraw'])->index();
-            $table->bigInteger('amount');
+            $table->decimal('amount', 64, 0);
             $table->boolean('confirmed');
             $this->json($table, 'meta')->nullable();
             $table->uuid('uuid')->unique();

diff --git a/database/migrations_v2/2018_11_15_124230_create_wallets_table.php b/database/migrations_v2/2018_11_15_124230_create_wallets_table.php
@@ -30,7 +30,7 @@ public function up(): void
             $table->string('name');
             $table->string('slug')->index();
             $table->string('description')->nullable();
-            $table->bigInteger('balance')->default(0);
+            $table->decimal('balance', 64, 0)->default(0);
             $table->timestamps();
 
             $table->unique(['holder_type', 'holder_id', 'slug']);
@@ -41,14 +41,15 @@ public function up(): void
          */
         $default = config('wallet.wallet.default.name', 'Default Wallet');
         $slug = config('wallet.wallet.default.slug', 'default');
+        $now = time();
         $query = Transaction::query()->distinct()
             ->selectRaw('payable_type as holder_type')
             ->selectRaw('payable_id as holder_id')
             ->selectRaw('? as name', [$default])
             ->selectRaw('? as slug', [$slug])
             ->selectRaw('sum(amount) as balance')
-            ->selectRaw('? as created_at', [DB::raw('now()')])
-            ->selectRaw('? as updated_at', [DB::raw('now()')])
+            ->selectRaw('? as created_at', [$now])
+            ->selectRaw('? as updated_at', [$now])
             ->groupBy('holder_type', 'holder_id')
             ->orderBy('holder_type');
 

diff --git a/database/migrations_v2/2018_11_20_133759_add_fee_transfers_table.php b/database/migrations_v2/2018_11_20_133759_add_fee_transfers_table.php
@@ -22,7 +22,7 @@ protected function table(): string
     public function up(): void
     {
         Schema::table($this->table(), function (Blueprint $table) {
-            $table->bigInteger('fee')
+            $table->decimal('fee', 64, 0)
                 ->default(0)
                 ->after('withdraw_id');
         });

diff --git a/database/migrations_v2/2019_10_02_193759_add_discount_transfers_table.php b/database/migrations_v2/2019_10_02_193759_add_discount_transfers_table.php
@@ -22,7 +22,7 @@ protected function table(): string
     public function up(): void
     {
         Schema::table($this->table(), function (Blueprint $table) {
-            $table->bigInteger('discount')
+            $table->decimal('discount', 64, 0)
                 ->default(0)
                 ->after('withdraw_id');
         });

diff --git a/src/Commands/RefreshBalance.php b/src/Commands/RefreshBalance.php
@@ -5,6 +5,7 @@
 use Bavix\Wallet\Models\Wallet;
 use Bavix\Wallet\Services\DbService;
 use Illuminate\Console\Command;
+use Illuminate\Database\PostgresConnection;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Database\SQLiteConnection;
 use function config;
@@ -38,14 +39,11 @@ class RefreshBalance extends Command
     public function handle(): void
     {
         app(DbService::class)->transaction(function () {
-            if (app(DbService::class)->connection() instanceof SQLiteConnection) {
+            $connection = app(DbService::class)->connection();
+            if ($connection instanceof SQLiteConnection || $connection instanceof PostgresConnection) {
                 $wallet = config('wallet.wallet.table', 'wallets');
-                app(DbService::class)
-                    ->connection()
-                    ->table($wallet)
-                    ->update(['balance' => 0]);
-
-                $this->sqliteUpdate();
+                $connection->table($wallet)->update(['balance' => 0]);
+                $this->singleUpdate();
             } else {
                 $this->multiUpdate();
             }
@@ -57,7 +55,7 @@ public function handle(): void
      *
      * @return void
      */
-    protected function sqliteUpdate(): void
+    protected function singleUpdate(): void
     {
         Wallet::query()->each(static function (Wallet $wallet) {
             $wallet->refreshBalance();

diff --git a/src/Objects/Bring.php b/src/Objects/Bring.php
@@ -7,7 +7,6 @@
 use Bavix\Wallet\Models\Transaction;
 use Bavix\Wallet\Models\Transfer;
 use Ramsey\Uuid\Uuid;
-use function abs;
 
 class Bring
 {
@@ -85,7 +84,7 @@ public function setStatus(string $status): self
      */
     public function setDiscount(int $discount): self
     {
-        $this->discount = $discount;
+        $this->discount = app(Mathable::class)->round($discount);
         return $this;
     }
 
@@ -182,14 +181,17 @@ public function getDiscount(): int
      */
     public function getFee(): int
     {
-        if ($this->fee === null) {
-            return app(Mathable::class)->sub(
-                app(Mathable::class)->abs($this->getWithdraw()->amount),
-                app(Mathable::class)->abs($this->getDeposit()->amount)
+        $fee = $this->fee;
+        if ($fee === null) {
+            $fee = app(Mathable::class)->round(
+                app(Mathable::class)->sub(
+                    app(Mathable::class)->abs($this->getWithdraw()->amount),
+                    app(Mathable::class)->abs($this->getDeposit()->amount)
+                )
             );
         }
 
-        return $this->fee;
+        return $fee;
     }
 
     /**
@@ -198,7 +200,7 @@ public function getFee(): int
      */
     public function setFee($fee): self
     {
-        $this->fee = $fee;
+        $this->fee = app(Mathable::class)->round($fee);
         return $this;
     }
 

diff --git a/src/Objects/Operation.php b/src/Objects/Operation.php
@@ -2,6 +2,7 @@
 
 namespace Bavix\Wallet\Objects;
 
+use Bavix\Wallet\Interfaces\Mathable;
 use Bavix\Wallet\Interfaces\Wallet;
 use Bavix\Wallet\Models\Transaction;
 use Ramsey\Uuid\Uuid;
@@ -104,7 +105,7 @@ public function setType(string $type): self
      */
     public function setAmount($amount): self
     {
-        $this->amount = $amount;
+        $this->amount = app(Mathable::class)->round($amount);
         return $this;
     }
 

diff --git a/src/Services/CommonService.php b/src/Services/CommonService.php
@@ -161,7 +161,7 @@ public function verifyWithdraw(Wallet $wallet, $amount, bool $allowZero = null):
      * Create Operation without DB::transaction
      *
      * @param Wallet $self
-     * @param array $operations
+     * @param Operation[] $operations
      * @return array
      */
     public function multiOperation(Wallet $self, array $operations): array

diff --git a/src/Simple/Store.php b/src/Simple/Store.php
@@ -24,7 +24,7 @@ public function getBalance($object)
             $balance = method_exists($wallet, 'getRawOriginal') ?
                 $wallet->getRawOriginal('balance', 0) : $wallet->getOriginal('balance', 0);
 
-            $this->balanceSheets[$wallet->getKey()] = app(Mathable::class)->round($balance);
+            $this->balanceSheets[$wallet->getKey()] = $this->toInt($balance);
         }
 
         return $this->balanceSheets[$wallet->getKey()];
@@ -37,6 +37,7 @@ public function incBalance($object, $amount)
     {
         $math = app(Mathable::class);
         $balance = $math->add($this->getBalance($object), $amount);
+        $balance = $this->toInt($balance);
         $this->setBalance($object, $balance);
         return $balance;
     }
@@ -47,8 +48,17 @@ public function incBalance($object, $amount)
     public function setBalance($object, $amount): bool
     {
         $wallet = app(WalletService::class)->getWallet($object);
-        $this->balanceSheets[$wallet->getKey()] = app(Mathable::class)->round($amount ?: 0);
+        $this->balanceSheets[$wallet->getKey()] = $this->toInt($amount);
         return true;
     }
 
+    /**
+     * @param string $balance
+     * @return string
+     */
+    protected function toInt($balance): string
+    {
+        return app(Mathable::class)->round($balance ?: 0);
+    }
+
 }
diff --git a/src/Traits/HasWallet.php b/src/Traits/HasWallet.php
@@ -145,14 +145,16 @@ public function withdraw($amount, ?array $meta = null, bool $confirmed = true):
      */
     public function canWithdraw($amount, bool $allowZero = null): bool
     {
+        $math = app(Mathable::class);
+
         /**
          * Allow to buy for free with a negative balance
          */
-        if ($allowZero && $amount === 0) {
+        if ($allowZero && !$math->compare($amount, 0)) {
             return true;
         }
 
-        return app(Mathable::class)->compare($this->balance, $amount) >= 0;
+        return $math->compare($this->balance, $amount) >= 0;
     }
 
     /**

diff --git a/tests/BalanceTest.php b/tests/BalanceTest.php
@@ -8,6 +8,7 @@
 use Bavix\Wallet\Simple\Store;
 use Bavix\Wallet\Test\Models\Buyer;
 use Bavix\Wallet\Test\Models\UserMulti;
+use Illuminate\Database\SQLiteConnection;
 use Illuminate\Support\Facades\DB;
 use PDOException;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -96,16 +97,23 @@ public function testSimple(): void
 
         $this->assertEquals($wallet->balance, 1000);
 
+        $key = $wallet->getKey();
         $this->assertTrue($wallet->delete());
         $this->assertFalse($wallet->exists);
+        $this->assertEquals($wallet->getKey(), $key);
         $result = app(CommonService::class)->addBalance($wallet, 100);
         $this->assertTrue($result); // automatic create default wallet
 
         $wallet->refreshBalance();
-        $this->assertEquals($wallet->balance, 1000);
+        $balance = 0;
+        if ($wallet->getConnection() instanceof SQLiteConnection) {
+            $balance = 1000;
+        }
+
+        $this->assertEquals($wallet->balance, $balance);
 
         $wallet->deposit(1);
-        $this->assertEquals($wallet->balance, 1001);
+        $this->assertEquals($wallet->balance, $balance + 1);
     }
 
     /**

diff --git a/tests/MultiWalletTest.php b/tests/MultiWalletTest.php
@@ -6,9 +6,12 @@
 use Bavix\Wallet\Exceptions\BalanceIsEmpty;
 use Bavix\Wallet\Models\Transaction;
 use Bavix\Wallet\Models\Transfer;
+use Bavix\Wallet\Services\DbService;
 use Bavix\Wallet\Test\Models\Item;
 use Bavix\Wallet\Test\Models\UserCashier;
 use Bavix\Wallet\Test\Models\UserMulti;
+use Doctrine\DBAL\Driver\PDOException;
+use Illuminate\Database\PostgresConnection;
 use Illuminate\Database\QueryException;
 use function compact;
 use function range;
@@ -336,20 +339,22 @@ public function testConfirmed(): void
      */
     public function testWalletUnique(): void
     {
-        $this->expectException(QueryException::class);
+        if (!(app(DbService::class)->connection() instanceof PostgresConnection)) {
+            $this->expectException(QueryException::class);
 
-        /**
-         * @var UserMulti $user
-         */
-        $user = factory(UserMulti::class)->create();
+            /**
+             * @var UserMulti $user
+             */
+            $user = factory(UserMulti::class)->create();
 
-        $user->createWallet([
-            'name' => 'deposit'
-        ]);
+            $user->createWallet([
+                'name' => 'deposit'
+            ]);
 
-        $user->createWallet([
-            'name' => 'deposit'
-        ]);
+            $user->createWallet([
+                'name' => 'deposit'
+            ]);
+        }
     }
 
     /**