MC-32278: Position sort does not work in GraphQl.

- allow only category through

Author: cpartica

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/VisibilityStatusProcessor.php

@@ -27,7 +27,7 @@ public function process(
         array $attributeNames
     ): Collection {
         $collection->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner');
-        //$collection->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner');
+        $collection->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner');
 
         return $collection;
     }

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php

@@ -16,6 +16,8 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Search\Api\SearchInterface;
 use Magento\Search\Model\Search\PageSizeProvider;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\Search\FilterGroupBuilder;
 
 /**
  * Full text search for catalog using given search criteria.
@@ -57,6 +59,12 @@ class Search implements ProductQueryInterface
      */
     private $searchCriteriaBuilder;
 
+    /** @var FilterBuilder */
+    private $filterBuilder;
+
+    /** @var FilterGroupBuilder */
+    private $filterGroupBuilder;
+
     /**
      * @param SearchInterface $search
      * @param SearchResultFactory $searchResultFactory
@@ -65,6 +73,8 @@ class Search implements ProductQueryInterface
      * @param FieldSelection $fieldSelection
      * @param ProductSearch $productsProvider
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param FilterBuilder $filterBuilder
+     * @param FilterGroupBuilder $filterGroupBuilder
      */
     public function __construct(
         SearchInterface $search,
@@ -73,7 +83,9 @@ public function __construct(
         SearchCriteriaInterfaceFactory $searchCriteriaFactory,
         FieldSelection $fieldSelection,
         ProductSearch $productsProvider,
-        SearchCriteriaBuilder $searchCriteriaBuilder
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        FilterBuilder $filterBuilder,
+        FilterGroupBuilder $filterGroupBuilder
     ) {
         $this->search = $search;
         $this->searchResultFactory = $searchResultFactory;
@@ -82,6 +94,8 @@ public function __construct(
         $this->fieldSelection = $fieldSelection;
         $this->productsProvider = $productsProvider;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->filterBuilder = $filterBuilder;
+        $this->filterGroupBuilder = $filterGroupBuilder;
     }
 
     /**
@@ -109,14 +123,42 @@ public function getResult(
 
         $searchCriteria->setPageSize($realPageSize)->setCurrentPage($realCurrentPage);
 
-        $searchResults = $this->productsProvider->getList($searchCriteria, $itemsResults, $queryFields);
+        //Create copy of search criteria without conditions (conditions will be applied by joining search result)
+        $searchCriteriaCopy = $this->searchCriteriaFactory->create()
+            ->setSortOrders($searchCriteria->getSortOrders())
+            ->setPageSize($realPageSize)
+            ->setCurrentPage($realCurrentPage);
+
+        $categoryGroup = null;
+        foreach ($searchCriteria->getFilterGroups() as $filterGroup) {
+            foreach ($filterGroup->getFilters() as $filter) {
+                if ($filter->getField() == 'category_id') {
+                    $categoryFilter = $this->filterBuilder
+                        ->setField($filter->getField())
+                        ->setValue($filter->getValue())
+                        ->setConditionType($filter->getConditionType())
+                        ->create();
+
+                    $this->filterGroupBuilder->addFilter($categoryFilter);
+                    $categoryGroup = $this->filterGroupBuilder->create();
+                }
+            }
+        }
+
+        if ($categoryGroup) {
+            $searchCriteriaCopy->setFilterGroups([$categoryGroup]);
+        }
+
+        $searchResults = $this->productsProvider->getList($searchCriteriaCopy, $itemsResults, $queryFields);
 
         //possible division by 0
         if ($realPageSize) {
             $maxPages = (int)ceil($searchResults->getTotalCount() / $realPageSize);
         } else {
             $maxPages = 0;
         }
+        $searchCriteria->setPageSize($realPageSize);
+        $searchCriteria->setCurrentPage($realCurrentPage);
 
         $productArray = [];
         /** @var \Magento\Catalog\Model\Product $product */

app/code/Magento/Eav/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php

@@ -65,21 +65,16 @@ private function addFilterGroupToCollection(
     ) {
         $fields = [];
         foreach ($filterGroup->getFilters() as $filter) {
-            if ($filter->getField() != 'search_term'
-                && $filter->getField() != 'price_dynamic_algorithm'
-                && $filter->getField() != 'price.to'
-                && $filter->getField() != 'price.from') {
-                $isApplied = false;
-                $customFilter = $this->getCustomFilterForField($filter->getField());
-                if ($customFilter) {
-                    $isApplied = $customFilter->apply($filter, $collection);
-                }
+            $isApplied = false;
+            $customFilter = $this->getCustomFilterForField($filter->getField());
+            if ($customFilter) {
+                $isApplied = $customFilter->apply($filter, $collection);
+            }
 
-                if (!$isApplied) {
-                    $field = $this->getFieldMapping($filter->getField());
-                    $condition = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
-                    $fields[] = ['attribute' => $field, $condition => $filter->getValue()];
-                }
+            if (!$isApplied) {
+                $field = $this->getFieldMapping($filter->getField());
+                $condition = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
+                $fields[] = ['attribute' => $field, $condition => $filter->getValue()];
             }
         }