MAGETWO-51447: CatalogSearch Fulltext Collection not allows to use filters with multiple values

Author: igrybkov

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php

@@ -263,6 +263,8 @@ protected function _getIndexableAttributesCondition()
             'ca.is_filterable_in_search > 0',
             'ca.is_visible_in_advanced_search > 0',
             'ca.is_filterable > 0',
+            // Visibility is attribute that isn't used by search, but required to determine is product should be shown
+            "ea.attribute_code = 'visibility'"
         ];
 
         return implode(' OR ', $conditions);

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

@@ -265,7 +265,7 @@ public function addFieldToFilter($field, $condition = null)
 
         $this->getSearchCriteriaBuilder();
         $this->getFilterBuilder();
-        if (!is_array($condition) || !in_array(key($condition), ['from', 'to'])) {
+        if (!is_array($condition) || !in_array(key($condition), ['from', 'to'], true)) {
             $this->filterBuilder->setField($field);
             $this->filterBuilder->setValue($condition);
             $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
@@ -371,7 +371,7 @@ protected function _renderFilters()
     public function setOrder($attribute, $dir = Select::SQL_DESC)
     {
         $this->order = ['field' => $attribute, 'dir' => $dir];
-        if ($attribute != 'relevance') {
+        if ($attribute !== 'relevance') {
             parent::setOrder($attribute, $dir);
         }
         return $this;

app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php

@@ -123,7 +123,7 @@ public function build(RequestInterface $request)
             ScopeInterface::SCOPE_STORE
         );
         if ($isShowOutOfStock === false) {
-            $select->joinLeft(
+            $select->joinInner(
                 ['stock_index' => $this->resource->getTableName('cataloginventory_stock_status')],
                 'search_index.entity_id = stock_index.product_id'
                 . $this->resource->getConnection()->quoteInto(

app/code/Magento/CatalogSearch/Model/Search/TableMapper.php

@@ -6,8 +6,11 @@
 
 namespace Magento\CatalogSearch\Model\Search;
 
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory;
+use Magento\Eav\Model\Config as EavConfig;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection as AppResource;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Request\FilterInterface;
@@ -34,41 +37,64 @@ class TableMapper
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
+     * @deprecated
      */
     private $attributeCollection;
 
+    /**
+     * @var EavConfig
+     */
+    private $eavConfig;
+
     /**
      * @param AppResource $resource
      * @param StoreManagerInterface $storeManager
      * @param CollectionFactory $attributeCollectionFactory
+     * @param EavConfig $eavConfig
      */
     public function __construct(
         AppResource $resource,
         StoreManagerInterface $storeManager,
-        CollectionFactory $attributeCollectionFactory
+        CollectionFactory $attributeCollectionFactory,
+        EavConfig $eavConfig = null
     ) {
         $this->resource = $resource;
         $this->storeManager = $storeManager;
         $this->attributeCollection = $attributeCollectionFactory->create();
+        $this->eavConfig = $eavConfig !== null ? $eavConfig : ObjectManager::getInstance()->get(EavConfig::class);
     }
 
     /**
      * @param Select $select
      * @param RequestInterface $request
      * @return Select
+     * @throws \LogicException
      */
     public function addTables(Select $select, RequestInterface $request)
     {
         $mappedTables = [];
         $filters = $this->getFilters($request->getQuery());
         foreach ($filters as $filter) {
-            list($alias, $table, $mapOn, $mappedFields) = $this->getMappingData($filter);
+            list($alias, $table, $mapOn, $mappedFields, $joinType) = $this->getMappingData($filter);
             if (!array_key_exists($alias, $mappedTables)) {
-                $select->joinLeft(
-                    [$alias => $table],
-                    $mapOn,
-                    $mappedFields
-                );
+                switch ($joinType) {
+                    case \Magento\Framework\DB\Select::INNER_JOIN:
+                        $select->joinInner(
+                            [$alias => $table],
+                            $mapOn,
+                            $mappedFields
+                        );
+                        break;
+                    case \Magento\Framework\DB\Select::LEFT_JOIN:
+                        $select->joinLeft(
+                            [$alias => $table],
+                            $mapOn,
+                            $mappedFields
+                        );
+                        break;
+                    default:
+                        throw new \LogicException(__('Unsupported join type: %1', $joinType));
+                }
                 $mappedTables[$alias] = $table;
             }
         }
@@ -102,6 +128,7 @@ private function getMappingData(FilterInterface $filter)
         $mapOn = null;
         $mappedFields = null;
         $field = $filter->getField();
+        $joinType = \Magento\Framework\DB\Select::INNER_JOIN;
         $fieldToTableMap = $this->getFieldToTableMap($field);
         if ($fieldToTableMap) {
             list($alias, $table, $mapOn, $mappedFields) = $fieldToTableMap;
@@ -110,6 +137,7 @@ private function getMappingData(FilterInterface $filter)
             if ($filter->getType() === FilterInterface::TYPE_TERM
                 && in_array($attribute->getFrontendInput(), ['select', 'multiselect'], true)
             ) {
+                $joinType = \Magento\Framework\DB\Select::LEFT_JOIN;
                 $table = $this->resource->getTableName('catalog_product_index_eav');
                 $alias = $field . RequestGenerator::FILTER_SUFFIX;
                 $mapOn = sprintf(
@@ -127,7 +155,7 @@ private function getMappingData(FilterInterface $filter)
             }
         }
 
-        return [$alias, $table, $mapOn, $mappedFields];
+        return [$alias, $table, $mapOn, $mappedFields, $joinType];
     }
 
     /**
@@ -242,10 +270,11 @@ private function getFieldToTableMap($field)
     /**
      * @param string $field
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function getAttributeByCode($field)
     {
-        $attribute = $this->attributeCollection->getItemByColumnValue('attribute_code', $field);
+        $attribute = $this->eavConfig->getAttribute(Product::ENTITY, $field);
         return $attribute;
     }
 }