Bugfix: Do not process locked order to prevent timeouts

Author: michielgerritsen

Controller/Checkout/Webhook.php

@@ -16,6 +16,7 @@
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Mollie\Payment\Helper\General as MollieHelper;
 use Mollie\Payment\Model\Mollie as MollieModel;
+use Mollie\Payment\Service\OrderLockService;
 
 /**
  * Class Webhook
@@ -50,31 +51,27 @@ class Webhook extends Action
      * @var EncryptorInterface
      */
     private $encryptor;
-
     /**
-     * Webhook constructor.
-     *
-     * @param Context       $context
-     * @param Session       $checkoutSession
-     * @param MollieModel   $mollieModel
-     * @param MollieHelper  $mollieHelper
-     * @param OrderRepositoryInterface $orderRepository
-     * @param EncryptorInterface $encryptor
+     * @var OrderLockService
      */
+    private $orderLockService;
+
     public function __construct(
         Context $context,
         Session $checkoutSession,
         MollieModel $mollieModel,
         MollieHelper $mollieHelper,
         OrderRepositoryInterface $orderRepository,
-        EncryptorInterface $encryptor
+        EncryptorInterface $encryptor,
+        OrderLockService $orderLockService
     ) {
         $this->checkoutSession = $checkoutSession;
         $this->resultFactory = $context->getResultFactory();
         $this->mollieModel = $mollieModel;
         $this->mollieHelper = $mollieHelper;
         $this->orderRepository = $orderRepository;
         $this->encryptor = $encryptor;
+        $this->orderLockService = $orderLockService;
         parent::__construct($context);
     }
 
@@ -99,6 +96,14 @@ public function execute()
             }
 
             foreach ($orders as $order) {
+                // If this returns true, it means that the order is just created but did go straight to "paid".
+                // That can happen for Apple Pay and Credit Card. In that case, Mollie immediately sends a webhook,
+                // but we are not ready to process it yet.
+                if ($this->orderLockService->isLocked($order)) {
+                    $this->mollieHelper->addTolog('info', 'Order is locked, skipping webhook');
+                    continue;
+                }
+
                 $order->setMollieTransactionId($transactionId);
                 $this->mollieModel->processTransactionForOrder($order, 'webhook');
             }

Service/OrderLockService.php

@@ -45,7 +45,7 @@ public function __construct(
 
     public function execute(OrderInterface $order, callable $callback)
     {
-        $key = 'mollie.order.' . $order->getEntityId();
+        $key = $this->getKeyName($order);
         if ($this->lockService->checkIfIsLockedWithWait($key)) {
             throw new LocalizedException(__('Unable to get lock for %1', $key));
         }
@@ -85,4 +85,16 @@ public function execute(OrderInterface $order, callable $callback)
 
         return $result;
     }
+
+    public function isLocked(OrderInterface $order): bool
+    {
+        $key = $this->getKeyName($order);
+
+        return $this->lockService->isLocked($key);
+    }
+
+    private function getKeyName(OrderInterface $order): string
+    {
+        return 'mollie.order.' . $order->getEntityId();
+    }
 }