#31252:default store breadcrumbs returned for products which in both root categories - fixed requested changes

Author: sasha19957099

app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php

@@ -172,14 +172,36 @@ protected function reindex()
     {
         foreach ($this->storeManager->getStores() as $store) {
             if ($this->getPathFromCategoryId($store->getRootCategoryId())) {
-                $this->currentStore = $store;
+                $this->setCurrentStore($store);
                 $this->reindexRootCategory($store);
                 $this->reindexAnchorCategories($store);
                 $this->reindexNonAnchorCategories($store);
             }
         }
     }
 
+    /**
+     * Set current store
+     *
+     * @param StoreInterface $store
+     * @return $this
+     */
+    private function setCurrentStore(StoreInterface $store): self
+    {
+        $this->currentStore = $store;
+        return $this;
+    }
+
+    /**
+     * Get current store
+     *
+     * @return StoreInterface
+     */
+    private function getCurrentStore(): StoreInterface
+    {
+        return $this->currentStore;
+    }
+
     /**
      * Return validated table name
      *
@@ -485,6 +507,7 @@ protected function hasAnchorSelect(Store $store)
      */
     protected function createAnchorSelect(Store $store)
     {
+        $this->setCurrentStore($store);
         $isAnchorAttributeId = $this->config->getAttribute(
             \Magento\Catalog\Model\Category::ENTITY,
             'is_anchor'
@@ -494,7 +517,6 @@ protected function createAnchorSelect(Store $store)
         $rootCatIds = explode('/', $this->getPathFromCategoryId($store->getRootCategoryId()));
         array_pop($rootCatIds);
 
-        $this->currentStore = $store;
         $temporaryTreeTable = $this->makeTempCategoryTreeIndex();
 
         $productMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
@@ -692,7 +714,7 @@ protected function fillTempCategoryTreeIndex($temporaryName)
                     ['ccacs' => $this->getTable('catalog_category_entity_int')],
                     'ccacs.' . $categoryLinkField . ' = c.' . $categoryLinkField
                     . ' AND ccacs.attribute_id = ccacd.attribute_id AND ccacs.store_id = ' .
-                    $this->currentStore->getId(),
+                    $this->getCurrentStore()->getId(),
                     []
                 )->where(
                     $this->connection->getIfNullSql('ccacs.value', 'ccacd.value') . ' = ?',
@@ -708,7 +730,7 @@ protected function fillTempCategoryTreeIndex($temporaryName)
             foreach ($categories as $category) {
                 $categoriesTree = explode('/', $category['path']);
                 foreach ($categoriesTree as $parentId) {
-                    if (!in_array($this->currentStore->getRootCategoryId(), $categoriesTree, true)) {
+                    if (!in_array($this->getCurrentStore()->getRootCategoryId(), $categoriesTree, true)) {
                         break;
                     }
 

dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_two_root_categories_rollback.php

@@ -6,22 +6,7 @@
 
 declare(strict_types=1);
 
-use Magento\Catalog\Api\CategoryRepositoryInterface;
-use Magento\Catalog\Model\ResourceModel\Category\Collection;
-use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
-use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-//$objectManager = Bootstrap::getObjectManager();
-
-//$categoryRepository = $objectManager->get(CategoryRepositoryInterface::class);
-//$categoryCollectionFactory = $objectManager->get(CollectionFactory::class);
-
-///** @var $categoryCollection Collection */
-//$categoryCollection = $categoryCollectionFactory->create();
-//$categoryCollection->addFieldToFilter('name', ['eq' => 'Second Root Category']);
-//$secondRootCategory = $categoryCollection->getFirstItem();
-//$categoryRepository->delete($secondRootCategory);
-
 Resolver::getInstance()->requireDataFixture('Magento/Store/_files/store_with_second_root_category_rollback.php');
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_with_category_rollback.php');