Add `ITenantValidator`.

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantValidator.cs

@@ -0,0 +1,26 @@
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.TenantManagement;
+
+public class AbpTenantValidator : ITenantValidator, ITransientDependency
+{
+    protected ITenantRepository TenantRepository { get; }
+
+    public AbpTenantValidator(ITenantRepository tenantRepository)
+    {
+        TenantRepository = tenantRepository;
+    }
+
+    public virtual async Task ValidateAsync(Tenant tenant)
+    {
+        Check.NotNullOrWhiteSpace(tenant.Name, nameof(tenant.Name));
+        Check.NotNullOrWhiteSpace(tenant.NormalizedName, nameof(tenant.NormalizedName));
+
+        var owner = await TenantRepository.FindByNameAsync(tenant.NormalizedName);
+        if (owner != null && owner.Id != tenant.Id)
+        {
+            throw new BusinessException("Volo.Abp.TenantManagement:DuplicateTenantName").WithData("Name", tenant.NormalizedName);
+        }
+    }
+}

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/DefaultTenantNameValidator.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Domain.Services;
-
-namespace Volo.Abp.TenantManagement;
-
-public class DefaultTenantNameValidator : ITenantNameValidator, ITransientDependency
-{
-    protected ITenantRepository TenantRepository { get; }
-
-    public DefaultTenantNameValidator(ITenantRepository tenantRepository)
-    {
-        TenantRepository = tenantRepository;
-    }
-
-    public virtual async Task ValidateAsync(string normalizedTenantName, Guid? expectedTenantId = null)
-    {
-        Check.NotNullOrWhiteSpace(normalizedTenantName, nameof(normalizedTenantName));
-
-        var existingTenant = await TenantRepository.FindByNameAsync(normalizedTenantName);
-        if (existingTenant != null && existingTenant.Id != expectedTenantId)
-        {
-            throw new BusinessException("Volo.Abp.TenantManagement:DuplicateTenantName")
-                .WithData("Name", normalizedTenantName);
-        }
-    }
-}

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/ITenantNameValidator.cs

@@ -1,9 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Volo.Abp.TenantManagement;
-
-public interface ITenantNameValidator
-{
-    Task ValidateAsync(string normalizedTenantName, Guid? expectedTenantId = null);
-}

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/ITenantValidator.cs

@@ -0,0 +1,8 @@
+using System.Threading.Tasks;
+
+namespace Volo.Abp.TenantManagement;
+
+public interface ITenantValidator
+{
+    Task ValidateAsync(Tenant tenant);
+}

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantManager.cs

@@ -1,6 +1,4 @@
-using System;
+using System.Threading.Tasks;
-using System.Threading.Tasks;
-using Volo.Abp.Caching;
 using Volo.Abp.Domain.Services;
 using Volo.Abp.EventBus.Local;
 using Volo.Abp.MultiTenancy;
@@ -9,27 +7,25 @@ namespace Volo.Abp.TenantManagement;
 
 public class TenantManager : DomainService, ITenantManager
 {
-    public ITenantNameValidator TenantNameValidator { get; }
+    protected ITenantValidator TenantValidator { get; }
     protected ITenantNormalizer TenantNormalizer { get; }
     protected ILocalEventBus LocalEventBus { get; }
 
     public TenantManager(
-        ITenantNameValidator tenantNameValidator,
+        ITenantValidator tenantValidator,
         ITenantNormalizer tenantNormalizer,
         ILocalEventBus localEventBus)
     {
-        TenantNameValidator = tenantNameValidator;
+        TenantValidator = tenantValidator;
         TenantNormalizer = tenantNormalizer;
         LocalEventBus = localEventBus;
     }
 
     public virtual async Task<Tenant> CreateAsync(string name)
     {
-        Check.NotNull(name, nameof(name));
+        var tenant = new Tenant(GuidGenerator.Create(), name, TenantNormalizer.NormalizeName(name));
-
+        await TenantValidator.ValidateAsync(tenant);
-        var normalizedName = TenantNormalizer.NormalizeName(name);
+        return tenant;
-        await TenantNameValidator.ValidateAsync(normalizedName);
-        return new Tenant(GuidGenerator.Create(), name, normalizedName);
     }
 
     public virtual async Task ChangeNameAsync(Tenant tenant, string name)
@@ -37,11 +33,10 @@ public class TenantManager : DomainService, ITenantManager
         Check.NotNull(tenant, nameof(tenant));
         Check.NotNull(name, nameof(name));
 
-        var normalizedName = TenantNormalizer.NormalizeName(name);
-
-        await TenantNameValidator.ValidateAsync(normalizedName, tenant.Id);
         await LocalEventBus.PublishAsync(new TenantChangedEvent(tenant.Id, tenant.NormalizedName));
+
         tenant.SetName(name);
-        tenant.SetNormalizedName(normalizedName);
+        tenant.SetNormalizedName( TenantNormalizer.NormalizeName(name));
+        await TenantValidator.ValidateAsync(tenant);
     }
 }

modules/tenant-management/test/Volo.Abp.TenantManagement.Domain.Tests/Volo/Abp/TenantManagement/TenantNameValidator_Tests.cs

@@ -1,35 +1,47 @@
 using System;
 using System.Threading.Tasks;
-using Volo.Abp.Guids;
+using Shouldly;
 using Xunit;
 
 namespace Volo.Abp.TenantManagement;
 
-public class TenantNameValidator_Tests : AbpTenantManagementDomainTestBase
+public class TenantValidator_Tests : AbpTenantManagementDomainTestBase
 {
-    private readonly ITenantNameValidator _tenantNameValidator;
+    private readonly TenantManager _tenantManager;
     private readonly ITenantRepository _tenantRepository;
-    public TenantNameValidator_Tests()
+
+    public TenantValidator_Tests()
     {
+        _tenantManager = GetRequiredService<TenantManager>();
         _tenantRepository = GetRequiredService<ITenantRepository>();
-        _tenantNameValidator = GetRequiredService<ITenantNameValidator>();
     }
 
     [Fact]
     public async Task Should_Throw_If_Name_Is_Null()
     {
-        await Assert.ThrowsAsync<ArgumentException>(() => _tenantNameValidator.ValidateAsync(null));
+        await Assert.ThrowsAsync<ArgumentException>(() => _tenantManager.CreateAsync(""));
     }
 
     [Fact]
     public async Task Should_Throw_If_Duplicate_Name()
     {
-        await Assert.ThrowsAsync<BusinessException>(() => _tenantNameValidator.ValidateAsync("VOLOSOFT"));
+        await Assert.ThrowsAsync<BusinessException>(() => _tenantManager.CreateAsync("VOLOSOFT"));
+
+        var tenant = await _tenantRepository.FindByNameAsync("ABP");
+        await Assert.ThrowsAsync<BusinessException>(() => _tenantManager.ChangeNameAsync(tenant, "VOLOSOFT"));
     }
 
     [Fact]
     public async Task Should_Not_Throw_For_Unique_Name()
     {
-        await _tenantNameValidator.ValidateAsync("UNIQUE-TENANT-NAME");
+        var tenant = await _tenantManager.CreateAsync("VOLOSOFT2");
+        await _tenantRepository.InsertAsync(tenant);
+
+        tenant = await _tenantRepository.FindByNameAsync("ABP");
+        await _tenantManager.ChangeNameAsync(tenant, "VOLOSOFT3");
+        await _tenantRepository.UpdateAsync(tenant);
+
+        tenant = await _tenantRepository.FindByNameAsync("VOLOSOFT3");
+        tenant.ShouldNotBeNull();
     }
 }