Merge branch 'feature/stripe-webhooks' into 0.8

dystcz · Feb 7, 2024 · af8e6fb · af8e6fb
2 parents 6e33ce4 + e7d8d69
commit af8e6fb
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 27 deletions.
diff --git a/src/Jobs/Webhooks/HandleOtherEvent.php b/src/Jobs/Webhooks/HandleOtherEvent.php
@@ -2,8 +2,6 @@
 
 namespace Dystcz\LunarApiStripeAdapter\Jobs\Webhooks;
 
-use Illuminate\Support\Facades\Config;
-
 class HandleOtherEvent extends WebhookHandler
 {
     /**
@@ -14,7 +12,6 @@ public function handle(): void
         // $event = $this->constructStripeEvent();
         // $paymentIntent = $this->getPaymentIntentFromEvent($event);
         // $order = $this->findOrderByIntent($paymentIntent);
-        //
-        // $paymentAdapter = $this->register->get(Config::get('lunar-api.stripe.driver', 'stripe'));
+        // $paymentAdapter = $this->getPaymentAdapter();
     }
 }
diff --git a/src/Jobs/Webhooks/HandlePaymentIntentCancelled.php b/src/Jobs/Webhooks/HandlePaymentIntentCancelled.php
@@ -3,7 +3,6 @@
 namespace Dystcz\LunarApiStripeAdapter\Jobs\Webhooks;
 
 use Dystcz\LunarApi\Domain\Orders\Events\OrderPaymentCanceled;
-use Illuminate\Support\Facades\Config;
 
 class HandlePaymentIntentCancelled extends WebhookHandler
 {
@@ -15,8 +14,7 @@ public function handle(): void
         $event = $this->constructStripeEvent();
         $paymentIntent = $this->getPaymentIntentFromEvent($event);
         $order = $this->findOrderByIntent($paymentIntent);
-
-        $paymentAdapter = $this->register->get(Config::get('lunar-api.stripe.driver', 'stripe'));
+        $paymentAdapter = $this->getPaymentAdapter();
 
         OrderPaymentCanceled::dispatch($order, $paymentAdapter, $paymentIntent);
     }

diff --git a/src/Jobs/Webhooks/HandlePaymentIntentCreated.php b/src/Jobs/Webhooks/HandlePaymentIntentCreated.php
@@ -2,8 +2,6 @@
 
 namespace Dystcz\LunarApiStripeAdapter\Jobs\Webhooks;
 
-use Illuminate\Support\Facades\Config;
-
 class HandlePaymentIntentCreated extends WebhookHandler
 {
     /**
@@ -14,7 +12,6 @@ public function handle(): void
         // $event = $this->constructStripeEvent();
         // $paymentIntent = $this->getPaymentIntentFromEvent($event);
         // $order = $this->findOrderByIntent($paymentIntent);
-        //
-        // $paymentAdapter = $this->register->get(Config::get('lunar-api.stripe.driver', 'stripe'));
+        // $paymentAdapter = $this->getPaymentAdapter();
     }
 }
diff --git a/src/Jobs/Webhooks/HandlePaymentIntentFailed.php b/src/Jobs/Webhooks/HandlePaymentIntentFailed.php
@@ -3,7 +3,6 @@
 namespace Dystcz\LunarApiStripeAdapter\Jobs\Webhooks;
 
 use Dystcz\LunarApi\Domain\Orders\Events\OrderPaymentFailed;
-use Illuminate\Support\Facades\Config;
 
 class HandlePaymentIntentFailed extends WebhookHandler
 {
@@ -15,8 +14,7 @@ public function handle(): void
         $event = $this->constructStripeEvent();
         $paymentIntent = $this->getPaymentIntentFromEvent($event);
         $order = $this->findOrderByIntent($paymentIntent);
-
-        $paymentAdapter = $this->register->get(Config::get('lunar-api.stripe.driver', 'stripe'));
+        $paymentAdapter = $this->getPaymentAdapter();
 
         OrderPaymentFailed::dispatch($order, $paymentAdapter, $paymentIntent);
     }

diff --git a/src/Jobs/Webhooks/HandlePaymentIntentProcessing.php b/src/Jobs/Webhooks/HandlePaymentIntentProcessing.php
@@ -2,8 +2,6 @@
 
 namespace Dystcz\LunarApiStripeAdapter\Jobs\Webhooks;
 
-use Illuminate\Support\Facades\Config;
-
 class HandlePaymentIntentProcessing extends WebhookHandler
 {
     /**
@@ -14,7 +12,6 @@ public function handle(): void
         // $event = $this->constructStripeEvent();
         // $paymentIntent = $this->getPaymentIntentFromEvent($event);
         // $order = $this->findOrderByIntent($paymentIntent);
-        //
-        // $paymentAdapter = $this->register->get(Config::get('lunar-api.stripe.driver', 'stripe'));
+        // $paymentAdapter = $this->getPaymentAdapter();
     }
 }
diff --git a/src/Jobs/Webhooks/HandlePaymentIntentRequiresAction.php b/src/Jobs/Webhooks/HandlePaymentIntentRequiresAction.php
@@ -2,8 +2,6 @@
 
 namespace Dystcz\LunarApiStripeAdapter\Jobs\Webhooks;
 
-use Illuminate\Support\Facades\Config;
-
 class HandlePaymentIntentRequiresAction extends WebhookHandler
 {
     /**
@@ -14,7 +12,6 @@ public function handle(): void
         // $event = $this->constructStripeEvent();
         // $paymentIntent = $this->getPaymentIntentFromEvent($event);
         // $order = $this->findOrderByIntent($paymentIntent);
-        //
-        // $paymentAdapter = $this->register->get(Config::get('lunar-api.stripe.driver', 'stripe'));
+        // $paymentAdapter = $this->getPaymentAdapter();
     }
 }
diff --git a/src/Jobs/Webhooks/HandlePaymentIntentSucceeded.php b/src/Jobs/Webhooks/HandlePaymentIntentSucceeded.php
@@ -4,7 +4,6 @@
 
 use Dystcz\LunarApiStripeAdapter\Actions\AuthorizeStripePayment;
 use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Config;
 
 class HandlePaymentIntentSucceeded extends WebhookHandler
 {
@@ -17,8 +16,6 @@ public function handle(): void
         $paymentIntent = $this->getPaymentIntentFromEvent($event);
         $order = $this->findOrderByIntent($paymentIntent);
 
-        $paymentAdapter = $this->register->get(Config::get('lunar-api.stripe.driver', 'stripe'));
-
         App::make(AuthorizeStripePayment::class)($order, $order->cart, $paymentIntent);
     }
 }
diff --git a/src/Jobs/Webhooks/WebhookHandler.php b/src/Jobs/Webhooks/WebhookHandler.php
@@ -27,7 +27,6 @@ abstract class WebhookHandler implements ShouldQueue
 
     public function __construct(
         WebhookCall $webhookCall,
-        protected PaymentAdaptersRegister $register
     ) {
         $this->webhookCall = $webhookCall;
     }
@@ -64,7 +63,9 @@ protected function getPaymentIntentFromEvent(Event $event): PaymentIntentContrac
      */
     protected function getPaymentAdapter(): PaymentAdapter
     {
-        return $this->register->get(Config::get('lunar-api.stripe.driver', 'stripe'));
+        $register = App::make(PaymentAdaptersRegister::class);
+
+        return $register->get(Config::get('lunar-api.stripe.driver', 'stripe'));
     }
 
     /**