tenantIdentity shared project

DavidEggenberger · Feb 19, 2024 · a64ad33 · a64ad33
1 parent d5b02fa
commit a64ad33
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 20 deletions.
diff --git a/ModularMonolith.sln b/ModularMonolith.sln
@@ -25,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.TenantIdentity.Feat
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.TenantIdentity.Web.Client", "Source\Modules\TenantIdentity\Web\Client\Modules.TenantIdentity.Web.Client.csproj", "{D5015915-70A7-43CE-8E29-34F6C71F960E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.TenantIdentity.Web.Shared", "Source\Modules\TenantIdentity\Web\Shared\Modules.TenantIdentity.Web.Shared.csproj", "{74FE9343-CE51-4716-BADD-2603348C1677}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.TenantIdentity.Shared", "Source\Modules\TenantIdentity\Web\Shared\Modules.TenantIdentity.Shared.csproj", "{74FE9343-CE51-4716-BADD-2603348C1677}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.TenantIdentity.Web.Server", "Source\Modules\TenantIdentity\Web\Server\Modules.TenantIdentity.Web.Server.csproj", "{D5B57887-1F64-4F6F-8793-0530DB9942DB}"
 EndProject
@@ -116,7 +116,7 @@ Global
 		{F813B837-ABC4-4014-8EFE-E41B0115E215} = {F738ECB7-F490-411F-BDB1-0FE532C2BE63}
 		{7CDD9EF6-4BBC-47F8-A1E6-DB8C6829D3AC} = {F738ECB7-F490-411F-BDB1-0FE532C2BE63}
 		{D5015915-70A7-43CE-8E29-34F6C71F960E} = {F813B837-ABC4-4014-8EFE-E41B0115E215}
-		{74FE9343-CE51-4716-BADD-2603348C1677} = {F813B837-ABC4-4014-8EFE-E41B0115E215}
+		{74FE9343-CE51-4716-BADD-2603348C1677} = {F738ECB7-F490-411F-BDB1-0FE532C2BE63}
 		{D5B57887-1F64-4F6F-8793-0530DB9942DB} = {F813B837-ABC4-4014-8EFE-E41B0115E215}
 		{F467D121-BDE5-451B-B175-B01F3E7E634F} = {D3B7FB8B-F843-4BB2-9A39-FCF048E743DB}
 		{5A77BA95-9C7B-41BE-A4F4-CF2FE18CFA03} = {5EFD35D5-4900-4756-9C87-9BB98381C3E8}

diff --git a/Source/Modules/TenantIdentity/Features/Aggregates/TenantAggregate/Domain/Tenant.cs b/Source/Modules/TenantIdentity/Features/Aggregates/TenantAggregate/Domain/Tenant.cs
@@ -15,8 +15,7 @@ public Tenant()
 
         public override Guid TenantId { get => base.TenantId; }
         public string Name { get; set; }
-        public TenantStyling Styling { get; set; }
-        public TenantSettings Settings { get; set; }
+        public TenantConfiguration Configuration { get; set; }
         public SubscriptionPlanType SubscriptionPlanType { get; set; }
         public IReadOnlyCollection<TenantMembership> Memberships => memberships.AsReadOnly();
         private List<TenantMembership> memberships = new List<TenantMembership>();

diff --git a/.../TenantAggregate/Domain/TenantSettings.cs → ...ntAggregate/Domain/TenantConfiguration.cs b/.../TenantAggregate/Domain/TenantSettings.cs → ...ntAggregate/Domain/TenantConfiguration.cs
@@ -2,7 +2,7 @@
 
 namespace Modules.TenantIdentity.Features.Aggregates.TenantAggregate.Domain
 {
-    public class TenantSettings : Entity
+    public class TenantConfiguration : Entity
     {
         public string IconURI { get; set; }
     }

diff --git a/Source/Modules/TenantIdentity/Features/Aggregates/TenantAggregate/Domain/TenantStyling.cs b/Source/Modules/TenantIdentity/Features/Aggregates/TenantAggregate/Domain/TenantStyling.cs
diff --git a/Source/Modules/TenantIdentity/Features/Infrastructure/EFCore/TenantIdentityDbContext.cs b/Source/Modules/TenantIdentity/Features/Infrastructure/EFCore/TenantIdentityDbContext.cs
@@ -7,7 +7,6 @@
 using Shared.Features.EFCore.Configuration;
 using Modules.TenantIdentity.Features.Aggregates.UserAggregate;
 using Shared.Features.EFCore;
-using System.Threading;
 using Shared.Kernel.BuildingBlocks;
 using Modules.TenantIdentity.Features.Aggregates.TenantAggregate.Domain;
 using Modules.TenantIdentity.Features.Aggregates.UserAggregate.Infrastructure;
@@ -31,9 +30,7 @@ public TenantIdentityDbContext(IServiceProvider serviceProvider, DbContextOption
         public DbSet<Tenant> Tenants { get; set; }
         public DbSet<TenantInvitation> TenantInvitations { get; set; }
         public DbSet<TenantMembership> TenantMeberships { get; set; }
-        public DbSet<TenantSettings> TenantSettings { get; set; }
-        public DbSet<TenantStyling> TenantStylings { get; set; }
-
+        public DbSet<TenantConfiguration> TenantConfiguration { get; set; }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {

diff --git a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features.csproj b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features.csproj
@@ -18,7 +18,7 @@
     <ProjectReference Include="..\..\..\Shared\Kernel\Shared.Kernel.csproj" />
     <ProjectReference Include="..\..\Subscriptions\IntegrationEvents\Modules.Subscriptions.IntegrationEvents.csproj" />
     <ProjectReference Include="..\IntegrationEvents\Modules.TenantIdentity.IntegrationEvents.csproj" />
-    <ProjectReference Include="..\Web\Shared\Modules.TenantIdentity.Web.Shared.csproj" />
+    <ProjectReference Include="..\Web\Shared\Modules.TenantIdentity.Shared.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Source/Modules/TenantIdentity/Web/Client/Modules.TenantIdentity.Web.Client.csproj b/Source/Modules/TenantIdentity/Web/Client/Modules.TenantIdentity.Web.Client.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Shared\Kernel\Shared.Kernel.csproj" />
-    <ProjectReference Include="..\Shared\Modules.TenantIdentity.Web.Shared.csproj" />
+    <ProjectReference Include="..\Shared\Modules.TenantIdentity.Shared.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Source/Modules/TenantIdentity/Web/Server/Modules.TenantIdentity.Web.Server.csproj b/Source/Modules/TenantIdentity/Web/Server/Modules.TenantIdentity.Web.Server.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Features\Modules.TenantIdentity.Features.csproj" />
-    <ProjectReference Include="..\Shared\Modules.TenantIdentity.Web.Shared.csproj" />
+    <ProjectReference Include="..\Shared\Modules.TenantIdentity.Shared.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/.../Modules.TenantIdentity.Web.Shared.csproj → ...ared/Modules.TenantIdentity.Shared.csproj b/.../Modules.TenantIdentity.Web.Shared.csproj → ...ared/Modules.TenantIdentity.Shared.csproj