Merge branch 'master' of github.com:MannikJ/laravel-wallet

MannikJ · Aug 6, 2021 · de0499f · de0499f
2 parents eed874c + 8f8363a
commit de0499f
Show file tree

Hide file tree

Showing 35 changed files with 195 additions and 146 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,21 @@
+{
+    "name": "Laradock",
+    "dockerComposeFile": ["../../laradock/docker-compose.yml"],
+    "service": "workspace",
+    "workspaceFolder": "/var/www/laravel-wallet",
+    "extensions": [
+      "dotjoshjohnson.xml",
+      "ryu1kn.partial-diff",
+      "artdiniz.quitcontrol-vscode",
+      "emallin.phpunit",
+      "eamodio.gitlens",
+      "onecentlin.laravel-extension-pack",
+      "onecentlin.php-productive-pack",
+      "sdras.vue-vscode-extensionpack",
+      "fknop.vscode-npm",
+      "apility.beautify-blade"
+    ],
+    "remoteUser": "laradock",
+    "shutdownAction": "none",
+    "runServices": ["mysql", "redis", "nginx"]
+  }
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/README.md b/README.md
diff --git a/composer.json b/composer.json
@@ -28,8 +28,7 @@
     ],
     "require": {
         "php": "^7.3|^8.0",
-        "illuminate/support": "^7.0|^8.0",
-        "laravel/legacy-factories": "^1.1"
+        "illuminate/support": "^7.0|^8.0"
     },
     "require-dev": {
         "doctrine/dbal": "^2.9",

diff --git a/config/.gitkeep b/config/.gitkeep
diff --git a/config/config.php b/config/config.php
diff --git a/database/migrations/2018_09_13_123456_create_wallet_tables.php b/database/migrations/2018_09_13_123456_create_wallet_tables.php
diff --git a/database/migrations/2018_11_05_123456_update_wallet_transactions_table.php b/database/migrations/2018_11_05_123456_update_wallet_transactions_table.php
diff --git a/database/migrations/2019_01_25_000000_add_polymorphic_relation_to_transactions_table.php b/database/migrations/2019_01_25_000000_add_polymorphic_relation_to_transactions_table.php
diff --git a/phpunit.xml b/phpunit.xml
diff --git a/src/Exceptions/UnacceptedTransactionException.php b/src/Exceptions/UnacceptedTransactionException.php
diff --git a/src/Facades/WalletFacade.php b/src/Facades/WalletFacade.php
diff --git a/src/Jobs/RecalculateWalletBalance.php b/src/Jobs/RecalculateWalletBalance.php
diff --git a/src/Models/Transaction.php b/src/Models/Transaction.php
@@ -2,13 +2,15 @@
 
 namespace MannikJ\Laravel\Wallet\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Arr;
 
 class Transaction extends Model
 {
     use SoftDeletes;
+    use HasFactory;
 
     protected $table = 'wallet_transactions';
 

diff --git a/src/Models/Wallet.php b/src/Models/Wallet.php
@@ -2,6 +2,7 @@
 
 namespace MannikJ\Laravel\Wallet\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Carbon;
@@ -10,6 +11,7 @@
 class Wallet extends Model
 {
     use SoftDeletes;
+    use HasFactory;
 
     protected $attributes = [
         'balance' => 0,

diff --git a/src/Observers/TransactionObserver.php b/src/Observers/TransactionObserver.php
diff --git a/src/Observers/WalletObserver.php b/src/Observers/WalletObserver.php
diff --git a/src/Services/Wallet.php b/src/Services/Wallet.php
diff --git a/src/Traits/HasWallet.php b/src/Traits/HasWallet.php
diff --git a/src/WalletServiceProvider.php b/src/WalletServiceProvider.php
diff --git a/tests/Factories/TransactionFactory.php b/tests/Factories/TransactionFactory.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace MannikJ\Laravel\Wallet\Tests\Factories;
+
+use Faker\Generator as Faker;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use MannikJ\Laravel\Wallet\Models\Transaction;
+use MannikJ\Laravel\Wallet\Models\Wallet;
+
+class TransactionFactory extends Factory
+{
+
+    protected $model = Transaction::class;
+
+
+    public function definition()
+    {
+        return [
+            'wallet_id' => WalletFactory::new(),
+            'type' => $this->faker->randomElement([
+                'deposit',
+                'withdraw',
+            ]),
+            'amount' => $this->faker->randomFloat(4, 0, 10000),
+        ];
+    }
+
+    public function withdraw()
+    {
+        return $this->state(function (array $attributes) {
+            return ['type' => 'withdraw'];
+        });
+    }
+
+    public function deposit()
+    {
+        return $this->state(function (array $attributes) {
+            return ['type' => 'deposit'];
+        });
+    }
+}
diff --git a/tests/Factories/UserFactory.php b/tests/Factories/UserFactory.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace MannikJ\Laravel\Wallet\Tests\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use MannikJ\Laravel\Wallet\Tests\Models\User;
+use Illuminate\Support\Str;
+
+class UserFactory extends Factory
+{
+    protected $model = User::class;
+
+    public function definition()
+    {
+        return [
+            'name' => $this->faker->name,
+            'email' => $this->faker->unique()->safeEmail,
+            'email_verified_at' => now(),
+            'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
+            'remember_token' => Str::random(10),
+        ];
+    }
+}
diff --git a/tests/Factories/WalletFactory.php b/tests/Factories/WalletFactory.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace MannikJ\Laravel\Wallet\Tests\Factories;
+
+use MannikJ\Laravel\Wallet\Models\Wallet;
+use MannikJ\Laravel\Wallet\Tests\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class WalletFactory extends Factory
+{
+
+    protected $model = Wallet::class;
+
+    public function definition()
+    {
+        return [
+            'owner_id' => UserFactory::new(),
+            'owner_type' => User::class
+        ];
+    }
+}
diff --git a/tests/Models/User.php b/tests/Models/User.php
@@ -2,10 +2,12 @@
 
 namespace MannikJ\Laravel\Wallet\Tests\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as AuthUser;
 use MannikJ\Laravel\Wallet\Traits\HasWallet;
 
 class User extends AuthUser
 {
     use HasWallet;
+    use HasFactory;
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -14,7 +14,6 @@ class TestCase extends BaseTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $this->withFactories(__DIR__ . '/factories');
         $this->loadLaravelMigrations();
         $this->loadMigrationsFrom('database/migrations');
     }

diff --git a/tests/factories/TransactionFactory.php b/tests/factories/TransactionFactory.php
diff --git a/tests/factories/UserFactory.php b/tests/factories/UserFactory.php
diff --git a/tests/factories/WalletFactory.php b/tests/factories/WalletFactory.php
diff --git a/tests/unit/HasWalletTest.php b/tests/unit/HasWalletTest.php
@@ -5,16 +5,18 @@
 use MannikJ\Laravel\Wallet\Models\Wallet;
 use MannikJ\Laravel\Wallet\Exceptions\UnacceptedTransactionException;
 use MannikJ\Laravel\Wallet\Tests\TestCase;
-use MannikJ\Laravel\Wallet\Tests\Models\User;
 use MannikJ\Laravel\Wallet\Models\Transaction;
 use Illuminate\Support\Collection;
+use MannikJ\Laravel\Wallet\Tests\Factories\TransactionFactory;
+use MannikJ\Laravel\Wallet\Tests\Factories\UserFactory;
+use MannikJ\Laravel\Wallet\Tests\Factories\WalletFactory;
 
 class HasWalletTest extends TestCase
 {
     /** @test */
     public function wallet()
     {
-        $user = factory(User::class)->create();
+        $user = UserFactory::new()->create();
         $this->assertInstanceOf(Wallet::class, $user->wallet);
         $this->assertFalse($user->wallet->exists());
         $this->assertTrue(0.0 === $user->wallet->balance);
@@ -23,15 +25,15 @@ public function wallet()
     /** @test */
     public function wallet_transactions()
     {
-        $user1 = factory(User::class)->create();
-        $wallet1 = factory(Wallet::class)->create(['owner_id' => $user1->id]);
-        $transactions1 = factory(Transaction::class, 10)->create(['wallet_id' => $wallet1->id]);
+        $user1 = UserFactory::new()->create();
+        $wallet1 = WalletFactory::new()->create(['owner_id' => $user1->id]);
+        $transactions1 = TransactionFactory::new()->count(10)->create(['wallet_id' => $wallet1->id]);
         $this->assertInstanceOf(Collection::class, $user1->walletTransactions);
         $this->assertEquals(10, $user1->walletTransactions()->count());
         $this->assertEmpty($wallet1->transactions->diff($user1->walletTransactions));
-        $user2 = factory(User::class)->create();
-        $wallet2 = factory(Wallet::class)->create(['owner_id' => $user2->id]);
-        $transactions2 = factory(Transaction::class, 5)->create(['wallet_id' => $wallet2->id]);
+        $user2 = UserFactory::new()->create();
+        $wallet2 = WalletFactory::new()->create(['owner_id' => $user2->id]);
+        $transactions2 = TransactionFactory::new()->count(5)->create(['wallet_id' => $wallet2->id]);
         $this->assertInstanceOf(Collection::class, $user1->walletTransactions);
         $this->assertEquals(10, $user1->walletTransactions()->count());
         $this->assertEmpty($wallet2->transactions->diff($user2->walletTransactions));

diff --git a/tests/unit/RecalculateWalletBalanceTest.php b/tests/unit/RecalculateWalletBalanceTest.php
@@ -10,14 +10,15 @@
 use Illuminate\Support\Collection;
 use MannikJ\Laravel\Wallet\Jobs\RecalculateWalletBalance;
 use MannikJ\Laravel\Wallet\DebouncedJob;
+use MannikJ\Laravel\Wallet\Tests\Factories\WalletFactory;
 
 class RecalculateWalletBalanceTest extends TestCase
 {
     /** @test */
     public function dispatch()
     {
         config(['auto_recalculate_balance' => true]);
-        $wallet = factory(Wallet::class)->create();
+        $wallet = WalletFactory::new()->create();
         Transaction::flushEventListeners();
         $transaction = $wallet->transactions()->make(['type' => 'deposit', 'amount' => 10]);
         $transaction->hash = uniqid();