Refactor PaymentService to use handler by unique name

damms005 · Oct 15, 2024 · dae5024 · dae5024
1 parent 4ec11bf
commit dae5024
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Http/Controllers/PaymentController.php b/src/Http/Controllers/PaymentController.php
@@ -59,9 +59,9 @@ public function sendToPaymentGateway(Request $request)
         }
 
         /** @var PaymentHandlerInterface */
-        $handler = app()->make(PaymentHandlerInterface::class);
+        $basePaymentHandler = PaymentService::getHandlerFqcn($payment->payment_processor_name);
 
-        return $handler->proceedToPaymentGateway($payment, route('payment.finished.callback_url'), true);
+        return $basePaymentHandler->proceedToPaymentGateway($payment, route('payment.finished.callback_url'), true);
     }
 
     public function handlePaymentGatewayResponse(Request $request)

diff --git a/src/Services/PaymentService.php b/src/Services/PaymentService.php
@@ -19,9 +19,9 @@ public static function storePaymentAndShowUserBeforeProcessing(?int $user_id, fl
         return $basePaymentHandler->storePaymentAndShowUserBeforeProcessing($user_id, $amount, $description, $currency, $transaction_reference, null, null, $view, $metadata);
     }
 
-    private static function getHandlerFqcn(string $uniqueName): BasePaymentHandler
+    public static function getHandlerFqcn(string $uniqueName): BasePaymentHandler
     {
-        $handler = BasePaymentHandler::getNamesOfPaymentHandlers()->filter(fn($name) => $name === $uniqueName);
+        $handler = BasePaymentHandler::getNamesOfPaymentHandlers()->filter(fn ($name) => $name === $uniqueName);
 
         if ($handler->isEmpty()) {
             throw new \Exception("No handler found with name '{$uniqueName}'");
@@ -32,7 +32,7 @@ private static function getHandlerFqcn(string $uniqueName): BasePaymentHandler
         }
 
         return $handler
-            ->map(fn($name, $key) => new $key)
+            ->map(fn ($name, $key) => new $key())
             ->sole();
     }