PLGMAG2V2-494: Fixed an issue with the timing of request timeouts for incoming notifications (#522)

* PLGMAG2V2-494: Fix issue with request timeouts

* Remove double status history comment

Author: vinodsowdagar

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Fixed an issue with the timing of request timeouts for incoming notifications
 
 ## [2.15.1] - 2022-05-10
 ### Fixed

Service/Order/ProcessOrderByTransactionStatus.php

@@ -17,6 +17,8 @@
 
 namespace MultiSafepay\ConnectCore\Service\Order;
 
+use Exception;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 use Magento\Sales\Model\Order;
@@ -148,7 +150,6 @@ public function execute(
             case TransactionStatus::DECLINED:
             case TransactionStatus::CANCELLED:
             case TransactionStatus::VOID:
-                usleep(5000000);
                 $updateOrderStatus = true;
                 $this->cancelOrder($order, $transactionStatusMessage);
                 break;
@@ -228,13 +229,20 @@ private function completeOrderTransaction(
     }
 
     /**
+     * Cancel the order if it is not already canceled
+     *
      * @param OrderInterface $order
      * @param string $transactionStatusMessage
+     * @throws LocalizedException
+     * @throws Exception
      */
     private function cancelOrder(OrderInterface $order, string $transactionStatusMessage): void
     {
+        if ($order->getState() === Order::STATE_CANCELED) {
+            return;
+        }
+
         $order->cancel();
-        $order->addCommentToStatusHistory($transactionStatusMessage);
         $this->logger->logInfoForOrder(
             $order->getIncrementId(),
             'Order has been canceled. ' . $transactionStatusMessage