ACP2E-1579: Catalog rule discount disappears after a product is saved from Admin

Author: dhorytskyi

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

@@ -8,9 +8,17 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Indexer\Product\Price\Processor;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Store\Api\WebsiteRepositoryInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Fixture\AppIsolation;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DbIsolation;
 use Magento\TestFramework\Helper\Bootstrap;
 
+#[
+    DbIsolation(false),
+    AppIsolation(true),
+]
 class IndexerBuilderTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -58,6 +66,11 @@ class IndexerBuilderTest extends \PHPUnit\Framework\TestCase
      */
     private $indexProductProcessor;
 
+    /**
+     * @var WebsiteRepositoryInterface
+     */
+    private $websiteRepository;
+
     protected function setUp(): void
     {
         $this->indexerBuilder = Bootstrap::getObjectManager()->get(
@@ -69,6 +82,7 @@ protected function setUp(): void
         $this->productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
         $this->connection = Bootstrap::getObjectManager()->get(ResourceConnection::class);
         $this->indexProductProcessor = Bootstrap::getObjectManager()->get(Processor::class);
+        $this->websiteRepository = Bootstrap::getObjectManager()->get(WebsiteRepositoryInterface::class);
     }
 
     protected function tearDown(): void
@@ -93,8 +107,6 @@ protected function tearDown(): void
     }
 
     /**
-     * @magentoDbIsolation disabled
-     * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/CatalogRule/_files/attribute.php
      * @magentoDataFixture Magento/CatalogRule/_files/rule_by_attribute.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
@@ -111,8 +123,6 @@ public function testReindexById()
     }
 
     /**
-     * @magentoDbIsolation disabled
-     * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/CatalogRule/_files/simple_product_with_catalog_rule_50_percent_off_tomorrow.php
      * @magentoConfigFixture base_website general/locale/timezone Europe/Amsterdam
      * @magentoConfigFixture general/locale/timezone America/Chicago
@@ -139,8 +149,6 @@ public function testReindexByIdDifferentTimezones()
     }
 
     /**
-     * @magentoDbIsolation disabled
-     * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/CatalogRule/_files/attribute.php
      * @magentoDataFixture Magento/CatalogRule/_files/rule_by_attribute.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
@@ -166,8 +174,6 @@ public function testReindexByIds()
     }
 
     /**
-     * @magentoDbIsolation disabled
-     * @magentoAppIsolation enabled
      * @magentoDataFixtureBeforeTransaction Magento/CatalogRule/_files/attribute.php
      * @magentoDataFixtureBeforeTransaction Magento/CatalogRule/_files/rule_by_attribute.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
@@ -187,9 +193,6 @@ public function testReindexFull()
 
     /**
      * Tests restoring triggers on `catalogrule_product_price` table after full reindexing in 'Update by schedule' mode.
-     *
-     * @magentoDbIsolation disabled
-     * @magentoAppIsolation enabled
      */
     public function testRestoringTriggersAfterFullReindex()
     {
@@ -208,6 +211,42 @@ public function testRestoringTriggersAfterFullReindex()
         $this->assertEquals(0, $this->getTriggersCount($tableName));
     }
 
+    #[
+        DataFixture('Magento/CatalogRule/_files/simple_product_with_catalog_rule_50_percent_off.php'),
+    ]
+    public function testReindexByIdForSecondStore(): void
+    {
+        $websiteId = $this->websiteRepository->get('test')->getId();
+        $simpleProduct = $this->productRepository->get('simple');
+        $this->indexerBuilder->reindexById($simpleProduct->getId());
+        $rulePrice = $this->resourceRule->getRulePrice(new \DateTime(), $websiteId, 1, $simpleProduct->getId());
+        $this->assertEquals(25, $rulePrice);
+    }
+
+    #[
+        DataFixture('Magento/CatalogRule/_files/simple_product_with_catalog_rule_50_percent_off.php'),
+    ]
+    public function testReindexByIdsForSecondStore(): void
+    {
+        $websiteId = $this->websiteRepository->get('test')->getId();
+        $simpleProduct = $this->productRepository->get('simple');
+        $this->indexerBuilder->reindexByIds([$simpleProduct->getId()]);
+        $rulePrice = $this->resourceRule->getRulePrice(new \DateTime(), $websiteId, 1, $simpleProduct->getId());
+        $this->assertEquals(25, $rulePrice);
+    }
+
+    #[
+        DataFixture('Magento/CatalogRule/_files/simple_product_with_catalog_rule_50_percent_off.php'),
+    ]
+    public function testReindexFullForSecondStore(): void
+    {
+        $websiteId = $this->websiteRepository->get('test')->getId();
+        $simpleProduct = $this->productRepository->get('simple');
+        $this->indexerBuilder->reindexFull();
+        $rulePrice = $this->resourceRule->getRulePrice(new \DateTime(), $websiteId, 1, $simpleProduct->getId());
+        $this->assertEquals(25, $rulePrice);
+    }
+
     /**
      * Returns triggers count.
      *

dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/Product/PriceTest.php

@@ -6,13 +6,10 @@
 namespace Magento\CatalogRule\Model\Indexer\Product;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Model\ProductRepository;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
-use Magento\CatalogRule\Model\Indexer\IndexBuilder;
 use Magento\CatalogRule\Model\ResourceModel\Rule;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SortOrder;
-use Magento\Store\Api\WebsiteRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 class PriceTest extends \PHPUnit\Framework\TestCase
@@ -27,31 +24,13 @@ class PriceTest extends \PHPUnit\Framework\TestCase
      */
     private $resourceRule;
 
-    /**
-     * @var WebsiteRepositoryInterface
-     */
-    private $websiteRepository;
-
-    /**
-     * @var ProductRepository
-     */
-    private $productRepository;
-
-    /**
-     * @var IndexBuilder
-     */
-    private $indexerBuilder;
-
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->resourceRule = $this->objectManager->get(Rule::class);
-        $this->websiteRepository = $this->objectManager->get(WebsiteRepositoryInterface::class);
-        $this->productRepository = $this->objectManager->create(ProductRepository::class);
-        $this->indexerBuilder = $this->objectManager->get(IndexBuilder::class);
     }
 
     /**
@@ -86,24 +65,6 @@ public function testPriceApplying()
         $this->assertEquals($simpleProduct->getFinalPrice(), $confProduct->getMinimalPrice());
     }
 
-    /**
-     * @magentoDataFixtureBeforeTransaction Magento/CatalogRule/_files/simple_product_with_catalog_rule_50_percent_off.php
-     * @magentoDbIsolation enabled
-     * @magentoAppIsolation enabled
-     * @return void
-     */
-    public function testPriceForSecondStore():void
-    {
-        $websiteId = $this->websiteRepository->get('test')->getId();
-        $simpleProduct = $this->productRepository->get('simple');
-        $this->assertEquals('simple', $simpleProduct->getSku());
-        $this->indexerBuilder->reindexById($simpleProduct->getId());
-        $this->assertEquals(
-            25,
-            $this->resourceRule->getRulePrice(new \DateTime(), $websiteId, 1, $simpleProduct->getId())
-        );
-    }
-
     /**
      * @magentoDataFixtureBeforeTransaction Magento/CatalogRule/_files/simple_products.php
      * @magentoDataFixtureBeforeTransaction Magento/CatalogRule/_files/rule_by_attribute.php

dev/tests/integration/testsuite/Magento/CatalogRule/_files/simple_product_with_catalog_rule_50_percent_off.php

@@ -18,7 +18,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_website_with_two_stores.php');
+Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_website_with_store_group_and_store.php');
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var WebsiteRepositoryInterface $websiteRepository */

dev/tests/integration/testsuite/Magento/CatalogRule/_files/simple_product_with_catalog_rule_50_percent_off_rollback.php

@@ -52,4 +52,4 @@
 
 $indexBuilder->reindexFull();
 
-Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_website_with_two_stores_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_website_with_store_group_and_store_rollback.php');