Bti 1238 consolidate duplicate order saves in success push flow

Model/Push/AfterpayProcessor.php

@@ -81,7 +81,10 @@ public function __construct(
         ?\Magento\Sales\Api\OrderRepositoryInterface $orderRepository = null,
         ?\Magento\Sales\Api\OrderPaymentRepositoryInterface $paymentRepository = null,
         ?\Magento\Sales\Api\InvoiceRepositoryInterface $invoiceRepository = null,
-        ?\Buckaroo\Magento2\Model\ResourceModel\GroupTransaction $groupTransactionResource = null
+        ?\Buckaroo\Magento2\Model\ResourceModel\GroupTransaction $groupTransactionResource = null,
+        ?\Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository = null,
+        ?\Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder = null,
+        ?\Magento\Sales\Api\OrderManagementInterface $orderManagement = null
     ) {
         parent::__construct(
             $orderRequestService,
@@ -101,7 +104,10 @@ public function __construct(
             $orderRepository,
             $paymentRepository,
             $invoiceRepository,
-            $groupTransactionResource
+            $groupTransactionResource,
+            $transactionRepository,
+            $searchCriteriaBuilder,
+            $orderManagement
         );
         $this->afterpayConfig = $afterpayConfig;
     }

Model/Push/DefaultProcessor.php

@@ -46,14 +46,17 @@
 use Buckaroo\Magento2\Service\Push\OrderRequestService;
 use Exception;
 use Magento\Directory\Model\CurrencyFactory;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Phrase;
 use Magento\Sales\Api\Data\TransactionInterface;
 use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\Sales\Api\OrderManagementInterface;
 use Magento\Sales\Api\OrderPaymentRepositoryInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Api\TransactionRepositoryInterface;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Invoice;
 use Magento\Sales\Model\Order\Payment;
@@ -191,6 +194,21 @@ class DefaultProcessor implements PushProcessorInterface
      */
     protected $groupTransactionResource;
 
+    /**
+     * @var TransactionRepositoryInterface
+     */
+    protected $transactionRepository;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    protected $searchCriteriaBuilder;
+
+    /**
+     * @var OrderManagementInterface
+     */
+    protected $orderManagement;
+
     /**
      * Constructor
      *
@@ -212,6 +230,9 @@ class DefaultProcessor implements PushProcessorInterface
      * @param OrderPaymentRepositoryInterface|null $paymentRepository
      * @param InvoiceRepositoryInterface|null $invoiceRepository
      * @param \Buckaroo\Magento2\Model\ResourceModel\GroupTransaction|null $groupTransactionResource
+     * @param TransactionRepositoryInterface|null $transactionRepository
+     * @param SearchCriteriaBuilder|null $searchCriteriaBuilder
+     * @param OrderManagementInterface|null $orderManagement
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -232,7 +253,10 @@ public function __construct(
         ?OrderRepositoryInterface                                $orderRepository = null,
         ?OrderPaymentRepositoryInterface                         $paymentRepository = null,
         ?InvoiceRepositoryInterface                              $invoiceRepository = null,
-        ?\Buckaroo\Magento2\Model\ResourceModel\GroupTransaction $groupTransactionResource = null
+        ?\Buckaroo\Magento2\Model\ResourceModel\GroupTransaction $groupTransactionResource = null,
+        ?TransactionRepositoryInterface                          $transactionRepository = null,
+        ?SearchCriteriaBuilder                                   $searchCriteriaBuilder = null,
+        ?OrderManagementInterface                                $orderManagement = null
     ) {
         $this->pushTransactionType = $pushTransactionType;
         $this->orderRequestService = $orderRequestService;
@@ -248,15 +272,34 @@ public function __construct(
         $this->uncancelService = $uncancelService;
         $this->resourceConnection = $resourceConnection;
         $this->giftcardCollection = $giftcardCollection;
-        $this->currencyFactory = $currencyFactory ?: ObjectManager::getInstance()->get(CurrencyFactory::class);
-        $this->orderRepository = $orderRepository
-            ?: ObjectManager::getInstance()->get(OrderRepositoryInterface::class);
-        $this->paymentRepository = $paymentRepository
-            ?: ObjectManager::getInstance()->get(OrderPaymentRepositoryInterface::class);
-        $this->invoiceRepository = $invoiceRepository
-            ?: ObjectManager::getInstance()->get(InvoiceRepositoryInterface::class);
-        $this->groupTransactionResource = $groupTransactionResource
-            ?: ObjectManager::getInstance()->get(\Buckaroo\Magento2\Model\ResourceModel\GroupTransaction::class);
+        $this->currencyFactory = $this->resolveDependency($currencyFactory, CurrencyFactory::class);
+        $this->orderRepository = $this->resolveDependency($orderRepository, OrderRepositoryInterface::class);
+        $this->paymentRepository = $this->resolveDependency($paymentRepository, OrderPaymentRepositoryInterface::class);
+        $this->invoiceRepository = $this->resolveDependency($invoiceRepository, InvoiceRepositoryInterface::class);
+        $this->groupTransactionResource = $this->resolveDependency(
+            $groupTransactionResource,
+            \Buckaroo\Magento2\Model\ResourceModel\GroupTransaction::class
+        );
+        $this->transactionRepository = $this->resolveDependency(
+            $transactionRepository,
+            TransactionRepositoryInterface::class
+        );
+        $this->searchCriteriaBuilder = $this->resolveDependency($searchCriteriaBuilder, SearchCriteriaBuilder::class);
+        $this->orderManagement = $this->resolveDependency($orderManagement, OrderManagementInterface::class);
+    }
+
+    /**
+     * BC fallback for constructor deps added after the initial release; subclasses
+     * forward them positionally, so DI cannot fill parent-only params. Removed when
+     * the Phase 4.4 constructor cleanup makes them required.
+     *
+     * @param object|null $dependency
+     * @param class-string $class
+     * @return object
+     */
+    private function resolveDependency(?object $dependency, string $class): object
+    {
+        return $dependency ?: ObjectManager::getInstance()->get($class);
     }
 
     /**
@@ -910,21 +953,22 @@ private function reactivateCanceledOrder(): bool
         // 6. Delete ALL existing transactions to start fresh
         // This prevents circular references and stale transaction states
         try {
-            $connection = $this->resourceConnection->getConnection();
-            $tableName = $this->resourceConnection->getTableName('sales_payment_transaction');
+            $searchCriteria = $this->searchCriteriaBuilder
+                ->addFilter('order_id', $this->order->getId())
+                ->create();
+            $transactions = $this->transactionRepository->getList($searchCriteria)->getItems();
 
-            $deleted = $connection->delete(
-                $tableName,
-                ['order_id = ?' => $this->order->getId()]
-            );
+            foreach ($transactions as $orderTransaction) {
+                $this->transactionRepository->delete($orderTransaction);
+            }
 
-            if ($deleted > 0) {
+            if (count($transactions) > 0) {
                 $this->logger->addDebug(sprintf(
                     '[%s:%s] - Order %s: Deleted %d transaction(s) to prevent circular references',
                     __METHOD__,
                     __LINE__,
                     $orderNumber,
-                    $deleted
+                    count($transactions)
                 ));
             }
 
@@ -1186,8 +1230,8 @@ protected function getTransactionKey(): string
     protected function setOrderStatusMessage(): void
     {
         if (!empty($this->pushRequest->getStatusMessage())) {
-            // Refresh order state to get the most current state
-            $this->order = $this->order->load($this->order->getId());
+            // Refresh the shared order instance in place
+            $this->orderRequestService->loadOrder();
 
             if ($this->order->getState() === Order::STATE_NEW
                 && empty($this->pushRequest->getRelatedtransactionPartialpayment())
@@ -1612,8 +1656,8 @@ protected function processSucceededPushAuthorization(): void
                 var_export($this->payment->getMethod(), true)
             ));
 
+            // Persisted by the updateOrderStatus save that follows in processSucceededPush
             $this->order->setState(Order::STATE_PROCESSING);
-            $this->order->save();
         }
     }
 
@@ -1944,9 +1988,6 @@ public function processFailedPush(string $newStatus, string $message): bool
                 $message
             ));
 
-            // Add a clear cancellation message to order history before canceling
-            $this->order->addCommentToStatusHistory('Payment failed. Canceling order due to payment failure: ' . $message);
-
             // setting parameter which will cause to stop the cancel process on
             $methods = [
                 'buckaroo_magento2_afterpay',
@@ -1973,14 +2014,31 @@ public function processFailedPush(string $newStatus, string $message): bool
 
             try {
                 try {
-                    $this->order->cancel()->save();
+                    if (!$this->orderManagement->cancel((int)$this->order->getId())) {
+                        $this->logger->addDebug(sprintf(
+                            '[%s:%s] - Order %s could not be canceled through OrderManagement',
+                            __METHOD__,
+                            __LINE__,
+                            $this->order->getIncrementId()
+                        ));
+                    }
                 } finally {
                     // Restore the original flag value to avoid side effects
                     if ($originalRequestOnVoid !== null) {
                         $methodInstanceClass::$requestOnVoid = $originalRequestOnVoid;
                     }
                 }
 
+                // OrderManagement cancels and saves its own order instance; reload the
+                // shared one so the steps below don't persist pre-cancellation state
+                $this->orderRequestService->loadOrder();
+
+                // On the refreshed instance so it survives the reload; persisted by the
+                // updateOrderStatus save below
+                $this->order->addCommentToStatusHistory(
+                    'Payment failed. Canceling order due to payment failure: ' . $message
+                );
+
                 if (!$this->isMagentoGiftCardRefundActive()) {
                     $this->giftCardRefundService->refund($this->order);
                 }

Model/Push/KlarnaKpProcessor.php

@@ -77,6 +77,9 @@ class KlarnaKpProcessor extends DefaultProcessor
      * @param OrderPaymentRepositoryInterface|null $paymentRepository
      * @param InvoiceRepositoryInterface|null $invoiceRepository
      * @param GroupTransaction|null $groupTransactionResource
+     * @param \Magento\Sales\Api\TransactionRepositoryInterface|null $transactionRepository
+     * @param \Magento\Framework\Api\SearchCriteriaBuilder|null $searchCriteriaBuilder
+     * @param \Magento\Sales\Api\OrderManagementInterface|null $orderManagement
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -98,7 +101,10 @@ public function __construct(
         ?OrderRepositoryInterface        $orderRepository = null,
         ?OrderPaymentRepositoryInterface $paymentRepository = null,
         ?InvoiceRepositoryInterface      $invoiceRepository = null,
-        ?GroupTransaction                $groupTransactionResource = null
+        ?GroupTransaction                $groupTransactionResource = null,
+        ?\Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository = null,
+        ?\Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder = null,
+        ?\Magento\Sales\Api\OrderManagementInterface $orderManagement = null
     ) {
         parent::__construct(
             $orderRequestService,
@@ -118,7 +124,10 @@ public function __construct(
             $orderRepository,
             $paymentRepository,
             $invoiceRepository,
-            $groupTransactionResource
+            $groupTransactionResource,
+            $transactionRepository,
+            $searchCriteriaBuilder,
+            $orderManagement
         );
         $this->klarnakpConfig = $klarnakpConfig;
         $this->escaper = $escaper;
@@ -202,10 +211,14 @@ private function processPlazaCancelReservation(): bool
             $methodInstanceClass::$requestOnVoid = false;
 
             try {
-                $this->order->cancel()->save();
+                $this->orderManagement->cancel((int)$this->order->getId());
             } finally {
                 $methodInstanceClass::$requestOnVoid = $originalRequestOnVoid;
             }
+
+            // OrderManagement cancels and saves its own order instance; reload the
+            // shared one so updateOrderStatus below doesn't persist pre-cancellation state
+            $this->orderRequestService->loadOrder();
         }
 
         $cancelTrxId = $this->escaper->escapeHtml((string)$this->pushRequest->getDatarequest());
@@ -440,8 +453,8 @@ protected function processSucceededPushAuthorization(): void
 
             // Only set to processing if not already canceled (the canUpdateOrderStatus will handle canceled->new transition)
             if ($this->order->getState() !== Order::STATE_CANCELED) {
+                // Persisted by the updateOrderStatus save that follows in processSucceededPush
                 $this->order->setState(Order::STATE_PROCESSING);
-                $this->orderRepository->save($this->order);
             }
         }
     }

Model/Push/KlarnaMorProcessor.php

@@ -66,6 +66,9 @@ class KlarnaMorProcessor extends DefaultProcessor
      * @param OrderPaymentRepositoryInterface|null $paymentRepository
      * @param InvoiceRepositoryInterface|null $invoiceRepository
      * @param GroupTransaction|null $groupTransactionResource
+     * @param \Magento\Sales\Api\TransactionRepositoryInterface|null $transactionRepository
+     * @param \Magento\Framework\Api\SearchCriteriaBuilder|null $searchCriteriaBuilder
+     * @param \Magento\Sales\Api\OrderManagementInterface|null $orderManagement
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -85,7 +88,10 @@ public function __construct(
         ?OrderRepositoryInterface        $orderRepository = null,
         ?OrderPaymentRepositoryInterface $paymentRepository = null,
         ?InvoiceRepositoryInterface      $invoiceRepository = null,
-        ?GroupTransaction                $groupTransactionResource = null
+        ?GroupTransaction                $groupTransactionResource = null,
+        ?\Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository = null,
+        ?\Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder = null,
+        ?\Magento\Sales\Api\OrderManagementInterface $orderManagement = null
     ) {
         parent::__construct(
             $orderRequestService,
@@ -105,7 +111,10 @@ public function __construct(
             $orderRepository,
             $paymentRepository,
             $invoiceRepository,
-            $groupTransactionResource
+            $groupTransactionResource,
+            $transactionRepository,
+            $searchCriteriaBuilder,
+            $orderManagement
         );
     }
 
@@ -387,8 +396,8 @@ protected function processSucceededPushAuthorization(): void
             ));
 
             if ($this->order->getState() !== Order::STATE_CANCELED) {
+                // Persisted by the updateOrderStatus save that follows in processSucceededPush
                 $this->order->setState(Order::STATE_PROCESSING);
-                $this->orderRepository->save($this->order);
             }
         }
     }

Model/Push/PayPerEmailProcessor.php

@@ -88,6 +88,9 @@ class PayPerEmailProcessor extends DefaultProcessor
      * @param OrderPaymentRepositoryInterface|null $paymentRepository
      * @param InvoiceRepositoryInterface|null $invoiceRepository
      * @param GroupTransaction|null $groupTransactionResource
+     * @param \Magento\Sales\Api\TransactionRepositoryInterface|null $transactionRepository
+     * @param \Magento\Framework\Api\SearchCriteriaBuilder|null $searchCriteriaBuilder
+     * @param \Magento\Sales\Api\OrderManagementInterface|null $orderManagement
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -109,7 +112,10 @@ public function __construct(
         ?OrderRepositoryInterface        $orderRepository = null,
         ?OrderPaymentRepositoryInterface $paymentRepository = null,
         ?InvoiceRepositoryInterface      $invoiceRepository = null,
-        ?GroupTransaction                $groupTransactionResource = null
+        ?GroupTransaction                $groupTransactionResource = null,
+        ?\Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository = null,
+        ?\Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder = null,
+        ?\Magento\Sales\Api\OrderManagementInterface $orderManagement = null
     ) {
         parent::__construct(
             $orderRequestService,
@@ -129,7 +135,10 @@ public function __construct(
             $orderRepository,
             $paymentRepository,
             $invoiceRepository,
-            $groupTransactionResource
+            $groupTransactionResource,
+            $transactionRepository,
+            $searchCriteriaBuilder,
+            $orderManagement
         );
         $this->configPayPerEmail = $configPayPerEmail;
     }

Model/Push/PaypalProcessor.php

@@ -70,6 +70,9 @@ class PaypalProcessor extends DefaultProcessor
      * @param OrderPaymentRepositoryInterface|null $paymentRepository
      * @param InvoiceRepositoryInterface|null $invoiceRepository
      * @param GroupTransaction|null $groupTransactionResource
+     * @param \Magento\Sales\Api\TransactionRepositoryInterface|null $transactionRepository
+     * @param \Magento\Framework\Api\SearchCriteriaBuilder|null $searchCriteriaBuilder
+     * @param \Magento\Sales\Api\OrderManagementInterface|null $orderManagement
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -90,7 +93,10 @@ public function __construct(
         ?OrderRepositoryInterface                                $orderRepository = null,
         ?OrderPaymentRepositoryInterface                         $paymentRepository = null,
         ?InvoiceRepositoryInterface                              $invoiceRepository = null,
-        ?GroupTransaction $groupTransactionResource = null
+        ?GroupTransaction $groupTransactionResource = null,
+        ?\Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository = null,
+        ?\Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder = null,
+        ?\Magento\Sales\Api\OrderManagementInterface $orderManagement = null
     ) {
         parent::__construct(
             $orderRequestService,
@@ -110,7 +116,10 @@ public function __construct(
             $orderRepository,
             $paymentRepository,
             $invoiceRepository,
-            $groupTransactionResource
+            $groupTransactionResource,
+            $transactionRepository,
+            $searchCriteriaBuilder,
+            $orderManagement
         );
         $this->paypalConfig = $paypalConfig;
     }