MDEE-455: Catalog Rule price is not propagated to SaaS when price indexer is disabled (#266)

* MDEE-455: Catalog Rule price is not propagated to SaaS when price indexer is disabled

Author: mslabko

CatalogInventoryDataExporter/composer.json

@@ -17,17 +17,18 @@
     "suggest": {
         "magento/module-inventory-indexer": "*",
         "magento/module-inventory-api": ">=1.2.3",
-        "magento/module-indexer": ">=100.4.4",
         "magento/module-inventory-multi-dimensional-indexer-api": ">=1.2.1",
         "magento/module-inventory-sales": ">=1.3.0"
     },
     "require": {
         "php": "~8.1.0||~8.2.0",
         "magento/framework": ">=103.0.4",
         "magento/module-catalog-inventory": ">=100.4.4",
+        "magento/module-indexer": ">=100.4.4",
         "magento/module-store": ">=101.1.4",
         "magento/module-catalog": ">=104.0.4",
         "magento/module-data-exporter": "self.version",
         "magento/module-catalog-data-exporter": "self.version"
-    }
+    },
+    "version": "102.2.100"
 }

ProductPriceDataExporter/Model/Query/CatalogRulePricesQuery.php

@@ -9,33 +9,25 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Select;
-use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * Get catalog rule prices
  */
 class CatalogRulePricesQuery
 {
-    /**
-     * @var MetadataPool
-     */
-    private $metadataPool;
+    private ResourceConnection $resourceConnection;
 
-    /**
-     * @var ResourceConnection
-     */
-    private $resourceConnection;
+    private DateWebsiteProvider $dateWebsiteProvider;
 
     /**
      * @param ResourceConnection $resourceConnection
-     * @param MetadataPool $metadataPool
      */
     public function __construct(
         ResourceConnection $resourceConnection,
-        MetadataPool $metadataPool
+        DateWebsiteProvider $dateWebsiteProvider
     ) {
         $this->resourceConnection = $resourceConnection;
-        $this->metadataPool = $metadataPool;
+        $this->dateWebsiteProvider = $dateWebsiteProvider;
     }
 
     /**
@@ -45,24 +37,17 @@ public function __construct(
     public function getQuery(array $productIds): Select
     {
         $connection = $this->resourceConnection->getConnection();
-        /** @var \Magento\Framework\EntityManager\EntityMetadataInterface $metadata */
-        $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
 
         return $connection->select()
             ->joinInner(
                 ['product_website' => $this->resourceConnection->getTableName('catalog_product_website')],
                 'product_website.product_id = product.entity_id',
                 ['website_id']
             )
-            ->joinInner(
-                ['pwi' => $this->resourceConnection->getTableName('catalog_product_index_website')],
-                'pwi.website_id = product_website.website_id',
-                []
-            )
             ->joinInner(
                 ['rule' => $this->resourceConnection->getTableName('catalogrule_product_price')],
                 'product.entity_id = rule.product_id' .
-                ' AND rule.website_id = product_website.website_id AND rule.rule_date = pwi.website_date',
+                ' AND rule.website_id = product_website.website_id AND rule.rule_date = ' . $this->getWebsiteDate(),
                 [
                     'rule_price AS value',
                     'customer_group_id',
@@ -78,4 +63,17 @@ public function getQuery(array $productIds): Select
             )
             ->where('product.entity_id IN (?)', $productIds);
     }
+
+    private function getWebsiteDate(): \Zend_Db_Expr
+    {
+        $caseResults = [];
+        foreach ($this->dateWebsiteProvider->getWebsitesDate() as $websiteId => $date) {
+            $caseResults["product_website.website_id = '$websiteId'"] = "'$date'";
+        }
+        return $this->resourceConnection->getConnection()->getCaseSql(
+            '',
+            $caseResults,
+            'CURRENT_DATE'
+        );
+    }
 }

ProductPriceDataExporter/Model/Query/DateWebsiteProvider.php

@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\ProductPriceDataExporter\Model\Query;
+
+use Magento\DataExporter\Model\Logging\CommerceDataExportLoggerInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+
+/**
+ * Get _current_ date in website timezone in format [website_id => website_date, ...]
+ */
+class DateWebsiteProvider
+{
+    protected TimezoneInterface $localeDate;
+    private ResourceConnection $resourceConnection;
+    private CommerceDataExportLoggerInterface $logger;
+    private DateTime $dateTime;
+    private array $data = [];
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     * @param DateTime $dateTime
+     * @param TimezoneInterface $localeDate
+     * @param CommerceDataExportLoggerInterface $logger
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        DateTime $dateTime,
+        TimezoneInterface $localeDate,
+        CommerceDataExportLoggerInterface $logger
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->logger = $logger;
+        $this->dateTime = $dateTime;
+        $this->localeDate = $localeDate;
+    }
+
+    /**
+     * @return array
+     */
+    public function getWebsitesDate(): array
+    {
+        if (!empty($this->data)) {
+            return $this->data;
+        }
+        $connection = $this->resourceConnection->getConnection();
+        $select = $connection->select()->from(
+            ['cw' => $this->resourceConnection->getTableName('store_website')],
+            ['website_id']
+        )->join(
+            ['csg' => $this->resourceConnection->getTableName('store_group')],
+            'cw.default_group_id = csg.group_id',
+            ['store_id' => 'default_store_id']
+        )->where(
+            'cw.website_id != 0'
+        );
+
+        foreach ($connection->fetchAll($select) as $item) {
+            try {
+                $timestamp = $this->localeDate->scopeTimeStamp($item['store_id']);
+            } catch (\Throwable $e) {
+                // use current timestamp
+                $timestamp = true;
+                $this->logger->warning("can't obtain website datetime", ['exception' => $e]);
+            }
+
+            $this->data[$item['website_id']] = $this->dateTime->formatDate($timestamp, false);
+        }
+        return $this->data;
+    }
+}

ProductPriceDataExporter/composer.json

@@ -23,7 +23,6 @@
         "magento/module-grouped-product": ">=100.4.2",
         "magento/module-downloadable": ">=100.4.4",
         "magento/module-catalog-rule": ">=101.2.4",
-        "magento/module-customer": ">=103.0.4",
         "magento/module-catalog": ">=104.0.4",
         "magento/module-data-exporter": "self.version"
     }

dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/undeclared_dependency/commerce-data-export.php

@@ -27,4 +27,14 @@
     'app/code/Magento/CatalogExport/Model/GenerateDTOs.php' => [
         'Magento\DataExporter',
     ],
+    'app/code/Magento/CatalogInventoryDataExporter/Model/Provider/Product/InventoryDataProvider.php' => [
+        'Magento\InventoryIndexer',
+    ],
+    'app/code/Magento/CatalogInventoryDataExporter/Model/Query/InventoryData.php' => [
+        'Magento\InventorySales',
+    ],
+    'app/code/Magento/CatalogInventoryDataExporter/Model/Plugin/StockStatusUpdater.php' => [
+        'Magento\InventoryApi',
+        'Magento\InventoryMultiDimensionalIndexerApi',
+    ],
 ];