msumshk/TakeoutSaaS.AdminApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: AdminApi 剔除租户侧能力

Browse Source
This commit is contained in:
MSuMshk
2026-01-29 23:24:44 +00:00
parent 71e5a9dc29
commit 4f8424adb6
139 changed files with 622 additions and 4691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/TakeoutSaaS.Integration.Tests/App/Tenants/AnnouncementWorkflowTests.cs
View File

@@ -13,12 +13,15 @@ using TakeoutSaaS.Shared.Abstractions.Exceptions;
namespace TakeoutSaaS.Integration.Tests.App.Tenants;
/// <summary>
/// 公告工作流集成测试。
/// </summary>
public sealed class AnnouncementWorkflowTests
{
[Fact]
public async Task GivenDraftAnnouncement_WhenPublish_ThenStatusIsPublishedAndActive()
{
// Arrange
// 1. 准备
using var database = new SqliteTestDatabase();
using var context = database.CreateContext(tenantId: 100, userId: 11);
@@ -28,18 +31,18 @@ public sealed class AnnouncementWorkflowTests
context.ChangeTracker.Clear();
var repository = new EfTenantAnnouncementRepository(context);
var tenantProvider = new TestTenantProvider(100);
var eventPublisher = new Mock<IEventPublisher>();
var handler = new PublishAnnouncementCommandHandler(repository, tenantProvider, eventPublisher.Object);
var handler = new PublishAnnouncementCommandHandler(repository, eventPublisher.Object);
// Act
// 2. (空行后) 执行
var result = await handler.Handle(new PublishAnnouncementCommand
{
TenantId = 100,
AnnouncementId = announcement.Id,
RowVersion = announcement.RowVersion
}, CancellationToken.None);
// Assert
// 3. (空行后) 断言
result.Should().NotBeNull();
result!.Status.Should().Be(AnnouncementStatus.Published);
result.IsActive.Should().BeTrue();
@@ -53,7 +56,7 @@ public sealed class AnnouncementWorkflowTests
[Fact]
public async Task GivenPublishedAnnouncement_WhenRevoke_ThenStatusIsRevokedAndInactive()
{
// Arrange
// 1. 准备
using var database = new SqliteTestDatabase();
using var context = database.CreateContext(tenantId: 200, userId: 11);
@@ -64,18 +67,18 @@ public sealed class AnnouncementWorkflowTests
context.ChangeTracker.Clear();
var repository = new EfTenantAnnouncementRepository(context);
var tenantProvider = new TestTenantProvider(200);
var eventPublisher = new Mock<IEventPublisher>();
var handler = new RevokeAnnouncementCommandHandler(repository, tenantProvider, eventPublisher.Object);
var handler = new RevokeAnnouncementCommandHandler(repository, eventPublisher.Object);
// Act
// 2. (空行后) 执行
var result = await handler.Handle(new RevokeAnnouncementCommand
{
TenantId = 200,
AnnouncementId = announcement.Id,
RowVersion = announcement.RowVersion
}, CancellationToken.None);
// Assert
// 3. (空行后) 断言
result.Should().NotBeNull();
result!.Status.Should().Be(AnnouncementStatus.Revoked);
result.IsActive.Should().BeFalse();
@@ -89,7 +92,7 @@ public sealed class AnnouncementWorkflowTests
[Fact]
public async Task GivenRevokedAnnouncement_WhenPublish_ThenRepublishAndClearRevokedAt()
{
// Arrange
// 1. 准备
using var database = new SqliteTestDatabase();
using var context = database.CreateContext(tenantId: 300, userId: 11);
@@ -101,18 +104,18 @@ public sealed class AnnouncementWorkflowTests
context.ChangeTracker.Clear();
var repository = new EfTenantAnnouncementRepository(context);
var tenantProvider = new TestTenantProvider(300);
var eventPublisher = new Mock<IEventPublisher>();
var handler = new PublishAnnouncementCommandHandler(repository, tenantProvider, eventPublisher.Object);
var handler = new PublishAnnouncementCommandHandler(repository, eventPublisher.Object);
// Act
// 2. (空行后) 执行
var result = await handler.Handle(new PublishAnnouncementCommand
{
TenantId = 300,
AnnouncementId = announcement.Id,
RowVersion = announcement.RowVersion
}, CancellationToken.None);
// Assert
// 3. (空行后) 断言
result.Should().NotBeNull();
result!.Status.Should().Be(AnnouncementStatus.Published);
result.IsActive.Should().BeTrue();

15
tests/TakeoutSaaS.Integration.Tests/Fixtures/DictionarySqliteTestDatabase.cs
View File

@@ -4,9 +4,13 @@ using TakeoutSaaS.Infrastructure.Dictionary.Persistence;
namespace TakeoutSaaS.Integration.Tests.Fixtures;
/// <summary>
/// 集成测试用 SQLite 内存数据库（字典库）。
/// </summary>
public sealed class DictionarySqliteTestDatabase : IDisposable
{
private readonly SqliteConnection _connection;
private readonly TestIdGenerator _idGenerator = new();
private bool _initialized;
public DictionarySqliteTestDatabase()
@@ -24,10 +28,14 @@ public sealed class DictionarySqliteTestDatabase : IDisposable
public DictionaryDbContext CreateContext(long tenantId, long userId = 0)
{
EnsureCreated();
// 1. AdminApi 不使用租户上下文；tenantId 参数仅用于兼容测试调用方签名
_ = tenantId;
// 2. (空行后) 按需注入当前用户与 ID 生成器
return new DictionaryDbContext(
Options,
new TestTenantProvider(tenantId),
userId == 0 ? null : new TestCurrentUserAccessor(userId));
userId == 0 ? null : new TestCurrentUserAccessor(userId),
_idGenerator);
}
public void EnsureCreated()
@@ -37,7 +45,8 @@ public sealed class DictionarySqliteTestDatabase : IDisposable
return;
}
using var context = new DictionaryDbContext(Options, new TestTenantProvider(1));
// 1. 创建并初始化数据库结构
using var context = new DictionaryDbContext(Options, idGenerator: _idGenerator);
context.Database.EnsureCreated();
_initialized = true;
}

16
tests/TakeoutSaaS.Integration.Tests/Fixtures/SqliteTestDatabase.cs
View File

@@ -4,9 +4,13 @@ using TakeoutSaaS.Infrastructure.App.Persistence;
namespace TakeoutSaaS.Integration.Tests.Fixtures;
/// <summary>
/// 集成测试用 SQLite 内存数据库（业务主库）。
/// </summary>
public sealed class SqliteTestDatabase : IDisposable
{
private readonly SqliteConnection _connection;
private readonly TestIdGenerator _idGenerator = new();
private bool _initialized;
public SqliteTestDatabase()
@@ -24,7 +28,14 @@ public sealed class SqliteTestDatabase : IDisposable
public TakeoutAdminDbContext CreateContext(long tenantId, long userId = 0)
{
EnsureCreated();
return new TakeoutAdminDbContext(Options, new TestTenantProvider(tenantId), new TestCurrentUserAccessor(userId));
// 1. AdminApi 不使用租户上下文；tenantId 参数仅用于兼容测试调用方签名
_ = tenantId;
// 2. (空行后) 按需注入当前用户与 ID 生成器
return new TakeoutAdminDbContext(
Options,
userId == 0 ? null : new TestCurrentUserAccessor(userId),
_idGenerator);
}
public void EnsureCreated()
@@ -34,7 +45,8 @@ public sealed class SqliteTestDatabase : IDisposable
return;
}
using var context = new TakeoutAdminDbContext(Options, new TestTenantProvider(1));
// 1. 创建并初始化数据库结构
using var context = new TakeoutAdminDbContext(Options, idGenerator: _idGenerator);
context.Database.EnsureCreated();
_initialized = true;
}

20
tests/TakeoutSaaS.Integration.Tests/Fixtures/TestIdGenerator.cs Normal file
View File

@@ -0,0 +1,20 @@
using System.Threading;
using TakeoutSaaS.Shared.Abstractions.Ids;
namespace TakeoutSaaS.Integration.Tests.Fixtures;
/// <summary>
/// 集成测试用雪花 ID 生成器（递增模拟）。
/// </summary>
public sealed class TestIdGenerator : IIdGenerator
{
private long _current;
/// <summary>
/// 生成下一个 ID。
/// </summary>
/// <returns>递增的 long ID。</returns>
public long NextId()
=> Interlocked.Increment(ref _current);
}

23
tests/TakeoutSaaS.Integration.Tests/Performance/AnnouncementQueryPerformanceTests.cs
View File

@@ -9,15 +9,17 @@ using TakeoutSaaS.Integration.Tests.Fixtures;
namespace TakeoutSaaS.Integration.Tests.Performance;
/// <summary>
/// 公告查询性能相关测试。
/// </summary>
public sealed class AnnouncementQueryPerformanceTests
{
[Fact]
public async Task GivenLargeDataset_WhenQueryingAnnouncements_ThenCompletesWithinThreshold()
{
// Arrange
// 1. 准备
using var database = new SqliteTestDatabase();
using var context = database.CreateContext(tenantId: 900);
var announcements = new List<TenantAnnouncement>();
for (var i = 0; i < 1000; i++)
{
@@ -45,30 +47,21 @@ public sealed class AnnouncementQueryPerformanceTests
context.TenantAnnouncements.AddRange(announcements);
await context.SaveChangesAsync();
context.ChangeTracker.Clear();
var announcementRepository = new EfTenantAnnouncementRepository(context);
var readRepository = new EfTenantAnnouncementReadRepository(context);
var tenantProvider = new TestTenantProvider(900);
var handler = new GetTenantsAnnouncementsQueryHandler(
announcementRepository,
readRepository,
tenantProvider);
var handler = new GetTenantsAnnouncementsQueryHandler(announcementRepository);
var query = new GetTenantsAnnouncementsQuery
{
TenantId = 900,
Page = 1,
PageSize = 50
};
// Act
// 2. (空行后) 执行
var stopwatch = Stopwatch.StartNew();
var result = await handler.Handle(query, CancellationToken.None);
stopwatch.Stop();
// Assert
// 注意：由于性能优化，TotalCount 不再是精确的全局总数，
// 而是基于估算查询限制（page * size * 3）过滤后的结果数
// 这是性能优化的权衡：牺牲精确性换取性能
// 3. (空行后) 断言：TotalCount 为估算口径（page * size * 3）过滤后的数量
result.Items.Count.Should().Be(50); // 请求的页大小
result.TotalCount.Should().BeLessThanOrEqualTo(150); // 最多是 estimatedLimit
result.TotalCount.Should().BeGreaterThan(0); // 至少有一些结果