Browse Source

Rename `NormalizedTenantName` to `NormalizedName`.

pull/18426/head
maliming 3 years ago
parent
commit
ecc0562c7c
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 6
      framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/MauiBlazorRemoteTenantStore.cs
  2. 8
      modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/Tenant.cs
  3. 13
      modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantManager.cs
  4. 4
      modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs

6
framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/MauiBlazorRemoteTenantStore.cs

@ -98,12 +98,12 @@ public class MauiBlazorRemoteTenantStore : ITenantStore, ITransientDependency
return null; return null;
} }
return new TenantConfiguration(tenantResultDto.TenantId.Value, tenantResultDto.Name!); return new TenantConfiguration(tenantResultDto.TenantId.Value, tenantResultDto.Name!, tenantResultDto.NormalizedName!);
} }
protected virtual string CreateCacheKey(string tenantName) protected virtual string CreateCacheKey(string normalizedName)
{ {
return $"RemoteTenantStore_Name_{tenantName}"; return $"RemoteTenantStore_Name_{normalizedName}";
} }
protected virtual string CreateCacheKey(Guid tenantId) protected virtual string CreateCacheKey(Guid tenantId)

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

@ -22,11 +22,11 @@ public class Tenant : FullAuditedAggregateRoot<Guid>, IHasEntityVersion
} }
protected internal Tenant(Guid id, [NotNull] string name, [CanBeNull] string normalizedTenantName) protected internal Tenant(Guid id, [NotNull] string name, [CanBeNull] string normalizedName)
: base(id) : base(id)
{ {
SetName(name); SetName(name);
SetNormalizedTenantName(normalizedTenantName); SetNormalizedName(normalizedName);
ConnectionStrings = new List<TenantConnectionString>(); ConnectionStrings = new List<TenantConnectionString>();
} }
@ -82,8 +82,8 @@ public class Tenant : FullAuditedAggregateRoot<Guid>, IHasEntityVersion
Name = Check.NotNullOrWhiteSpace(name, nameof(name), TenantConsts.MaxNameLength); Name = Check.NotNullOrWhiteSpace(name, nameof(name), TenantConsts.MaxNameLength);
} }
protected internal virtual void SetNormalizedTenantName([CanBeNull] string normalizedTenantName) protected internal virtual void SetNormalizedName([CanBeNull] string normalizedName)
{ {
NormalizedName = normalizedTenantName; NormalizedName = normalizedName;
} }
} }

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

@ -10,7 +10,6 @@ public class TenantManager : DomainService, ITenantManager
{ {
protected ITenantRepository TenantRepository { get; } protected ITenantRepository TenantRepository { get; }
protected IDistributedCache<TenantConfigurationCacheItem> Cache { get; } protected IDistributedCache<TenantConfigurationCacheItem> Cache { get; }
protected ITenantNormalizer TenantNormalizer { get; } protected ITenantNormalizer TenantNormalizer { get; }
public TenantManager(ITenantRepository tenantRepository, IDistributedCache<TenantConfigurationCacheItem> cache, ITenantNormalizer tenantNormalizer) public TenantManager(ITenantRepository tenantRepository, IDistributedCache<TenantConfigurationCacheItem> cache, ITenantNormalizer tenantNormalizer)
@ -24,9 +23,9 @@ public class TenantManager : DomainService, ITenantManager
{ {
Check.NotNull(name, nameof(name)); Check.NotNull(name, nameof(name));
var normalizedTenantName = TenantNormalizer.NormalizeName(name); var normalizedName = TenantNormalizer.NormalizeName(name);
await ValidateNameAsync(normalizedTenantName); await ValidateNameAsync(normalizedName);
return new Tenant(GuidGenerator.Create(), name, normalizedTenantName); return new Tenant(GuidGenerator.Create(), name, normalizedName);
} }
public virtual async Task ChangeNameAsync(Tenant tenant, string name) public virtual async Task ChangeNameAsync(Tenant tenant, string name)
@ -34,12 +33,12 @@ public class TenantManager : DomainService, ITenantManager
Check.NotNull(tenant, nameof(tenant)); Check.NotNull(tenant, nameof(tenant));
Check.NotNull(name, nameof(name)); Check.NotNull(name, nameof(name));
var normalizedTenantName = TenantNormalizer.NormalizeName(name); var normalizedName = TenantNormalizer.NormalizeName(name);
await ValidateNameAsync(normalizedTenantName, tenant.Id); await ValidateNameAsync(normalizedName, tenant.Id);
await Cache.RemoveAsync(TenantConfigurationCacheItem.CalculateCacheKey(tenant.NormalizedName)); await Cache.RemoveAsync(TenantConfigurationCacheItem.CalculateCacheKey(tenant.NormalizedName));
tenant.SetName(name); tenant.SetName(name);
tenant.SetNormalizedTenantName(normalizedTenantName); tenant.SetNormalizedName(normalizedName);
} }
protected virtual async Task ValidateNameAsync(string normalizeName, Guid? expectedId = null) protected virtual async Task ValidateNameAsync(string normalizeName, Guid? expectedId = null)

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

@ -77,7 +77,7 @@ public class TenantStore : ITenantStore, ITransientDependency
} }
} }
throw new AbpException("Both id and name can't be invalid."); throw new AbpException("Both id and normalizedName can't be invalid.");
} }
protected virtual async Task<TenantConfigurationCacheItem> SetCacheAsync(string cacheKey, [CanBeNull] Tenant tenant) protected virtual async Task<TenantConfigurationCacheItem> SetCacheAsync(string cacheKey, [CanBeNull] Tenant tenant)
@ -117,7 +117,7 @@ public class TenantStore : ITenantStore, ITransientDependency
} }
} }
throw new AbpException("Both id and name can't be invalid."); throw new AbpException("Both id and normalizedName can't be invalid.");
} }
[Obsolete("Use SetCacheAsync method.")] [Obsolete("Use SetCacheAsync method.")]

Loading…
Cancel
Save