Merge branch 'ACP2E-1458' of https://github.com/magento-l3/magento2ce into PR-2023-02-24

Author: vkolesny

app/code/Magento/Indexer/etc/di.xml

@@ -37,6 +37,9 @@
     <type name="Magento\Framework\Mview\View\Subscription">
         <arguments>
             <argument name="viewCollection" xsi:type="object" shared="false">Magento\Framework\Mview\View\CollectionInterface</argument>
+            <argument name="ignoredUpdateColumns" xsi:type="array">
+                <item name="updated_at" xsi:type="string">updated_at</item>
+            </argument>
         </arguments>
     </type>
     <type name="Magento\Indexer\Model\Processor">

app/etc/di.xml

@@ -212,6 +212,7 @@
     <preference for="Magento\Framework\HTTP\ClientInterface" type="Magento\Framework\HTTP\Client\Curl" />
     <preference for="Magento\Framework\Interception\ConfigLoaderInterface" type="Magento\Framework\Interception\PluginListGenerator" />
     <preference for="Magento\Framework\Interception\ConfigWriterInterface" type="Magento\Framework\Interception\PluginListGenerator" />
+    <preference for="Magento\Framework\Mview\View\SubscriptionStatementPostprocessorInterface" type="Magento\Framework\Mview\View\CompositeSubscriptionStatementPostprocessor" />
     <type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
     <type name="Magento\Framework\Acl\Data\Cache">
         <arguments>

lib/internal/Magento/Framework/Mview/Test/Unit/View/SubscriptionTest.php

@@ -18,6 +18,7 @@
 use Magento\Framework\Mview\View\CollectionInterface;
 use Magento\Framework\Mview\View\StateInterface;
 use Magento\Framework\Mview\View\Subscription;
+use Magento\Framework\Mview\View\SubscriptionStatementPostprocessorInterface;
 use Magento\Framework\Mview\ViewInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -127,6 +128,9 @@ protected function setUp(): void
                     ]
                 ]
             ]);
+        $statementPostprocessorMock = $this->createMock(SubscriptionStatementPostprocessorInterface::class);
+        $statementPostprocessorMock->method('process')
+            ->willReturnArgument(2);
         $this->model = new Subscription(
             $this->resourceMock,
             $this->triggerFactoryMock,
@@ -136,7 +140,8 @@ protected function setUp(): void
             'columnName',
             [],
             [],
-            $mviewConfigMock
+            $mviewConfigMock,
+            $statementPostprocessorMock
         );
     }
 
@@ -417,6 +422,9 @@ public function testBuildStatementIgnoredColumnSubscriptionLevel(): void
                     ]
                 ]
             ]);
+        $statementPostprocessorMock = $this->createMock(SubscriptionStatementPostprocessorInterface::class);
+        $statementPostprocessorMock->method('process')
+            ->willReturnArgument(2);
 
         $this->connectionMock->expects($this->any())
             ->method('isTableExists')
@@ -464,7 +472,8 @@ public function testBuildStatementIgnoredColumnSubscriptionLevel(): void
             'columnName',
             [],
             $ignoredData,
-            $mviewConfigMock
+            $mviewConfigMock,
+            $statementPostprocessorMock
         );
 
         $method = new ReflectionMethod($model, 'buildStatement');

lib/internal/Magento/Framework/Mview/View/CompositeSubscriptionStatementPostprocessor.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Mview\View;
+
+class CompositeSubscriptionStatementPostprocessor implements SubscriptionStatementPostprocessorInterface
+{
+    /**
+     * @var SubscriptionStatementPostprocessorInterface[]
+     */
+    private $postprocessors;
+
+    /**
+     * @param SubscriptionStatementPostprocessorInterface[] $postprocessors
+     */
+    public function __construct(array $postprocessors = [])
+    {
+        $this->postprocessors = $postprocessors;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(string $tableName, string $event, string $statement): string
+    {
+        foreach ($this->postprocessors as $postprocessor) {
+            $statement = $postprocessor->process($tableName, $event, $statement);
+        }
+
+        return $statement;
+    }
+}

lib/internal/Magento/Framework/Mview/View/Subscription.php

@@ -87,6 +87,11 @@ class Subscription implements SubscriptionInterface, SubscriptionTriggersInterfa
      */
     private $mviewConfig;
 
+    /**
+     * @var SubscriptionStatementPostprocessorInterface
+     */
+    private $statementPostprocessor;
+
     /**
      * @var Trigger[]
      */
@@ -102,6 +107,8 @@ class Subscription implements SubscriptionInterface, SubscriptionTriggersInterfa
      * @param array $ignoredUpdateColumns
      * @param array $ignoredUpdateColumnsBySubscription
      * @param Config|null $mviewConfig
+     * @param SubscriptionStatementPostprocessorInterface|null $statementPostprocessor
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         ResourceConnection $resource,
@@ -112,7 +119,8 @@ public function __construct(
         $columnName,
         $ignoredUpdateColumns = [],
         $ignoredUpdateColumnsBySubscription = [],
-        Config $mviewConfig = null
+        ?Config $mviewConfig = null,
+        ?SubscriptionStatementPostprocessorInterface $statementPostprocessor = null
     ) {
         $this->connection = $resource->getConnection();
         $this->triggerFactory = $triggerFactory;
@@ -124,6 +132,8 @@ public function __construct(
         $this->ignoredUpdateColumns = $ignoredUpdateColumns;
         $this->ignoredUpdateColumnsBySubscription = $ignoredUpdateColumnsBySubscription;
         $this->mviewConfig = $mviewConfig ?? ObjectManager::getInstance()->get(Config::class);
+        $this->statementPostprocessor = $statementPostprocessor
+            ?? ObjectManager::getInstance()->get(SubscriptionStatementPostprocessorInterface::class);
     }
 
     /**
@@ -324,13 +334,16 @@ protected function buildStatement(string $event, ViewInterface $view): string
         }
         $columns = $this->prepareColumns($view, $event);
 
-        return sprintf(
+        $statement = sprintf(
             $trigger,
             $this->getProcessor()->getPreStatements(),
             $this->connection->quoteIdentifier($this->resource->getTableName($changelog->getName())),
             implode(', ', $columns['column_names']),
             implode(', ', $columns['column_values'])
         );
+        $statement = $this->statementPostprocessor->process($this->getTableName(), $event, $statement);
+
+        return $statement;
     }
 
     /**

lib/internal/Magento/Framework/Mview/View/SubscriptionStatementPostprocessorInterface.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Mview\View;
+
+interface SubscriptionStatementPostprocessorInterface
+{
+    /**
+     * Postprocess subscription statement.
+     *
+     * @param string $tableName
+     * @param string $event
+     * @param string $statement
+     * @return string
+     */
+    public function process(string $tableName, string $event, string $statement): string;
+}