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

Author: Oleksandr Gorkun

app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/AliasResolverTest.php

@@ -63,7 +63,11 @@ public function aliasDataProvider()
             ],
             'category_ids' => [
                 'field' => 'category_ids',
-                'alias' => 'category_ids_index',
+                'alias' => 'category_products_index',
+            ],
+            'visibility' => [
+                'field' => 'visibility',
+                'alias' => 'category_products_index',
             ],
         ];
     }

app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/PreprocessorTest.php

@@ -203,9 +203,9 @@ public function testProcessPrice()
     public function processCategoryIdsDataProvider()
     {
         return [
-            ['5', 'category_ids_index.category_id = 5'],
-            [3, 'category_ids_index.category_id = 3'],
-            ["' and 1 = 0", 'category_ids_index.category_id = 0'],
+            ['5', ':alias.category_id = 5'],
+            [3, ':alias.category_id = 3'],
+            ["' and 1 = 0", ':alias.category_id = 0'],
         ];
     }
 
@@ -218,7 +218,11 @@ public function testProcessCategoryIds($categoryId, $expectedResult)
     {
         $isNegation = false;
         $query = 'SELECT category_ids FROM catalog_product_entity';
+        $tableAlias = 'category__alias';
 
+        $this->aliasResolver->expects($this->atLeastOnce())
+            ->method('getAlias')
+            ->willReturn($tableAlias);
         $this->filter->expects($this->exactly(3))
             ->method('getField')
             ->will($this->returnValue('category_ids'));
@@ -233,9 +237,35 @@ public function testProcessCategoryIds($categoryId, $expectedResult)
             ->will($this->returnValue($this->attribute));
 
         $actualResult = $this->target->process($this->filter, $isNegation, $query);
+        $expectedResult = strtr($expectedResult, [':alias' => $tableAlias]);
         $this->assertSame($expectedResult, $this->removeWhitespaces($actualResult));
     }
 
+    public function testProcessVisibilityIds()
+    {
+        $query = 'visibility in (1, 2)';
+        $tableAlias = 'visibility__alias';
+
+        $this->aliasResolver->expects($this->atLeastOnce())
+            ->method('getAlias')
+            ->willReturn($tableAlias);
+        $this->filter->expects($this->atLeastOnce())
+            ->method('getField')
+            ->will($this->returnValue('visibility'));
+        $this->filter->expects($this->never())
+            ->method('getValue');
+        $this->config->expects($this->once())
+            ->method('getAttribute')
+            ->with(\Magento\Catalog\Model\Product::ENTITY, 'visibility')
+            ->will($this->returnValue($this->attribute));
+
+        $actualResult = $this->target->process($this->filter, false, $query);
+        $this->assertSame(
+            "$tableAlias.$query",
+            $this->removeWhitespaces($actualResult)
+        );
+    }
+
     public function testProcessStaticAttribute()
     {
         $expectedResult = 'attr_table_alias.static_attribute LIKE %name%';
@@ -246,7 +276,7 @@ public function testProcessStaticAttribute()
             ->willReturn('static_attribute');
         $this->aliasResolver->expects($this->once())->method('getAlias')
             ->willReturn('attr_table_alias');
-        $this->filter->expects($this->exactly(3))
+        $this->filter->expects($this->exactly(4))
             ->method('getField')
             ->will($this->returnValue('static_attribute'));
         $this->config->expects($this->exactly(1))
@@ -285,7 +315,7 @@ public function testProcessTermFilter($frontendInput, $fieldValue, $isNegation,
         $this->aliasResolver->expects($this->once())->method('getAlias')
             ->willReturn('termAttrAlias');
 
-        $this->filter->expects($this->exactly(3))
+        $this->filter->expects($this->exactly(4))
             ->method('getField')
             ->willReturn('termField');
         $this->filter->expects($this->exactly(2))
@@ -360,7 +390,7 @@ public function testProcessNotStaticAttribute()
         $attributeId = 1234567;
 
         $this->scope->expects($this->once())->method('getId')->will($this->returnValue($scopeId));
-        $this->filter->expects($this->exactly(4))
+        $this->filter->expects($this->exactly(5))
             ->method('getField')
             ->will($this->returnValue('not_static_attribute'));
         $this->config->expects($this->exactly(1))

dev/tests/api-functional/testsuite/Magento/Framework/Api/Search/SearchTest.php

@@ -34,6 +34,11 @@ public function testCatalogSearch()
                                 'field' => 'price_dynamic_algorithm',
                                 'value' => 'auto',
                                 'condition_type' => 'eq'
+                            ],
+                            [
+                                'field' => 'visibility',
+                                'value' => [3, 4],
+                                'condition_type' => 'eq'
                             ]
                         ]
                     ]

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Fulltext/CollectionTest.php

@@ -40,6 +40,7 @@ public function filtersDataProviderSearch()
             ['catalog_view_container', ['category_ids' => 100001], 0],
             ['catalog_view_container', ['category_ids' => []], 0],
             ['catalog_view_container', [], 0],
+            ['catalog_view_container', ['visibility' => [2, 4]], 5],
         ];
     }
 }