make finding order more robust

dystcz · Feb 16, 2024 · 0164476 · 0164476
1 parent 7521ad5
commit 0164476
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/Jobs/Webhooks/HandlePaymentIntentCancelled.php b/src/Jobs/Webhooks/HandlePaymentIntentCancelled.php
@@ -13,7 +13,7 @@ public function handle(): void
     {
         $event = $this->constructStripeEvent();
         $paymentIntent = $this->getPaymentIntentFromEvent($event);
-        $order = $this->findOrderByIntent($paymentIntent);
+        $order = $this->findOrder($paymentIntent);
         $paymentAdapter = $this->getPaymentAdapter();
 
         OrderPaymentCanceled::dispatch($order, $paymentAdapter, $paymentIntent);

diff --git a/src/Jobs/Webhooks/HandlePaymentIntentFailed.php b/src/Jobs/Webhooks/HandlePaymentIntentFailed.php
@@ -13,7 +13,7 @@ public function handle(): void
     {
         $event = $this->constructStripeEvent();
         $paymentIntent = $this->getPaymentIntentFromEvent($event);
-        $order = $this->findOrderByIntent($paymentIntent);
+        $order = $this->findOrder($paymentIntent);
         $paymentAdapter = $this->getPaymentAdapter();
 
         OrderPaymentFailed::dispatch($order, $paymentAdapter, $paymentIntent);

diff --git a/src/Jobs/Webhooks/HandlePaymentIntentSucceeded.php b/src/Jobs/Webhooks/HandlePaymentIntentSucceeded.php
@@ -14,7 +14,7 @@ public function handle(): void
     {
         $event = $this->constructStripeEvent();
         $paymentIntent = $this->getPaymentIntentFromEvent($event);
-        $order = $this->findOrderByIntent($paymentIntent);
+        $order = $this->findOrder($paymentIntent);
 
         App::make(AuthorizeStripePayment::class)($order, $order->cart, $paymentIntent);
     }

diff --git a/src/Jobs/Webhooks/WebhookHandler.php b/src/Jobs/Webhooks/WebhookHandler.php
@@ -2,7 +2,9 @@
 
 namespace Dystcz\LunarApiStripeAdapter\Jobs\Webhooks;
 
+use Dystcz\LunarApi\Domain\Orders\Actions\FindOrderByCartIntent;
 use Dystcz\LunarApi\Domain\Orders\Actions\FindOrderByIntent;
+use Dystcz\LunarApi\Domain\Orders\Actions\FindOrderByTransaction;
 use Dystcz\LunarApi\Domain\Payments\Contracts\PaymentIntent as PaymentIntentContract;
 use Dystcz\LunarApi\Domain\Payments\Data\PaymentIntent;
 use Dystcz\LunarApi\Domain\Payments\PaymentAdapters\PaymentAdapter;
@@ -73,10 +75,12 @@ protected function getPaymentAdapter(): PaymentAdapter
      *
      * @throws ModelNotFoundException
      */
-    protected function findOrderByIntent(PaymentIntentContract $paymentIntent): Order
+    protected function findOrder(PaymentIntentContract $paymentIntent): Order
     {
         try {
-            $order = App::make(FindOrderByIntent::class)($paymentIntent);
+            $order = App::make(FindOrderByIntent::class)($paymentIntent)
+                ?? App::make(FindOrderByTransaction::class)($paymentIntent)
+                ?? App::make(FindOrderByCartIntent::class)($paymentIntent);
         } catch (Throwable $e) {
             $this->fail($e);
         }