features renamed EventHandlers

DavidEggenberger · Nov 28, 2024 · f31ef60 · f31ef60
1 parent adcd024
commit f31ef60
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 55 deletions.
diff --git a/...antAdminCreatedIntegrationEventHandler.cs → ...antAdminCreatedIntegrationEventHandler.cs b/...antAdminCreatedIntegrationEventHandler.cs → ...antAdminCreatedIntegrationEventHandler.cs
@@ -4,7 +4,7 @@
 using Shared.Features.Messaging.IntegrationEvents;
 using Stripe;
 
-namespace Modules.Subscriptions.Features.DomainFeatures.StripeCustomers.Application.IntegrationEvents
+namespace Modules.Subscriptions.Features.DomainFeatures.StripeCustomers.Application.EventHandlers
 {
     public class TenantAdminCreatedIntegrationEventHandler : IIntegrationEventHandler<TenantAdminCreatedIntegrationEvent>
     {

diff --git a/...dules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/DeleteTenant.cs b/...dules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/DeleteTenant.cs
@@ -1,8 +1,9 @@
 using Microsoft.EntityFrameworkCore;
 using Shared.Features.Messaging.Command;
-using Shared.Features.Domain.Exceptions;
 using System.Threading;
 using Shared.Features.Server;
+using Shared.Kernel.Errors;
+using Modules.TenantIdentity.Features.DomainFeatures.Tenants.Domain;
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Commands
 {
@@ -17,10 +18,10 @@ public DeleteTenantCommandHandler(IServiceProvider serviceProvider) : base(servi
 
         public async Task HandleAsync(DeleteTenant command, CancellationToken cancellationToken)
         {
-            var tenant = await module.TenantIdentityDbContext.Tenants.SingleAsync(t => t.TenantId == command.TenantId);
+            var tenant = await module.TenantIdentityDbContext.Tenants.SingleAsync(t => t.Id == command.TenantId);
             if (tenant == null)
             {
-                throw new NotFoundException();
+                throw Errors.NotFound(nameof(Tenant), command.TenantId);
             }
 
             tenant.ThrowIfUserCantDeleteTenant();

diff --git a/...criptionUpdatedIntegrationEventHandler.cs → ...criptionUpdatedIntegrationEventHandler.cs b/...criptionUpdatedIntegrationEventHandler.cs → ...criptionUpdatedIntegrationEventHandler.cs
@@ -4,7 +4,7 @@
 using Shared.Features.Server;
 using System.Threading;
 
-namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.IntegrationEvents
+namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.EventHandlers
 {
     public class TenantSubscriptionUpdatedIntegrationEventHandler : ServerExecutionBase<TenantIdentityModule>, IIntegrationEventHandler<TenantSubscriptionPlanUpdatedIntegrationEvent>
     {

diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/Tenant.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/Tenant.cs
@@ -5,14 +5,14 @@
 using Shared.Features.Domain;
 using Shared.Features.Domain.Exceptions;
 using Shared.Kernel.BuildingBlocks.Auth;
+using Shared.Kernel.Errors;
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Domain
 {
     public class Tenant : Entity
     {
         public Tenant() { }
 
-        public override Guid TenantId { get => base.TenantId; }
         public string Name { get; set; }
         public SubscriptionPlanType SubscriptionPlanType { get; set; }
         public IReadOnlyCollection<TenantMembership> Memberships => memberships.AsReadOnly();
@@ -91,7 +91,7 @@ public void DeleteTenantMembership(Guid membershipId)
             var tenantMembership = Memberships.SingleOrDefault(t => t.Id == membershipId);
             if (tenantMembership == null)
             {
-                throw new NotFoundException();
+                throw Errors.NotFound(nameof(TenantMembership), membershipId);
             }
 
             memberships.Remove(tenantMembership);

diff --git a/Source/Modules/TenantIdentity/Features/Infrastructure/EFCore/TenantIdentityDbContext.cs b/Source/Modules/TenantIdentity/Features/Infrastructure/EFCore/TenantIdentityDbContext.cs
@@ -9,6 +9,7 @@
 using Shared.Features.EFCore;
 using Shared.Kernel.BuildingBlocks;
 using Modules.TenantIdentity.Features.DomainFeatures.Tenants.Domain;
+using Shared.Kernel.Errors;
 
 namespace Modules.TenantIdentity.Features.Infrastructure.EFCore
 {
@@ -78,7 +79,7 @@ public async Task<ApplicationUser> GetUserByIdAsync(Guid userId)
             var user = await Users.FirstOrDefaultAsync(t => t.Id == userId);
             if (user == null)
             {
-                throw new NotFoundException();
+                throw Errors.NotFound(nameof(ApplicationUser), userId);
             }
             return user;
         }
@@ -88,7 +89,7 @@ public async Task<Tenant> GetTenantByIdAsync(Guid tenantId)
             var tenant = await Tenants.FirstOrDefaultAsync(t => t.TenantId == tenantId);
             if (tenant == null)
             {
-                throw new NotFoundException();
+                throw Errors.NotFound(nameof(Tenant), tenantId);
             }
             return tenant;
         }
@@ -101,7 +102,7 @@ public async Task<Tenant> GetTenantExtendedByIdAsync(Guid tenantId)
                 .FirstOrDefaultAsync(t => t.TenantId == tenantId);
             if (tenant == null)
             {
-                throw new NotFoundException();
+                throw Errors.NotFound(nameof(Tenant), tenantId);
             }
             return tenant;
         }

diff --git a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features.csproj b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features.csproj
@@ -18,7 +18,6 @@
     <ProjectReference Include="..\..\Subscriptions\IntegrationEvents\Modules.Subscriptions.IntegrationEvents.csproj" />
     <ProjectReference Include="..\IntegrationEvents\Modules.TenantIdentity.IntegrationEvents.csproj" />
     <ProjectReference Include="..\Shared\Modules.TenantIdentity.Shared.csproj" />
-    <ProjectReference Include="..\Web\Shared\Modules.TenantIdentity.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/Modules/TenantIdentity/Web/Client/Modules.TenantIdentity.Web.Client.csproj b/Source/Modules/TenantIdentity/Web/Client/Modules.TenantIdentity.Web.Client.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Shared\Kernel\Shared.Kernel.csproj" />
-    <ProjectReference Include="..\Shared\Modules.TenantIdentity.Shared.csproj" />
+    <ProjectReference Include="..\..\Shared\Modules.TenantIdentity.Shared.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...ules/TenantIdentity/Web/Server/Controllers/Infrastructure/IdentityOperationsController.cs b/...ules/TenantIdentity/Web/Server/Controllers/Infrastructure/IdentityOperationsController.cs
@@ -42,7 +42,7 @@ public ActionResult<BFFUserInfoDTO> GetClaimsOfCurrentUser()
         }
 
         [HttpGet("selectTenant/{TenantId}")]
-        public async Task<ActionResult> SetTenantForCurrentUser(Guid tenantId, [FromQuery] string redirectUri)
+        public async Task<ActionResult> SetTenantForCurrentUser([FromRoute] Guid tenantId, [FromQuery] string redirectUri)
         {
             var user = await queryDispatcher.DispatchAsync<GetUserById, ApplicationUser>(new GetUserById { });
 

diff --git a/Source/Shared/Features/Domain/Attributes/JoiningTableAttribute.cs b/Source/Shared/Features/Domain/Attributes/JoiningTableAttribute.cs
diff --git a/Source/Shared/Features/Domain/Attributes/NotDatabasePersistedAttribute.cs b/Source/Shared/Features/Domain/Attributes/NotDatabasePersistedAttribute.cs
diff --git a/Source/Shared/Features/Domain/Attributes/ValueObjectAttribute.cs b/Source/Shared/Features/Domain/Attributes/ValueObjectAttribute.cs
diff --git a/Source/Shared/Features/Domain/Exceptions/NotAllowedException.cs b/Source/Shared/Features/Domain/Exceptions/NotAllowedException.cs
diff --git a/Source/Shared/Features/Domain/Exceptions/NotFoundException.cs b/Source/Shared/Features/Domain/Exceptions/NotFoundException.cs
diff --git a/Source/Shared/Features/EFCore/DbSetExtensions.cs b/Source/Shared/Features/EFCore/DbSetExtensions.cs
@@ -12,7 +12,7 @@ public static async Task<TEntity> GetEntityAsync<TEntity>(this DbSet<TEntity> db
             var entity = await dbSet.FirstOrDefaultAsync(t => t.Id == entityId);
             if (entity == null)
             {
-                throw Errors.NotFound; 
+                throw Errors.NotFound(typeof(TEntity).Name, entityId); 
             }
             if (entity.TenantId != owningTenantId)
             {
@@ -27,7 +27,7 @@ public static async Task<TEntity> GetEntityAsync<TEntity, TSecond>(this IIncluda
             var entity = await dbSet.FirstOrDefaultAsync(t => t.Id == entityId);
             if (entity == null)
             {
-                throw Errors.NotFound;
+                throw Errors.NotFound(typeof(TEntity).Name, entityId);
             }
             if (entity.TenantId != tenantId)
             {

diff --git a/Source/Shared/Features/Messaging/Commands/ICommandHandler.cs b/Source/Shared/Features/Messaging/Commands/ICommandHandler.cs
@@ -1,4 +1,8 @@
-namespace Shared.Features.Messaging.Command
+using Microsoft.EntityFrameworkCore.Metadata;
+using Shared.Features.Modules;
+using Shared.Features.Server;
+
+namespace Shared.Features.Messaging.Command
 {
     public interface ICommandHandler<in TCommand> where TCommand : Command
     {

diff --git a/Source/Shared/Features/Server/BaseController.cs b/Source/Shared/Features/Server/BaseController.cs
@@ -8,6 +8,16 @@
 
 namespace Shared.Features.Server
 {
+    public class BaseController<TModule> : BaseController
+    {
+        protected readonly TModule module;
+
+        public BaseController(IServiceProvider serviceProvider) : base(serviceProvider)
+        {
+            module = serviceProvider.GetService<TModule>();
+        }
+    }
+
     public class BaseController : ControllerBase
     {
         protected readonly IExecutionContext executionContext;

diff --git a/Source/Shared/Kernel/Errors/Errors.cs b/Source/Shared/Kernel/Errors/Errors.cs
@@ -4,7 +4,8 @@ namespace Shared.Kernel.Errors
 {
     public static class Errors
     {
-        public static NotFoundException NotFound = new NotFoundException();
+        public static NotFoundException NotFound(string entityName, Guid id) => new NotFoundException(entityName, id);
+        public static NotFoundException NotFound(string entityName, string id) => new NotFoundException(entityName, id);
         public static UnAuthorizedException UnAuthorized = new UnAuthorizedException();
     }
 }
diff --git a/Source/Shared/Kernel/Errors/Exceptions/NotFoundException.cs b/Source/Shared/Kernel/Errors/Exceptions/NotFoundException.cs
@@ -2,7 +2,12 @@
 {
     public class NotFoundException : Exception
     {
-        public NotFoundException() : base("Entity was not found")
+        public NotFoundException(string entityType, string id) : base($"{entityType} with {id} was not found")
+        {
+
+        }
+
+        public NotFoundException(string entityType, Guid id) : base($"{entityType} with {id} was not found")
         {
 
         }

diff --git a/Source/Web/Server/BuildingBlocks/ExceptionHandling/ExceptionHandler.cs b/Source/Web/Server/BuildingBlocks/ExceptionHandling/ExceptionHandler.cs
@@ -3,8 +3,8 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
-using Shared.Features.Domain.Exceptions;
 using Shared.Kernel.BuildingBlocks.Auth.Exceptions;
+using Shared.Kernel.Errors.Exceptions;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;

diff --git a/Source/Web/Server/Web.Server.csproj b/Source/Web/Server/Web.Server.csproj
@@ -23,7 +23,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Modules\LandingPages\Modules.LandingPages.Web.Server\Modules.LandingPages.Web.csproj" />
     <ProjectReference Include="..\..\Modules\LandingPages\Server\Modules.LandingPages.Web.csproj" />
     <ProjectReference Include="..\..\Modules\Subscriptions\Web\Server\Modules.Subscriptions.Web.Server.csproj" />
     <ProjectReference Include="..\..\Modules\TenantIdentity\Web\Server\Modules.TenantIdentity.Web.Server.csproj" />