From 3f4c269bb2937613fc5a266ac1cc8c22c26f33f8 Mon Sep 17 00:00:00 2001
From: Jacob Tobiasz <jakub.tobiasz@icloud.com>
Date: Tue, 26 Nov 2024 18:51:18 +0100
Subject: [PATCH] Move all `Apple Pay`-related services under the
 `ApplePayPayment` namespace

---
 config/routes_webhook.php                     |  2 +-
 config/services.php                           |  5 +-
 config/services/api/command.php               |  2 +-
 .../services/apple_pay_payment/controller.php | 18 +++++
 .../apple_pay_payment/payum/action.php        |  4 +-
 .../apple_pay_payment/payum/factory.php       |  6 ++
 config/services/controller.php                | 10 +--
 config/services/payum/factory.php             |  6 --
 config/services/refunding.php                 |  1 -
 config/validation/Pay.xml                     |  4 +-
 .../InitializeApplePaySessionHandler.php      |  2 +-
 .../Controller/InitApplePayPaymentAction.php  |  7 +-
 .../CreateApplePayTransactionAction.php       |  3 +-
 .../InitializeApplePayPaymentAction.php       |  5 +-
 .../InitializeApplePayPaymentFactory.php      |  4 +-
 ...tializeApplePayPaymentFactoryInterface.php |  4 +-
 .../Request}/InitializeApplePayPayment.php    |  2 +-
 src/Refunding/Dispatcher/RefundDispatcher.php | 18 ++++-
 .../InitializeApplePaySessionHandlerTest.php  |  4 +-
 .../CreateApplePayTransactionActionTest.php   |  4 +-
 .../InitializeApplePayPaymentActionTest.php   |  6 +-
 .../InitializeApplePayPaymentFactoryTest.php  |  8 +--
 .../Dispatcher/RefundDispatcherTest.php       | 65 +++++++++++++++----
 23 files changed, 130 insertions(+), 60 deletions(-)
 create mode 100644 config/services/apple_pay_payment/controller.php
 rename src/{ => ApplePayPayment}/Controller/InitApplePayPaymentAction.php (84%)
 rename src/{Payum/Action/Api => ApplePayPayment/Payum/Action}/CreateApplePayTransactionAction.php (95%)
 rename src/{Payum/Action/Api => ApplePayPayment/Payum/Action}/InitializeApplePayPaymentAction.php (87%)
 rename src/{ => ApplePayPayment}/Payum/Factory/InitializeApplePayPaymentFactory.php (74%)
 rename src/{ => ApplePayPayment}/Payum/Factory/InitializeApplePayPaymentFactoryInterface.php (67%)
 rename src/{Payum/Request/Api => ApplePayPayment/Payum/Request}/InitializeApplePayPayment.php (89%)
 rename tests/Unit/{Payum/Action/Api => ApplePayPayment/Payum/Action}/CreateApplePayTransactionActionTest.php (98%)
 rename tests/Unit/{Payum/Action/Api => ApplePayPayment/Payum/Action}/InitializeApplePayPaymentActionTest.php (95%)
 rename tests/Unit/{ => ApplePayPayment}/Payum/Factory/InitializeApplePayPaymentFactoryTest.php (75%)

diff --git a/config/routes_webhook.php b/config/routes_webhook.php
index d10a8d86..37f437c7 100644
--- a/config/routes_webhook.php
+++ b/config/routes_webhook.php
@@ -4,7 +4,7 @@
 
 namespace Symfony\Component\Routing\Loader\Configurator;
 
-use CommerceWeavers\SyliusTpayPlugin\Controller\InitApplePayPaymentAction;
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Controller\InitApplePayPaymentAction;
 use CommerceWeavers\SyliusTpayPlugin\Controller\PaymentNotificationAction;
 use CommerceWeavers\SyliusTpayPlugin\Controller\TpayNotificationAction;
 use CommerceWeavers\SyliusTpayPlugin\Routing;
diff --git a/config/services.php b/config/services.php
index b84b43b5..c927c1a8 100644
--- a/config/services.php
+++ b/config/services.php
@@ -4,6 +4,7 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Factory\GatewayFactory;
 use Payum\Core\Gateway;
 
 return function(ContainerConfigurator $container): void {
@@ -11,8 +12,8 @@
 
     $services = $container->services();
 
-    $services->set('commerce_weavers_sylius_tpay.gateway', Gateway::class)
+    $services->set('commerce_weavers_sylius_tpay.apple_pay_gateway', Gateway::class)
         ->factory([service('payum'), 'getGateway'])
-        ->args(['tpay'])
+        ->args([GatewayFactory::NAME])
     ;
 };
diff --git a/config/services/api/command.php b/config/services/api/command.php
index 0d6c0047..cfc6c3a9 100644
--- a/config/services/api/command.php
+++ b/config/services/api/command.php
@@ -50,7 +50,7 @@
         ->args([
             service('sylius.repository.order'),
             service('sylius.repository.payment'),
-            service('commerce_weavers_sylius_tpay.gateway'),
+            service('commerce_weavers_sylius_tpay.apple_pay_gateway'),
             service('commerce_weavers_sylius_tpay.payum.factory.initialize_apple_pay_payment'),
         ])
         ->tag('messenger.message_handler')
diff --git a/config/services/apple_pay_payment/controller.php b/config/services/apple_pay_payment/controller.php
new file mode 100644
index 00000000..c13e3308
--- /dev/null
+++ b/config/services/apple_pay_payment/controller.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Controller\InitApplePayPaymentAction;
+
+return function(ContainerConfigurator $container): void {
+    $services = $container->services();
+
+    $services->set(InitApplePayPaymentAction::class)
+        ->args([
+            service('payum'),
+        ])
+        ->tag('controller.service_arguments')
+    ;
+};
diff --git a/config/services/apple_pay_payment/payum/action.php b/config/services/apple_pay_payment/payum/action.php
index 493d52f3..3650e959 100644
--- a/config/services/apple_pay_payment/payum/action.php
+++ b/config/services/apple_pay_payment/payum/action.php
@@ -4,9 +4,9 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Action\CreateApplePayTransactionAction;
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Action\InitializeApplePayPaymentAction;
 use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Factory\GatewayFactory as ApplePayGatewayFactory;
-use CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api\CreateApplePayTransactionAction;
-use CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api\InitializeApplePayPaymentAction;
 
 return function(ContainerConfigurator $container): void {
     $services = $container->services();
diff --git a/config/services/apple_pay_payment/payum/factory.php b/config/services/apple_pay_payment/payum/factory.php
index 4161992b..3454cb30 100644
--- a/config/services/apple_pay_payment/payum/factory.php
+++ b/config/services/apple_pay_payment/payum/factory.php
@@ -5,6 +5,8 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Factory\GatewayFactory;
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Factory\InitializeApplePayPaymentFactory;
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Factory\InitializeApplePayPaymentFactoryInterface;
 use Payum\Core\Bridge\Symfony\Builder\GatewayFactoryBuilder;
 
 return function(ContainerConfigurator $container): void {
@@ -16,4 +18,8 @@
         ])
         ->tag('payum.gateway_factory_builder', ['factory' => GatewayFactory::NAME])
     ;
+
+    $services->set('commerce_weavers_sylius_tpay.payum.factory.initialize_apple_pay_payment', InitializeApplePayPaymentFactory::class)
+        ->alias(InitializeApplePayPaymentFactoryInterface::class, 'commerce_weavers_sylius_tpay.payum.factory.initialize_apple_pay_payment')
+    ;
 };
diff --git a/config/services/controller.php b/config/services/controller.php
index 66ffaea4..b37f1a80 100644
--- a/config/services/controller.php
+++ b/config/services/controller.php
@@ -8,9 +8,8 @@
 use CommerceWeavers\SyliusTpayPlugin\Controller\DisplayThankYouPageAction;
 use CommerceWeavers\SyliusTpayPlugin\Controller\DisplayWaitingForPaymentPage;
 use CommerceWeavers\SyliusTpayPlugin\Controller\PaymentNotificationAction;
-use CommerceWeavers\SyliusTpayPlugin\Controller\InitApplePayPaymentAction;
-use CommerceWeavers\SyliusTpayPlugin\Controller\TpayNotificationAction;
 use CommerceWeavers\SyliusTpayPlugin\Controller\RetryPaymentAction;
+use CommerceWeavers\SyliusTpayPlugin\Controller\TpayNotificationAction;
 
 return function(ContainerConfigurator $container): void {
     $services = $container->services();
@@ -42,13 +41,6 @@
         ->tag('controller.service_arguments')
     ;
 
-    $services->set(InitApplePayPaymentAction::class)
-        ->args([
-            service('payum'),
-        ])
-        ->tag('controller.service_arguments')
-    ;
-
     $services->set(PaymentNotificationAction::class)
         ->args([
             service('payum'),
diff --git a/config/services/payum/factory.php b/config/services/payum/factory.php
index 0466c94e..3670d449 100644
--- a/config/services/payum/factory.php
+++ b/config/services/payum/factory.php
@@ -6,8 +6,6 @@
 
 use CommerceWeavers\SyliusTpayPlugin\Payum\Factory\CreateTransactionFactory;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Factory\CreateTransactionFactoryInterface;
-use CommerceWeavers\SyliusTpayPlugin\Payum\Factory\InitializeApplePayPaymentFactory;
-use CommerceWeavers\SyliusTpayPlugin\Payum\Factory\InitializeApplePayPaymentFactoryInterface;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Factory\NotifyDataFactory;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Factory\NotifyDataFactoryInterface;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Factory\NotifyFactory;
@@ -35,10 +33,6 @@
         ->alias(CreateTransactionFactoryInterface::class, 'commerce_weavers_sylius_tpay.payum.factory.create_transaction')
     ;
 
-    $services->set('commerce_weavers_sylius_tpay.payum.factory.initialize_apple_pay_payment', InitializeApplePayPaymentFactory::class)
-        ->alias(InitializeApplePayPaymentFactoryInterface::class, 'commerce_weavers_sylius_tpay.payum.factory.initialize_apple_pay_payment')
-    ;
-
     $services->set('commerce_weavers_sylius_tpay.payum.factory.notify_data', NotifyDataFactory::class)
         ->alias(NotifyDataFactoryInterface::class, 'commerce_weavers_sylius_tpay.payum.factory.notify_data')
     ;
diff --git a/config/services/refunding.php b/config/services/refunding.php
index 6f4032c5..4c68b560 100644
--- a/config/services/refunding.php
+++ b/config/services/refunding.php
@@ -21,7 +21,6 @@
     $services->set('commerce_weavers_sylius_tpay.refunding.dispatcher.refund', RefundDispatcher::class)
         ->public()
         ->args([
-            service('commerce_weavers_sylius_tpay.gateway'),
             service('commerce_weavers_sylius_tpay.refunding.checker.refund_plugin_availability'),
         ])
         ->alias(RefundDispatcherInterface::class, 'commerce_weavers_sylius_tpay.refunding.dispatcher.refund')
diff --git a/config/validation/Pay.xml b/config/validation/Pay.xml
index 2fbf601e..4c96a100 100644
--- a/config/validation/Pay.xml
+++ b/config/validation/Pay.xml
@@ -24,8 +24,8 @@
             </option>
         </constraint>
         <property name="applePayToken">
-            <constraint name="CommerceWeavers\SyliusTpayPlugin\Api\Validator\Constraint\NotBlankIfGatewayConfigTypeEquals">
-                <option name="paymentMethodType">apple_pay</option>
+            <constraint name="CommerceWeavers\SyliusTpayPlugin\Api\Validator\Constraint\NotBlankIfGatewayNameEquals">
+                <option name="gatewayName">tpay_apple_pay</option>
                 <option name="fieldRequiredErrorMessage">commerce_weavers_sylius_tpay.shop.pay.apple_pay_token.required</option>
                 <option name="groups">
                     <value>commerce_weavers_sylius_tpay:shop:order:pay</value>
diff --git a/src/Api/Command/InitializeApplePaySessionHandler.php b/src/Api/Command/InitializeApplePaySessionHandler.php
index 0598a0f6..ad0480c7 100644
--- a/src/Api/Command/InitializeApplePaySessionHandler.php
+++ b/src/Api/Command/InitializeApplePaySessionHandler.php
@@ -6,8 +6,8 @@
 
 use CommerceWeavers\SyliusTpayPlugin\Api\Command\Exception\OrderCannotBeFoundException;
 use CommerceWeavers\SyliusTpayPlugin\Api\Command\Exception\PaymentCannotBeFoundException;
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Factory\InitializeApplePayPaymentFactoryInterface;
 use CommerceWeavers\SyliusTpayPlugin\Model\PaymentDetails;
-use CommerceWeavers\SyliusTpayPlugin\Payum\Factory\InitializeApplePayPaymentFactoryInterface;
 use Payum\Core\GatewayInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
diff --git a/src/Controller/InitApplePayPaymentAction.php b/src/ApplePayPayment/Controller/InitApplePayPaymentAction.php
similarity index 84%
rename from src/Controller/InitApplePayPaymentAction.php
rename to src/ApplePayPayment/Controller/InitApplePayPaymentAction.php
index f96d7f77..3325b30e 100644
--- a/src/Controller/InitApplePayPaymentAction.php
+++ b/src/ApplePayPayment/Controller/InitApplePayPaymentAction.php
@@ -2,10 +2,11 @@
 
 declare(strict_types=1);
 
-namespace CommerceWeavers\SyliusTpayPlugin\Controller;
+namespace CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Controller;
 
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Factory\GatewayFactory;
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Request\InitializeApplePayPayment;
 use CommerceWeavers\SyliusTpayPlugin\Model\PaymentDetails;
-use CommerceWeavers\SyliusTpayPlugin\Payum\Request\Api\InitializeApplePayPayment;
 use Payum\Core\GatewayInterface;
 use Payum\Core\Payum;
 use Sylius\Component\Core\Model\OrderInterface;
@@ -53,6 +54,6 @@ public function __invoke(Request $request): Response
 
     private function getGateway(): GatewayInterface
     {
-        return $this->payum->getGateway('tpay');
+        return $this->payum->getGateway(GatewayFactory::NAME);
     }
 }
diff --git a/src/Payum/Action/Api/CreateApplePayTransactionAction.php b/src/ApplePayPayment/Payum/Action/CreateApplePayTransactionAction.php
similarity index 95%
rename from src/Payum/Action/Api/CreateApplePayTransactionAction.php
rename to src/ApplePayPayment/Payum/Action/CreateApplePayTransactionAction.php
index b16bf511..42f3219c 100644
--- a/src/Payum/Action/Api/CreateApplePayTransactionAction.php
+++ b/src/ApplePayPayment/Payum/Action/CreateApplePayTransactionAction.php
@@ -2,9 +2,10 @@
 
 declare(strict_types=1);
 
-namespace CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api;
+namespace CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Action;
 
 use CommerceWeavers\SyliusTpayPlugin\Model\PaymentDetails;
+use CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api\BasePaymentAwareAction;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Factory\Token\NotifyTokenFactoryInterface;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Request\Api\CreateTransaction;
 use CommerceWeavers\SyliusTpayPlugin\Tpay\Factory\CreateApplePayPaymentPayloadFactoryInterface;
diff --git a/src/Payum/Action/Api/InitializeApplePayPaymentAction.php b/src/ApplePayPayment/Payum/Action/InitializeApplePayPaymentAction.php
similarity index 87%
rename from src/Payum/Action/Api/InitializeApplePayPaymentAction.php
rename to src/ApplePayPayment/Payum/Action/InitializeApplePayPaymentAction.php
index 9818e8a1..21e70e8f 100644
--- a/src/Payum/Action/Api/InitializeApplePayPaymentAction.php
+++ b/src/ApplePayPayment/Payum/Action/InitializeApplePayPaymentAction.php
@@ -2,10 +2,11 @@
 
 declare(strict_types=1);
 
-namespace CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api;
+namespace CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Action;
 
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Request\InitializeApplePayPayment;
 use CommerceWeavers\SyliusTpayPlugin\Model\PaymentDetails;
-use CommerceWeavers\SyliusTpayPlugin\Payum\Request\Api\InitializeApplePayPayment;
+use CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api\BasePaymentAwareAction;
 use CommerceWeavers\SyliusTpayPlugin\Tpay\Factory\CreateInitializeApplePayPaymentPayloadFactoryInterface;
 use Payum\Core\Bridge\Spl\ArrayObject;
 use Payum\Core\Request\Generic;
diff --git a/src/Payum/Factory/InitializeApplePayPaymentFactory.php b/src/ApplePayPayment/Payum/Factory/InitializeApplePayPaymentFactory.php
similarity index 74%
rename from src/Payum/Factory/InitializeApplePayPaymentFactory.php
rename to src/ApplePayPayment/Payum/Factory/InitializeApplePayPaymentFactory.php
index b88921e7..c8b4c5ca 100644
--- a/src/Payum/Factory/InitializeApplePayPaymentFactory.php
+++ b/src/ApplePayPayment/Payum/Factory/InitializeApplePayPaymentFactory.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace CommerceWeavers\SyliusTpayPlugin\Payum\Factory;
+namespace CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Factory;
 
-use CommerceWeavers\SyliusTpayPlugin\Payum\Request\Api\InitializeApplePayPayment;
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Request\InitializeApplePayPayment;
 use Sylius\Component\Core\Model\PaymentInterface;
 
 final class InitializeApplePayPaymentFactory implements InitializeApplePayPaymentFactoryInterface
diff --git a/src/Payum/Factory/InitializeApplePayPaymentFactoryInterface.php b/src/ApplePayPayment/Payum/Factory/InitializeApplePayPaymentFactoryInterface.php
similarity index 67%
rename from src/Payum/Factory/InitializeApplePayPaymentFactoryInterface.php
rename to src/ApplePayPayment/Payum/Factory/InitializeApplePayPaymentFactoryInterface.php
index a181e194..115bc175 100644
--- a/src/Payum/Factory/InitializeApplePayPaymentFactoryInterface.php
+++ b/src/ApplePayPayment/Payum/Factory/InitializeApplePayPaymentFactoryInterface.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace CommerceWeavers\SyliusTpayPlugin\Payum\Factory;
+namespace CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Factory;
 
-use CommerceWeavers\SyliusTpayPlugin\Payum\Request\Api\InitializeApplePayPayment;
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Request\InitializeApplePayPayment;
 use Sylius\Component\Core\Model\PaymentInterface;
 
 interface InitializeApplePayPaymentFactoryInterface
diff --git a/src/Payum/Request/Api/InitializeApplePayPayment.php b/src/ApplePayPayment/Payum/Request/InitializeApplePayPayment.php
similarity index 89%
rename from src/Payum/Request/Api/InitializeApplePayPayment.php
rename to src/ApplePayPayment/Payum/Request/InitializeApplePayPayment.php
index ac2f5ea4..af48a4b5 100644
--- a/src/Payum/Request/Api/InitializeApplePayPayment.php
+++ b/src/ApplePayPayment/Payum/Request/InitializeApplePayPayment.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace CommerceWeavers\SyliusTpayPlugin\Payum\Request\Api;
+namespace CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Request;
 
 use Payum\Core\Request\Generic;
 
diff --git a/src/Refunding/Dispatcher/RefundDispatcher.php b/src/Refunding/Dispatcher/RefundDispatcher.php
index 9e95cd28..caa1507b 100644
--- a/src/Refunding/Dispatcher/RefundDispatcher.php
+++ b/src/Refunding/Dispatcher/RefundDispatcher.php
@@ -6,14 +6,17 @@
 
 use CommerceWeavers\SyliusTpayPlugin\Refunding\Checker\RefundPluginAvailabilityCheckerInterface;
 use Payum\Core\GatewayInterface;
+use Payum\Core\Payum;
 use Payum\Core\Request\Refund;
 use Sylius\Component\Core\Model\PaymentInterface;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\RefundPlugin\Entity\RefundPaymentInterface;
+use Webmozart\Assert\Assert;
 
 final class RefundDispatcher implements RefundDispatcherInterface
 {
     public function __construct(
-        private readonly GatewayInterface $gateway,
+        private readonly Payum $payum,
         private readonly RefundPluginAvailabilityCheckerInterface $refundPluginAvailabilityChecker,
     ) {
     }
@@ -24,7 +27,7 @@ public function dispatch(PaymentInterface|RefundPaymentInterface $payment): void
             return;
         }
 
-        $this->gateway->execute(new Refund($payment));
+        $this->getGateway($payment)->execute(new Refund($payment));
     }
 
     private function checkIfShouldBeDispatched(PaymentInterface|RefundPaymentInterface $payment): bool
@@ -35,4 +38,15 @@ private function checkIfShouldBeDispatched(PaymentInterface|RefundPaymentInterfa
 
         return (!$isRefundPaymentAvailable && $isPayment) || ($isRefundPaymentAvailable && $isRefundPayment);
     }
+
+    private function getGateway(PaymentInterface|RefundPaymentInterface $payment): GatewayInterface
+    {
+        /** @var PaymentMethodInterface|null $paymentMethod */
+        $paymentMethod = $payment instanceof PaymentInterface ? $payment->getMethod() : $payment->getPaymentMethod();
+        $gatewayName = $paymentMethod?->getGatewayConfig()?->getGatewayName();
+
+        Assert::notNull($gatewayName);
+
+        return $this->payum->getGateway($gatewayName);
+    }
 }
diff --git a/tests/Unit/Api/Command/InitializeApplePaySessionHandlerTest.php b/tests/Unit/Api/Command/InitializeApplePaySessionHandlerTest.php
index e587e677..8b3ba4ca 100644
--- a/tests/Unit/Api/Command/InitializeApplePaySessionHandlerTest.php
+++ b/tests/Unit/Api/Command/InitializeApplePaySessionHandlerTest.php
@@ -8,8 +8,8 @@
 use CommerceWeavers\SyliusTpayPlugin\Api\Command\Exception\PaymentCannotBeFoundException;
 use CommerceWeavers\SyliusTpayPlugin\Api\Command\InitializeApplePaySession;
 use CommerceWeavers\SyliusTpayPlugin\Api\Command\InitializeApplePaySessionHandler;
-use CommerceWeavers\SyliusTpayPlugin\Payum\Factory\InitializeApplePayPaymentFactoryInterface;
-use CommerceWeavers\SyliusTpayPlugin\Payum\Request\Api\InitializeApplePayPayment;
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Factory\InitializeApplePayPaymentFactoryInterface;
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Request\InitializeApplePayPayment;
 use Payum\Core\GatewayInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
diff --git a/tests/Unit/Payum/Action/Api/CreateApplePayTransactionActionTest.php b/tests/Unit/ApplePayPayment/Payum/Action/CreateApplePayTransactionActionTest.php
similarity index 98%
rename from tests/Unit/Payum/Action/Api/CreateApplePayTransactionActionTest.php
rename to tests/Unit/ApplePayPayment/Payum/Action/CreateApplePayTransactionActionTest.php
index d2a3d722..4847cd25 100644
--- a/tests/Unit/Payum/Action/Api/CreateApplePayTransactionActionTest.php
+++ b/tests/Unit/ApplePayPayment/Payum/Action/CreateApplePayTransactionActionTest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\CommerceWeavers\SyliusTpayPlugin\Unit\Payum\Action\Api;
+namespace Tests\CommerceWeavers\SyliusTpayPlugin\Unit\ApplePayPayment\Payum\Action;
 
-use CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api\CreateApplePayTransactionAction;
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Action\CreateApplePayTransactionAction;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Factory\Token\NotifyTokenFactoryInterface;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Request\Api\CreateTransaction;
 use CommerceWeavers\SyliusTpayPlugin\Tpay\Factory\CreateApplePayPaymentPayloadFactoryInterface;
diff --git a/tests/Unit/Payum/Action/Api/InitializeApplePayPaymentActionTest.php b/tests/Unit/ApplePayPayment/Payum/Action/InitializeApplePayPaymentActionTest.php
similarity index 95%
rename from tests/Unit/Payum/Action/Api/InitializeApplePayPaymentActionTest.php
rename to tests/Unit/ApplePayPayment/Payum/Action/InitializeApplePayPaymentActionTest.php
index 38c3df3d..1c24d2dc 100644
--- a/tests/Unit/Payum/Action/Api/InitializeApplePayPaymentActionTest.php
+++ b/tests/Unit/ApplePayPayment/Payum/Action/InitializeApplePayPaymentActionTest.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Tests\CommerceWeavers\SyliusTpayPlugin\Unit\Payum\Action\Api;
+namespace Tests\CommerceWeavers\SyliusTpayPlugin\Unit\ApplePayPayment\Payum\Action;
 
-use CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api\InitializeApplePayPaymentAction;
-use CommerceWeavers\SyliusTpayPlugin\Payum\Request\Api\InitializeApplePayPayment;
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Action\InitializeApplePayPaymentAction;
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Request\InitializeApplePayPayment;
 use CommerceWeavers\SyliusTpayPlugin\Tpay\ApplePayApi;
 use CommerceWeavers\SyliusTpayPlugin\Tpay\Factory\CreateInitializeApplePayPaymentPayloadFactoryInterface;
 use CommerceWeavers\SyliusTpayPlugin\Tpay\TpayApi;
diff --git a/tests/Unit/Payum/Factory/InitializeApplePayPaymentFactoryTest.php b/tests/Unit/ApplePayPayment/Payum/Factory/InitializeApplePayPaymentFactoryTest.php
similarity index 75%
rename from tests/Unit/Payum/Factory/InitializeApplePayPaymentFactoryTest.php
rename to tests/Unit/ApplePayPayment/Payum/Factory/InitializeApplePayPaymentFactoryTest.php
index a5688d2f..afa6ba22 100644
--- a/tests/Unit/Payum/Factory/InitializeApplePayPaymentFactoryTest.php
+++ b/tests/Unit/ApplePayPayment/Payum/Factory/InitializeApplePayPaymentFactoryTest.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Tests\CommerceWeavers\SyliusTpayPlugin\Unit\Payum\Factory;
+namespace Tests\CommerceWeavers\SyliusTpayPlugin\Unit\ApplePayPayment\Payum\Factory;
 
-use CommerceWeavers\SyliusTpayPlugin\Payum\Factory\InitializeApplePayPaymentFactory;
-use CommerceWeavers\SyliusTpayPlugin\Payum\Factory\InitializeApplePayPaymentFactoryInterface;
-use CommerceWeavers\SyliusTpayPlugin\Payum\Request\Api\InitializeApplePayPayment;
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Factory\InitializeApplePayPaymentFactory;
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Factory\InitializeApplePayPaymentFactoryInterface;
+use CommerceWeavers\SyliusTpayPlugin\ApplePayPayment\Payum\Request\InitializeApplePayPayment;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Sylius\Component\Core\Model\PaymentInterface;
diff --git a/tests/Unit/Refunding/Dispatcher/RefundDispatcherTest.php b/tests/Unit/Refunding/Dispatcher/RefundDispatcherTest.php
index 3b700170..38c63ad2 100644
--- a/tests/Unit/Refunding/Dispatcher/RefundDispatcherTest.php
+++ b/tests/Unit/Refunding/Dispatcher/RefundDispatcherTest.php
@@ -8,34 +8,39 @@
 use CommerceWeavers\SyliusTpayPlugin\Refunding\Dispatcher\RefundDispatcher;
 use CommerceWeavers\SyliusTpayPlugin\Refunding\Dispatcher\RefundDispatcherInterface;
 use Payum\Core\GatewayInterface;
+use Payum\Core\Payum;
 use Payum\Core\Request\Refund;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
+use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\RefundPlugin\Entity\RefundPaymentInterface;
 
 final class RefundDispatcherTest extends TestCase
 {
     use ProphecyTrait;
 
-    private GatewayInterface|ObjectProphecy $gateway;
+    private Payum|ObjectProphecy $payum;
 
     private RefundPluginAvailabilityCheckerInterface|ObjectProphecy $refundPluginAvailabilityChecker;
 
     protected function setUp(): void
     {
-        $this->gateway = $this->prophesize(GatewayInterface::class);
+        $this->payum = $this->prophesize(Payum::class);
         $this->refundPluginAvailabilityChecker = $this->prophesize(RefundPluginAvailabilityCheckerInterface::class);
     }
 
     public function test_it_executes_a_refund_request_with_payment_if_plugin_is_not_available(): void
     {
         $this->refundPluginAvailabilityChecker->isAvailable()->willReturn(false);
-        $payment = $this->prophesize(PaymentInterface::class);
+        $payment = $this->createPayment();
+
+        $this->payum->getGateway('tpay')->willReturn($gateway = $this->prophesize(GatewayInterface::class));
 
-        $this->gateway->execute(Argument::that(function (Refund $refund) use ($payment): bool {
+        $gateway->execute(Argument::that(function (Refund $refund) use ($payment): bool {
             return $refund->getModel() === $payment->reveal();
         }))->shouldBeCalled();
 
@@ -45,9 +50,11 @@ public function test_it_executes_a_refund_request_with_payment_if_plugin_is_not_
     public function test_it_does_nothing_if_payment_is_passed_and_plugin_is_available(): void
     {
         $this->refundPluginAvailabilityChecker->isAvailable()->willReturn(true);
-        $payment = $this->prophesize(PaymentInterface::class);
+        $payment = $this->createPayment();
 
-        $this->gateway->execute(Argument::any())->shouldNotBeCalled();
+        $this->payum->getGateway('tpay')->willReturn($gateway = $this->prophesize(GatewayInterface::class));
+
+        $gateway->execute(Argument::any())->shouldNotBeCalled();
 
         $this->createTestSubject()->dispatch($payment->reveal());
     }
@@ -55,9 +62,11 @@ public function test_it_does_nothing_if_payment_is_passed_and_plugin_is_availabl
     public function test_it_executes_a_refund_request_with_refund_payment_if_plugin_is_available(): void
     {
         $this->refundPluginAvailabilityChecker->isAvailable()->willReturn(true);
-        $refundPayment = $this->prophesize(RefundPaymentInterface::class);
+        $refundPayment = $this->createRefundPayment();
+
+        $this->payum->getGateway('tpay')->willReturn($gateway = $this->prophesize(GatewayInterface::class));
 
-        $this->gateway->execute(Argument::that(function (Refund $refund) use ($refundPayment): bool {
+        $gateway->execute(Argument::that(function (Refund $refund) use ($refundPayment): bool {
             return $refund->getModel() === $refundPayment->reveal();
         }))->shouldBeCalled();
 
@@ -67,17 +76,51 @@ public function test_it_executes_a_refund_request_with_refund_payment_if_plugin_
     public function test_it_does_nothing_if_refund_payment_is_passed_and_plugin_is_not_available(): void
     {
         $this->refundPluginAvailabilityChecker->isAvailable()->willReturn(false);
-        $refundPayment = $this->prophesize(RefundPaymentInterface::class);
+        $refundPayment = $this->createRefundPayment();
+
+        $this->payum->getGateway('tpay')->willReturn($gateway = $this->prophesize(GatewayInterface::class));
 
-        $this->gateway->execute(Argument::any())->shouldNotBeCalled();
+        $gateway->execute(Argument::any())->shouldNotBeCalled();
 
         $this->createTestSubject()->dispatch($refundPayment->reveal());
     }
 
+    private function createPayment(): PaymentInterface|ObjectProphecy
+    {
+        $gatewayName = 'tpay';
+
+        $gatewayConfig = $this->prophesize(GatewayConfigInterface::class);
+        $gatewayConfig->getGatewayName()->willReturn($gatewayName);
+
+        $paymentMethod = $this->prophesize(PaymentMethodInterface::class);
+        $paymentMethod->getGatewayConfig()->willReturn($gatewayConfig);
+
+        $payment = $this->prophesize(PaymentInterface::class);
+        $payment->getMethod()->willReturn($paymentMethod);
+
+        return $payment;
+    }
+
+    private function createRefundPayment(): RefundPaymentInterface|ObjectProphecy
+    {
+        $gatewayName = 'tpay';
+
+        $gatewayConfig = $this->prophesize(GatewayConfigInterface::class);
+        $gatewayConfig->getGatewayName()->willReturn($gatewayName);
+
+        $paymentMethod = $this->prophesize(PaymentMethodInterface::class);
+        $paymentMethod->getGatewayConfig()->willReturn($gatewayConfig);
+
+        $refundPayment = $this->prophesize(RefundPaymentInterface::class);
+        $refundPayment->getPaymentMethod()->willReturn($paymentMethod);
+
+        return $refundPayment;
+    }
+
     private function createTestSubject(): RefundDispatcherInterface
     {
         return new RefundDispatcher(
-            $this->gateway->reveal(),
+            $this->payum->reveal(),
             $this->refundPluginAvailabilityChecker->reveal(),
         );
     }