Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.x] Fix factory suppositions #60

Merged
merged 2 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions database/factories/TransactionEventFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
namespace Payavel\Checkout\Database\Factories;

use Illuminate\Database\Eloquent\Factories\Factory;
use Payavel\Checkout\Models\Payment;
use Payavel\Checkout\Models\TransactionEvent;
use Payavel\Checkout\CheckoutStatus;
use Payavel\Checkout\Models\Dispute;
use Payavel\Checkout\Models\Payment;
use Payavel\Checkout\Models\Refund;
use Payavel\Checkout\Models\TransactionEvent;
use Payavel\Orchestration\Support\ServiceConfig;

class TransactionEventFactory extends Factory
Expand Down Expand Up @@ -49,15 +49,16 @@ public function configure()
$transactionEvent->amount = $transactionEvent->transactionable->amount ?? $transactionEvent->payment->amount;
}

if (is_null($transactionEvent->status_code)) {
$transactionEvent->status_code = [
ServiceConfig::get('checkout', 'models.' . Payment::class, Payment::class) => CheckoutStatus::AUTHORIZED,
ServiceConfig::get('checkout', 'models.' . Refund::class, Refund::class) => CheckoutStatus::REFUNDED,
ServiceConfig::get('checkout', 'models.' . Dispute::class, Dispute::class) => CheckoutStatus::CHARGEBACK,
][
ServiceConfig::get('checkout', 'models.' . $transactionEvent->transactionable_type, $transactionEvent->transactionable_type) ??
ServiceConfig::get('checkout', 'models.' . Payment::class, Payment::class)
];
if (is_null($transactionEvent->status_code) && !is_null($transactionEvent->transactionable_type)) {
$transactionable = new $transactionEvent->transactionable_type();

if ($transactionable instanceof Payment) {
$transactionEvent->status_code = CheckoutStatus::AUTHORIZED;
} elseif ($transactionable instanceof Refund) {
$transactionEvent->status_code = CheckoutStatus::REFUNDED;
} elseif ($transactionable instanceof Dispute) {
$transactionEvent->status_code = CheckoutStatus::CHARGEBACK;
}
}
});
}
Expand Down
11 changes: 0 additions & 11 deletions src/CheckoutServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@

namespace Payavel\Checkout;

use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Support\ServiceProvider;
use Payavel\Checkout\Console\Commands\CheckoutInstall;
use Payavel\Checkout\Console\Commands\CheckoutProvider;
use Payavel\Checkout\Models\Dispute;
use Payavel\Checkout\Models\Payment;
use Payavel\Checkout\Models\Refund;
use Payavel\Orchestration\Support\ServiceConfig;

class CheckoutServiceProvider extends ServiceProvider
{
Expand All @@ -24,12 +19,6 @@ public function boot()
$this->registerCommands();

$this->registerMigrations();

Relation::morphMap([
Payment::class => fn () => ServiceConfig::get('checkout', 'models.' . Payment::class, Payment::class),
Refund::class => fn () => ServiceConfig::get('checkout', 'models.' . Refund::class, Refund::class),
Dispute::class => fn () => ServiceConfig::get('checkout', 'models.' . Dispute::class, Dispute::class),
]);
}

public function register()
Expand Down
19 changes: 0 additions & 19 deletions src/Models/TransactionEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
namespace Payavel\Checkout\Models;

use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Support\Arr;
use Payavel\Orchestration\Support\ServiceConfig;
use Payavel\Orchestration\Traits\HasFactory;

Expand Down Expand Up @@ -66,21 +64,4 @@ public function transactionable()
{
return $this->morphTo();
}

/**
* Retrieve the actual class name for a given morph class.
*
* @param string $class
* @return string
*/
public static function getActualClassNameForMorph($class)
{
$value = Arr::get(Relation::morphMap() ?: [], $class, $class);

if (is_callable($value)) {
return $value();
}

return $value;
}
}
5 changes: 3 additions & 2 deletions tests/Unit/PaymentModelTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Payavel\Checkout\Tests\Unit;

use Payavel\Checkout\CheckoutStatus;
use Payavel\Checkout\Models\Payment;
use Payavel\Checkout\Models\PaymentInstrument;
use Payavel\Checkout\Models\PaymentRail;
Expand Down Expand Up @@ -72,12 +73,12 @@ public function retrieve_payment_events()
$payment = Payment::factory()->create();
$this->assertEmpty($payment->events);

$paymentWith2Events = Payment::factory()->hasEvents(2)->create();
$paymentWith2Events = Payment::factory()->hasEvents(2, ['status_code' => CheckoutStatus::AUTHORIZED])->create();
$this->assertCount(2, $paymentWith2Events->events);
$this->assertContainsOnlyInstancesOf(TransactionEvent::class, $paymentWith2Events->events);

ServiceConfig::set('checkout', 'models.' . TransactionEvent::class, TestTransactionEvent::class);
$paymentWith3OverriddenEvents = Payment::factory()->hasEvents(3)->create();
$paymentWith3OverriddenEvents = Payment::factory()->hasEvents(3, ['status_code' => CheckoutStatus::AUTHORIZED])->create();
$this->assertCount(3, $paymentWith3OverriddenEvents->events);
$this->assertContainsOnlyInstancesOf(TestTransactionEvent::class, $paymentWith3OverriddenEvents->events);
}
Expand Down
30 changes: 10 additions & 20 deletions tests/Unit/TransactionEventModelTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@

namespace Payavel\Checkout\Tests\Unit;

use Payavel\Checkout\Models\Dispute;
use Payavel\Checkout\CheckoutStatus;
use Payavel\Checkout\Models\Payment;
use Payavel\Checkout\Models\Refund;
use Payavel\Checkout\Models\TransactionEvent;
use Payavel\Checkout\Tests\Models\TestDispute;
use Payavel\Checkout\Tests\Models\TestPayment;
use Payavel\Checkout\Tests\Models\TestRefund;
use Payavel\Checkout\Tests\TestCase;
use Payavel\Orchestration\Support\ServiceConfig;
use PHPUnit\Framework\Attributes\Test;
Expand All @@ -18,33 +15,26 @@ class TransactionEventModelTest extends TestCase
#[Test]
public function retrieve_transaction_event_payment()
{
$transactionEventWithPayment = TransactionEvent::factory()->create();
$transactionEventWithPayment = TransactionEvent::factory()->create(['status_code' => CheckoutStatus::AUTHORIZED]);
$this->assertInstanceOf(Payment::class, $transactionEventWithPayment->payment);

ServiceConfig::set('checkout', 'models.' . Payment::class, TestPayment::class);
$transactionEventWithOverriddenPayment = TransactionEvent::factory()->create();
$transactionEventWithOverriddenPayment = TransactionEvent::factory()->create(['status_code' => CheckoutStatus::AUTHORIZED]);
$this->assertInstanceOf(TestPayment::class, $transactionEventWithOverriddenPayment->payment);
}

#[Test]
public function retrieve_transaction_event_transactionable()
{
$transactionEvent = TransactionEvent::factory()->create();
$transactionEvent = TransactionEvent::factory()->create(['status_code' => CheckoutStatus::AUTHORIZED]);
$this->assertNull($transactionEvent->transactionable);

$transactionables = [
Payment::class => TestPayment::class,
Refund::class => TestRefund::class,
Dispute::class => TestDispute::class,
];
$transactionEventWithTransactionable = TransactionEvent::factory()->for(Payment::factory(), 'transactionable')->create(['status_code' => CheckoutStatus::AUTHORIZED]);
$this->assertInstanceOf(Payment::class, $transactionEventWithTransactionable->transactionable);

$randomTransactionable = $this->faker->randomElement(array_keys($transactionables));
$transactionEventWithTransactionable = TransactionEvent::factory()->for($randomTransactionable::factory(), 'transactionable')->create();
$this->assertInstanceOf($randomTransactionable, $transactionEventWithTransactionable->transactionable);

$randomTransactionable = $this->faker->randomElement(array_keys($transactionables));
ServiceConfig::set('checkout', 'models.' . $randomTransactionable, $transactionables[$randomTransactionable]);
$transactionEventWithOverriddenTransactionable = TransactionEvent::factory()->for($transactionables[$randomTransactionable]::factory(), 'transactionable')->create();
$this->assertInstanceOf($transactionables[$randomTransactionable], $transactionEventWithOverriddenTransactionable->transactionable);
ServiceConfig::set('checkout', 'models.' . Payment::class, TestPayment::class);
$transactionEventWithOverriddenTransactionable = TransactionEvent::factory()->create(['status_code' => CheckoutStatus::AUTHORIZED]);
$transactionEventWithOverriddenTransactionable->transactionable()->associate(transform(Payment::factory()->create(), fn ($payment) => TestPayment::find($payment->id)));
$this->assertInstanceOf(TestPayment::class, $transactionEventWithOverriddenTransactionable->transactionable);
}
}
Loading