MC-29864: Incorrect MC-13493 behaviour when ElasticSearch enabled

Author: zakdma

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

@@ -385,6 +385,8 @@ public function addFieldToFilter($field, $condition = null)
     public function clear()
     {
         $this->searchResult = null;
+        $this->setFlag('has_category_filter', false);
+
         return parent::clear();
     }
 
@@ -394,6 +396,8 @@ public function clear()
     protected function _reset()
     {
         $this->searchResult = null;
+        $this->setFlag('has_category_filter', false);
+
         return parent::_reset();
     }
 
@@ -423,7 +427,11 @@ public function _loadEntities($printQuery = false, $logQuery = false)
             throw $e;
         }
 
+        $position = 0;
         foreach ($rows as $value) {
+            if ($this->getFlag('has_category_filter')) {
+                $value['cat_index_position'] = $position++;
+            }
             $object = $this->getNewEmptyItem()->setData($value);
             $this->addItem($object);
             if (isset($this->_itemsById[$object->getId()])) {
@@ -432,6 +440,9 @@ public function _loadEntities($printQuery = false, $logQuery = false)
                 $this->_itemsById[$object->getId()] = [$object];
             }
         }
+        if ($this->getFlag('has_category_filter')) {
+            $this->setFlag('has_category_filter', false);
+        }
 
         return $this;
     }
@@ -669,6 +680,7 @@ public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
         if ($this->defaultFilterStrategyApplyChecker->isApplicable()) {
             parent::addCategoryFilter($category);
         } else {
+            $this->setFlag('has_category_filter', true);
             $this->_productLimitationPrice();
         }