ACP2E-3166: [Cloud] Graphql Product sorting do not work

Author: glo23503

app/code/Magento/CatalogGraphQl/Plugin/ProductAttributeSortInput.php

@@ -88,6 +88,7 @@ public function beforeResolve(
      */
     private function getDataFromRequest(RequestInterface $request): array
     {
+        $data = [];
         if ($request->isPost()) {
             $data = $this->jsonSerializer->unserialize($request->getContent());
         } elseif ($request->isGet()) {
@@ -96,10 +97,7 @@ private function getDataFromRequest(RequestInterface $request): array
                 $this->jsonSerializer->unserialize($data['variables']) : null;
             $data['variables'] = is_array($data['variables']) ?
                 $data['variables'] : null;
-        } else {
-            return [];
         }
-
         return $data;
     }
 

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

@@ -122,7 +122,7 @@ protected function setUp(): void
      */
     public function testSortMultipleFieldsSentInVariables(): void
     {
-        $query = <<<'QUERY'
+        $queryAsc = <<<'QUERY'
 query GetProductsQuery(
     $search: String,
     $filter: ProductAttributeFilterInput,
@@ -164,7 +164,7 @@ public function testSortMultipleFieldsSentInVariables(): void
             'currentPage' => 1,
             'sort' => ['price' => 'ASC', 'name' => 'ASC']
         ];
-        $response = $this->graphQlQuery($query, $variables);
+        $response = $this->graphQlQuery($queryAsc, $variables);
         $this->assertEquals(5, $response['products']['total_count']);
         $prod1 = $this->productRepository->get('search_product_1');
         $prod2 = $this->productRepository->get('search_product_2');
@@ -183,6 +183,64 @@ public function testSortMultipleFieldsSentInVariables(): void
                 ]
             );
         }
+
+        //price DESC and name ASC order
+        $queryPriceDescNameAsc = <<<'QUERY'
+query GetProductsQuery(
+    $search: String,
+    $filter: ProductAttributeFilterInput,
+    $pageSize: Int,
+    $currentPage: Int,
+    $sort: ProductAttributeSortInput
+) {
+    products(
+        search: $search,
+        filter: $filter,
+        pageSize: $pageSize,
+        currentPage: $currentPage,
+        sort: $sort
+    ) {
+        total_count
+        page_info{total_pages}
+        items{
+            __typename
+            url_key
+            sku
+            name
+            stock_status
+            price_range {
+                minimum_price {
+                    final_price {
+                        value
+                        currency
+                    }
+                }
+            }
+        }
+    }
+}
+QUERY;
+        $variables = [
+            'search' => null,
+            'filter' => [],
+            'pageSize' => 24,
+            'currentPage' => 1,
+            'sort' => ['price' => 'DESC', 'name' => 'ASC']
+        ];
+        $response = $this->graphQlQuery($queryPriceDescNameAsc, $variables);
+        $this->assertEquals(5, $response['products']['total_count']);
+
+        $filteredProducts = [$prod5, $prod4, $prod3, $prod1, $prod2];
+        $productItemsInResponse = array_map(null, $response['products']['items'], $filteredProducts);
+        foreach ($productItemsInResponse as $itemIndex => $itemArray) {
+            $this->assertNotEmpty($itemArray);
+            $this->assertResponseFields(
+                $productItemsInResponse[$itemIndex][0],
+                [
+                    'name' => $filteredProducts[$itemIndex]->getName(),
+                ]
+            );
+        }
     }
 
     /**