Merge pull request #440 from bavix/develop

#438 UUID Duplicate entry fix

Author: rez1dent3

changelog.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [8.0.3] - 2022-02-19
+### Fixed
+- Fixed "UUID Duplicate entry" bug on eager loading. #438 @DanielSpravtsev
+- Use predefined PHP float epsilon (phpunit) sebastianbergmann/phpunit#4874
+
 ## [8.0.2] - 2022-02-12
 ### Fixed
 - Added keys to service provider
@@ -784,7 +789,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/8.0.2...develop
+[Unreleased]: https://github.com/bavix/laravel-wallet/compare/8.0.3...develop
+[8.0.3]: https://github.com/bavix/laravel-wallet/compare/8.0.2...8.0.3
 [8.0.2]: https://github.com/bavix/laravel-wallet/compare/8.0.1...8.0.2
 [8.0.1]: https://github.com/bavix/laravel-wallet/compare/8.0.0...8.0.1
 [8.0.0]: https://github.com/bavix/laravel-wallet/compare/7.3.2...8.0.0

src/Models/Wallet.php

@@ -14,6 +14,7 @@
 use Bavix\Wallet\Internal\Exceptions\LockProviderNotFoundException;
 use Bavix\Wallet\Internal\Exceptions\TransactionFailedException;
 use Bavix\Wallet\Internal\Service\MathServiceInterface;
+use Bavix\Wallet\Internal\Service\UuidFactoryServiceInterface;
 use Bavix\Wallet\Services\AtomicServiceInterface;
 use Bavix\Wallet\Services\RegulatorServiceInterface;
 use Bavix\Wallet\Traits\CanConfirm;
@@ -167,4 +168,9 @@ public function getCurrencyAttribute(): string
     {
         return $this->meta['currency'] ?? Str::upper($this->slug);
     }
+
+    protected function initializeMorphOneWallet(): void
+    {
+        $this->uuid = app(UuidFactoryServiceInterface::class)->uuid4();
+    }
 }

src/Traits/MorphOneWallet.php

@@ -4,7 +4,6 @@
 
 namespace Bavix\Wallet\Traits;
 
-use Bavix\Wallet\Internal\Service\UuidFactoryServiceInterface;
 use Bavix\Wallet\Models\Wallet as WalletModel;
 use Bavix\Wallet\Services\CastServiceInterface;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
@@ -31,7 +30,6 @@ public function wallet(): MorphOne
                 'name' => config('wallet.wallet.default.name', 'Default Wallet'),
                 'slug' => config('wallet.wallet.default.slug', 'default'),
                 'meta' => config('wallet.wallet.default.meta', []),
-                'uuid' => app(UuidFactoryServiceInterface::class)->uuid4(),
                 'balance' => 0,
             ]))
         ;

tests/Units/Domain/EagerLoadingTest.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Test\Units\Domain;
+
+use Bavix\Wallet\Test\Infra\Factories\BuyerFactory;
+use Bavix\Wallet\Test\Infra\Models\Buyer;
+use Bavix\Wallet\Test\Infra\TestCase;
+
+/**
+ * @internal
+ */
+class EagerLoadingTest extends TestCase
+{
+    public function testUuidDuplicate(): void
+    {
+        $buyerTimes = BuyerFactory::times(10)->create();
+
+        /** @var Buyer[] $buyers */
+        $buyers = Buyer::with('wallet')
+            ->whereIn('id', $buyerTimes->pluck('id')->toArray())
+            ->paginate(10)
+        ;
+
+        $uuids = [];
+        $balances = [];
+        foreach ($buyers as $buyer) {
+            $uuids[] = $buyer->wallet->uuid;
+            $balances[] = $buyer->wallet->balanceInt;
+        }
+
+        self::assertCount(10, array_unique($uuids));
+        self::assertCount(1, array_unique($balances));
+    }
+}

tests/Units/Domain/MultiWalletTest.php

@@ -415,16 +415,21 @@ public function testGetWallet(): void
         $secondWallet = $user->getWallet('test');
         self::assertSame($secondWallet->getKey(), $firstWallet->getKey());
 
+        $uuid = app(UuidFactoryServiceInterface::class)->uuid4();
         $test2 = $user->wallets()->create([
             'name' => 'Test2',
-            'uuid' => app(UuidFactoryServiceInterface::class)->uuid4(),
+            'uuid' => $uuid,
         ]);
 
+        self::assertNotNull($test2->refresh());
+        self::assertSame($uuid, $test2->uuid);
         self::assertSame(
             $test2->getKey(),
             $user->getWallet('test2')->getKey()
         );
 
+        self::assertNotNull($user->wallets()->where('uuid', $uuid)->first());
+
         // check default wallet
         self::assertSame(
             $user->balance,
@@ -443,9 +448,17 @@ public function testGetWalletOptimize(): void
 
         $user->load('wallets'); // optimize
 
+        $ids = [];
+        $uuids = [];
         foreach ($names as $name) {
-            self::assertSame($name, $user->getWallet($name)->name);
+            $wallet = $user->getWallet($name);
+            self::assertSame($name, $wallet->name);
+            $uuids[] = $wallet->uuid;
+            $ids[] = $wallet->getKey();
         }
+
+        self::assertCount(count($names), array_unique($uuids));
+        self::assertCount(count($names), array_unique($ids));
     }
 
     public function testPay(): void

tests/Units/Domain/WalletFloatTest.php

@@ -196,7 +196,7 @@ public function testMantissa(): void
         self::assertSame($transaction->type, Transaction::TYPE_WITHDRAW);
 
         self::assertSame($user->balanceInt, 1_000_000 - 255672);
-        self::assertSame((float) $user->balanceFloat, 10000.00 - 2556.72);
+        self::assertSame((float) $user->balanceFloat, 7443.28);
 
         $transaction = $user->depositFloat(2556.72 * 2);
         self::assertSame($transaction->amountInt, 255672 * 2);

tests/Units/Service/MathTest.php

@@ -143,8 +143,8 @@ public function testDiv(): void
         self::assertSame(-0.2, (float) $provider->div(-1, 5));
 
         // float
-        self::assertSame(0.24223602484472, (float) $provider->div(1.17, 4.83));
-        self::assertSame(-0.26519337016574, (float) $provider->div(-1.44, 5.43));
+        self::assertSame(0.24223602484472, (float) $provider->div(1.17, 4.83, 14));
+        self::assertSame(-0.26519337016574, (float) $provider->div(-1.44, 5.43, 14));
 
         self::assertSame(
             0,