MAGETWO-94565: Catalog product collection filters produce errors and cause inconsistent behaviour

- Replace using category collection to using db.

Author: YuliyaLabudova

app/code/Magento/Catalog/Model/ResourceModel/Category.php

@@ -9,11 +9,14 @@
  *
  * @author      Magento Core Team <[email protected]>
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\ResourceModel;
 
 use Magento\Catalog\Model\Indexer\Category\Product\Processor;
 use Magento\Framework\DataObject;
 use Magento\Framework\EntityManager\EntityManager;
+use Magento\Catalog\Setup\CategorySetup;
 
 /**
  * Resource model for category entity
@@ -1132,4 +1135,41 @@ private function getAggregateCount()
         }
         return $this->aggregateCount;
     }
+
+    /**
+     * Get category with children.
+     *
+     * @param int $categoryId
+     * @return array
+     */
+    public function getCategoryWithChildren(int $categoryId): array
+    {
+        $connection = $this->getConnection();
+
+        $select = $connection->select()
+            ->from(
+                ['eav_attribute' => $this->getTable('eav_attribute')],
+                ['attribute_id']
+            )->where('entity_type_id = ?', CategorySetup::CATEGORY_ENTITY_TYPE_ID)
+            ->where('attribute_code = ?', 'is_anchor')
+            ->limit(1);
+        $attributeId = $connection->fetchRow($select);
+
+        $select = $connection->select()
+            ->from(
+                ['cce' => $this->getTable('catalog_category_entity')],
+                ['entity_id', 'parent_id', 'path']
+            )->join(
+                ['cce_int' => $this->getTable('catalog_category_entity_int')],
+                'cce.entity_id = cce_int.entity_id',
+                ['is_anchor' => 'cce_int.value']
+            )->where(
+                'cce_int.attribute_id = ?',
+                $attributeId['attribute_id']
+            )->where(
+                "cce.path LIKE '%/{$categoryId}' OR cce.path LIKE '%/{$categoryId}/%'"
+            )->order('path');
+
+        return $connection->fetchAll($select);
+    }
 }

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -23,7 +23,7 @@
 use Magento\Framework\Indexer\DimensionFactory;
 use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
 use Magento\Store\Model\Store;
-use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
+use Magento\Catalog\Model\ResourceModel\Category;
 
 /**
  * Product collection
@@ -305,9 +305,9 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
     private $urlFinder;
 
     /**
-     * @var CollectionFactory
+     * @var Category
      */
-    private $categoryCollectionFactory;
+    private $categoryResourceModel;
 
     /**
      * Collection constructor
@@ -337,7 +337,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * @param TableMaintainer|null $tableMaintainer
      * @param PriceTableResolver|null $priceTableResolver
      * @param DimensionFactory|null $dimensionFactory
-     * @param CollectionFactory|null $categoryCollectionFactory
+     * @param Category|null $categoryResourceModel
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -367,7 +367,7 @@ public function __construct(
         TableMaintainer $tableMaintainer = null,
         PriceTableResolver $priceTableResolver = null,
         DimensionFactory $dimensionFactory = null,
-        CollectionFactory $categoryCollectionFactory = null
+        Category $categoryResourceModel = null
     ) {
         $this->moduleManager = $moduleManager;
         $this->_catalogProductFlatState = $catalogProductFlatState;
@@ -401,8 +401,8 @@ public function __construct(
         $this->priceTableResolver = $priceTableResolver ?: ObjectManager::getInstance()->get(PriceTableResolver::class);
         $this->dimensionFactory = $dimensionFactory
             ?: ObjectManager::getInstance()->get(DimensionFactory::class);
-        $this->categoryCollectionFactory = $categoryCollectionFactory ?: ObjectManager::getInstance()
-            ->get(CollectionFactory::class);
+        $this->categoryResourceModel = $categoryResourceModel ?: ObjectManager::getInstance()
+            ->get(Category::class);
     }
 
     /**
@@ -2104,18 +2104,23 @@ protected function _applyZeroStoreProductLimitations()
     private function getChildrenCategories(int $categoryId): array
     {
         $categoryIds[] = $categoryId;
-
-        /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection */
-        $categoryCollection = $this->categoryCollectionFactory->create();
-        $categories = $categoryCollection
-            ->addAttributeToFilter(
-                ['is_anchor', 'path'],
-                [1, ['like' => $categoryId . '/%']]
-            )->getItems();
-        foreach ($categories as $category) {
-            $categoryChildren = $category->getChildren();
-            $categoryIds = array_merge($categoryIds, explode(',', $categoryChildren));
+        $anchorCategory = [];
+
+        $categories = $this->categoryResourceModel->getCategoryWithChildren($categoryId);
+        $firstCategory = array_shift($categories);
+        if ($firstCategory['is_anchor'] == 1) {
+            $anchorCategory[] = (int)$firstCategory['entity_id'];
+            foreach ($categories as $category) {
+                if (in_array($category['parent_id'], $categoryIds)
+                    && in_array($category['parent_id'], $anchorCategory)) {
+                    $categoryIds[] = (int)$category['entity_id'];
+                    if ($category['is_anchor'] == 1) {
+                        $anchorCategory[] = (int)$category['entity_id'];
+                    }
+                }
+            }
         }
+
         return $categoryIds;
     }