ACP2E-1569: Elasticsearch Indexer document version changes version when new/existing products are imported

Author: o-iegorov

dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/IndexerBuilderInScheduledModeTest.php

@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Model\Indexer;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;
+use Magento\Framework\DataObject;
+use Magento\TestFramework\Fixture\AppIsolation;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DbIsolation;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class IndexerBuilderInScheduledModeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var RuleProductProcessor
+     */
+    private $ruleProductProcessor;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $productCollectionFactory;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    protected function setUp(): void
+    {
+        $this->productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        $this->ruleProductProcessor = Bootstrap::getObjectManager()->get(RuleProductProcessor::class);
+        $this->productCollectionFactory = Bootstrap::getObjectManager()->get(CollectionFactory::class);
+    }
+
+    #[
+        DbIsolation(false),
+        AppIsolation(true),
+        DataFixture('Magento/Catalog/_files/product_with_options.php'),
+        DataFixture('Magento/CatalogRule/_files/catalog_rule_10_off_not_logged.php'),
+        DataFixture('Magento/CatalogRule/_files/set_indexer_to_scheduled_mode.php'),
+    ]
+    public function testReindexOfDependentIndexer(): void
+    {
+        $product = $this->productRepository->get('simple');
+        $productId = (int)$product->getId();
+
+        $product = $this->getProductFromCollection($productId);
+        $this->assertEquals(9, $product->getPriceInfo()->getPrice('final_price')->getAmount()->getValue());
+
+        $product->setPrice(100);
+        $this->productRepository->save($product);
+
+        $product = $this->getProductFromCollection($productId);
+        $this->assertEquals(9, $product->getPriceInfo()->getPrice('final_price')->getAmount()->getValue());
+
+        $this->ruleProductProcessor->getIndexer()->reindexList([$productId]);
+
+        $product = $this->getProductFromCollection($productId);
+        $this->assertEquals(90, $product->getPriceInfo()->getPrice('final_price')->getAmount()->getValue());
+    }
+
+    /**
+     * Get the product from the product collection
+     *
+     * @param int $productId
+     * @return DataObject
+     */
+    private function getProductFromCollection(int $productId) : DataObject
+    {
+        $productCollection = $this->productCollectionFactory->create();
+        $productCollection->addIdFilter($productId);
+        $productCollection->addPriceData();
+        $productCollection->load();
+        return $productCollection->getFirstItem();
+    }
+}

dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/IndexerBuilderTest.php

@@ -10,12 +10,10 @@
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\App\Area;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Fixture\AppIsolation;
 use Magento\TestFramework\Fixture\DataFixture;
 use Magento\TestFramework\Fixture\DbIsolation;
-use Magento\TestFramework\Fixture\AppArea;
 use Magento\TestFramework\Helper\Bootstrap;
 
 #[
@@ -287,38 +285,4 @@ protected function prepareProducts()
             ->setData('test_attribute', 'NO_test_attribute_value')
             ->save();
     }
-
-    #[
-        AppArea(Area::AREA_FRONTEND),
-        DataFixture('Magento/CatalogRule/_files/simple_product_with_catalog_rule_50_percent_off.php'),
-        DataFixture('Magento/CatalogRule/_files/set_indexer_to_scheduled_mode.php'),
-    ]
-    public function testReindexOfDependentIndexer(): void
-    {
-        $productId = $this->productRepository->get('simple')->getId();
-
-        $productCollection = $this->productCollectionFactory->create();
-        $productCollection->addIdFilter($productId);
-        //$productCollection->addPriceData();
-        $productCollection->load();
-        echo (string)$productCollection->getSelect();
-        $product = $productCollection->getFirstItem();
-        echo "\n\n" . $product->getId() . '=';
-        //$product = $productCollection->getItemByColumnValue('sku', 'simple');
-        //$product = $this->productRepository->get('simple');
-        //print_r($product->getPriceInfo());
-        echo $product->getFinalPrice();
-        echo ' * ';
-        $product->setPrice(500);
-        $this->productRepository->save($product);
-        $product = $this->productRepository->get('simple');
-        echo $product->getPriceInfo()->getPrice('final_price')->getAmount()->getValue();
-        $product->setPrice(50);
-        $this->productRepository->save($product);
-
-        $this->indexProductProcessor->getIndexer()->setScheduled(false);
-        $this->ruleProductProcessor->getIndexer()->setScheduled(false);
-
-        $this->indexerBuilder->reindexFull();
-    }
 }