Merge branch 'ACP2E-51' of https://github.com/magento-l3/magento2ce into L3-PR-20211001

Author: ArtemVasyliev

app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php

@@ -104,7 +104,7 @@ public function build(array $args, bool $includeAggregation): SearchCriteriaInte
             $this->addDefaultSortOrder($searchCriteria, $args, $isSearch);
         }
 
-        $this->addEntityIdSort($searchCriteria, $isSearch);
+        $this->addEntityIdSort($searchCriteria, $args);
         $this->addVisibilityFilter($searchCriteria, $isSearch, !empty($args['filter']));
 
         $searchCriteria->setCurrentPage($args['currentPage']);
@@ -137,17 +137,15 @@ private function addVisibilityFilter(SearchCriteriaInterface $searchCriteria, bo
      * Add sort by Entity ID
      *
      * @param SearchCriteriaInterface $searchCriteria
-     * @param bool $isSearch
+     * @param array $args
      */
-    private function addEntityIdSort(SearchCriteriaInterface $searchCriteria, bool $isSearch): void
+    private function addEntityIdSort(SearchCriteriaInterface $searchCriteria, array $args): void
     {
-        if ($isSearch) {
-            return;
-        }
+        $sortOrder = !empty($args['sort']) ? reset($args['sort']) : SortOrder::SORT_DESC;
         $sortOrderArray = $searchCriteria->getSortOrders();
         $sortOrderArray[] = $this->sortOrderBuilder
             ->setField('_id')
-            ->setDirection(SortOrder::SORT_DESC)
+            ->setDirection($sortOrder)
             ->create();
         $searchCriteria->setSortOrders($sortOrderArray);
     }

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductPriceTest.php

@@ -12,6 +12,7 @@
 use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
 use Magento\ConfigurableProduct\Api\LinkManagementInterface;
 use Magento\ConfigurableProduct\Model\LinkManagement;
 use Magento\Customer\Model\Group;
@@ -1222,4 +1223,61 @@ private function saveProductTierPrices(ProductInterface $product, array $tierPri
             $product->save();
         }
     }
+
+    /**
+     * Test products with the same price reverse position with ASC and DESC sorting
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/category_with_three_products.php
+     */
+    public function testSortByEqualPriceAndAscDescReversePosition()
+    {
+        /** @var Product $product */
+        $product = $this->productRepository->get('simple1001');
+        //setting the same price for the product as all the rest have
+        $product->setPrice('10');
+        $this->productRepository->save($product);
+
+        /** @var Collection $categoryCollection */
+        $categoryCollection = Bootstrap::getObjectManager()->get(Collection::class);
+        $category = $categoryCollection->addFieldToFilter('name', 'Category 999')->getFirstItem();
+        $categoryId = (int) $category->getId();
+
+        $expectedProductsAsc = ['simple1000', 'simple1001', 'simple1002'];
+        $queryAsc = $this->getCategoryFilterPriceQuery($categoryId, 'ASC');
+        $resultAsc = $this->graphQlQuery($queryAsc);
+        $this->assertArrayNotHasKey('errors', $resultAsc);
+        $productsAsc = array_column($resultAsc['products']['items'], 'sku');
+        $this->assertEquals($expectedProductsAsc, $productsAsc);
+
+        $expectedProductsDesc = array_reverse($expectedProductsAsc);
+        $queryDesc = $this->getCategoryFilterPriceQuery($categoryId, 'DESC');
+        $resultDesc = $this->graphQlQuery($queryDesc);
+        $this->assertArrayNotHasKey('errors', $resultDesc);
+        $productsDesc = array_column($resultDesc['products']['items'], 'sku');
+        $this->assertEquals($expectedProductsDesc, $productsDesc);
+    }
+
+    /**
+     * Query for category filter price
+     *
+     * @param int $categoryId
+     * @param string $direction
+     * @return string
+     */
+    protected function getCategoryFilterPriceQuery(int $categoryId, string $direction): string
+    {
+        $query = <<<QUERY
+{
+  products(filter: {category_id: {eq: "$categoryId"}}, sort: {price: $direction}) {
+    total_count
+    items {
+      sku
+      name
+    }
+  }
+}
+QUERY;
+
+        return $query;
+    }
 }