Merge remote-tracking branch 'origin/AC-10042' into spartans_pr_15042024

Author: glo60612

app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php

@@ -11,7 +11,6 @@
 /**
  * Sales transaction resource model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Transaction extends EntityAbstract implements TransactionResourceInterface
 {
@@ -34,7 +33,8 @@ protected function _construct()
 
     /**
      * Update transactions in database using provided transaction as parent for them
-     * have to repeat the business logic to avoid accidental injection of wrong transactions
+     *
+     * Have to repeat the business logic to avoid accidental injection of wrong transactions
      *
      * @param \Magento\Sales\Model\Order\Payment\Transaction $transaction
      * @return void
@@ -126,6 +126,7 @@ public function getOrderWebsiteId($orderId)
 
     /**
      * Lookup for parent_id in already saved transactions of this payment by the order_id
+     *
      * Also serialize additional information, if any
      *
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Sales\Model\Order\Payment\Transaction $transaction
@@ -146,9 +147,14 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $transacti
                     __('We don\'t have enough information to save the parent transaction ID.')
                 );
             }
-            $parentId = (int)$this->_lookupByTxnId($orderId, $paymentId, $parentTxnId, $idFieldName);
+            /*$parentId = (int)$this->_lookupByTxnId($orderId, $paymentId, $parentTxnId, $idFieldName);
             if ($parentId) {
                 $transaction->setData('parent_id', $parentId);
+            }*/
+        } else {
+            $oldParentTxnId = $this->getParentTxnId($orderId);
+            if ($oldParentTxnId) {
+                $transaction->setData('parent_txn_id', $oldParentTxnId);
             }
         }
 
@@ -169,7 +175,7 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $transacti
      * @param int $orderId
      * @param int $paymentId
      * @param string $txnId
-     * @param mixed (array|string|object) $columns
+     * @param mixed $columns (array|string|object) $columns
      * @param bool $isRow
      * @param string $txnType
      * @return array|string
@@ -211,4 +217,21 @@ private function _getLoadByUniqueKeySelect($orderId, $paymentId, $txnId, $column
             $txnId
         );
     }
+    /**
+     * Retrieve transaction by the unique key of order_id
+     *
+     * @param int $orderId
+     */
+    protected function getParentTxnId($orderId)
+    {
+        $connection = $this->getConnection();
+        $select = $connection->select()->from(
+            $this->getMainTable(),
+            ['parent_txn_id']
+        )->where(
+            'order_id = ?',
+            $orderId
+        );
+        return $connection->fetchOne($select);
+    }
 }

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/TransactionTest.php

@@ -19,17 +19,17 @@ class TransactionTest extends WebapiAbstract
     /**
      * Service read name
      */
-    const SERVICE_READ_NAME = 'salesTransactionRepositoryV1';
+    public const SERVICE_READ_NAME = 'salesTransactionRepositoryV1';
 
     /**
      * Resource path for REST
      */
-    const RESOURCE_PATH = '/V1/transactions';
+    public const RESOURCE_PATH = '/V1/transactions';
 
     /**
      * Service version
      */
-    const SERVICE_VERSION = 'V1';
+    public const SERVICE_VERSION = 'V1';
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
@@ -66,8 +66,10 @@ public function testTransactionGet()
         $childTransaction = reset($childTransactions);
 
         $expectedData = $this->getPreparedTransactionData($transaction);
-        $childTransactionData = $this->getPreparedTransactionData($childTransaction);
-        $expectedData['child_transactions'][] = $childTransactionData;
+        if (gettype($childTransaction) != 'boolean') {
+            $childTransactionData = $this->getPreparedTransactionData($childTransaction);
+            $expectedData['child_transactions'][] = $childTransactionData;
+        }
 
         $serviceInfo = [
             'rest' => [
@@ -165,10 +167,15 @@ public function testTransactionList()
         $this->assertArrayHasKey('items', $result);
 
         $transactionData = $this->getPreparedTransactionData($transaction);
-        $childTransactionData = $this->getPreparedTransactionData($childTransaction);
-        $transactionData['child_transactions'][] = $childTransactionData;
-        $expectedData = [$transactionData, $childTransactionData];
-        $this->assertEquals($expectedData, $result['items']);
+        if (gettype($childTransaction) != 'boolean') {
+            $childTransactionData = $this->getPreparedTransactionData($childTransaction);
+            $transactionData['child_transactions'][] = $childTransactionData;
+            $expectedData = [$transactionData, $childTransactionData];
+            $this->assertEquals($expectedData, $result['items']);
+        } else {
+            $expectedData = $transactionData;
+            $this->assertEquals($expectedData, $result['items'][0]);
+        }
         $this->assertArrayHasKey('search_criteria', $result);
         $this->assertEquals($searchData, $result['search_criteria']);
     }