PAYOSWXP-105: improvements

PAYONE-GmbH · Feb 5, 2024 · 403ddf8 · 403ddf8
1 parent 9876097
commit 403ddf8
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 30 deletions.
diff --git a/src/PaymentHandler/AbstractAsynchronousPayonePaymentHandler.php b/src/PaymentHandler/AbstractAsynchronousPayonePaymentHandler.php
@@ -103,6 +103,13 @@ public function pay(
             $salesChannelContext
         );
 
+        $this->orderActionLogDataHandler->createOrderActionLog(
+            $transaction->getOrder(),
+            $request,
+            $response,
+            $salesChannelContext->getContext()
+        );
+
         if ($this->deviceFingerprintService instanceof AbstractDeviceFingerprintService) {
             $this->deviceFingerprintService->deleteDeviceIdentToken();
         }
@@ -147,12 +154,6 @@ protected function handleResponse(
         );
 
         $this->transactionDataHandler->saveTransactionData($paymentTransaction, $salesChannelContext->getContext(), $data);
-        $this->orderActionLogDataHandler->createOrderActionLog(
-            $transaction->getOrder(),
-            $request,
-            $response,
-            $salesChannelContext->getContext()
-        );
     }
 
     protected function getRedirectResponse(array $request, array $response): RedirectResponse

diff --git a/src/PaymentHandler/AbstractSynchronousPayonePaymentHandler.php b/src/PaymentHandler/AbstractSynchronousPayonePaymentHandler.php
@@ -99,6 +99,13 @@ public function pay(
             $salesChannelContext
         );
 
+        $this->orderActionLogDataHandler->createOrderActionLog(
+            $transaction->getOrder(),
+            $request,
+            $response,
+            $salesChannelContext->getContext()
+        );
+
         if ($this->deviceFingerprintService instanceof AbstractDeviceFingerprintService) {
             $this->deviceFingerprintService->deleteDeviceIdentToken();
         }
@@ -133,11 +140,5 @@ protected function handleResponse(
         );
 
         $this->transactionDataHandler->saveTransactionData($paymentTransaction, $salesChannelContext->getContext(), $data);
-        $this->orderActionLogDataHandler->createOrderActionLog(
-            $transaction->getOrder(),
-            $request,
-            $response,
-            $salesChannelContext->getContext()
-        );
     }
 }
diff --git a/src/PaymentHandler/PayoneApplePayPaymentHandler.php b/src/PaymentHandler/PayoneApplePayPaymentHandler.php
@@ -48,6 +48,7 @@ public function pay(
 
         $data = $this->preparePayoneOrderTransactionData($request, $response);
         $this->transactionDataHandler->saveTransactionData($paymentTransaction, $salesChannelContext->getContext(), $data);
+        // special case: the request has been already processed before the payment handler has been executed. Now we will log the previous request/response
         $this->orderActionLogDataHandler->createOrderActionLog(
             $transaction->getOrder(),
             $request,

diff --git a/src/PaymentHandler/PayoneCreditCardPaymentHandler.php b/src/PaymentHandler/PayoneCreditCardPaymentHandler.php
@@ -142,12 +142,6 @@ protected function handleResponse(
             ],
         ]);
         $this->transactionDataHandler->saveTransactionData($paymentTransaction, $salesChannelContext->getContext(), $data);
-        $this->orderActionLogDataHandler->createOrderActionLog(
-            $transaction->getOrder(),
-            $request,
-            $response,
-            $salesChannelContext->getContext()
-        );
 
         if ($paymentTransaction->getOrder()->getLineItems() !== null) {
             $this->setLineItemCustomFields($paymentTransaction->getOrder()->getLineItems(), $salesChannelContext->getContext());

diff --git a/src/PaymentHandler/PayonePaypalExpressPaymentHandler.php b/src/PaymentHandler/PayonePaypalExpressPaymentHandler.php
@@ -57,12 +57,6 @@ protected function handleResponse(
         ]);
 
         $this->transactionDataHandler->saveTransactionData($paymentTransaction, $salesChannelContext->getContext(), $data);
-        $this->orderActionLogDataHandler->createOrderActionLog(
-            $transaction->getOrder(),
-            $request,
-            $response,
-            $salesChannelContext->getContext()
-        );
     }
 
     protected function getRedirectResponse(array $request, array $response): RedirectResponse

diff --git a/src/PaymentHandler/PayonePaypalPaymentHandler.php b/src/PaymentHandler/PayonePaypalPaymentHandler.php
@@ -54,12 +54,6 @@ protected function handleResponse(
 
         $data = $this->preparePayoneOrderTransactionData($request, $response);
         $this->transactionDataHandler->saveTransactionData($paymentTransaction, $salesChannelContext->getContext(), $data);
-        $this->orderActionLogDataHandler->createOrderActionLog(
-            $transaction->getOrder(),
-            $request,
-            $response,
-            $salesChannelContext->getContext()
-        );
     }
 
     protected function getRedirectResponse(array $request, array $response): RedirectResponse

diff --git a/tests/PaymentHandler/PayoneApplePayPaymentHandlerTest.php b/tests/PaymentHandler/PayoneApplePayPaymentHandlerTest.php
@@ -0,0 +1,76 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PayonePayment\PaymentHandler;
+
+use PayonePayment\Components\Currency\CurrencyPrecision;
+use PayonePayment\Components\DataHandler\OrderActionLog\OrderActionLogDataHandlerInterface;
+use PayonePayment\Components\DataHandler\Transaction\TransactionDataHandler;
+use PayonePayment\Payone\Client\PayoneClient;
+use PayonePayment\Payone\RequestParameter\RequestParameterFactory;
+use PayonePayment\TestCaseBase\Mock\ConfigReaderMock;
+use PayonePayment\TestCaseBase\PayoneTestBehavior;
+use PHPUnit\Framework\TestCase;
+use Shopware\Core\Checkout\Payment\Cart\SyncPaymentTransactionStruct;
+use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
+use Shopware\Core\Framework\Validation\DataBag\RequestDataBag;
+
+/**
+ * @covers \PayonePayment\PaymentHandler\PayoneApplePayPaymentHandler
+ */
+class PayoneApplePayPaymentHandlerTest extends TestCase
+{
+    use PayoneTestBehavior;
+
+    public function testIfCreateOrderActionLogGotCalled(): void
+    {
+        $salesChannelContext = $this->createSalesChannelContextWithLoggedInCustomerAndWithNavigation();
+
+        $requestDataBag = new RequestDataBag(['response' => json_encode([
+            'status' => 'APPROVED',
+            'txid' => '123456789',
+            'userid' => '987654321',
+        ])]);
+
+        /** @var PayoneApplePayPaymentHandler $paymentHandler */
+        $paymentHandler = $this->getPaymentHandler($requestDataBag);
+
+        $paymentTransaction = $this->getPaymentTransaction(
+            $this->getRandomOrder($salesChannelContext),
+            PayoneApplePayPaymentHandler::class
+        );
+
+        $paymentHandler->pay(
+            new SyncPaymentTransactionStruct(
+                $paymentTransaction->getOrderTransaction(),
+                $paymentTransaction->getOrder()
+            ),
+            $requestDataBag,
+            $salesChannelContext
+        );
+
+        // info: assertion if the `createOrderActionLog` is called, is in the `getPaymentHandler`.
+    }
+
+    private function getPaymentHandler(RequestDataBag $dataBag): PayoneApplePayPaymentHandler
+    {
+        $configReader = new ConfigReaderMock([
+            'applePayAuthorizationMethod' => 'authorization',
+        ]);
+
+        $orderActionLogDataHandler = $this->createMock(OrderActionLogDataHandlerInterface::class);
+        $orderActionLogDataHandler->expects(static::once())->method('createOrderActionLog');
+
+        return new PayoneApplePayPaymentHandler(
+            $configReader,
+            $this->createMock(EntityRepository::class),
+            $this->getRequestStack($dataBag),
+            $this->createMock(PayoneClient::class),
+            $this->getContainer()->get('translator'),
+            new TransactionDataHandler($this->createMock(EntityRepository::class), new CurrencyPrecision()),
+            $orderActionLogDataHandler,
+            $this->createMock(RequestParameterFactory::class)
+        );
+    }
+}