From 9e8a18ceae2ab649d00ee1ec3777981d3cb12a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Sat, 6 Jan 2018 12:45:35 +0300 Subject: [PATCH] Moved to multitenancy abstractions module. --- .../AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs | 5 +-- .../Volo/Abp/Data/ConnectionStrings.cs | 8 +++-- .../Volo.Abp.MultiTenancy.Abstractions.csproj | 1 + .../AbpMultiTenancyAbstractionsModule.cs | 2 ++ .../AsyncLocalTenantScopeProvider.cs | 2 +- .../ConfigurationTenantStore.cs | 6 ++-- .../ConfigurationTenantStoreOptions.cs | 12 +++++++ .../Abp/MultiTenancy/IMultiTenancyManager.cs | 2 +- .../Abp/MultiTenancy/ITenantScopeProvider.cs | 2 +- .../Volo/Abp/MultiTenancy/ITenantStore.cs | 4 +-- .../Abp/MultiTenancy/MultiTenancyManager.cs | 8 ++--- .../MultiTenancyManagerCurrentTenant.cs | 0 .../MultiTenantConnectionStringResolver.cs | 6 ++-- .../Volo/Abp/MultiTenancy/TenantInfo.cs | 31 +++++++++++++++++++ .../Volo/Abp/MultiTenancy/TenantScope.cs | 4 +-- .../ConfigurationTenantStoreOptions.cs | 12 ------- .../MultiTenancy/TenantConnectionString.cs | 2 +- .../AspNetCoreMultiTenancy_Tests.cs | 3 +- ...ltiTenantConnectionStringResolver_Tests.cs | 13 ++++---- .../MultiTenancy/MultiTenantManager_Tests.cs | 5 +-- 20 files changed, 83 insertions(+), 45 deletions(-) rename src/{Volo.Abp.MultiTenancy.Domain => Volo.Abp.MultiTenancy.Abstractions}/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs (93%) rename src/{Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy => Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ConfigurationStore}/ConfigurationTenantStore.cs (83%) create mode 100644 src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStoreOptions.cs rename src/{Volo.Abp.MultiTenancy.Domain => Volo.Abp.MultiTenancy.Abstractions}/Volo/Abp/MultiTenancy/IMultiTenancyManager.cs (85%) rename src/{Volo.Abp.MultiTenancy.Domain => Volo.Abp.MultiTenancy.Abstractions}/Volo/Abp/MultiTenancy/ITenantScopeProvider.cs (81%) rename src/{Volo.Abp.MultiTenancy.Domain => Volo.Abp.MultiTenancy.Abstractions}/Volo/Abp/MultiTenancy/ITenantStore.cs (69%) rename src/{Volo.Abp.MultiTenancy.Domain => Volo.Abp.MultiTenancy.Abstractions}/Volo/Abp/MultiTenancy/MultiTenancyManager.cs (93%) rename src/{Volo.Abp.MultiTenancy.Domain => Volo.Abp.MultiTenancy.Abstractions}/Volo/Abp/MultiTenancy/MultiTenancyManagerCurrentTenant.cs (100%) rename src/{Volo.Abp.MultiTenancy.Domain => Volo.Abp.MultiTenancy.Abstractions}/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs (89%) create mode 100644 src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantInfo.cs rename src/{Volo.Abp.MultiTenancy.Domain => Volo.Abp.MultiTenancy.Abstractions}/Volo/Abp/MultiTenancy/TenantScope.cs (75%) delete mode 100644 src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ConfigurationTenantStoreOptions.cs diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs index bcf41ff344..7cfbce5bb5 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs @@ -28,6 +28,7 @@ using Volo.Abp.Ui.Navigation; using Volo.Abp.VirtualFileSystem; using Volo.Abp.IdentityServer.Jwt; using Volo.Abp.MultiTenancy; +using Volo.Abp.MultiTenancy.ConfigurationStore; namespace AbpDesk.Web.Mvc { @@ -72,11 +73,11 @@ namespace AbpDesk.Web.Mvc { options.Tenants = new[] { - new Tenant( + new TenantInfo( Guid.Parse("446a5211-3d72-4339-9adc-845151f8ada0"), "acme" ), - new Tenant( + new TenantInfo( Guid.Parse("25388015-ef1c-4355-9c18-f6b6ddbaf89d"), "volosoft" ) diff --git a/src/Volo.Abp.Data/Volo/Abp/Data/ConnectionStrings.cs b/src/Volo.Abp.Data/Volo/Abp/Data/ConnectionStrings.cs index a72f9a079e..59df9f55dd 100644 --- a/src/Volo.Abp.Data/Volo/Abp/Data/ConnectionStrings.cs +++ b/src/Volo.Abp.Data/Volo/Abp/Data/ConnectionStrings.cs @@ -1,15 +1,17 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; namespace Volo.Abp.Data { + [Serializable] public class ConnectionStrings : Dictionary { public const string DefaultConnectionStringName = "Default"; public string Default { - get { return this.GetOrDefault(DefaultConnectionStringName); } - set { this[DefaultConnectionStringName] = value; } + get => this.GetOrDefault(DefaultConnectionStringName); + set => this[DefaultConnectionStringName] = value; } } } \ No newline at end of file diff --git a/src/Volo.Abp.MultiTenancy.Abstractions/Volo.Abp.MultiTenancy.Abstractions.csproj b/src/Volo.Abp.MultiTenancy.Abstractions/Volo.Abp.MultiTenancy.Abstractions.csproj index 766f316fb6..13c109ad2a 100644 --- a/src/Volo.Abp.MultiTenancy.Abstractions/Volo.Abp.MultiTenancy.Abstractions.csproj +++ b/src/Volo.Abp.MultiTenancy.Abstractions/Volo.Abp.MultiTenancy.Abstractions.csproj @@ -15,6 +15,7 @@ + diff --git a/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpMultiTenancyAbstractionsModule.cs b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpMultiTenancyAbstractionsModule.cs index 1d3bc23a03..767fd2a6a0 100644 --- a/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpMultiTenancyAbstractionsModule.cs +++ b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpMultiTenancyAbstractionsModule.cs @@ -1,8 +1,10 @@ using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Data; using Volo.Abp.Modularity; namespace Volo.Abp.MultiTenancy { + [DependsOn(typeof(AbpDataModule))] public class AbpMultiTenancyAbstractionsModule : AbpModule { public override void ConfigureServices(IServiceCollection services) diff --git a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs similarity index 93% rename from src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs rename to src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs index 2ac1adeccc..7be78bd0e4 100644 --- a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs +++ b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs @@ -19,7 +19,7 @@ namespace Volo.Abp.MultiTenancy _currentScope = new AsyncLocal(); } - public IDisposable EnterScope(Tenant tenant) + public IDisposable EnterScope(TenantInfo tenant) { var parentScope = CurrentScope; CurrentScope = new TenantScope(tenant); diff --git a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ConfigurationTenantStore.cs b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStore.cs similarity index 83% rename from src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ConfigurationTenantStore.cs rename to src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStore.cs index f71997e91c..c9ef920a79 100644 --- a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ConfigurationTenantStore.cs +++ b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStore.cs @@ -3,7 +3,7 @@ using System.Linq; using Microsoft.Extensions.Options; using Volo.Abp.DependencyInjection; -namespace Volo.Abp.MultiTenancy +namespace Volo.Abp.MultiTenancy.ConfigurationStore { //TODO: Move to another package. [Dependency(TryRegister = true)] @@ -16,12 +16,12 @@ namespace Volo.Abp.MultiTenancy _options = options.Value; } - public Tenant Find(string name) + public TenantInfo Find(string name) { return _options.Tenants.FirstOrDefault(t => t.Name == name); } - public Tenant Find(Guid id) + public TenantInfo Find(Guid id) { return _options.Tenants.FirstOrDefault(t => t.Id == id); } diff --git a/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStoreOptions.cs b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStoreOptions.cs new file mode 100644 index 0000000000..2d5a060d51 --- /dev/null +++ b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStoreOptions.cs @@ -0,0 +1,12 @@ +namespace Volo.Abp.MultiTenancy.ConfigurationStore +{ + public class ConfigurationTenantStoreOptions + { + public TenantInfo[] Tenants { get; set; } + + public ConfigurationTenantStoreOptions() + { + Tenants = new TenantInfo[0]; + } + } +} \ No newline at end of file diff --git a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/IMultiTenancyManager.cs b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/IMultiTenancyManager.cs similarity index 85% rename from src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/IMultiTenancyManager.cs rename to src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/IMultiTenancyManager.cs index a7a9df91ed..8d81508d4c 100644 --- a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/IMultiTenancyManager.cs +++ b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/IMultiTenancyManager.cs @@ -6,7 +6,7 @@ namespace Volo.Abp.MultiTenancy public interface IMultiTenancyManager { [CanBeNull] - Tenant CurrentTenant { get; } + TenantInfo CurrentTenant { get; } IDisposable ChangeTenant(Guid? tenantId); diff --git a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ITenantScopeProvider.cs b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantScopeProvider.cs similarity index 81% rename from src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ITenantScopeProvider.cs rename to src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantScopeProvider.cs index 25396484aa..319da1ede0 100644 --- a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ITenantScopeProvider.cs +++ b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantScopeProvider.cs @@ -11,6 +11,6 @@ namespace Volo.Abp.MultiTenancy [CanBeNull] TenantScope CurrentScope { get; } - IDisposable EnterScope([CanBeNull] Tenant tenant); + IDisposable EnterScope([CanBeNull] TenantInfo tenant); } } \ No newline at end of file diff --git a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ITenantStore.cs b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantStore.cs similarity index 69% rename from src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ITenantStore.cs rename to src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantStore.cs index 32a46a3503..8ca9b181c0 100644 --- a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ITenantStore.cs +++ b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantStore.cs @@ -6,9 +6,9 @@ namespace Volo.Abp.MultiTenancy public interface ITenantStore { [CanBeNull] - Tenant Find(string name); + TenantInfo Find(string name); [CanBeNull] - Tenant Find(Guid id); + TenantInfo Find(Guid id); } } \ No newline at end of file diff --git a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/MultiTenancyManager.cs b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenancyManager.cs similarity index 93% rename from src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/MultiTenancyManager.cs rename to src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenancyManager.cs index fc13dc456d..7a73a3ae18 100644 --- a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/MultiTenancyManager.cs +++ b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenancyManager.cs @@ -8,7 +8,7 @@ namespace Volo.Abp.MultiTenancy public class MultiTenancyManager : IMultiTenancyManager, ITransientDependency { - public Tenant CurrentTenant => GetCurrentTenant(); + public TenantInfo CurrentTenant => GetCurrentTenant(); private readonly ITenantScopeProvider _tenantScopeProvider; private readonly ITenantStore _tenantStore; @@ -59,7 +59,7 @@ namespace Volo.Abp.MultiTenancy return _tenantScopeProvider.EnterScope(tenant); } - protected virtual Tenant GetCurrentTenant() + protected virtual TenantInfo GetCurrentTenant() { if (_tenantScopeProvider.CurrentScope != null) { @@ -71,7 +71,7 @@ namespace Volo.Abp.MultiTenancy return ResolveTenant(); } - protected virtual Tenant ResolveTenant() + protected virtual TenantInfo ResolveTenant() { var tenantIdOrName = _tenantResolver.ResolveTenantIdOrName(); if (tenantIdOrName == null) @@ -79,7 +79,7 @@ namespace Volo.Abp.MultiTenancy return null; } - Tenant tenant; + TenantInfo tenant; //Try to find by id if (Guid.TryParse(tenantIdOrName, out var tenantId)) diff --git a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/MultiTenancyManagerCurrentTenant.cs b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenancyManagerCurrentTenant.cs similarity index 100% rename from src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/MultiTenancyManagerCurrentTenant.cs rename to src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenancyManagerCurrentTenant.cs diff --git a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs similarity index 89% rename from src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs rename to src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs index 8eebb45ef4..1b7b460bf0 100644 --- a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs +++ b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs @@ -31,12 +31,12 @@ namespace Volo.Abp.MultiTenancy //Requesting default connection string if (connectionStringName == null) { - return tenant.FindDefaultConnectionString() ?? + return tenant.ConnectionStrings.Default ?? Options.ConnectionStrings.Default; } //Requesting specific connection string - var connString = tenant.FindConnectionString(connectionStringName); + var connString = tenant.ConnectionStrings.GetOrDefault(connectionStringName); if (connString != null) { return connString; @@ -53,7 +53,7 @@ namespace Volo.Abp.MultiTenancy return connStringInOptions; } - return tenant.FindDefaultConnectionString() ?? + return tenant.ConnectionStrings.Default ?? Options.ConnectionStrings.Default; } } diff --git a/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantInfo.cs b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantInfo.cs new file mode 100644 index 0000000000..084638f183 --- /dev/null +++ b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantInfo.cs @@ -0,0 +1,31 @@ +using System; +using JetBrains.Annotations; +using Volo.Abp.Data; + +namespace Volo.Abp.MultiTenancy +{ + [Serializable] + public class TenantInfo + { + public Guid Id { get; } + + public string Name { get; } + + public ConnectionStrings ConnectionStrings { get; } + + private TenantInfo() + { + + } + + public TenantInfo(Guid id, [NotNull] string name) + { + Check.NotNull(name, nameof(name)); + + Id = id; + Name = name; + + ConnectionStrings = new ConnectionStrings(); + } + } +} \ No newline at end of file diff --git a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/TenantScope.cs b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantScope.cs similarity index 75% rename from src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/TenantScope.cs rename to src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantScope.cs index 538ee484a3..7476ac0a1f 100644 --- a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/TenantScope.cs +++ b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantScope.cs @@ -9,9 +9,9 @@ namespace Volo.Abp.MultiTenancy /// Not null value for a tenant. /// [CanBeNull] - public Tenant Tenant { get; } + public TenantInfo Tenant { get; } - public TenantScope([CanBeNull] Tenant tenant) + public TenantScope([CanBeNull] TenantInfo tenant) { Tenant = tenant; } diff --git a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ConfigurationTenantStoreOptions.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ConfigurationTenantStoreOptions.cs deleted file mode 100644 index b26900c968..0000000000 --- a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ConfigurationTenantStoreOptions.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Volo.Abp.MultiTenancy -{ - public class ConfigurationTenantStoreOptions - { - public Tenant[] Tenants { get; set; } - - public ConfigurationTenantStoreOptions() - { - Tenants = new Tenant[0]; - } - } -} \ No newline at end of file diff --git a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/TenantConnectionString.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/TenantConnectionString.cs index 4be2075df7..2d3c5235e1 100644 --- a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/TenantConnectionString.cs +++ b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/TenantConnectionString.cs @@ -4,7 +4,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.MultiTenancy { - public class TenantConnectionString : Entity + public class TenantConnectionString : Entity //TODO: This should be a value object! { public virtual Guid TenantId { get; protected set; } diff --git a/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Tests.cs b/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Tests.cs index 7e33f0a2d1..34a5acaa82 100644 --- a/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Tests.cs +++ b/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Tests.cs @@ -7,6 +7,7 @@ using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; using Shouldly; using Volo.Abp.MultiTenancy; +using Volo.Abp.MultiTenancy.ConfigurationStore; using Xunit; namespace Volo.Abp.AspNetCore.MultiTenancy @@ -31,7 +32,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy { options.Tenants = new[] { - new Tenant(_testTenantId, _testTenantName) + new TenantInfo(_testTenantId, _testTenantName) }; }); }); diff --git a/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs b/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs index a3060abbf5..8478975d37 100644 --- a/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs +++ b/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs @@ -1,8 +1,8 @@ using System; -using System.Collections.Generic; using Microsoft.Extensions.DependencyInjection; using Shouldly; using Volo.Abp.MultiTenancy; +using Volo.Abp.MultiTenancy.ConfigurationStore; using Xunit; namespace Volo.Abp.Data.MultiTenancy @@ -30,18 +30,17 @@ namespace Volo.Abp.Data.MultiTenancy services.Configure(options => { - var tenant1Id = Guid.NewGuid(); options.Tenants = new[] { - new Tenant(tenant1Id, "tenant1") + new TenantInfo(Guid.NewGuid(), "tenant1") { ConnectionStrings = { - new TenantConnectionString(tenant1Id,ConnectionStrings.DefaultConnectionStringName, "tenant1-default-value"), - new TenantConnectionString(tenant1Id,"db1", "tenant1-db1-value") - } + { ConnectionStrings.DefaultConnectionStringName, "tenant1-default-value"}, + {"db1", "tenant1-db1-value"} +} }, - new Tenant(Guid.NewGuid(), "tenant2") + new TenantInfo(Guid.NewGuid(), "tenant2") }; }); } diff --git a/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantManager_Tests.cs b/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantManager_Tests.cs index 045e35d77a..1fdc733100 100644 --- a/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantManager_Tests.cs +++ b/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantManager_Tests.cs @@ -1,6 +1,7 @@ using System; using Microsoft.Extensions.DependencyInjection; using Shouldly; +using Volo.Abp.MultiTenancy.ConfigurationStore; using Xunit; namespace Volo.Abp.MultiTenancy @@ -32,8 +33,8 @@ namespace Volo.Abp.MultiTenancy { options.Tenants = new[] { - new Tenant(Guid.NewGuid(), _tenantA), - new Tenant(Guid.NewGuid(), _tenantB) + new TenantInfo(Guid.NewGuid(), _tenantA), + new TenantInfo(Guid.NewGuid(), _tenantB) }; }); }