MAGETWO-59163: Category product count incorporating products with visibility set to search only

Author: Oleksandr Gorkun

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/AliasResolver.php

@@ -35,7 +35,8 @@ public function getAlias(\Magento\Framework\Search\Request\FilterInterface $filt
                 $alias = 'price_index';
                 break;
             case 'category_ids':
-                $alias = 'category_ids_index';
+            case 'visibility':
+                $alias = 'category_products_index';
                 break;
             default:
                 $alias = $field . RequestGenerator::FILTER_SUFFIX;

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php

@@ -141,7 +141,10 @@ private function processQueryWithField(FilterInterface $filter, $isNegation, $qu
                 $query
             );
         } elseif ($filter->getField() === 'category_ids') {
-            return 'category_ids_index.category_id = ' . (int) $filter->getValue();
+            return "{$this->aliasResolver->getAlias($filter)}.category_id = "
+                . (int) $filter->getValue();
+        } elseif ($filter->getField() === 'visibility') {
+            return "{$this->aliasResolver->getAlias($filter)}." . $query;
         } elseif ($attribute->isStatic()) {
             $alias = $this->aliasResolver->getAlias($filter);
             $resultQuery = str_replace(

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

@@ -270,6 +270,14 @@ public function addFieldToFilter($field, $condition = null)
             $this->filterBuilder->setValue($condition);
             $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
         } else {
+            if (empty($condition['from']) && empty($condition['to'])) {
+                $this->filterBuilder->setField($field);
+                $this->filterBuilder->setValue($condition);
+                $this->filterBuilder->setConditionType('in');
+                $this->searchCriteriaBuilder->addFilter(
+                    $this->filterBuilder->create()
+                );
+            }
             if (!empty($condition['from'])) {
                 $this->filterBuilder->setField("{$field}.from");
                 $this->filterBuilder->setValue($condition['from']);

app/code/Magento/CatalogSearch/Model/Search/FilterMapper/ExclusionStrategy.php

@@ -70,14 +70,18 @@ public function apply(
                 []
             );
             $isApplied = true;
-        } elseif ('category_ids' === $field) {
+        } elseif ('category_ids' === $field || $field === 'visibility') {
             $alias = $this->aliasResolver->getAlias($filter);
-            $tableName = $this->resourceConnection->getTableName('catalog_category_product_index');
-            $select->joinInner(
-                [$alias => $tableName],
-                'search_index.entity_id = category_ids_index.product_id',
-                []
-            );
+            if (!array_key_exists($alias, $select->getPart('from'))) {
+                $tableName = $this->resourceConnection->getTableName(
+                    'catalog_category_product_index'
+                );
+                $select->joinInner(
+                    [$alias => $tableName],
+                    "search_index.entity_id = $alias.product_id",
+                    []
+                );
+            }
             $isApplied = true;
         }
 

lib/internal/Magento/Framework/Search/Search.php

@@ -84,15 +84,19 @@ public function search(SearchCriteriaInterface $searchCriteria)
      */
     private function addFieldToFilter($field, $condition = null)
     {
-        if (!is_array($condition) || !in_array(key($condition), ['from', 'to'], true)) {
-            $this->requestBuilder->bind($field, $condition);
-        } else {
+        if (is_array($condition)
+            && (
+                !empty($condition['from']) || !empty($condition['to'])
+            )
+        ) {
             if (!empty($condition['from'])) {
                 $this->requestBuilder->bind("{$field}.from", $condition['from']);
             }
             if (!empty($condition['to'])) {
                 $this->requestBuilder->bind("{$field}.to", $condition['to']);
             }
+        } else {
+            $this->requestBuilder->bind($field, $condition);
         }
 
         return $this;