[2.x] Extract service module into payavel/orchestration package.

.github/workflows/run-tests.yml

@@ -16,19 +16,17 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.4, 8.0, 8.1, 8.2]
-        laravel: [8.*, 9.*]
+        php: [8.1, 8.2, 8.3]
+        laravel: [10.*, 11.*]
         dependency-version: [prefer-stable]
         include:
-          - laravel: 8.*
-            testbench: 6.*
-          - laravel: 9.*
-            testbench: 7.*
+          - laravel: 10.*
+            testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
         exclude:
-          - laravel: 8.*
-            php: 8.2
-          - laravel: 9.*
-            php: 7.4
+          - laravel: 11.*
+            php: 8.1
 
     steps:
       - name: Checkout code
@@ -50,3 +48,5 @@ jobs:
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

composer.json

@@ -8,25 +8,28 @@
             "email": "[email protected]"
         }
     ],
-    "require-dev": {
-        "orchestra/testbench": "^6.0|^7.0"
-    },
     "autoload": {
         "psr-4": {
             "Payavel\\Checkout\\": "src/",
-            "Payavel\\Checkout\\Database\\Factories\\": "src/database/factories/",
-            "Payavel\\Checkout\\Database\\Seeders\\": "src/database/seeders/"
+            "Payavel\\Checkout\\Database\\Factories\\": "database/factories/",
+            "Payavel\\Checkout\\Database\\Seeders\\": "database/seeders/"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "Payavel\\Checkout\\Tests\\": "tests/",
-            "Payavel\\Checkout\\Tests\\App\\": "tests/app/"
+            "Payavel\\Orchestration\\Tests\\": "vendor/payavel/orchestration/tests/"
         }
     },
     "scripts": {
         "test": "vendor/bin/phpunit"
     },
+    "require": {
+        "payavel/orchestration": "dev-master"
+    },
+    "require-dev": {
+        "orchestra/testbench": "^8.0|^9.0"
+    },
     "extra": {
         "laravel": {
             "providers": [

config/checkout.php

@@ -0,0 +1,31 @@
+<?php
+
+return [
+
+    'name' => 'Checkout',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Checkout Test Mode
+    |--------------------------------------------------------------------------
+    |
+    | When set to true, the provider & account will be shared with the fake payment
+    | request so you can mock your responses as you wish. This is very useful for
+    | local & testing environments where a sandbox is limited or non-existent.
+    |
+    */
+    'test_mode' => env('PAYMENT_TEST_MODE', false),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Checkout Testing
+    |--------------------------------------------------------------------------
+    |
+    | This option allows you to define the location of the fake payment
+    | request & response classes you would like to leverage when test_mode
+    | is set to true. Also, feel free to add any other settings here.
+    |
+    */
+    'test_gateway' => \App\Services\Payment\FakePaymentRequest::class,
+
+];

src/database/factories/PaymentMethodFactory.php → database/factories/PaymentMethodFactory.php

@@ -6,18 +6,16 @@
 use Payavel\Checkout\Models\Wallet;
 use Payavel\Checkout\Models\PaymentMethod;
 use Payavel\Checkout\Models\PaymentType;
+use Payavel\Orchestration\Support\ServiceConfig;
 
 class PaymentMethodFactory extends Factory
 {
     /**
      * The name of the factory's corresponding model.
      *
-     * @return string
+     * @var string
      */
-    public function modelName()
-    {
-        return config('payment.models.' . PaymentMethod::class, PaymentMethod::class);
-    }
+    protected $model = PaymentMethod::class;
 
     /**
      * Define the model's default state.

src/database/factories/PaymentTransactionEventFactory.php → database/factories/PaymentTransactionEventFactory.php

@@ -12,13 +12,9 @@ class PaymentTransactionEventFactory extends Factory
     /**
      * The name of the factory's corresponding model.
      *
-     * @return string
+     * @var string
      */
-    public function modelName()
-    {
-        return config('payment.models.' . PaymentTransactionEvent::class, PaymentTransactionEvent::class);
-    }
-
+    protected $model = PaymentTransactionEvent::class;
 
     /**
      * Define the model's default state.

src/database/factories/PaymentTransactionFactory.php → database/factories/PaymentTransactionFactory.php

@@ -3,22 +3,19 @@
 namespace Payavel\Checkout\Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Payavel\Checkout\Models\PaymentMerchant;
-use Payavel\Checkout\Models\PaymentProvider;
 use Payavel\Checkout\Models\PaymentTransaction;
 use Payavel\Checkout\PaymentStatus;
+use Payavel\Orchestration\Models\Account;
+use Payavel\Orchestration\Models\Provider;
 
 class PaymentTransactionFactory extends Factory
 {
     /**
      * The name of the factory's corresponding model.
      *
-     * @return string
+     * @var string
      */
-    public function modelName()
-    {
-        return config('payment.models.' . PaymentTransaction::class, PaymentTransaction::class);
-    }
+    protected $model = PaymentTransaction::class;
 
     /**
      * Define the model's default state.
@@ -46,29 +43,29 @@ public function configure()
             if (is_null($transaction->provider_id)) {
                 $provider = ! is_null($transaction->payment_method_id)
                     ? $transaction->paymentMethod->provider
-                    : PaymentProvider::whereHas('merchants', function ($query) use ($transaction) {
-                        $query->where('payment_merchants.id', $transaction->merchant_id);
-                    })->inRandomOrder()->firstOr(function ()  {
-                        return PaymentProvider::factory()->create();
+                    : Provider::whereHas('accounts', function ($query) use ($transaction) {
+                        $query->where('payment_accounts.id', $transaction->account_id);
+                    })->inRandomOrder()->firstOr(function () {
+                        return Provider::factory()->create();
                     });
 
                 $transaction->provider_id = $provider->id;
             }
 
-            if (is_null($transaction->merchant_id)) {
-                $merchant = ! is_null($transaction->payment_method_id)
-                    ? $transaction->paymentMethod->merchant
-                    : PaymentMerchant::whereHas('providers', function ($query) use ($transaction) {
+            if (is_null($transaction->account_id)) {
+                $account = ! is_null($transaction->payment_method_id)
+                    ? $transaction->paymentMethod->account
+                    : Account::whereHas('providers', function ($query) use ($transaction) {
                         $query->where('payment_providers.id', $transaction->provider_id);
                     })->inRandomOrder()->firstOr(function () use ($transaction) {
-                        $merchant = PaymentMerchant::factory()->create();
+                        $account = Account::factory()->create();
 
-                        $merchant->providers()->attach($transaction->provider_id, ['is_default' => true]);
+                        $account->providers()->attach($transaction->provider_id, ['is_default' => true]);
 
-                        return $merchant;
+                        return $account;
                     });
 
-                $transaction->merchant_id = $merchant->id;
+                $transaction->account_id = $account->id;
             }
         });
     }

src/database/factories/PaymentTypeFactory.php → database/factories/PaymentTypeFactory.php

@@ -10,12 +10,9 @@ class PaymentTypeFactory extends Factory
     /**
      * The name of the factory's corresponding model.
      *
-     * @return string
+     * @var string
      */
-    public function modelName()
-    {
-        return config('payment.models.' . PaymentType::class, PaymentType::class);
-    }
+    protected $model = PaymentType::class;
 
     public const DEFAULTS = [
         [
@@ -80,8 +77,7 @@ public function real()
         return $this->state(function () {
             $type = collect(static::DEFAULTS)->whereNotIn('slug', PaymentType::all()->pluck('slug'))->first();
 
-            if (is_null($type))
-            {
+            if (is_null($type)) {
                 return [];
             }
 

src/database/factories/WalletFactory.php → database/factories/WalletFactory.php

@@ -3,21 +3,18 @@
 namespace Payavel\Checkout\Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Payavel\Checkout\Models\PaymentMerchant;
-use Payavel\Checkout\Models\PaymentProvider;
 use Payavel\Checkout\Models\Wallet;
+use Payavel\Orchestration\Models\Account;
+use Payavel\Orchestration\Models\Provider;
 
 class WalletFactory extends Factory
 {
     /**
      * The name of the factory's corresponding model.
      *
-     * @return string
+     * @var string
      */
-    public function modelName()
-    {
-        return config('payment.models.' . Wallet::class, Wallet::class);
-    }
+    protected $model = Wallet::class;
 
     /**
      * Define the model's default state.
@@ -40,27 +37,27 @@ public function configure()
     {
         return $this->afterMaking(function (Wallet $wallet) {
             if (is_null($wallet->provider_id)) {
-                $provider = PaymentProvider::whereHas('merchants', function ($query) use ($wallet) {
-                    $query->where('payment_merchants.id', $wallet->merchant_id);
+                $provider = Provider::whereHas('accounts', function ($query) use ($wallet) {
+                    $query->where('payment_accounts.id', $wallet->account_id);
                 })->inRandomOrder()->firstOr(function () {
-                    return PaymentProvider::factory()->create();
+                    return Provider::factory()->create();
                 });
 
                 $wallet->provider_id = $provider->id;
             }
 
-            if (is_null($wallet->merchant_id)) {
-                $merchant = PaymentMerchant::whereHas('providers', function ($query) use ($wallet) {
+            if (is_null($wallet->account_id)) {
+                $account = Account::whereHas('providers', function ($query) use ($wallet) {
                     $query->where('payment_providers.id', $wallet->provider_id);
                 })->inRandomOrder()->firstOr(function () use ($wallet) {
-                    $merchant = PaymentMerchant::factory()->create();
+                    $account = Account::factory()->create();
 
-                    $merchant->providers()->attach($wallet->provider_id, ['is_default' => true]);
+                    $account->providers()->attach($wallet->provider_id, ['is_default' => true]);
 
-                    return $merchant;
+                    return $account;
                 });
 
-                $wallet->merchant_id = $merchant->id;
+                $wallet->account_id = $account->id;
             }
         });
     }

src/database/migrations/2021_01_01_000000_create_base_payment_tables.php → database/migrations/2024_01_01_000010_create_base_checkout_tables.php

@@ -3,45 +3,17 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Payavel\Orchestration\Support\ServiceConfig;
 
-class CreateBasePaymentTables extends Migration
-{
+return new class () extends Migration {
     /**
      * Run the migrations.
      *
      * @return void
      */
     public function up()
     {
-        $usingDatabaseDriver = config('payment.defaults.driver') === 'database';
-
-        if ($usingDatabaseDriver) {
-            Schema::create('payment_providers', function (Blueprint $table) {
-                $table->string('id')->primary();
-                $table->string('name');
-                $table->string('request_class');
-                $table->string('response_class');
-                $table->timestamps();
-            });
-
-            Schema::create('payment_merchants', function (Blueprint $table) {
-                $table->string('id')->primary();
-                $table->string('name');
-                $table->timestamps();
-            });
-
-            Schema::create('payment_merchant_provider', function (Blueprint $table) {
-                $table->increments('id');
-                $table->string('merchant_id');
-                $table->string('provider_id');
-                $table->boolean('is_default')->default(false);
-                $table->json('config')->nullable();
-                $table->timestamps();
-
-                $table->foreign('merchant_id')->references('id')->on('payment_merchants')->onUpdate('cascade')->onDelete('cascade');
-                $table->foreign('provider_id')->references('id')->on('payment_providers')->onUpdate('cascade')->onDelete('cascade');
-            });
-        }
+        $usingDatabaseDriver = ServiceConfig::get('checkout', 'defaults.driver') === 'database';
 
         Schema::create('payment_types', function (Blueprint $table) {
             $table->smallIncrements('id');
@@ -55,13 +27,13 @@ public function up()
             $table->unsignedBigInteger('billable_id')->nullable();
             $table->string('billable_type')->nullable();
             $table->string('provider_id');
-            $table->string('merchant_id');
+            $table->string('account_id');
             $table->string('token');
             $table->timestamps();
 
             if ($usingDatabaseDriver) {
-                $table->foreign('provider_id')->references('id')->on('payment_providers')->onUpdate('cascade')->onDelete('cascade');
-                $table->foreign('merchant_id')->references('id')->on('payment_merchants')->onUpdate('cascade')->onDelete('cascade');
+                $table->foreign('provider_id')->references('id')->on('providers')->onUpdate('cascade')->onDelete('cascade');
+                $table->foreign('account_id')->references('id')->on('accounts')->onUpdate('cascade')->onDelete('cascade');
             }
         });
 
@@ -80,7 +52,7 @@ public function up()
         Schema::create('payment_transactions', function (Blueprint $table) use ($usingDatabaseDriver) {
             $table->bigIncrements('id');
             $table->string('provider_id');
-            $table->string('merchant_id');
+            $table->string('account_id');
             $table->string('reference');
             $table->unsignedInteger('amount');
             $table->char('currency', 3)->default('USD');
@@ -90,8 +62,8 @@ public function up()
             $table->timestamps();
 
             if ($usingDatabaseDriver) {
-                $table->foreign('provider_id')->references('id')->on('payment_providers')->onUpdate('cascade')->onDelete('set null');
-                $table->foreign('merchant_id')->references('id')->on('payment_merchants')->onUpdate('cascade')->onDelete('set null');
+                $table->foreign('provider_id')->references('id')->on('providers')->onUpdate('cascade')->onDelete('set null');
+                $table->foreign('account_id')->references('id')->on('accounts')->onUpdate('cascade')->onDelete('set null');
             }
 
             $table->foreign('payment_method_id')->references('id')->on('payment_methods')->onDelete('set null');
@@ -122,8 +94,5 @@ public function down()
         Schema::dropIfExists('payment_methods');
         Schema::dropIfExists('payment_types');
         Schema::dropIfExists('wallets');
-        Schema::dropIfExists('payment_merchant_provider');
-        Schema::dropIfExists('payment_merchants');
-        Schema::dropIfExists('payment_providers');
     }
-}
+};