Product Category Data - Include in Menu Configuration (#864)

Author: bsuravech

Helper/Entity/CategoryHelper.php

@@ -4,7 +4,6 @@
 
 use Algolia\AlgoliaSearch\Exception\CategoryEmptyException;
 use Algolia\AlgoliaSearch\Exception\CategoryNotActiveException;
-use Algolia\AlgoliaSearch\Exception\CategoryNotIncludedInMenuException;
 use Algolia\AlgoliaSearch\Helper\ConfigHelper;
 use Algolia\AlgoliaSearch\Helper\Image;
 use Magento\Catalog\Model\Category;
@@ -213,10 +212,6 @@ public function canCategoryBeReindexed($category, $storeId)
             throw new CategoryEmptyException();
         }
 
-        if ($this->configHelper->showCatsNotIncludedInNavigation($storeId) === false && !$category->getIncludeInMenu()) {
-            throw new CategoryNotIncludedInMenuException();
-        }
-
         return true;
     }
 
@@ -490,7 +485,7 @@ private function getCategoryById($categoryId)
 
     public function isCategoryVisibleInMenu($categoryId, $storeId)
     {
-        $key = $categoryId . ' - ' . $storeId;
+        $key = $categoryId . '-' . $storeId;
         if (isset($this->isCategoryVisibleInMenuCache[$key])) {
             return $this->isCategoryVisibleInMenuCache[$key];
         }
@@ -504,28 +499,33 @@ public function isCategoryVisibleInMenu($categoryId, $storeId)
         return $this->isCategoryVisibleInMenuCache[$key];
     }
 
-    public function getCoreCategories()
+    public function getCoreCategories($filterNotIncludedCategories = true)
     {
-        if (isset($this->coreCategories)) {
-            return $this->coreCategories;
+        $key = $filterNotIncludedCategories ? 'filtered' : 'non_filtered';
+
+        if (isset($this->coreCategories[$key])) {
+            return $this->coreCategories[$key];
         }
 
         $collection = $this->categoryCollectionFactory->create()
             ->distinct(true)
             ->addNameToResult()
             ->addIsActiveFilter()
             ->addAttributeToSelect('name')
-            ->addAttributeToFilter('include_in_menu', '1')
             ->addAttributeToFilter('level', ['gt' => 1]);
 
-        $this->coreCategories = [];
+        if ($filterNotIncludedCategories) {
+            $collection->addAttributeToFilter('include_in_menu', '1');
+        }
+
+        $this->coreCategories[$key] = [];
 
         /** @var \Magento\Catalog\Model\Category $category */
         foreach ($collection as $category) {
-            $this->coreCategories[$category->getId()] = $category;
+            $this->coreCategories[$key][$category->getId()] = $category;
         }
 
-        return $this->coreCategories;
+        return $this->coreCategories[$key];
     }
 
     private function getCorrectIdColumn()

Helper/Entity/ProductHelper.php

@@ -447,7 +447,7 @@ public function setSettings($indexName, $indexNameTmp, $storeId, $saveToTmpIndic
 
     public function getAllCategories($categoryIds)
     {
-        $categories = $this->categoryHelper->getCoreCategories();
+        $categories = $this->categoryHelper->getCoreCategories(false);
 
         $selectedCategories = [];
         foreach ($categoryIds as $id) {
@@ -653,13 +653,6 @@ private function addCategoryData($customData, Product $product)
                 $path = [];
 
                 foreach ($category->getPathIds() as $treeCategoryId) {
-                    if (!$this->configHelper->showCatsNotIncludedInNavigation($storeId)
-                        && !$this->categoryHelper->isCategoryVisibleInMenu($treeCategoryId, $storeId)) {
-                        // If the category should not be included in menu - skip it
-                        $path[] = null;
-                        continue;
-                    }
-
                     $name = $this->categoryHelper->getCategoryName($treeCategoryId, $storeId);
                     if ($name) {
                         $categoryIds[] = $treeCategoryId;