feat: support negative indexing (#336)

ikesnowy · web-flow · commit b1c24fb58aeb · 2025-10-08T14:47:13.000+08:00
* feat: support negative indexing

* fix: ensure db deleted before creating new db context

* fix: split in memory db name
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj
@@ -17,8 +17,8 @@
 
   <ItemGroup>
     <PackageReference Include="Mapster" Version="7.4.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.9" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/PageableQueryHandlerBase.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/PageableQueryHandlerBase.cs
@@ -1,5 +1,4 @@
 ﻿using Cnblogs.Architecture.Ddd.Infrastructure.Abstractions;
-
 using Mapster;
 
 namespace Cnblogs.Architecture.Ddd.Cqrs.Abstractions;
@@ -21,15 +20,21 @@ public async Task<PagedList<TView>> Handle(TQuery request, CancellationToken can
             request.OrderByString,
             out var orderBySegments);
 
+        var isNegativeIndexing = request.PagingParams?.PageIndex < 0;
+        if (isNegativeIndexing && orderBySegments is { Count: > 0 })
+        {
+            orderBySegments = orderBySegments.Select(o => o with { IsDesc = !o.IsDesc }).ToList();
+        }
+
         var ordered = hasOrderBy && orderBySegments is { Count: > 0 }
             ? queryable.OrderBy(orderBySegments)
-            : DefaultOrderBy(request, queryable);
+            : DefaultOrderBy(request, queryable, isNegativeIndexing);
 
         var totalCount = 0;
         if (request.PagingParams != null)
         {
             totalCount = await CountAsync(request, queryable);
-            if (request.PagingParams.PageSize == 0 || totalCount == 0)
+            if (request.PagingParams.PageSize <= 0 || totalCount == 0)
             {
                 // need count only or no available item, short circuit here.
                 return new PagedList<TView>([], request.PagingParams, totalCount);
@@ -60,6 +65,17 @@ public async Task<PagedList<TView>> Handle(TQuery request, CancellationToken can
     /// <returns>Ordered <see cref="IQueryable{T}" />.</returns>
     protected abstract IQueryable<TEntity> DefaultOrderBy(TQuery query, IQueryable<TEntity> queryable);
 
+    /// <summary>
+    ///     The default reverse order by field, used when <see cref="OrderBySegment" /> is not present and pageIndex is negative.
+    /// </summary>
+    /// <param name="query">The query parameters.</param>
+    /// <param name="queryable"><see cref="IQueryable{TEntity}" /> returned by <see cref="Filter" />.</param>
+    /// <returns>Ordered <see cref="IQueryable{T}" />.</returns>
+    protected virtual IQueryable<TEntity> DefaultReverseOrderBy(TQuery query, IQueryable<TEntity> queryable)
+    {
+        return DefaultOrderBy(query, queryable);
+    }
+
     /// <summary>
     ///     Create queryable and apply filter, return filtered <see cref="IQueryable{T}" />.
     /// </summary>
@@ -95,4 +111,12 @@ protected virtual IQueryable<TView> ProjectToView(TQuery query, IQueryable<TEnti
     /// <param name="queryable">Projected <see cref="IQueryable{T}" />.</param>
     /// <returns>The query result.</returns>
     protected abstract Task<List<TView>> ToListAsync(TQuery query, IQueryable<TView> queryable);
+
+    private IQueryable<TEntity> DefaultOrderBy(
+        TQuery query,
+        IQueryable<TEntity> queryable,
+        bool isNegativeIndexing)
+    {
+        return isNegativeIndexing ? DefaultReverseOrderBy(query, queryable) : DefaultOrderBy(query, queryable);
+    }
 }
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/PagingParamsModelBinder.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/PagingParamsModelBinder.cs
@@ -29,17 +29,17 @@ public Task BindModelAsync(ModelBindingContext bindingContext)
         }
 
         var pageIndexSuccess = int.TryParse(pageIndexString, out var pageIndexNumber);
-        if (pageIndexSuccess == false || pageIndexNumber <= 0)
+        if (pageIndexSuccess == false)
         {
-            bindingContext.ModelState.TryAddModelError(modelName, "PageIndex must be a positive number");
+            bindingContext.ModelState.TryAddModelError(modelName, "PageIndex must be a number");
             bindingContext.Result = ModelBindingResult.Failed();
             return Task.CompletedTask;
         }
 
         var pageSizeSuccess = int.TryParse(pageSizeString, out var pageSizeNumber);
         if (pageSizeSuccess == false || pageSizeNumber < 0)
         {
-            bindingContext.ModelState.TryAddModelError(modelName, "PageIndex must be a positive number or 0");
+            bindingContext.ModelState.TryAddModelError(modelName, "PageSize must be a positive number or 0");
             bindingContext.Result = ModelBindingResult.Failed();
             return Task.CompletedTask;
         }
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj
@@ -12,11 +12,11 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.9" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.9" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Abstractions/PagingParams.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.Abstractions/PagingParams.cs
@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations;
+﻿using System.ComponentModel.DataAnnotations;
 
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
@@ -10,7 +10,7 @@ namespace Cnblogs.Architecture.Ddd.Infrastructure.Abstractions;
 /// </summary>
 /// <param name="PageIndex">页码。</param>
 /// <param name="PageSize">每页元素数。</param>
-public record PagingParams([Range(1, int.MaxValue)] int PageIndex, [Range(0, int.MaxValue)] int PageSize)
+public record PagingParams(int PageIndex, [Range(0, int.MaxValue)] int PageSize)
 {
     /// <inheritdoc />
     public override string ToString()
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Abstractions/QueryPager.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.Abstractions/QueryPager.cs
@@ -18,7 +18,7 @@ public static class QueryPager
     public static IQueryable<T> Paging<T>(this IQueryable<T> queryable, PagingParams pagingParams)
     {
         var (pageIndex, pageSize) = pagingParams;
-        return queryable.Paging(pageIndex, pageSize);
+        return queryable.Paging(pageIndex < 0 ? -pageIndex : pageIndex, pageSize < 0 ? -pageSize : pageSize);
     }
 
     /// <summary>
@@ -53,4 +53,4 @@ public static IQueryable<T> Paging<T>(this IQueryable<T> queryable, int pageInde
             ? queryable.Take(pageSize)
             : queryable.Skip((pageIndex - 1) * pageSize).Take(pageSize);
     }
-}
+}
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Abstractions/QueryStringBuilder.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.Abstractions/QueryStringBuilder.cs
@@ -45,15 +45,15 @@ public QueryStringBuilder(
     /// </summary>
     /// <param name="pagingParams">分页参数。</param>
     /// <returns></returns>
-    public QueryStringBuilder AddPaging(PagingParams pagingParams)
-        => AddPaging(pagingParams.PageIndex, pagingParams.PageSize);
+    public QueryStringBuilder AddPaging(PagingParams? pagingParams)
+        => AddPaging(pagingParams?.PageIndex, pagingParams?.PageSize);
 
     /// <summary>
     /// 添加分页参数。
     /// </summary>
     /// <param name="pageIndex">页码。</param>
     /// <param name="pageSize">分页大小。</param>
-    public QueryStringBuilder AddPaging(int pageIndex, int pageSize)
+    public QueryStringBuilder AddPaging(int? pageIndex, int? pageSize)
         => Add(nameof(pageIndex), pageIndex).Add(nameof(pageSize), pageSize);
 
     /// <summary>
@@ -170,4 +170,4 @@ public override string ToString()
     {
         return Build();
     }
-}
+}
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.csproj"/>
     <ProjectReference Include="..\Cnblogs.Architecture.Ddd.Infrastructure.Abstractions\Cnblogs.Architecture.Ddd.Infrastructure.Abstractions.csproj"/>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.9" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj
@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="StackExchange.Redis" Version="2.9.11" />
+      <PackageReference Include="StackExchange.Redis" Version="2.9.25" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.1.66" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.9" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="MongoDB.Driver" Version="3.4.3" />
+      <PackageReference Include="MongoDB.Driver" Version="3.5.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
     <PackageReference Include="Cnblogs.Serilog.Extensions" Version="1.1.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -12,7 +12,7 @@
     <PackageReference Include="Serilog.Sinks.InMemory" Version="2.0.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Cnblogs.Architecture.IntegrationTests/CustomModelBinderTests.cs b/test/Cnblogs.Architecture.IntegrationTests/CustomModelBinderTests.cs
@@ -41,7 +41,6 @@ public async Task PagingParamsModelBinder_NoPageIndexOrPageSize_NullAsync(string
 
     [Theory]
     [InlineData("hello")]
-    [InlineData("-1")]
     public async Task PagingParamsModelBinder_PageIndexInvalid_FailAsync(string pageIndex)
     {
         // Arrange
diff --git a/test/Cnblogs.Architecture.TestShared/EntityGenerator.Varies.cs b/test/Cnblogs.Architecture.TestShared/EntityGenerator.Varies.cs
@@ -44,6 +44,15 @@ public EntityGenerator<TEntity> VaryByDateTimeDay(
             days,
             DateTime.Now);
 
+    public EntityGenerator<TEntity> VaryByDateTimeDay(
+        Expression<Func<TEntity, DateTimeOffset>>? datetimeAccess,
+        int days)
+        => VaryByDateTime(
+            datetimeAccess,
+            (start, day) => start.AddDays(-day),
+            days,
+            DateTime.Now);
+
     public EntityGenerator<TEntity> VaryByDateTime(
         Expression<Func<TEntity, DateTime>>? datetimeAccess,
         Func<DateTime, int, DateTime> timeDiffer,
@@ -59,6 +68,21 @@ public EntityGenerator<TEntity> VaryByDateTime(
         return VaryBy(datetimeAccess, dates);
     }
 
+    public EntityGenerator<TEntity> VaryByDateTime(
+        Expression<Func<TEntity, DateTimeOffset>>? datetimeAccess,
+        Func<DateTimeOffset, int, DateTimeOffset> timeDiffer,
+        int diffs,
+        DateTime startDate)
+    {
+        var dates = new DateTimeOffset[diffs];
+        for (var i = 0; i < diffs; i++)
+        {
+            dates[i] = timeDiffer(startDate, i);
+        }
+
+        return VaryBy(datetimeAccess, dates);
+    }
+
     public EntityGenerator<TEntity> VaryByBoolean(Expression<Func<TEntity, bool>>? booleanAccess)
         => VaryBy(booleanAccess, true, false);
 
@@ -67,4 +91,4 @@ public EntityGenerator<TEntity> VaryByInt(Expression<Func<TEntity, int>>? intAcc
 
     public EntityGenerator<TEntity> MultiplyBy(int times)
         => VaryBy<int>(null, Enumerable.Range(0, times));
-}
+}
diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj
@@ -2,8 +2,8 @@
 
   <ItemGroup>
     <PackageReference Include="xunit" Version="2.9.3"/>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/test/Cnblogs.Architecture.UnitTests/Cqrs/FakeObjects/FakePostDto.cs b/test/Cnblogs.Architecture.UnitTests/Cqrs/FakeObjects/FakePostDto.cs
@@ -0,0 +1,3 @@
+﻿namespace Cnblogs.Architecture.UnitTests.Cqrs.FakeObjects;
+
+public record FakePostDto(int Id, DateTimeOffset DateAdded, DateTimeOffset DateUpdated);
diff --git a/test/Cnblogs.Architecture.UnitTests/Cqrs/FakeObjects/TestPageableQuery.cs b/test/Cnblogs.Architecture.UnitTests/Cqrs/FakeObjects/TestPageableQuery.cs
@@ -0,0 +1,7 @@
+﻿using Cnblogs.Architecture.Ddd.Cqrs.Abstractions;
+using Cnblogs.Architecture.Ddd.Infrastructure.Abstractions;
+
+namespace Cnblogs.Architecture.UnitTests.Cqrs.FakeObjects;
+
+public record TestPageableQuery(bool? Deleted, PagingParams? PagingParams, string? OrderByString)
+    : IPageableQuery<FakePostDto>;
diff --git a/test/Cnblogs.Architecture.UnitTests/Cqrs/FakeObjects/TestPageableQueryHandler.cs b/test/Cnblogs.Architecture.UnitTests/Cqrs/FakeObjects/TestPageableQueryHandler.cs
@@ -0,0 +1,33 @@
+﻿using Cnblogs.Architecture.Ddd.Cqrs.EntityFramework;
+using Cnblogs.Architecture.UnitTests.Infrastructure.FakeObjects;
+using Microsoft.EntityFrameworkCore;
+
+namespace Cnblogs.Architecture.UnitTests.Cqrs.FakeObjects;
+
+public class TestPageableQueryHandler(DbContext context)
+    : EfPageableQueryHandler<TestPageableQuery, FakePost, FakePostDto>
+{
+    /// <inheritdoc />
+    protected override IQueryable<FakePost> DefaultOrderBy(TestPageableQuery query, IQueryable<FakePost> queryable)
+    {
+        return queryable.OrderByDescending(x => x.DateAdded).ThenByDescending(x => x.DateUpdated);
+    }
+
+    /// <inheritdoc />
+    protected override IQueryable<FakePost> DefaultReverseOrderBy(TestPageableQuery query, IQueryable<FakePost> queryable)
+    {
+        return queryable.OrderBy(x => x.DateAdded).ThenBy(x => x.DateUpdated);
+    }
+
+    /// <inheritdoc />
+    protected override IQueryable<FakePost> Filter(TestPageableQuery query)
+    {
+        var queryable = context.Set<FakePost>().AsNoTracking();
+        if (query.Deleted.HasValue)
+        {
+            queryable = queryable.Where(x => x.Deleted == query.Deleted.Value);
+        }
+
+        return queryable;
+    }
+}
diff --git a/test/Cnblogs.Architecture.UnitTests/Cqrs/Handlers/PageableQueryHandlerTests.cs b/test/Cnblogs.Architecture.UnitTests/Cqrs/Handlers/PageableQueryHandlerTests.cs
diff --git a/test/Cnblogs.Architecture.UnitTests/Infrastructure/EntityFramework/BaseRepositoryTests.cs b/test/Cnblogs.Architecture.UnitTests/Infrastructure/EntityFramework/BaseRepositoryTests.cs
diff --git a/test/Cnblogs.Architecture.UnitTests/Infrastructure/FakeObjects/FakeDbContext.cs b/test/Cnblogs.Architecture.UnitTests/Infrastructure/FakeObjects/FakeDbContext.cs

Original file line number	Diff line number	Diff line change
`@@ -29,17 +29,17 @@ public Task BindModelAsync(ModelBindingContext bindingContext)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`var pageIndexSuccess = int.TryParse(pageIndexString, out var pageIndexNumber);`
`32`		`- if (pageIndexSuccess == false \|\| pageIndexNumber <= 0)`
	`32`	`+ if (pageIndexSuccess == false)`
`33`	`33`	`{`
`34`		`- bindingContext.ModelState.TryAddModelError(modelName, "PageIndex must be a positive number");`
	`34`	`+ bindingContext.ModelState.TryAddModelError(modelName, "PageIndex must be a number");`
`35`	`35`	`bindingContext.Result = ModelBindingResult.Failed();`
`36`	`36`	`return Task.CompletedTask;`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`var pageSizeSuccess = int.TryParse(pageSizeString, out var pageSizeNumber);`
`40`	`40`	`if (pageSizeSuccess == false \|\| pageSizeNumber < 0)`
`41`	`41`	`{`
`42`		`- bindingContext.ModelState.TryAddModelError(modelName, "PageIndex must be a positive number or 0");`
	`42`	`+ bindingContext.ModelState.TryAddModelError(modelName, "PageSize must be a positive number or 0");`
`43`	`43`	`bindingContext.Result = ModelBindingResult.Failed();`
`44`	`44`	`return Task.CompletedTask;`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public static class QueryPager`
`18`	`18`	`public static IQueryable<T> Paging<T>(this IQueryable<T> queryable, PagingParams pagingParams)`
`19`	`19`	`{`
`20`	`20`	`var (pageIndex, pageSize) = pagingParams;`
`21`		`- return queryable.Paging(pageIndex, pageSize);`
	`21`	`+ return queryable.Paging(pageIndex < 0 ? -pageIndex : pageIndex, pageSize < 0 ? -pageSize : pageSize);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/// <summary>`
`@@ -53,4 +53,4 @@ public static IQueryable<T> Paging<T>(this IQueryable<T> queryable, int pageInde`
`53`	`53`	`? queryable.Take(pageSize)`
`54`	`54`	`: queryable.Skip((pageIndex - 1) * pageSize).Take(pageSize);`
`55`	`55`	`}`
`56`		`-}`
	`56`	`+}`