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

- add category collection handling

Author: cpartica

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

@@ -7,7 +7,6 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor;
 
-use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
@@ -19,20 +18,6 @@
  */
 class VisibilityStatusProcessor implements CollectionProcessorInterface
 {
-    /**
-     * @var Visibility
-     */
-    private $visibility;
-
-    /**
-     * @param Visibility $visibility
-     */
-    public function __construct(Visibility $visibility)
-    {
-        $this->visibility = $visibility;
-
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -42,8 +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->setVisibility($this->visibility->getVisibleInSiteIds());
+        //$collection->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner');
 
         return $collection;
     }

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

@@ -88,16 +88,6 @@ public function getList(
         //Join search results
         $this->getSearchResultsApplier($searchResult, $collection, $this->getSortOrderArray($searchCriteria))->apply();
 
-        //Additional applier to keep sorting from search
-//        if (!empty($searchResult->getItems())) {
-//            $items = [];
-//            foreach ($searchResult->getItems() as $item) {
-//                $items[] = $item->getId();
-//            }
-//            $orderList = join(',', $items);
-//            $collection->getSelect()->order(new \Zend_Db_Expr("FIELD(e.entity_id,$orderList)"));
-//        }
-
         $this->collectionPreProcessor->process($collection, $searchCriteria, $attributes);
         $collection->load();
         $this->collectionPostProcessor->process($collection, $attributes);

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

@@ -9,12 +9,12 @@
 
 use Magento\CatalogGraphQl\DataProvider\Product\SearchCriteriaBuilder;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\ProductSearch;
-use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Framework\Api\Search\SearchCriteriaInterface;
 use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResult;
 use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResultFactory;
-use Magento\Search\Api\SearchInterface;
+use Magento\Framework\Api\Search\SearchCriteriaInterface;
 use Magento\Framework\Api\Search\SearchCriteriaInterfaceFactory;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Search\Api\SearchInterface;
 use Magento\Search\Model\Search\PageSizeProvider;
 
 /**
@@ -107,22 +107,16 @@ public function getResult(
         $searchCriteria->setCurrentPage(0);
         $itemsResults = $this->search->search($searchCriteria);
 
-        //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);
+        $searchCriteria->setPageSize($realPageSize)->setCurrentPage($realCurrentPage);
 
-        $searchResults = $this->productsProvider->getList($searchCriteriaCopy, $itemsResults, $queryFields);
+        $searchResults = $this->productsProvider->getList($searchCriteria, $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/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php

@@ -61,6 +61,7 @@ public function apply(Filter $filter, AbstractDb $collection)
             $category = $this->categoryFactory->create();
             $this->categoryResourceModel->load($category, $categoryId);
             $categoryProducts[$categoryId] = $category->getProductCollection()->getAllIds();
+            $collection->addCategoryFilter($category);
         }
 
         $categoryProductIds = array_unique(array_merge(...$categoryProducts));