MC-42571: Unexpected results with graphql search query

- commit with test

Author: arnobsh

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php

@@ -8,6 +8,7 @@
 namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider;
 
 use Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory;
+use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionPostProcessor;
@@ -18,6 +19,7 @@
 use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SearchResultsInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
@@ -55,28 +57,36 @@ class ProductSearch
      */
     private $searchCriteriaBuilder;
 
+    /**
+     * @var Visibility
+     */
+    private $catalogProductVisibility;
+
     /**
      * @param CollectionFactory $collectionFactory
      * @param ProductSearchResultsInterfaceFactory $searchResultsFactory
      * @param CollectionProcessorInterface $collectionPreProcessor
      * @param CollectionPostProcessor $collectionPostProcessor
      * @param SearchResultApplierFactory $searchResultsApplierFactory
      * @param ProductCollectionSearchCriteriaBuilder $searchCriteriaBuilder
+     * @param Visibility $catalogProductVisibility
      */
     public function __construct(
         CollectionFactory $collectionFactory,
         ProductSearchResultsInterfaceFactory $searchResultsFactory,
         CollectionProcessorInterface $collectionPreProcessor,
         CollectionPostProcessor $collectionPostProcessor,
         SearchResultApplierFactory $searchResultsApplierFactory,
-        ProductCollectionSearchCriteriaBuilder $searchCriteriaBuilder
+        ProductCollectionSearchCriteriaBuilder $searchCriteriaBuilder,
+        Visibility $catalogProductVisibility
     ) {
         $this->collectionFactory = $collectionFactory;
         $this->searchResultsFactory = $searchResultsFactory;
         $this->collectionPreProcessor = $collectionPreProcessor;
         $this->collectionPostProcessor = $collectionPostProcessor;
         $this->searchResultApplierFactory = $searchResultsApplierFactory;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->catalogProductVisibility = $catalogProductVisibility;
     }
 
     /**
@@ -106,6 +116,7 @@ public function getList(
             $this->getSortOrderArray($searchCriteriaForCollection)
         )->apply();
 
+        $collection->setVisibility($this->catalogProductVisibility->getVisibleInSiteIds());
         $this->collectionPreProcessor->process($collection, $searchCriteriaForCollection, $attributes, $context);
         $collection->load();
         $this->collectionPostProcessor->process($collection, $attributes);

dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogGraphQl/ProductSearchTest.php

@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\CatalogGraphQl;
+
+use Magento\GraphQl\GetCustomerAuthenticationHeader;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test class to verify product search, used for GraphQL resolver
+ * for configurable product returns only visible products.
+ */
+class ProductSearchTest extends GraphQlAbstract
+{
+    /**
+     * @var ObjectManager|null
+     */
+    private $objectManager;
+
+    /**
+     * @var GetCustomerAuthenticationHeader
+     */
+    private $getCustomerAuthenticationHeader;
+
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->getCustomerAuthenticationHeader = $this->objectManager->get(GetCustomerAuthenticationHeader::class);
+    }
+
+    /**
+     * Test for checking if graphQL query fpr configurable product returns
+     * expected visible items
+     *
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_products_with_different_super_attribute.php
+     */
+    public function testCheckIfConfigurableProductVisibilityReturnsExpectedItem(): void
+    {
+        $productName = 'Configurable Product';
+        $productSku = 'configurable';
+        $query = $this->getProductSearchQuery($productName, $productSku);
+
+        $response = $this->graphQlQuery($query);
+
+        $this->assertNotEmpty($response['products']);
+        $this->assertEquals(1, $response['products']['total_count']);
+        $this->assertNotEmpty($response['products']['items']);
+        $this->assertEquals($productName, $response['products']['items'][0]['name']);
+        $this->assertEquals($productSku, $response['products']['items'][0]['sku']);
+    }
+
+    /**
+     * Get a query which user filter for product sku and search by product name
+     *
+     * @param string $productName
+     * @param string $productSku
+     * @return string
+     */
+    private function getProductSearchQuery(string $productName, string $productSku): string
+    {
+        return <<<QUERY
+{
+  products(filter: {sku: {eq: "{$productSku}"}}, search: "$productName", sort: {}, pageSize: 200, currentPage: 1) {
+    total_count
+    page_info {
+        total_pages
+        current_page
+        page_size
+    }
+    items {
+        name
+        sku
+    }
+  }
+}
+QUERY;
+    }
+}