Merge pull request vindi#37 from cedran/master

fix: correcting bill sending via webhook

Api/Data/SubscriptionOrderSearchResultInterface.php

@@ -8,7 +8,6 @@
 /**
  * Interface SubscriptionOrderSearchResultInterface
  * @package Vindi\Payment\Api\Data
- * @author Iago Cedran <iago@bizcommerce.com.br>
  */
 interface SubscriptionOrderSearchResultInterface extends SearchResultsInterface
 {

Api/SubscriptionOrderRepositoryInterface.php

@@ -11,7 +11,6 @@
 /**
  * Interface SubscriptionOrderRepositoryInterface
  * @package Vindi\Payment\Api
- * @author Iago Cedran <iago@bizcommerce.com.br>
  */
 interface SubscriptionOrderRepositoryInterface
 {

Controller/Index/Webhook.php

@@ -5,7 +5,7 @@
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
-use Psr\Log\LoggerInterface;
+use Vindi\Payment\Logger\Logger;
 use Vindi\Payment\Helper\Api;
 use Vindi\Payment\Helper\Data;
 use Vindi\Payment\Helper\WebhookHandler;
@@ -23,7 +23,7 @@ class Webhook extends Action
  */
  private $api;
  /**
- * @var LoggerInterface
+ * @var Logger
  */
  private $logger;
  /**
@@ -34,15 +34,15 @@ class Webhook extends Action
  /**
  * Webhook constructor.
  * @param Api $api
- * @param LoggerInterface $logger
+ * @param Logger $logger
  * @param WebhookHandler $webhookHandler
  * @param Data $helperData
  * @param Context $context
  * @param PageFactory $pageFactory
  */
  public function __construct(
  Api $api,
- LoggerInterface $logger,
+ Logger $logger,
  WebhookHandler $webhookHandler,
  Data $helperData,
  Context $context,

Cron/ProcessOrderCreationQueue.php

@@ -6,6 +6,7 @@
 use Vindi\Payment\Api\OrderCreationQueueRepositoryInterface;
 use Vindi\Payment\Helper\WebHookHandlers\OrderCreator;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Lock\LockManagerInterface;
 
 class ProcessOrderCreationQueue
 {
@@ -24,28 +25,46 @@ class ProcessOrderCreationQueue
  */
  private $orderCreator;
 
+ /**
+ * @var LockManagerInterface
+ */
+ private $lockManager;
+
+ /**
+ * Lock name for this cron job
+ */
+ private const LOCK_NAME = 'vindi_payment_process_order_creation_queue';
+
  /**
  * Constructor
  *
  * @param LoggerInterface $logger
  * @param OrderCreationQueueRepositoryInterface $orderCreationQueueRepository
  * @param OrderCreator $orderCreator
+ * @param LockManagerInterface $lockManager
  */
  public function __construct(
  LoggerInterface $logger,
  OrderCreationQueueRepositoryInterface $orderCreationQueueRepository,
- OrderCreator $orderCreator
+ OrderCreator $orderCreator,
+ LockManagerInterface $lockManager
  ) {
  $this->logger = $logger;
  $this->orderCreationQueueRepository = $orderCreationQueueRepository;
  $this->orderCreator = $orderCreator;
+ $this->lockManager = $lockManager;
  }
 
  /**
  * Process the oldest pending order creation request.
  */
  public function execute()
  {
+ if (!$this->lockManager->lock(self::LOCK_NAME)) {
+ $this->logger->info(__('The job is already running.'));
+ return;
+ }
+
  try {
  $queueItem = $this->orderCreationQueueRepository->getOldestPending();
  if (!$queueItem) {
@@ -77,6 +96,8 @@ public function execute()
  $this->logger->error(__('Error processing order creation queue: %1', $e->getMessage()));
  } catch (\Exception $e) {
  $this->logger->error(__('Unexpected error processing order creation queue: %1', $e->getMessage()));
+ } finally {
+ $this->lockManager->unlock(self::LOCK_NAME);
  }
  }
 }

Helper/Api.php

@@ -95,10 +95,10 @@ public function request($endpoint, $method = 'POST', $data = [], $dataToLog = nu
  }
 
  $url = $this->base_path . $endpoint;
- $body = !empty($data) ? json_encode($data) : '';
+ $requestBody = !empty($data) ? json_encode($data) : '';
 
  $requestId = number_format(microtime(true), 2, '', '');
- $dataToLog = null !== $dataToLog ? json_encode($dataToLog) : $body;
+ $dataToLog = null !== $dataToLog ? json_encode($dataToLog) : $requestBody;
 
  $this->logger->info(__(sprintf(
  '[Request #%s]: New Api Request.\n%s %s\n%s',
@@ -125,8 +125,8 @@ public function request($endpoint, $method = 'POST', $data = [], $dataToLog = nu
  CURLOPT_CUSTOMREQUEST => $method
  ];
 
- if (!empty($body)) {
- $ch_options[CURLOPT_POSTFIELDS] = $body;
+ if (!empty($requestBody)) {
+ $ch_options[CURLOPT_POSTFIELDS] = $requestBody;
  }
 
  curl_setopt_array($ch, $ch_options);
@@ -141,7 +141,7 @@ public function request($endpoint, $method = 'POST', $data = [], $dataToLog = nu
  __(sprintf('[Request #%s]: Error while executing request!\n%s', $requestId, print_r($response, true)))
  );
  curl_close($ch);
- $this->logApiRequest($endpoint, $method, $body, $response, $statusCode, 'Error while executing request');
+ $this->logApiRequest($endpoint, $method, $requestBody, $response, $statusCode, 'Error while executing request');
  return false;
  }
 
@@ -159,17 +159,17 @@ public function request($endpoint, $method = 'POST', $data = [], $dataToLog = nu
  print_r($body, true)
  )));
 
- $this->logApiRequest($endpoint, $method, $body, $response, $statusCode, 'Error while recovering request body');
+ $this->logApiRequest($endpoint, $method, $requestBody, $response, $statusCode, 'Error while recovering request body');
 
  return false;
  }
 
  if (!$this->checkResponse($responseBody, $endpoint)) {
- $this->logApiRequest($endpoint, $method, $body, json_encode($responseBody), $statusCode, 'API response error');
+ $this->logApiRequest($endpoint, $method, $requestBody, json_encode($responseBody), $statusCode, 'API response error');
  return false;
  }
 
- $this->logApiRequest($endpoint, $method, $body, json_encode($responseBody), $statusCode, 'Success');
+ $this->logApiRequest($endpoint, $method, $requestBody, json_encode($responseBody), $statusCode, 'Success');
 
  return $responseBody;
  }

Helper/WebHookHandlers/BillCanceled.php

@@ -24,16 +24,23 @@ class BillCanceled
  */
  protected $orderRepository;
 
+ /**
+ * @var \Magento\Framework\Api\SearchCriteriaBuilder
+ */
+ protected $searchCriteriaBuilder;
+
  public function __construct(
  \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
  \Vindi\Payment\Model\Payment\Bill $bill,
  \Vindi\Payment\Helper\WebHookHandlers\Order $order,
- \Psr\Log\LoggerInterface $logger
+ \Psr\Log\LoggerInterface $logger,
+ \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
  ) {
  $this->orderRepository = $orderRepository;
  $this->bill = $bill;
  $this->order = $order;
  $this->logger = $logger;
+ $this->searchCriteriaBuilder = $searchCriteriaBuilder;
  }
 
  /**
@@ -51,8 +58,18 @@ public function billCanceled($data)
  return false;
  }
 
- /** @var \Magento\Sales\Model\Order $order */
- if (!($order = $this->getOrderFromBill($bill['id']))) {
+ $isSubscription = isset($bill['subscription']['id']);
+ $order = null;
+
+ if ($isSubscription) {
+ $order = $this->getOrderByVindiBillAndSubscriptionId($bill['id'], $bill['subscription']['id']);
+ }
+
+ if (!$order) {
+ $order = $this->getOrderFromBill($bill['id']);
+ }
+
+ if (!$order) {
  $this->logger->warning(__('Order not found'));
  return false;
  }
@@ -82,4 +99,30 @@ private function getOrderFromBill($billId)
 
  return $this->order->getOrder(compact('bill'));
  }
+
+ /**
+ * @param $vindiBillId
+ * @param $subscriptionId
+ * @return bool|\Magento\Sales\Api\Data\OrderInterface
+ */
+ private function getOrderByVindiBillAndSubscriptionId($vindiBillId, $subscriptionId)
+ {
+ $searchCriteria = $this->searchCriteriaBuilder
+ ->addFilter('vindi_bill_id', $vindiBillId, 'eq')
+ ->addFilter('vindi_subscription_id', $subscriptionId, 'eq')
+ ->create();
+
+ $orderList = $this->orderRepository
+ ->getList($searchCriteria)
+ ->getItems();
+
+ try {
+ return reset($orderList);
+ } catch (\Exception $e) {
+ $this->logger->error(__('Order with Vindi Bill ID #%1 and Subscription ID #%2 not found', $vindiBillId, $subscriptionId));
+ $this->logger->error($e->getMessage());
+ }
+
+ return false;
+ }
 }