Added support for between both cursors (#7800)

ChilliCream · Dec 3, 2024 · 7cafe32 · 7cafe32
1 parent 6824099
commit 7cafe32
Show file tree

Hide file tree

Showing 4 changed files with 118 additions and 2 deletions.
diff --git a/...ocolate/Pagination/src/Pagination.EntityFramework/Extensions/PagingQueryableExtensions.cs b/...ocolate/Pagination/src/Pagination.EntityFramework/Extensions/PagingQueryableExtensions.cs
@@ -99,13 +99,13 @@ public static async ValueTask<Page<T>> ToPageAsync<T>(
         if (arguments.After is not null)
         {
             var cursor = CursorParser.Parse(arguments.After, keys);
-            source = source.Where(BuildWhereExpression<T>(keys, cursor, forward));
+            source = source.Where(BuildWhereExpression<T>(keys, cursor, true));
         }
 
         if (arguments.Before is not null)
         {
             var cursor = CursorParser.Parse(arguments.Before, keys);
-            source = source.Where(BuildWhereExpression<T>(keys, cursor, forward));
+            source = source.Where(BuildWhereExpression<T>(keys, cursor, false));
         }
 
         if (arguments.First is not null)

diff --git a/src/HotChocolate/Pagination/test/Pagination.EntityFramework.Tests/PagingHelperTests.cs b/src/HotChocolate/Pagination/test/Pagination.EntityFramework.Tests/PagingHelperTests.cs
@@ -76,6 +76,27 @@ public async Task Fetch_First_2_Items_Third_Page()
         page.MatchMarkdownSnapshot();
     }
 
+    [Fact]
+    public async Task Fetch_First_2_Items_Between()
+    {
+        // Arrange
+        var connectionString = CreateConnectionString();
+        await SeedAsync(connectionString);
+
+        // .. get first page
+        var arguments = new PagingArguments(4);
+        await using var context = new CatalogContext(connectionString);
+        var page = await context.Products.OrderBy(t => t.Name).ThenBy(t => t.Id)
+            .ToPageAsync(arguments);
+
+        // Act
+        arguments = new PagingArguments(2, after: page.CreateCursor(page.First!), before: page.CreateCursor(page.Last!));
+        page = await context.Products.OrderBy(t => t.Name).ThenBy(t => t.Id).ToPageAsync(arguments);
+
+        // Assert
+        page.MatchMarkdownSnapshot();
+    }
+
     [Fact]
     public async Task Fetch_Last_2_Items()
     {
@@ -118,6 +139,29 @@ public async Task Fetch_Last_2_Items_Before_Last_Page()
         page.MatchMarkdownSnapshot();
     }
 
+    [Fact]
+    public async Task Fetch_Last_2_Items_Between()
+    {
+        // Arrange
+        var connectionString = CreateConnectionString();
+        await SeedAsync(connectionString);
+
+        // .. get last page
+        var arguments = new PagingArguments(last: 4);
+        await using var context = new CatalogContext(connectionString);
+        var page = await context.Products
+            .OrderBy(t => t.Name)
+            .ThenBy(t => t.Id)
+            .ToPageAsync(arguments);
+
+        // Act
+        arguments = new PagingArguments(after: page.CreateCursor(page.First!), last: 2, before: page.CreateCursor(page.Last!));
+        page = await context.Products.OrderBy(t => t.Name).ThenBy(t => t.Id).ToPageAsync(arguments);
+
+        // Assert
+        page.MatchMarkdownSnapshot();
+    }
+
     [Fact]
     public async Task Batch_Fetch_First_2_Items()
     {

diff --git a/...yFramework.Tests/__snapshots__/PagingHelperTests.Fetch_First_2_Items_Between.md b/...yFramework.Tests/__snapshots__/PagingHelperTests.Fetch_First_2_Items_Between.md
@@ -0,0 +1,36 @@
+# Fetch_First_2_Items_Between
+
+```json
+[
+  {
+    "Id": 2,
+    "Name": "Product 0-1",
+    "Description": null,
+    "Price": 0.0,
+    "ImageFileName": null,
+    "TypeId": 1,
+    "Type": null,
+    "BrandId": 1,
+    "Brand": null,
+    "AvailableStock": 0,
+    "RestockThreshold": 0,
+    "MaxStockThreshold": 0,
+    "OnReorder": false
+  },
+  {
+    "Id": 11,
+    "Name": "Product 0-10",
+    "Description": null,
+    "Price": 0.0,
+    "ImageFileName": null,
+    "TypeId": 1,
+    "Type": null,
+    "BrandId": 1,
+    "Brand": null,
+    "AvailableStock": 0,
+    "RestockThreshold": 0,
+    "MaxStockThreshold": 0,
+    "OnReorder": false
+  }
+]
+```
diff --git a/...tyFramework.Tests/__snapshots__/PagingHelperTests.Fetch_Last_2_Items_Between.md b/...tyFramework.Tests/__snapshots__/PagingHelperTests.Fetch_Last_2_Items_Between.md
@@ -0,0 +1,36 @@
+# Fetch_Last_2_Items_Between
+
+```json
+[
+  {
+    "Id": 9998,
+    "Name": "Product 99-97",
+    "Description": null,
+    "Price": 0.0,
+    "ImageFileName": null,
+    "TypeId": 1,
+    "Type": null,
+    "BrandId": 100,
+    "Brand": null,
+    "AvailableStock": 0,
+    "RestockThreshold": 0,
+    "MaxStockThreshold": 0,
+    "OnReorder": false
+  },
+  {
+    "Id": 9999,
+    "Name": "Product 99-98",
+    "Description": null,
+    "Price": 0.0,
+    "ImageFileName": null,
+    "TypeId": 1,
+    "Type": null,
+    "BrandId": 100,
+    "Brand": null,
+    "AvailableStock": 0,
+    "RestockThreshold": 0,
+    "MaxStockThreshold": 0,
+    "OnReorder": false
+  }
+]
+```