[2.x] Fix bug in tests.

database/factories/PaymentFactory.php

@@ -41,20 +41,20 @@ public function configure()
         return $this->afterMaking(function (Payment $payment) {
             if (is_null($payment->provider_id)) {
                 $provider = ! is_null($payment->instrument_id)
-                    ? $payment->instrument->provider
+                    ? $payment->instrument->wallet->getProvider()
                     : Provider::whereHas(
                         'accounts',
                         fn ($query) => $query->where('accounts.id', $payment->account_id)
                     )->inRandomOrder()->firstOr(
                         fn () => Provider::factory()->create()
                     );
 
-                $payment->provider_id = $provider->id;
+                $payment->provider_id = $provider->getId();
             }
 
             if (is_null($payment->account_id)) {
                 $account = ! is_null($payment->instrument_id)
-                    ? $payment->instrument->account
+                    ? $payment->instrument->wallet->getAccount()
                     : Account::whereHas(
                         'providers',
                         fn ($query) => $query->where('providers.id', $payment->provider_id)
@@ -67,7 +67,7 @@ public function configure()
                         return $account;
                     });
 
-                $payment->account_id = $account->id;
+                $payment->account_id = $account->getId();
             }
 
             if (is_null($payment->rail_id)) {

database/factories/TransactionEventFactory.php

@@ -42,7 +42,7 @@ public function configure()
 
         return $this->afterMaking(function (TransactionEvent $transactionEvent) {
             if (is_null($transactionEvent->payment_id)) {
-                $transactionEvent->payment_id = Payment::factory()->create()->id;
+                $transactionEvent->payment_id = $transactionEvent->transactionable_type === Payment::class ? $transactionEvent->transactionable_id : Payment::factory()->create()->id;
             }
 
             if (is_null($transactionEvent->amount)) {

src/Models/Dispute.php

@@ -45,26 +45,6 @@ protected static function getFactoryNamespace()
         return 'Payavel\\Checkout\\Database\\Factories';
     }
 
-    /**
-     * Get the dispute's provider.
-     *
-     * @return \Payavel\Orchestration\Models\Provider
-     */
-    public function getProviderAttribute()
-    {
-        return $this->payment->provider;
-    }
-
-    /**
-     * Get the dispute's account.
-     *
-     * @return \Payavel\Orchestration\Models\Account
-     */
-    public function getAccountAttribute()
-    {
-        return $this->payment->account;
-    }
-
     /**
      * Get the payment that is being disputed.
      *

src/Models/Payment.php

@@ -3,16 +3,17 @@
 namespace Payavel\Checkout\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Payavel\Checkout\Traits\ConfiguresCheckoutGateway;
+use Payavel\Orchestration\Contracts\Orchestrable;
 use Payavel\Orchestration\Models\Account;
 use Payavel\Orchestration\Models\Provider;
 use Payavel\Orchestration\Support\ServiceConfig;
+use Payavel\Orchestration\Traits\OrchestratesService;
 use Payavel\Orchestration\Traits\HasFactory;
 
-class Payment extends Model
+class Payment extends Model implements Orchestrable
 {
-    use ConfiguresCheckoutGateway;
     use HasFactory;
+    use OrchestratesService;
 
     /**
      * The attributes that aren't mass assignable.
@@ -39,6 +40,13 @@
         'details' => 'array',
     ];
 
+    /**
+     * The orchestra's service id.
+     *
+     * @var string
+     */
+    protected $serviceId = 'checkout';
+
     /**
      * Custom factory namespace fallback.
      *
@@ -116,7 +124,7 @@
      */
     public function fetch()
     {
-        return $this->gateway->getTransaction($this);
+        return $this->service->getTransaction($this);
     }
 
     /**
@@ -127,7 +135,7 @@
      */
     public function void($data = [])
     {
-        return $this->gateway->void($this, $data);
+        return $this->service->void($this, $data);
     }
 
     /**
@@ -138,6 +146,6 @@
      */
     public function refund($data = [])
     {
-        return $this->gateway->refund($this, $data);
+        return $this->service->refund($this, $data);
     }
 }

src/Models/PaymentInstrument.php

@@ -3,13 +3,11 @@
 namespace Payavel\Checkout\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Payavel\Checkout\Traits\ConfiguresCheckoutGateway;
 use Payavel\Orchestration\Support\ServiceConfig;
 use Payavel\Orchestration\Traits\HasFactory;
 
 class PaymentInstrument extends Model
 {
-    use ConfiguresCheckoutGateway;
     use HasFactory;
 
     /**
@@ -48,26 +46,6 @@
         return 'Payavel\\Checkout\\Database\\Factories';
     }
 
-    /**
-     * Get the payment instrument's provider.
-     *
-     * @return \Payavel\Orchestration\Models\Provider
-     */
-    public function getProviderAttribute()
-    {
-        return $this->wallet->provider;
-    }
-
-    /**
-     * Get the payment instrument's account.
-     *
-     * @return \Payavel\Orchestration\Models\Account
-     */
-    public function getAccountAttribute()
-    {
-        return $this->wallet->account;
-    }
-
     /**
      * Get the wallet the payment instrument belongs to.
      *
@@ -105,7 +83,7 @@
      */
     public function fetch()
     {
-        return $this->gateway->getPaymentInstrument($this);
+        return $this->wallet->service->getPaymentInstrument($this);
     }
 
     /**
@@ -116,7 +94,7 @@
      */
     public function patch($data)
     {
-        return $this->gateway->updatePaymentInstrument($this, $data);
+        return $this->wallet->service->updatePaymentInstrument($this, $data);
     }
 
     /**
@@ -126,6 +104,6 @@
      */
     public function disable()
     {
-        return $this->gateway->deletePaymentInstrument($this);
+        return $this->wallet->service->deletePaymentInstrument($this);
     }
 }

src/Models/Refund.php

@@ -45,26 +45,6 @@ protected static function getFactoryNamespace()
         return 'Payavel\\Checkout\\Database\\Factories';
     }
 
-    /**
-     * Get the refund's provider.
-     *
-     * @return \Payavel\Orchestration\Models\Provider
-     */
-    public function getProviderAttribute()
-    {
-        return $this->payment->provider;
-    }
-
-    /**
-     * Get the refund's account.
-     *
-     * @return \Payavel\Orchestration\Models\Account
-     */
-    public function getAccountAttribute()
-    {
-        return $this->payment->account;
-    }
-
     /**
      * Get the payment that is being refunded.
      *

src/Models/Wallet.php

@@ -3,16 +3,17 @@
 namespace Payavel\Checkout\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Payavel\Checkout\Traits\ConfiguresCheckoutGateway;
+use Payavel\Orchestration\Contracts\Orchestrable;
+use Payavel\Orchestration\Traits\OrchestratesService;
 use Payavel\Orchestration\Models\Account;
 use Payavel\Orchestration\Models\Provider;
 use Payavel\Orchestration\Support\ServiceConfig;
 use Payavel\Orchestration\Traits\HasFactory;
 
-class Wallet extends Model
+class Wallet extends Model implements Orchestrable
 {
-    use ConfiguresCheckoutGateway;
     use HasFactory;
+    use OrchestratesService;
 
     /**
      * The attributes that aren't mass assignable.
@@ -28,6 +29,13 @@
      */
     protected $hidden = ['reference'];
 
+    /**
+     * The orchestra's service id.
+     *
+     * @var string
+     */
+    protected $serviceId = 'checkout';
+
     /**
      * Custom factory namespace fallback.
      *
@@ -85,6 +93,6 @@
      */
     public function fetch()
     {
-        return $this->gateway->getWallet($this);
+        return $this->service->getWallet($this);
     }
 }

tests/Unit/Config/BillableTraitTest.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Payavel\Checkout\Tests\Unit\Config;
+
+use Payavel\Checkout\Tests\Unit\TestBillableTrait;
+use Payavel\Orchestration\Tests\Traits\CreatesConfigServiceables;
+use Payavel\Orchestration\Tests\Traits\SetsConfigDriver;
+
+class BillableTraitTest extends TestBillableTrait
+{
+    use CreatesConfigServiceables;
+    use SetsConfigDriver;
+}

tests/Unit/Config/CheckoutGatewayTest.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Payavel\Checkout\Tests\Unit\Config;
+
+use Payavel\Checkout\Tests\Unit\TestCheckoutGateway;
+use Payavel\Orchestration\Tests\Traits\CreatesConfigServiceables;
+use Payavel\Orchestration\Tests\Traits\SetsConfigDriver;
+
+class CheckoutGatewayTest extends TestCheckoutGateway
+{
+    use CreatesConfigServiceables;
+    use SetsConfigDriver;
+}

tests/Unit/Config/DisputeModelTest.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Payavel\Checkout\Tests\Unit\Config;
+
+use Payavel\Checkout\Tests\Unit\TestDisputeModel;
+use Payavel\Orchestration\Tests\Traits\CreatesConfigServiceables;
+use Payavel\Orchestration\Tests\Traits\SetsConfigDriver;
+
+class DisputeModelTest extends TestDisputeModel
+{
+    use CreatesConfigServiceables;
+    use SetsConfigDriver;
+}

tests/Unit/Config/PaymentInstrumentModelTest.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Payavel\Checkout\Tests\Unit\Config;
+
+use Payavel\Checkout\Tests\Unit\TestPaymentInstrumentModel;
+use Payavel\Orchestration\Tests\Traits\CreatesConfigServiceables;
+use Payavel\Orchestration\Tests\Traits\SetsConfigDriver;
+
+class PaymentInstrumentModelTest extends TestPaymentInstrumentModel
+{
+    use CreatesConfigServiceables;
+    use SetsConfigDriver;
+}