Added a new default sort by ID when searching Elasticsearch in SearchCriteriaBuilder.php

Remove the _id from the order that is being passed to the product collection in ProductSearch.php
Updated the position to be DESC passed to the product collection in ProductSearch.php
Updated the ProductSearchTest.php to have the items in the attended order

Author: dnyomo

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

@@ -86,13 +86,15 @@ public function __construct(
      *
      * @param SearchCriteriaInterface $searchCriteria
      * @param SearchResultInterface $searchResult
+     * @param array $args
      * @param array $attributes
      * @param ContextInterface|null $context
      * @return SearchResultsInterface
      */
     public function getList(
         SearchCriteriaInterface $searchCriteria,
         SearchResultInterface $searchResult,
+        array $args,
         array $attributes = [],
         ContextInterface $context = null
     ): SearchResultsInterface {
@@ -105,7 +107,7 @@ public function getList(
         $this->getSearchResultsApplier(
             $searchResult,
             $collection,
-            $this->getSortOrderArray($searchCriteriaForCollection)
+            $this->getSortOrderArray($searchCriteriaForCollection, $args)
         )->apply();
 
         $this->collectionPreProcessor->process($collection, $searchCriteriaForCollection, $attributes, $context);
@@ -147,17 +149,22 @@ private function getSearchResultsApplier(
      * E.g. ['field1' => 'DESC', 'field2' => 'ASC", ...]
      *
      * @param SearchCriteriaInterface $searchCriteria
+     * @param array $args
      * @return array
      */
-    private function getSortOrderArray(SearchCriteriaInterface $searchCriteria)
+    private function getSortOrderArray(SearchCriteriaInterface $searchCriteria, $args)
     {
         $ordersArray = [];
         $sortOrders = $searchCriteria->getSortOrders();
         if (is_array($sortOrders)) {
             foreach ($sortOrders as $sortOrder) {
                 if ($sortOrder->getField() !== '_id') {
                     if ($sortOrder->getField() == EavAttributeInterface::POSITION) {
-                        $sortOrder->setDirection(SortOrder::SORT_DESC);
+                        if (isset($args['sort'][EavAttributeInterface::POSITION])) {
+                            $sortOrder->setDirection($args['sort'][EavAttributeInterface::POSITION]);
+                        } else {
+                            $sortOrder->setDirection(SortOrder::SORT_DESC);
+                        }
                     }
                     $ordersArray[$sortOrder->getField()] = $sortOrder->getDirection();
                 }

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

@@ -103,7 +103,7 @@ public function getResult(
         //Address limitations of sort and pagination on search API apply original pagination from GQL query
         $searchCriteria->setPageSize($realPageSize);
         $searchCriteria->setCurrentPage($realCurrentPage);
-        $searchResults = $this->productsProvider->getList($searchCriteria, $itemsResults, $queryFields, $context);
+        $searchResults = $this->productsProvider->getList($searchCriteria, $itemsResults, $args, $queryFields, $context);
 
         $totalPages = $realPageSize ? ((int)ceil($searchResults->getTotalCount() / $realPageSize)) : 0;