Merge pull request #172 from Invertus/lock-rebase

apply changes from branch SL-232/conflicting-calls.
Invertus · Jul 1, 2024 · 5cc5042 · 5cc5042
2 parents adb4c5d + ba49048
commit 5cc5042
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/controllers/front/notify.php b/controllers/front/notify.php
@@ -146,6 +146,7 @@ public function postProcess()
                 $orderStatusService->capture($order);
             }
         } catch (Exception $e) {
+            $this->releaseLock();
             // this might be executed after pending transaction is declined (e.g. with accountToAccount payment)
             if (!isset($order)) {
                 $orderId = $this->getOrderId($cartId);
@@ -176,6 +177,7 @@ public function postProcess()
                 null,
                 true
             );
+            $this->releaseLock();
             die($this->module->l($e->getMessage(), self::FILENAME));
         }
 

diff --git a/src/Controller/AbstractSaferPayController.php b/src/Controller/AbstractSaferPayController.php
@@ -42,7 +42,7 @@ class AbstractSaferPayController extends \ModuleFrontControllerCore
     /**
      * @var Lock
      */
-    private $lock;
+    protected $lock;
 
     public function __construct()
     {
@@ -82,11 +82,6 @@ protected function applyLock($resource)
             $this->lock->create($resource);
 
             if (!$this->lock->acquire()) {
-                $logger = new SaferPayLog();
-                $logger->message = 'Lock resource conflict';
-                $logger->payload = $resource;
-                $logger->save();
-
                 return Response::respond(
                     $this->module->l('Resource conflict', self::FILE_NAME),
                     Response::HTTP_CONFLICT
@@ -110,6 +105,15 @@ protected function applyLock($resource)
         );
     }
 
+    protected function lockExist()
+    {
+        try {
+            return $this->lock->acquire();
+        } catch (\Exception $exception) {
+            return false;
+        }
+    }
+
     protected function releaseLock()
     {
         try {