MC-18450: Allow custom attributes to be filterable and also returned in the layered navigation the product filter section in GraphQL

- address review comments

Author: danielrenaud

app/code/Magento/CatalogGraphQl/Model/Config/FilterAttributeReader.php

@@ -45,16 +45,24 @@ class FilterAttributeReader implements ReaderInterface
      */
     private $collectionFactory;
 
+    /**
+     * @var array
+     */
+    private $exactMatchAttributes = ['sku'];
+
     /**
      * @param MapperInterface $mapper
      * @param CollectionFactory $collectionFactory
+     * @param array $exactMatchAttributes
      */
     public function __construct(
         MapperInterface $mapper,
-        CollectionFactory $collectionFactory
+        CollectionFactory $collectionFactory,
+        array $exactMatchAttributes = []
     ) {
         $this->mapper = $mapper;
         $this->collectionFactory = $collectionFactory;
+        $this->exactMatchAttributes = array_merge($this->exactMatchAttributes, $exactMatchAttributes);
     }
 
     /**
@@ -94,7 +102,7 @@ public function read($scope = null) : array
      */
     private function getFilterType(Attribute $attribute): string
     {
-        if ($attribute->getAttributeCode() === 'sku') {
+        if (in_array($attribute->getAttributeCode(), $this->exactMatchAttributes)) {
             return self::FILTER_EQUAL_TYPE;
         }
 

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

@@ -95,7 +95,7 @@ public function getList(
         $searchResults = $this->searchResultsFactory->create();
         $searchResults->setSearchCriteria($searchCriteria);
         $searchResults->setItems($collection->getItems());
-        $searchResults->setTotalCount($collection->getSize());
+        $searchResults->setTotalCount($searchResult->getTotalCount());
         return $searchResults;
     }
 

app/code/Magento/CatalogGraphQl/etc/schema.graphqls

@@ -338,7 +338,7 @@ type ProductMediaGalleryEntriesVideoContent @doc(description: "ProductMediaGalle
     video_metadata: String @doc(description: "Optional data about the video.")
 }
 
-input ProductSortInput @deprecated(reason: "The attributes used in this input are hard-coded, and some of them are not sortable. Use @ProductAttributeSortInput instead") @doc(description: "ProductSortInput specifies the attribute to use for sorting search results and indicates whether the results are sorted in ascending or descending order.") {
+input ProductSortInput @doc(description: "ProductSortInput is deprecated, use @ProductAttributeSortInput instead. ProductSortInput specifies the attribute to use for sorting search results and indicates whether the results are sorted in ascending or descending order.") {
     name: SortEnum @doc(description: "The product name. Customers use this name to identify the product.")
     sku: SortEnum @doc(description: "A number or code assigned to a product to identify the product, options, price, and manufacturer.")
     description: SortEnum @doc(description: "Detailed information about the product. The value can include simple HTML tags.")