refactor: AdminApi 剔除租户侧能力
This commit is contained in:
@@ -5,118 +5,50 @@ using TakeoutSaaS.Application.App.Tenants.Queries;
|
||||
using TakeoutSaaS.Application.Tests.TestUtilities;
|
||||
using TakeoutSaaS.Domain.Tenants.Entities;
|
||||
using TakeoutSaaS.Domain.Tenants.Repositories;
|
||||
using TakeoutSaaS.Shared.Abstractions.Security;
|
||||
using TakeoutSaaS.Shared.Abstractions.Tenancy;
|
||||
|
||||
namespace TakeoutSaaS.Application.Tests.App.Tenants.Handlers;
|
||||
|
||||
/// <summary>
|
||||
/// <see cref="GetAnnouncementByIdQueryHandler"/> 单元测试。
|
||||
/// </summary>
|
||||
public sealed class GetAnnouncementByIdQueryHandlerTests
|
||||
{
|
||||
[Fact]
|
||||
public async Task GivenAnnouncementMissing_WhenHandle_ThenReturnsNull()
|
||||
{
|
||||
// Arrange
|
||||
var tenantProvider = new Mock<ITenantProvider>();
|
||||
tenantProvider.Setup(x => x.GetCurrentTenantId()).Returns(99);
|
||||
|
||||
// 1. 准备
|
||||
var announcementRepository = new Mock<ITenantAnnouncementRepository>();
|
||||
announcementRepository
|
||||
.Setup(x => x.FindByIdInScopeAsync(99, 500, It.IsAny<CancellationToken>()))
|
||||
.Setup(x => x.FindByIdAsync(99, 500, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync((TenantAnnouncement?)null);
|
||||
|
||||
var readRepository = new Mock<ITenantAnnouncementReadRepository>();
|
||||
// 2. (空行后) 执行
|
||||
var handler = new GetAnnouncementByIdQueryHandler(announcementRepository.Object);
|
||||
var result = await handler.Handle(new GetAnnouncementByIdQuery { TenantId = 99, AnnouncementId = 500 }, CancellationToken.None);
|
||||
|
||||
var handler = new GetAnnouncementByIdQueryHandler(
|
||||
announcementRepository.Object,
|
||||
readRepository.Object,
|
||||
tenantProvider.Object);
|
||||
|
||||
// Act
|
||||
var result = await handler.Handle(new GetAnnouncementByIdQuery { AnnouncementId = 500 }, CancellationToken.None);
|
||||
|
||||
// Assert
|
||||
// 3. (空行后) 断言
|
||||
result.Should().BeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GivenTargetNotMatched_WhenHandle_ThenReturnsNullAndSkipsReadLookup()
|
||||
public async Task GivenAnnouncementExists_WhenHandle_ThenReturnsDtoWithoutReadState()
|
||||
{
|
||||
// Arrange
|
||||
var tenantProvider = new Mock<ITenantProvider>();
|
||||
tenantProvider.Setup(x => x.GetCurrentTenantId()).Returns(100);
|
||||
|
||||
var currentUserAccessor = new Mock<ICurrentUserAccessor>();
|
||||
currentUserAccessor.SetupGet(x => x.UserId).Returns(123);
|
||||
currentUserAccessor.SetupGet(x => x.IsAuthenticated).Returns(true);
|
||||
|
||||
var announcement = AnnouncementTestData.CreateAnnouncement(1, 100, 1, DateTime.UtcNow);
|
||||
announcement.TargetType = "SPECIFIC_USERS";
|
||||
announcement.TargetParameters = "{\"userIds\":[999]}";
|
||||
|
||||
var announcementRepository = new Mock<ITenantAnnouncementRepository>();
|
||||
announcementRepository
|
||||
.Setup(x => x.FindByIdInScopeAsync(100, 1, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(announcement);
|
||||
|
||||
var readRepository = new Mock<ITenantAnnouncementReadRepository>();
|
||||
|
||||
var handler = new GetAnnouncementByIdQueryHandler(
|
||||
announcementRepository.Object,
|
||||
readRepository.Object,
|
||||
tenantProvider.Object,
|
||||
currentUserAccessor.Object);
|
||||
|
||||
// Act
|
||||
var result = await handler.Handle(new GetAnnouncementByIdQuery { AnnouncementId = 1 }, CancellationToken.None);
|
||||
|
||||
// Assert
|
||||
result.Should().BeNull();
|
||||
readRepository.Verify(x => x.GetByAnnouncementAsync(
|
||||
It.IsAny<long>(),
|
||||
It.IsAny<IEnumerable<long>>(),
|
||||
It.IsAny<long?>(),
|
||||
It.IsAny<CancellationToken>()), Times.Never);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GivenUserReadRecord_WhenHandle_ThenReturnsDtoWithReadState()
|
||||
{
|
||||
// Arrange
|
||||
var tenantProvider = new Mock<ITenantProvider>();
|
||||
tenantProvider.Setup(x => x.GetCurrentTenantId()).Returns(200);
|
||||
|
||||
var currentUserAccessor = new Mock<ICurrentUserAccessor>();
|
||||
currentUserAccessor.SetupGet(x => x.UserId).Returns(321);
|
||||
currentUserAccessor.SetupGet(x => x.IsAuthenticated).Returns(true);
|
||||
|
||||
// 1. 准备
|
||||
var announcement = AnnouncementTestData.CreateAnnouncement(10, 200, 1, DateTime.UtcNow);
|
||||
var readAt = DateTime.UtcNow.AddMinutes(-3);
|
||||
|
||||
var announcementRepository = new Mock<ITenantAnnouncementRepository>();
|
||||
announcementRepository
|
||||
.Setup(x => x.FindByIdInScopeAsync(200, 10, It.IsAny<CancellationToken>()))
|
||||
.Setup(x => x.FindByIdAsync(200, 10, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(announcement);
|
||||
|
||||
var readRepository = new Mock<ITenantAnnouncementReadRepository>();
|
||||
readRepository
|
||||
.Setup(x => x.GetByAnnouncementAsync(200, It.IsAny<IEnumerable<long>>(), 321, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new List<TenantAnnouncementRead>
|
||||
{
|
||||
new() { AnnouncementId = 10, TenantId = 200, UserId = 321, ReadAt = readAt }
|
||||
});
|
||||
// 2. (空行后) 执行
|
||||
var handler = new GetAnnouncementByIdQueryHandler(announcementRepository.Object);
|
||||
var result = await handler.Handle(new GetAnnouncementByIdQuery { TenantId = 200, AnnouncementId = 10 }, CancellationToken.None);
|
||||
|
||||
var handler = new GetAnnouncementByIdQueryHandler(
|
||||
announcementRepository.Object,
|
||||
readRepository.Object,
|
||||
tenantProvider.Object,
|
||||
currentUserAccessor.Object);
|
||||
|
||||
// Act
|
||||
var result = await handler.Handle(new GetAnnouncementByIdQuery { AnnouncementId = 10 }, CancellationToken.None);
|
||||
|
||||
// Assert
|
||||
// 3. (空行后) 断言
|
||||
result.Should().NotBeNull();
|
||||
result!.IsRead.Should().BeTrue();
|
||||
result.ReadAt.Should().BeCloseTo(readAt, TimeSpan.FromSeconds(1));
|
||||
result!.Id.Should().Be(announcement.Id);
|
||||
result.TenantId.Should().Be(announcement.TenantId);
|
||||
result.IsRead.Should().BeFalse();
|
||||
result.ReadAt.Should().BeNull();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,24 +4,18 @@ using TakeoutSaaS.Application.App.Tenants.Handlers;
|
||||
using TakeoutSaaS.Application.App.Tenants.Queries;
|
||||
using TakeoutSaaS.Application.Tests.TestUtilities;
|
||||
using TakeoutSaaS.Domain.Tenants.Repositories;
|
||||
using TakeoutSaaS.Shared.Abstractions.Security;
|
||||
using TakeoutSaaS.Shared.Abstractions.Tenancy;
|
||||
|
||||
namespace TakeoutSaaS.Application.Tests.App.Tenants.Handlers;
|
||||
|
||||
/// <summary>
|
||||
/// <see cref="GetTenantsAnnouncementsQueryHandler"/> 单元测试。
|
||||
/// </summary>
|
||||
public sealed class GetTenantsAnnouncementsQueryHandlerTests
|
||||
{
|
||||
[Fact]
|
||||
public async Task GivenQuery_WhenHandle_ThenUsesTenantProviderAndOrdersAndPaginates()
|
||||
public async Task GivenQuery_WhenHandle_ThenOrdersAndPaginates()
|
||||
{
|
||||
// Arrange
|
||||
var tenantProvider = new Mock<ITenantProvider>();
|
||||
tenantProvider.Setup(x => x.GetCurrentTenantId()).Returns(42);
|
||||
|
||||
var currentUserAccessor = new Mock<ICurrentUserAccessor>();
|
||||
currentUserAccessor.SetupGet(x => x.UserId).Returns(0);
|
||||
currentUserAccessor.SetupGet(x => x.IsAuthenticated).Returns(false);
|
||||
|
||||
// 1. 准备
|
||||
var announcements = new List<TakeoutSaaS.Domain.Tenants.Entities.TenantAnnouncement>
|
||||
{
|
||||
AnnouncementTestData.CreateAnnouncement(1, 42, priority: 1, effectiveFrom: DateTime.UtcNow.AddDays(-1)),
|
||||
@@ -30,12 +24,11 @@ public sealed class GetTenantsAnnouncementsQueryHandlerTests
|
||||
AnnouncementTestData.CreateAnnouncement(4, 42, priority: 0, effectiveFrom: DateTime.UtcNow)
|
||||
};
|
||||
|
||||
// 模拟数据库端排序：按 priority DESC, effectiveFrom DESC
|
||||
// 2. (空行后) 模拟数据库端排序：按 priority DESC, effectiveFrom DESC
|
||||
var sortedAnnouncements = announcements
|
||||
.OrderByDescending(x => x.Priority)
|
||||
.ThenByDescending(x => x.EffectiveFrom)
|
||||
.ToList();
|
||||
|
||||
var announcementRepository = new Mock<ITenantAnnouncementRepository>();
|
||||
announcementRepository
|
||||
.Setup(x => x.SearchAsync(
|
||||
@@ -52,34 +45,19 @@ public sealed class GetTenantsAnnouncementsQueryHandlerTests
|
||||
It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(sortedAnnouncements);
|
||||
|
||||
var announcementReadRepository = new Mock<ITenantAnnouncementReadRepository>();
|
||||
announcementReadRepository
|
||||
.Setup(x => x.GetByAnnouncementAsync(
|
||||
It.IsAny<long>(),
|
||||
It.IsAny<IEnumerable<long>>(),
|
||||
It.IsAny<long?>(),
|
||||
It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Array.Empty<TakeoutSaaS.Domain.Tenants.Entities.TenantAnnouncementRead>());
|
||||
|
||||
var handler = new GetTenantsAnnouncementsQueryHandler(
|
||||
announcementRepository.Object,
|
||||
announcementReadRepository.Object,
|
||||
tenantProvider.Object,
|
||||
currentUserAccessor.Object);
|
||||
|
||||
// 3. (空行后) 执行
|
||||
var handler = new GetTenantsAnnouncementsQueryHandler(announcementRepository.Object);
|
||||
var query = new GetTenantsAnnouncementsQuery
|
||||
{
|
||||
TenantId = 999,
|
||||
TenantId = 42,
|
||||
Page = 2,
|
||||
PageSize = 2
|
||||
};
|
||||
|
||||
// Act
|
||||
var result = await handler.Handle(query, CancellationToken.None);
|
||||
|
||||
// Assert
|
||||
// 4. (空行后) 断言
|
||||
announcementRepository.Verify(x => x.SearchAsync(
|
||||
42,
|
||||
query.TenantId,
|
||||
query.Keyword,
|
||||
query.Status,
|
||||
query.AnnouncementType,
|
||||
@@ -100,22 +78,16 @@ public sealed class GetTenantsAnnouncementsQueryHandlerTests
|
||||
[Fact]
|
||||
public async Task GivenOnlyEffective_WhenHandle_ThenFiltersScheduledPublish()
|
||||
{
|
||||
// Arrange
|
||||
var tenantProvider = new Mock<ITenantProvider>();
|
||||
tenantProvider.Setup(x => x.GetCurrentTenantId()).Returns(42);
|
||||
|
||||
// 1. 准备
|
||||
var announcement1 = AnnouncementTestData.CreateAnnouncement(1, 42, priority: 1, effectiveFrom: DateTime.UtcNow.AddDays(-1));
|
||||
announcement1.ScheduledPublishAt = DateTime.UtcNow.AddMinutes(-10);
|
||||
|
||||
var announcement2 = AnnouncementTestData.CreateAnnouncement(2, 42, priority: 1, effectiveFrom: DateTime.UtcNow.AddDays(-1));
|
||||
announcement2.ScheduledPublishAt = DateTime.UtcNow.AddMinutes(30);
|
||||
|
||||
var announcements = new List<TakeoutSaaS.Domain.Tenants.Entities.TenantAnnouncement>
|
||||
{
|
||||
announcement1,
|
||||
announcement2
|
||||
};
|
||||
|
||||
var announcementRepository = new Mock<ITenantAnnouncementRepository>();
|
||||
announcementRepository
|
||||
.Setup(x => x.SearchAsync(
|
||||
@@ -132,31 +104,18 @@ public sealed class GetTenantsAnnouncementsQueryHandlerTests
|
||||
It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(announcements);
|
||||
|
||||
var announcementReadRepository = new Mock<ITenantAnnouncementReadRepository>();
|
||||
announcementReadRepository
|
||||
.Setup(x => x.GetByAnnouncementAsync(
|
||||
It.IsAny<long>(),
|
||||
It.IsAny<IEnumerable<long>>(),
|
||||
It.IsAny<long?>(),
|
||||
It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Array.Empty<TakeoutSaaS.Domain.Tenants.Entities.TenantAnnouncementRead>());
|
||||
|
||||
var handler = new GetTenantsAnnouncementsQueryHandler(
|
||||
announcementRepository.Object,
|
||||
announcementReadRepository.Object,
|
||||
tenantProvider.Object);
|
||||
|
||||
// 2. (空行后) 执行
|
||||
var handler = new GetTenantsAnnouncementsQueryHandler(announcementRepository.Object);
|
||||
var query = new GetTenantsAnnouncementsQuery
|
||||
{
|
||||
TenantId = 42,
|
||||
OnlyEffective = true,
|
||||
Page = 1,
|
||||
PageSize = 10
|
||||
};
|
||||
|
||||
// Act
|
||||
var result = await handler.Handle(query, CancellationToken.None);
|
||||
|
||||
// Assert
|
||||
// 3. (空行后) 断言
|
||||
result.Items.Should().ContainSingle();
|
||||
result.Items[0].Id.Should().Be(1);
|
||||
}
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
using FluentAssertions;
|
||||
using Moq;
|
||||
using TakeoutSaaS.Application.App.Tenants.Handlers;
|
||||
using TakeoutSaaS.Application.App.Tenants.Queries;
|
||||
using TakeoutSaaS.Application.Tests.TestUtilities;
|
||||
using TakeoutSaaS.Domain.Tenants.Enums;
|
||||
using TakeoutSaaS.Domain.Tenants.Repositories;
|
||||
using TakeoutSaaS.Shared.Abstractions.Security;
|
||||
using TakeoutSaaS.Shared.Abstractions.Tenancy;
|
||||
|
||||
namespace TakeoutSaaS.Application.Tests.App.Tenants.Handlers;
|
||||
|
||||
public sealed class GetUnreadAnnouncementsQueryHandlerTests
|
||||
{
|
||||
[Fact]
|
||||
public async Task GivenUnreadAnnouncements_WhenHandle_ThenUsesTenantProviderAndPaginates()
|
||||
{
|
||||
// Arrange
|
||||
var tenantProvider = new Mock<ITenantProvider>();
|
||||
tenantProvider.Setup(x => x.GetCurrentTenantId()).Returns(55);
|
||||
|
||||
var currentUserAccessor = new Mock<ICurrentUserAccessor>();
|
||||
currentUserAccessor.SetupGet(x => x.UserId).Returns(0);
|
||||
currentUserAccessor.SetupGet(x => x.IsAuthenticated).Returns(false);
|
||||
|
||||
var announcements = new List<TakeoutSaaS.Domain.Tenants.Entities.TenantAnnouncement>
|
||||
{
|
||||
AnnouncementTestData.CreateAnnouncement(1, 55, priority: 1, effectiveFrom: DateTime.UtcNow.AddDays(-1), status: AnnouncementStatus.Published),
|
||||
AnnouncementTestData.CreateAnnouncement(2, 55, priority: 3, effectiveFrom: DateTime.UtcNow.AddDays(-2), status: AnnouncementStatus.Published),
|
||||
AnnouncementTestData.CreateAnnouncement(3, 55, priority: 2, effectiveFrom: DateTime.UtcNow, status: AnnouncementStatus.Published)
|
||||
};
|
||||
|
||||
var announcementRepository = new Mock<ITenantAnnouncementRepository>();
|
||||
announcementRepository
|
||||
.Setup(x => x.SearchUnreadAsync(
|
||||
It.IsAny<long>(),
|
||||
It.IsAny<long?>(),
|
||||
It.IsAny<AnnouncementStatus?>(),
|
||||
It.IsAny<bool?>(),
|
||||
It.IsAny<DateTime?>(),
|
||||
It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(announcements);
|
||||
|
||||
var handler = new GetUnreadAnnouncementsQueryHandler(
|
||||
announcementRepository.Object,
|
||||
tenantProvider.Object,
|
||||
currentUserAccessor.Object);
|
||||
|
||||
var query = new GetUnreadAnnouncementsQuery
|
||||
{
|
||||
Page = 1,
|
||||
PageSize = 2
|
||||
};
|
||||
|
||||
// Act
|
||||
var result = await handler.Handle(query, CancellationToken.None);
|
||||
|
||||
// Assert
|
||||
announcementRepository.Verify(x => x.SearchUnreadAsync(
|
||||
55,
|
||||
null,
|
||||
AnnouncementStatus.Published,
|
||||
true,
|
||||
It.IsAny<DateTime?>(),
|
||||
It.IsAny<CancellationToken>()), Times.Once);
|
||||
|
||||
result.Items.Select(x => x.Id).Should().Equal(2, 3);
|
||||
result.TotalCount.Should().Be(3);
|
||||
result.Page.Should().Be(1);
|
||||
result.PageSize.Should().Be(2);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user