exclude AC-10042: /V1/transactions REST API returns error when parent_txn_id = txn_id

Author: glo60612

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

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Sales\Model\ResourceModel\Order\Payment;
 
 use Magento\Sales\Model\ResourceModel\EntityAbstract;
@@ -12,6 +11,7 @@
 /**
  * Sales transaction resource model
  *
+ * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Transaction extends EntityAbstract implements TransactionResourceInterface
 {
@@ -34,8 +34,7 @@ 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
@@ -127,7 +126,6 @@ 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
@@ -148,14 +146,9 @@ 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);
             }
         }
 
@@ -176,7 +169,7 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $transacti
      * @param int $orderId
      * @param int $paymentId
      * @param string $txnId
-     * @param mixed $columns (array|string|object) $columns
+     * @param mixed (array|string|object) $columns
      * @param bool $isRow
      * @param string $txnType
      * @return array|string
@@ -218,22 +211,4 @@ private function _getLoadByUniqueKeySelect($orderId, $paymentId, $txnId, $column
             $txnId
         );
     }
-    /**
-     * Retrieve transaction by the unique key of order_id
-     *
-     * @param int $orderId
-     * @return string
-     */
-    private function getParentTxnId(int $orderId): string
-    {
-        $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
      */
-    public const SERVICE_READ_NAME = 'salesTransactionRepositoryV1';
+    const SERVICE_READ_NAME = 'salesTransactionRepositoryV1';
 
     /**
      * Resource path for REST
      */
-    public const RESOURCE_PATH = '/V1/transactions';
+    const RESOURCE_PATH = '/V1/transactions';
 
     /**
      * Service version
      */
-    public const SERVICE_VERSION = 'V1';
+    const SERVICE_VERSION = 'V1';
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
@@ -66,10 +66,8 @@ public function testTransactionGet()
         $childTransaction = reset($childTransactions);
 
         $expectedData = $this->getPreparedTransactionData($transaction);
-        if (gettype($childTransaction) != 'boolean') {
-            $childTransactionData = $this->getPreparedTransactionData($childTransaction);
-            $expectedData['child_transactions'][] = $childTransactionData;
-        }
+        $childTransactionData = $this->getPreparedTransactionData($childTransaction);
+        $expectedData['child_transactions'][] = $childTransactionData;
 
         $serviceInfo = [
             'rest' => [
@@ -167,15 +165,10 @@ public function testTransactionList()
         $this->assertArrayHasKey('items', $result);
 
         $transactionData = $this->getPreparedTransactionData($transaction);
-        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]);
-        }
+        $childTransactionData = $this->getPreparedTransactionData($childTransaction);
+        $transactionData['child_transactions'][] = $childTransactionData;
+        $expectedData = [$transactionData, $childTransactionData];
+        $this->assertEquals($expectedData, $result['items']);
         $this->assertArrayHasKey('search_criteria', $result);
         $this->assertEquals($searchData, $result['search_criteria']);
     }

lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/SchemaBuilder.php

@@ -67,8 +67,9 @@ public function __construct(
 
     /**
      * @inheritdoc
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function build(Schema $schema)
+    public function build(Schema $schema, $tablesWithJsonTypeField = [])
     {
         foreach ($this->sharding->getResources() as $resource) {
             foreach ($this->dbSchemaReader->readTables($resource) as $tableName) {
@@ -95,9 +96,16 @@ public function build(Schema $schema)
                         'collation' => $tableOptions['collation']
                     ]
                 );
+                $isJsonType = false;
+                if (count($tablesWithJsonTypeField) > 0 && isset($tablesWithJsonTypeField[$tableName])) {
+                    $isJsonType = true;
+                }
 
                 // Process columns
                 foreach ($columnsData as $columnData) {
+                    if ($isJsonType && $tablesWithJsonTypeField[$tableName] == $columnData['name']) {
+                        $columnData['type'] = 'json';
+                    }
                     $columnData['table'] = $table;
                     $column = $this->elementFactory->create($columnData['type'], $columnData);
                     $columns[$column->getName()] = $column;

lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfig.php

@@ -62,8 +62,17 @@ public function __construct(
      */
     public function getDbConfig()
     {
+        $declarativeSchema = $this->getDeclarationConfig();
+        $tablesWithJsonTypeField = [];
+        foreach ($declarativeSchema->getTables() as $table) {
+            foreach ($table->getColumns() as $column) {
+                if ($column->getType() == 'json') {
+                    $tablesWithJsonTypeField[$table->getName()] = $column->getName();
+                }
+            }
+        }
         $schema = $this->schemaFactory->create();
-        $schema = $this->dbSchemaBuilder->build($schema);
+        $schema = $this->dbSchemaBuilder->build($schema, $tablesWithJsonTypeField);
         return $schema;
     }