vindi
diff --git a/‎Console/Command/ProcessCallbackQueueCommand.php‎
Lines changed: 71 additions & 0 deletions b/‎Console/Command/ProcessCallbackQueueCommand.php‎
Lines changed: 71 additions & 0 deletions
diff --git a/‎Controller/Callback/Payments.php‎
Lines changed: 14 additions & 33 deletions b/‎Controller/Callback/Payments.php‎
Lines changed: 14 additions & 33 deletions
diff --git a/‎Cron/ProcessCallbackQueue.php‎
Lines changed: 131 additions & 0 deletions b/‎Cron/ProcessCallbackQueue.php‎
Lines changed: 131 additions & 0 deletions
@@ -0,0 +1,71 @@
+<?php
+
+namespace Vindi\VP\Console\Command;
+
+use Vindi\VP\Cron\ProcessCallbackQueue;
+use Magento\Framework\Console\Cli;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Command to execute the vindi_vp_process_callback_queue cron job manually.
+ */
+class ProcessCallbackQueueCommand extends Command
+{
+    /**
+     * @var ProcessCallbackQueue
+     */
+    private $processCallbackQueue;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * Constructor.
+     *
+     * @param ProcessCallbackQueue $processCallbackQueue
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        ProcessCallbackQueue $processCallbackQueue,
+        LoggerInterface $logger
+    ) {
+        $this->processCallbackQueue = $processCallbackQueue;
+        $this->logger = $logger;
+        parent::__construct();
+    }
+
+    /**
+     * Configure the command options and description.
+     */
+    protected function configure()
+    {
+        $this->setName('vindi:process-callback-queue')
+            ->setDescription('Executes the vindi_vp_process_callback_queue cron job manually.');
+        parent::configure();
+    }
+
+    /**
+     * Execute the command.
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        try {
+            $this->processCallbackQueue->execute();
+            $output->writeln('<info>Callback queue processing executed successfully.</info>');
+            return Cli::RETURN_SUCCESS;
+        } catch (\Exception $e) {
+            $this->logger->error('Error executing callback queue processing: ' . $e->getMessage());
+            $output->writeln('<error>Error executing callback queue processing: ' . $e->getMessage() . '</error>');
+            return Cli::RETURN_FAILURE;
+        }
+    }
+}
@@ -1,73 +1,54 @@
 <?php
-
-/**
- *
- * @category    Vindi
- * @package     Vindi_VP
- */
+declare(strict_types=1);
 
 namespace Vindi\VP\Controller\Callback;
 
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\ResultFactory;
-use Vindi\VP\Controller\Callback;
-use Vindi\VP\Gateway\Http\Client\Api;
-use Vindi\VP\Helper\Order as HelperOrder;
-use Magento\Sales\Model\Order as SalesOrder;
 
-class Payments extends Callback
+class Payments extends \Vindi\VP\Controller\Callback
 {
     /**
      * @var string
      */
     protected $eventName = 'pix';
 
     /**
-     * @inheritDoc
+     * Validate CSRF request.
+     *
+     * @param RequestInterface $request
+     * @return bool|null
      */
     public function validateForCsrf(RequestInterface $request): ?bool
     {
         $hash = $request->getParam('hash');
         $storeHash = sha1($this->helperData->getToken());
-        return ($hash == $storeHash);
+        return ($hash === $storeHash);
     }
 
     /**
+     * Execute callback and register it in the callback table.
+     *
      * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
         $this->helperData->log(__('Webhook %1', __CLASS__), self::LOG_NAME);
-
         $result = $this->resultFactory->create(ResultFactory::TYPE_RAW);
-        $statusCode = 500;
+        $statusCode = 200;
 
         try {
             $content = $this->getContent($this->getRequest()) ?? '';
             $params = $this->getRequest()->getParams();
             $this->logParams($content, $params);
 
             if (isset($params['transaction'])) {
-                $method = 'vindi-payments';
-                $transaction = $params['transaction'];
-                $orderIncrementId = $transaction['order_number'] ?? $transaction['free'];
-                if (isset($transaction['status_id'])) {
-                    $vindiStatus = $transaction['status_id'];
-                    $order = $this->helperOrder->loadOrder($transaction['order_number']);
-                    if ($order->getId()) {
-                        $method = $order->getPayment()->getMethod();
-                        $amount = $transaction['price_original'] ?? $order->getGrandTotal();
-                        $this->helperOrder->updateOrder($order, $vindiStatus, $transaction, $amount, true);
-                        $statusCode = 200;
-                    }
-                }
-
-                /** @var \Vindi\VP\Model\Callback $callBack */
                 $callBack = $this->callbackFactory->create();
-                $callBack->setStatus($transaction['status_name'] ?? '');
-                $callBack->setMethod($method);
-                $callBack->setIncrementId($orderIncrementId);
+                $callBack->setStatus($params['transaction']['status_name'] ?? '');
+                $callBack->setMethod('vindi-payments');
+                $callBack->setIncrementId($params['transaction']['order_number'] ?? ($params['transaction']['free'] ?? ''));
                 $callBack->setPayload($this->json->serialize($params));
+                $callBack->setQueueStatus('pending');
                 $this->callbackResourceModel->save($callBack);
             }
         } catch (\Exception $e) {
 
@@ -0,0 +1,131 @@
+<?php
+declare(strict_types=1);
+
+namespace Vindi\VP\Cron;
+
+use Magento\Framework\Filesystem\Driver\File as FileDriver;
+use Magento\Framework\App\ResourceConnection;
+use Vindi\VP\Logger\Logger;
+use Vindi\VP\Helper\Order as HelperOrder;
+
+class ProcessCallbackQueue
+{
+    /**
+     * @var ResourceConnection
+     */
+    protected $resource;
+
+    /**
+     * @var Logger
+     */
+    protected $logger;
+
+    /**
+     * @var HelperOrder
+     */
+    protected $helperOrder;
+
+    /**
+     * @var FileDriver
+     */
+    protected $fileDriver;
+
+    /**
+     * Constructor.
+     *
+     * @param ResourceConnection $resource
+     * @param Logger $logger
+     * @param HelperOrder $helperOrder
+     * @param FileDriver $fileDriver
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        Logger $logger,
+        HelperOrder $helperOrder,
+        FileDriver $fileDriver
+    ) {
+        $this->resource = $resource;
+        $this->logger = $logger;
+        $this->helperOrder = $helperOrder;
+        $this->fileDriver = $fileDriver;
+    }
+
+    /**
+     * Execute Cron Job to process callback queue.
+     *
+     * @return void
+     */
+    public function execute(): void
+    {
+        $this->logger->info(__('Starting callback processing without lock mechanism.'));
+
+        try {
+            $connection = $this->resource->getConnection();
+            $tableName = $this->resource->getTableName('vindi_vp_callback');
+
+            $select = $connection->select()
+                ->from($tableName)
+                ->where('queue_status = ?', 'pending')
+                ->where('attempts < ?', 3);
+
+            $callbacks = $connection->fetchAll($select);
+            $this->logger->info(__('Found %1 pending callbacks to process.', count($callbacks)));
+
+            foreach ($callbacks as $callback) {
+                $callbackId = $callback['entity_id'];
+                $this->logger->info(__('Processing callback ID: %1', $callbackId));
+                $attempts = (int)$callback['attempts'];
+
+                $connection->update(
+                    $tableName,
+                    ['attempts' => $attempts + 1],
+                    ['entity_id = ?' => $callbackId]
+                );
+
+                try {
+                    $params = json_decode($callback['payload'], true);
+                    if (!is_array($params)) {
+                        throw new \Exception((string) __('Invalid JSON payload for callback ID %1', $callbackId));
+                    }
+
+                    if (isset($params['transaction'])) {
+                        $transaction = $params['transaction'];
+                        $orderIncrementId = $transaction['order_number'] ?? ($transaction['free'] ?? '');
+                        $order = $this->helperOrder->loadOrder($orderIncrementId);
+
+                        if ($order && $order->getId()) {
+                            $vindiStatus = $transaction['status_id'] ?? '';
+                            $amount = $transaction['price_original'] ?? $order->getGrandTotal();
+                            $this->helperOrder->updateOrder($order, $vindiStatus, $transaction, (float)$amount, true);
+                            $this->logger->info(__('Callback ID %1 processed successfully. Order %2 updated.', $callbackId, $orderIncrementId));
+                        } else {
+                            $this->logger->warning(__('Order not found for callback ID %1 with order number %2.', $callbackId, $orderIncrementId));
+                        }
+                    } else {
+                        $this->logger->warning(__('Transaction data missing in callback ID %1.', $callbackId));
+                    }
+
+                    $connection->update(
+                        $tableName,
+                        ['queue_status' => 'executed'],
+                        ['entity_id = ?' => $callbackId]
+                    );
+                } catch (\Exception $e) {
+                    $this->logger->error(__('Error processing callback ID %1: %2', $callbackId, $e->getMessage()));
+
+                    if (($attempts + 1) >= 3) {
+                        $connection->update(
+                            $tableName,
+                            ['queue_status' => 'failed'],
+                            ['entity_id = ?' => $callbackId]
+                        );
+                        $this->logger->error(__('Callback ID %1 marked as failed after %2 attempts.', $callbackId, $attempts + 1));
+                    }
+                }
+            }
+            $this->logger->info(__('Finished processing callbacks.'));
+        } catch (\Exception $e) {
+            $this->logger->error(__('Error executing cron job: %1', $e->getMessage()));
+        }
+    }
+}