Fixed: Preserve ordering when executing batched paging queries. (#7994)

Author: michaelstaib

src/GreenDonut/src/GreenDonut.Data.EntityFramework/Expressions/ExpressionHelpers.cs

@@ -441,11 +441,16 @@ protected override Expression VisitMethodCall(MethodCallExpression node)
             // we are not interested in nested order by calls
             if (node.Method.DeclaringType == typeof(Queryable) && node.Method.Name == nameof(Queryable.Select))
             {
+                // We first visit our parent. When we visit an expression
+                // like "OrderBy().Select()", we want to visit the OrderBy first.
+                var source = Visit(node.Arguments[0]);
+
                 var previousState = _insideSelectProjection;
                 _insideSelectProjection = true;
-                var result = base.VisitMethodCall(node);
+                var projection = Visit(node.Arguments[1]);
                 _insideSelectProjection = previousState;
-                return result;
+
+                return node.Update(null, [source, projection]);
             }
 
             if (node.Method.DeclaringType == typeof(Queryable)

src/HotChocolate/Data/test/Data.PostgreSQL.Tests/IntegrationTests.cs

@@ -211,6 +211,34 @@ ... on Brand {
         MatchSnapshot(result, interceptor);
     }
 
+    [Fact]
+    public async Task Query_Products_First_2_And_Brand()
+    {
+        // arrange
+        using var interceptor = new TestQueryInterceptor();
+
+        // act
+        var result = await ExecuteAsync(
+            """
+            {
+                products(first: 2) {
+                    nodes {
+                        name
+                        brand {
+                            name
+                        }
+                    }
+                }
+            }
+
+            """,
+            interceptor);
+
+        // assert
+        MatchSnapshot(result, interceptor);
+    }
+
+
     private static ServiceProvider CreateServer(string connectionString)
     {
         var services = new ServiceCollection();

src/HotChocolate/Data/test/Data.PostgreSQL.Tests/Services/ProductService.cs

@@ -1,9 +1,10 @@
 using GreenDonut.Data;
+using HotChocolate.Data.Data;
 using HotChocolate.Data.Models;
 
 namespace HotChocolate.Data.Services;
 
-public class ProductService(IProductBatchingContext batchingContext)
+public class ProductService(CatalogContext context, IProductBatchingContext batchingContext)
 {
     public async Task<Product?> GetProductByIdAsync(
         int id,
@@ -13,6 +14,12 @@ public class ProductService(IProductBatchingContext batchingContext)
             .With(query)
             .LoadAsync(id, cancellationToken);
 
+    public async Task<Page<Product>> GetProductsAsync(
+        PagingArguments pagingArgs,
+        QueryContext<Product>? query = null,
+        CancellationToken cancellationToken = default)
+        => await context.Products.With(query, DefaultOrder).ToPageAsync(pagingArgs, cancellationToken);
+
     public async Task<Page<Product>> GetProductsByBrandAsync(
         int brandId,
         PagingArguments pagingArgs,
@@ -22,4 +29,7 @@ public async Task<Page<Product>> GetProductsByBrandAsync(
             .With(pagingArgs, query)
             .LoadAsync(brandId, cancellationToken)
             ?? Page<Product>.Empty;
+
+    private static SortDefinition<Product> DefaultOrder(SortDefinition<Product> sort)
+        => sort.IfEmpty(o => o.AddDescending(t => t.Name)).AddAscending(t => t.Id);
 }

src/HotChocolate/Data/test/Data.PostgreSQL.Tests/Types/Brands/BrandNode.cs

@@ -4,7 +4,7 @@
 using HotChocolate.Types;
 using HotChocolate.Types.Pagination;
 
-namespace HotChocolate.Data.Types;
+namespace HotChocolate.Data.Types.Brands;
 
 [ObjectType<Brand>]
 public static partial class BrandNode

src/HotChocolate/Data/test/Data.PostgreSQL.Tests/Types/Brands/BrandQueries.cs

@@ -5,7 +5,7 @@
 using HotChocolate.Types.Pagination;
 using HotChocolate.Types.Relay;
 
-namespace HotChocolate.Data.Types;
+namespace HotChocolate.Data.Types.Brands;
 
 [QueryType]
 public static class BrandQueries
@@ -20,7 +20,7 @@ public static async Task<Connection<Brand>> GetBrandsAsync(
         => await brandService.GetBrandsAsync(pagingArgs, query, cancellationToken).ToConnectionAsync();
 
     [NodeResolver]
-    public static async Task<Brand?> GetBrandAsync(
+    public static async Task<Brand?> GetBrandByIdAsync(
         int id,
         QueryContext<Brand> query,
         BrandService brandService,

src/HotChocolate/Data/test/Data.PostgreSQL.Tests/Types/Brands/BrandSortInputType.cs

@@ -1,7 +1,7 @@
 using HotChocolate.Data.Models;
 using HotChocolate.Data.Sorting;
 
-namespace HotChocolate.Data.Types;
+namespace HotChocolate.Data.Types.Brands;
 
 public sealed class BrandSortInputType : SortInputType<Brand>
 {

src/HotChocolate/Data/test/Data.PostgreSQL.Tests/Types/Products/ProductNode.cs

@@ -1,18 +1,21 @@
 using GreenDonut.Data;
 using HotChocolate.Data.Models;
 using HotChocolate.Data.Services;
+using HotChocolate.Execution.Processing;
 using HotChocolate.Types;
 using HotChocolate.Types.Relay;
 
-namespace HotChocolate.Data.Types;
+namespace HotChocolate.Data.Types.Products;
 
 [ObjectType<Product>]
 public static partial class ProductNode
 {
+    // [BindMember(nameof(Product.Brand))]
     public static async Task<Brand?> GetBrandAsync(
-        [Parent(requires: nameof(Product.BrandId))]  Product product,
-        BrandService brandService,
+        [Parent(requires: nameof(Product.BrandId))] Product product,
         QueryContext<Brand> query,
+        ISelection selection,
+        BrandService brandService,
         CancellationToken cancellationToken)
         => await brandService.GetBrandByIdAsync(product.BrandId, query, cancellationToken);
 

src/HotChocolate/Data/test/Data.PostgreSQL.Tests/Types/Products/ProductQueries.cs

@@ -0,0 +1,22 @@
+using GreenDonut.Data;
+using HotChocolate.Data.Models;
+using HotChocolate.Data.Services;
+using HotChocolate.Types;
+using HotChocolate.Types.Pagination;
+
+namespace HotChocolate.Data.Types.Products;
+
+
+[QueryType]
+public static partial class ProductQueries
+{
+    [UsePaging]
+    [UseFiltering]
+    [UseSorting]
+    public static async Task<Connection<Product>> GetProductsAsync(
+        PagingArguments pagingArgs,
+        QueryContext<Product> query,
+        ProductService productService,
+        CancellationToken cancellationToken)
+        => await productService.GetProductsAsync(pagingArgs, query, cancellationToken).ToConnectionAsync();
+}

src/HotChocolate/Data/test/Data.PostgreSQL.Tests/Types/Products/ProductSortInputType.cs

@@ -1,7 +1,7 @@
 using HotChocolate.Data.Models;
 using HotChocolate.Data.Sorting;
 
-namespace HotChocolate.Data.Types;
+namespace HotChocolate.Data.Types.Products;
 
 public sealed class ProductSortInputType : SortInputType<Product>
 {

src/HotChocolate/Data/test/Data.PostgreSQL.Tests/__snapshots__/IntegrationTests.CreateSchema.graphql

@@ -90,8 +90,9 @@ type Query {
   node("ID of the object." id: ID!): Node @cost(weight: "10")
   "Lookup nodes by a list of IDs."
   nodes("The list of node IDs." ids: [ID!]!): [Node]! @cost(weight: "10")
+  products("Returns the first _n_ elements from the list." first: Int "Returns the elements in the list that come after the specified cursor." after: String "Returns the last _n_ elements from the list." last: Int "Returns the elements in the list that come before the specified cursor." before: String where: ProductFilterInput @cost(weight: "10") order: [ProductSortInput!] @cost(weight: "10")): ProductsConnection @listSize(assumedSize: 50, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 10, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
   brands("Returns the first _n_ elements from the list." first: Int "Returns the elements in the list that come after the specified cursor." after: String "Returns the last _n_ elements from the list." last: Int "Returns the elements in the list that come before the specified cursor." before: String where: BrandFilterInput @cost(weight: "10")): BrandsConnection @listSize(assumedSize: 50, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 10, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
-  brand(id: ID!): Brand @cost(weight: "10")
+  brandById(id: ID!): Brand @cost(weight: "10")
 }
 
 input BooleanOperationFilterInput {