only capture payment in notify action

Author: solverat

Action/CaptureAction.php

@@ -18,7 +18,6 @@
 use Payum\Core\Security\GenericTokenFactoryAwareInterface;
 use DachcomDigital\Payum\Saferpay\Api;
 use DachcomDigital\Payum\Saferpay\Request\Api\CreateTransaction;
-use DachcomDigital\Payum\Saferpay\Request\Api\CapturePayment;
 
 class CaptureAction implements ActionInterface, ApiAwareInterface, GatewayAwareInterface, GenericTokenFactoryAwareInterface
 {
@@ -91,23 +90,9 @@ public function execute($request)
             $this->gateway->execute(new CreateTransaction($details));
         }
 
-        if($this->api->getLockHandler()->transactionIsLocked($details['token'])) {
-            return;
-        }
-
-         // set lock
-        $this->api->getLockHandler()->lockTransaction($details['token']);
-
-        $this->gateway->execute(new Sync($details));
-
-        if (isset($details['transaction_status']) && in_array($details['transaction_status'], ['PENDING', 'AUTHORIZED'])) {
-            $this->gateway->execute(new CapturePayment($details));
-        }
-
+        $details['capture_state_reached'] = true;
         $this->gateway->execute(new Sync($details));
 
-        $this->api->getLockHandler()->unlockTransaction($details['token']);
-
     }
 
     /**
@@ -117,7 +102,6 @@ public function supports($request)
     {
         return
             $request instanceof Capture &&
-            $request->getModel() instanceof \ArrayAccess
-        ;
+            $request->getModel() instanceof \ArrayAccess;
     }
 }

Action/NotifyAction.php

@@ -11,21 +11,31 @@
 use Payum\Core\GatewayAwareInterface;
 use Payum\Core\GatewayAwareTrait;
 use Payum\Core\Reply\HttpResponse;
+use Payum\Core\Request\GetHumanStatus;
 use Payum\Core\Request\Notify;
 use Payum\Core\Request\Sync;
 use Payum\Core\Exception\RequestNotSupportedException;
+use Payum\Core\Storage\StorageInterface;
 
 class NotifyAction implements ActionInterface, ApiAwareInterface, GatewayAwareInterface
 {
     use GatewayAwareTrait;
     use ApiAwareTrait;
 
+    /**
+     * @var StorageInterface
+     */
+    protected $tokenStorage;
+
     /**
      * NotifyAction constructor.
+     *
+     * @param StorageInterface $tokenStorage
      */
-    public function __construct()
+    public function __construct(StorageInterface $tokenStorage)
     {
         $this->apiClass = Api::class;
+        $this->tokenStorage = $tokenStorage;
     }
 
     /**
@@ -40,15 +50,35 @@ public function execute($request)
         $details = ArrayObject::ensureArrayObject($request->getModel());
 
         // check lock
-        if($this->api->getLockHandler()->transactionIsLocked($details['token'])) {
-            throw new HttpResponse('OK', 200);
+        if ($this->api->getLockHandler()->transactionIsLocked($details['token'])) {
+            throw new HttpResponse('TRANSACTION_LOCKED', 503);
+        }
+
+        if (!isset($details['process_notify'])) {
+
+            // since we're handling with some sort of a race condition here,
+            // we need to throttle the unlock process for half of a second.
+            usleep(500000);
+
+            $details['process_notify'] = true;
+            throw new HttpResponse('TRANSACTION_AWAITING', 503);
         }
 
         // set lock
         $this->api->getLockHandler()->lockTransaction($details['token']);
 
+        // sync data
         $this->gateway->execute(new Sync($details));
 
+        // remove tmp capture state
+        unset($details['capture_state_reached']);
+
+        $this->gateway->execute($status = new GetHumanStatus($request->getToken()));
+
+        if ($status->isCaptured()) {
+            throw new HttpResponse('OK', 200);
+        }
+
         if (isset($details['transaction_status']) && in_array($details['transaction_status'], ['PENDING', 'AUTHORIZED'])) {
             $this->gateway->execute(new CapturePayment($details));
         }
@@ -67,7 +97,6 @@ public function supports($request)
     {
         return
             $request instanceof Notify &&
-            $request->getModel() instanceof \ArrayAccess
-        ;
+            $request->getModel() instanceof \ArrayAccess;
     }
 }

Action/StatusAction.php

@@ -60,6 +60,12 @@ public function execute($request)
             return;
         }
 
+        //handle tmp capture transaction
+        if (isset($details['capture_state_reached']) && $details['capture_state_reached'] === true) {
+            $request->markAuthorized();
+            return;
+        }
+
         if (!isset($details['token']) || !strlen($details['token'])) {
             $request->markNew();
             return;

Action/SyncAction.php

@@ -37,7 +37,6 @@ public function supports($request)
     {
         return
             $request instanceof Sync &&
-            $request->getModel() instanceof \ArrayAccess
-        ;
+            $request->getModel() instanceof \ArrayAccess;
     }
 }

Handler/LockHandler.php

@@ -38,10 +38,6 @@ public function lockTransaction($id)
      */
     public function unlockTransaction($id)
     {
-        // since we're handling with some sort of a race condition here,
-        // we need to throttle the unlock process for half of a second.
-        usleep(500000);
-
         if ($this->transactionIsLocked($id)) {
             unlink($this->getTransactionLockPath($id));
         }

SaferpayGatewayFactory.php

@@ -28,7 +28,7 @@ protected function populateConfig(ArrayObject $config)
 
             'payum.action.capture'         => new CaptureAction(),
             'payum.action.status'          => new StatusAction(),
-            'payum.action.notify'          => new NotifyAction(),
+            'payum.action.notify'          => new NotifyAction($config['payum.security.token_storage']),
             'payum.action.sync'            => new SyncAction(),
             'payum.action.refund'          => new RefundAction(),
             'payum.action.convert_payment' => new ConvertPaymentAction(),