diff --git a/CleanArchitecture.Api/Program.cs b/CleanArchitecture.Api/Program.cs index 2cc4745..afd0f84 100644 --- a/CleanArchitecture.Api/Program.cs +++ b/CleanArchitecture.Api/Program.cs @@ -15,7 +15,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using StackExchange.Redis; var builder = WebApplication.CreateBuilder(args); diff --git a/CleanArchitecture.Application/Interfaces/IUserService.cs b/CleanArchitecture.Application/Interfaces/IUserService.cs index 49e4f91..1a77271 100644 --- a/CleanArchitecture.Application/Interfaces/IUserService.cs +++ b/CleanArchitecture.Application/Interfaces/IUserService.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Threading.Tasks; using CleanArchitecture.Application.ViewModels; using CleanArchitecture.Application.ViewModels.Users; diff --git a/CleanArchitecture.Application/Services/TenantService.cs b/CleanArchitecture.Application/Services/TenantService.cs index 44eaa67..409a91f 100644 --- a/CleanArchitecture.Application/Services/TenantService.cs +++ b/CleanArchitecture.Application/Services/TenantService.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Threading.Tasks; using CleanArchitecture.Application.Interfaces; using CleanArchitecture.Application.Queries.Tenants.GetAll; diff --git a/CleanArchitecture.Domain.Tests/CommandHandler/Tenant/CreateTenant/CreateTenantCommandHandlerTests.cs b/CleanArchitecture.Domain.Tests/CommandHandler/Tenant/CreateTenant/CreateTenantCommandHandlerTests.cs index 2dce689..0ac8c00 100644 --- a/CleanArchitecture.Domain.Tests/CommandHandler/Tenant/CreateTenant/CreateTenantCommandHandlerTests.cs +++ b/CleanArchitecture.Domain.Tests/CommandHandler/Tenant/CreateTenant/CreateTenantCommandHandlerTests.cs @@ -1,7 +1,7 @@ using System; using CleanArchitecture.Domain.Commands.Tenants.CreateTenant; using CleanArchitecture.Domain.Errors; -using CleanArchitecture.Domain.Events.Tenant; +using CleanArchitecture.Shared.Events.Tenant; using Xunit; namespace CleanArchitecture.Domain.Tests.CommandHandler.Tenant.CreateTenant; diff --git a/CleanArchitecture.Domain.Tests/CommandHandler/Tenant/DeleteTenant/DeleteTenantCommandHandlerTests.cs b/CleanArchitecture.Domain.Tests/CommandHandler/Tenant/DeleteTenant/DeleteTenantCommandHandlerTests.cs index 8f0d378..68134d9 100644 --- a/CleanArchitecture.Domain.Tests/CommandHandler/Tenant/DeleteTenant/DeleteTenantCommandHandlerTests.cs +++ b/CleanArchitecture.Domain.Tests/CommandHandler/Tenant/DeleteTenant/DeleteTenantCommandHandlerTests.cs @@ -1,7 +1,7 @@ using System; using CleanArchitecture.Domain.Commands.Tenants.DeleteTenant; using CleanArchitecture.Domain.Errors; -using CleanArchitecture.Domain.Events.Tenant; +using CleanArchitecture.Shared.Events.Tenant; using Xunit; namespace CleanArchitecture.Domain.Tests.CommandHandler.Tenant.DeleteTenant; diff --git a/CleanArchitecture.Domain.Tests/CommandHandler/Tenant/UpdateTenant/UpdateTenantCommandHandlerTests.cs b/CleanArchitecture.Domain.Tests/CommandHandler/Tenant/UpdateTenant/UpdateTenantCommandHandlerTests.cs index 77a186a..980b97b 100644 --- a/CleanArchitecture.Domain.Tests/CommandHandler/Tenant/UpdateTenant/UpdateTenantCommandHandlerTests.cs +++ b/CleanArchitecture.Domain.Tests/CommandHandler/Tenant/UpdateTenant/UpdateTenantCommandHandlerTests.cs @@ -1,7 +1,7 @@ using System; using CleanArchitecture.Domain.Commands.Tenants.UpdateTenant; using CleanArchitecture.Domain.Errors; -using CleanArchitecture.Domain.Events.Tenant; +using CleanArchitecture.Shared.Events.Tenant; using Xunit; namespace CleanArchitecture.Domain.Tests.CommandHandler.Tenant.UpdateTenant; diff --git a/CleanArchitecture.Domain.Tests/CommandHandler/User/ChangePassword/ChangePasswordCommandHandlerTests.cs b/CleanArchitecture.Domain.Tests/CommandHandler/User/ChangePassword/ChangePasswordCommandHandlerTests.cs index 293c603..a318a0f 100644 --- a/CleanArchitecture.Domain.Tests/CommandHandler/User/ChangePassword/ChangePasswordCommandHandlerTests.cs +++ b/CleanArchitecture.Domain.Tests/CommandHandler/User/ChangePassword/ChangePasswordCommandHandlerTests.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using CleanArchitecture.Domain.Commands.Users.ChangePassword; using CleanArchitecture.Domain.Errors; -using CleanArchitecture.Domain.Events.User; +using CleanArchitecture.Shared.Events.User; using Xunit; namespace CleanArchitecture.Domain.Tests.CommandHandler.User.ChangePassword; diff --git a/CleanArchitecture.Domain.Tests/CommandHandler/User/CreateUser/CreateUserCommandHandlerTests.cs b/CleanArchitecture.Domain.Tests/CommandHandler/User/CreateUser/CreateUserCommandHandlerTests.cs index 0f0e7d6..c162f6d 100644 --- a/CleanArchitecture.Domain.Tests/CommandHandler/User/CreateUser/CreateUserCommandHandlerTests.cs +++ b/CleanArchitecture.Domain.Tests/CommandHandler/User/CreateUser/CreateUserCommandHandlerTests.cs @@ -2,7 +2,7 @@ using System; using CleanArchitecture.Domain.Commands.Users.CreateUser; using CleanArchitecture.Domain.Enums; using CleanArchitecture.Domain.Errors; -using CleanArchitecture.Domain.Events.User; +using CleanArchitecture.Shared.Events.User; using NSubstitute; using Xunit; diff --git a/CleanArchitecture.Domain.Tests/CommandHandler/User/DeleteUser/DeleteUserCommandHandlerTests.cs b/CleanArchitecture.Domain.Tests/CommandHandler/User/DeleteUser/DeleteUserCommandHandlerTests.cs index 95d2569..816a9d1 100644 --- a/CleanArchitecture.Domain.Tests/CommandHandler/User/DeleteUser/DeleteUserCommandHandlerTests.cs +++ b/CleanArchitecture.Domain.Tests/CommandHandler/User/DeleteUser/DeleteUserCommandHandlerTests.cs @@ -1,7 +1,7 @@ using System; using CleanArchitecture.Domain.Commands.Users.DeleteUser; using CleanArchitecture.Domain.Errors; -using CleanArchitecture.Domain.Events.User; +using CleanArchitecture.Shared.Events.User; using Xunit; namespace CleanArchitecture.Domain.Tests.CommandHandler.User.DeleteUser; diff --git a/CleanArchitecture.Domain.Tests/CommandHandler/User/UpdateUser/UpdateUserCommandHandlerTests.cs b/CleanArchitecture.Domain.Tests/CommandHandler/User/UpdateUser/UpdateUserCommandHandlerTests.cs index c1229b7..9395f57 100644 --- a/CleanArchitecture.Domain.Tests/CommandHandler/User/UpdateUser/UpdateUserCommandHandlerTests.cs +++ b/CleanArchitecture.Domain.Tests/CommandHandler/User/UpdateUser/UpdateUserCommandHandlerTests.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using CleanArchitecture.Domain.Commands.Users.UpdateUser; using CleanArchitecture.Domain.Enums; using CleanArchitecture.Domain.Errors; -using CleanArchitecture.Domain.Events.User; +using CleanArchitecture.Shared.Events.User; using NSubstitute; using Xunit; diff --git a/CleanArchitecture.Domain.Tests/CommandHandlerFixtureBase.cs b/CleanArchitecture.Domain.Tests/CommandHandlerFixtureBase.cs index 1d5087b..a16e775 100644 --- a/CleanArchitecture.Domain.Tests/CommandHandlerFixtureBase.cs +++ b/CleanArchitecture.Domain.Tests/CommandHandlerFixtureBase.cs @@ -1,9 +1,9 @@ using System; using System.Linq.Expressions; -using CleanArchitecture.Domain.DomainEvents; using CleanArchitecture.Domain.Enums; using CleanArchitecture.Domain.Interfaces; using CleanArchitecture.Domain.Notifications; +using CleanArchitecture.Shared.Events; using NSubstitute; namespace CleanArchitecture.Domain.Tests; diff --git a/CleanArchitecture.Domain/CleanArchitecture.Domain.csproj b/CleanArchitecture.Domain/CleanArchitecture.Domain.csproj index 8a6b041..56823a6 100644 --- a/CleanArchitecture.Domain/CleanArchitecture.Domain.csproj +++ b/CleanArchitecture.Domain/CleanArchitecture.Domain.csproj @@ -18,4 +18,8 @@ + + + + diff --git a/CleanArchitecture.Domain/Commands/Tenants/CreateTenant/CreateTenantCommandHandler.cs b/CleanArchitecture.Domain/Commands/Tenants/CreateTenant/CreateTenantCommandHandler.cs index 16d0821..4887de8 100644 --- a/CleanArchitecture.Domain/Commands/Tenants/CreateTenant/CreateTenantCommandHandler.cs +++ b/CleanArchitecture.Domain/Commands/Tenants/CreateTenant/CreateTenantCommandHandler.cs @@ -3,10 +3,10 @@ using System.Threading.Tasks; using CleanArchitecture.Domain.Entities; using CleanArchitecture.Domain.Enums; using CleanArchitecture.Domain.Errors; -using CleanArchitecture.Domain.Events.Tenant; using CleanArchitecture.Domain.Interfaces; using CleanArchitecture.Domain.Interfaces.Repositories; using CleanArchitecture.Domain.Notifications; +using CleanArchitecture.Shared.Events.Tenant; using MediatR; namespace CleanArchitecture.Domain.Commands.Tenants.CreateTenant; diff --git a/CleanArchitecture.Domain/Commands/Tenants/DeleteTenant/DeleteTenantCommandHandler.cs b/CleanArchitecture.Domain/Commands/Tenants/DeleteTenant/DeleteTenantCommandHandler.cs index 1303d7b..ea30b35 100644 --- a/CleanArchitecture.Domain/Commands/Tenants/DeleteTenant/DeleteTenantCommandHandler.cs +++ b/CleanArchitecture.Domain/Commands/Tenants/DeleteTenant/DeleteTenantCommandHandler.cs @@ -3,10 +3,10 @@ using System.Threading; using System.Threading.Tasks; using CleanArchitecture.Domain.Enums; using CleanArchitecture.Domain.Errors; -using CleanArchitecture.Domain.Events.Tenant; using CleanArchitecture.Domain.Interfaces; using CleanArchitecture.Domain.Interfaces.Repositories; using CleanArchitecture.Domain.Notifications; +using CleanArchitecture.Shared.Events.Tenant; using MediatR; namespace CleanArchitecture.Domain.Commands.Tenants.DeleteTenant; diff --git a/CleanArchitecture.Domain/Commands/Tenants/UpdateTenant/UpdateTenantCommandHandler.cs b/CleanArchitecture.Domain/Commands/Tenants/UpdateTenant/UpdateTenantCommandHandler.cs index dc1e076..9e445cb 100644 --- a/CleanArchitecture.Domain/Commands/Tenants/UpdateTenant/UpdateTenantCommandHandler.cs +++ b/CleanArchitecture.Domain/Commands/Tenants/UpdateTenant/UpdateTenantCommandHandler.cs @@ -2,10 +2,10 @@ using System.Threading; using System.Threading.Tasks; using CleanArchitecture.Domain.Enums; using CleanArchitecture.Domain.Errors; -using CleanArchitecture.Domain.Events.Tenant; using CleanArchitecture.Domain.Interfaces; using CleanArchitecture.Domain.Interfaces.Repositories; using CleanArchitecture.Domain.Notifications; +using CleanArchitecture.Shared.Events.Tenant; using MediatR; namespace CleanArchitecture.Domain.Commands.Tenants.UpdateTenant; diff --git a/CleanArchitecture.Domain/Commands/Users/ChangePassword/ChangePasswordCommandHandler.cs b/CleanArchitecture.Domain/Commands/Users/ChangePassword/ChangePasswordCommandHandler.cs index 713d43e..19d0616 100644 --- a/CleanArchitecture.Domain/Commands/Users/ChangePassword/ChangePasswordCommandHandler.cs +++ b/CleanArchitecture.Domain/Commands/Users/ChangePassword/ChangePasswordCommandHandler.cs @@ -1,10 +1,10 @@ using System.Threading; using System.Threading.Tasks; using CleanArchitecture.Domain.Errors; -using CleanArchitecture.Domain.Events.User; using CleanArchitecture.Domain.Interfaces; using CleanArchitecture.Domain.Interfaces.Repositories; using CleanArchitecture.Domain.Notifications; +using CleanArchitecture.Shared.Events.User; using MediatR; using BC = BCrypt.Net.BCrypt; diff --git a/CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommandHandler.cs b/CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommandHandler.cs index 39d3c2d..1956f5d 100644 --- a/CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommandHandler.cs +++ b/CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommandHandler.cs @@ -3,10 +3,10 @@ using System.Threading.Tasks; using CleanArchitecture.Domain.Entities; using CleanArchitecture.Domain.Enums; using CleanArchitecture.Domain.Errors; -using CleanArchitecture.Domain.Events.User; using CleanArchitecture.Domain.Interfaces; using CleanArchitecture.Domain.Interfaces.Repositories; using CleanArchitecture.Domain.Notifications; +using CleanArchitecture.Shared.Events.User; using MediatR; using BC = BCrypt.Net.BCrypt; diff --git a/CleanArchitecture.Domain/Commands/Users/DeleteUser/DeleteUserCommandHandler.cs b/CleanArchitecture.Domain/Commands/Users/DeleteUser/DeleteUserCommandHandler.cs index ef174bc..d3eba80 100644 --- a/CleanArchitecture.Domain/Commands/Users/DeleteUser/DeleteUserCommandHandler.cs +++ b/CleanArchitecture.Domain/Commands/Users/DeleteUser/DeleteUserCommandHandler.cs @@ -2,10 +2,10 @@ using System.Threading; using System.Threading.Tasks; using CleanArchitecture.Domain.Enums; using CleanArchitecture.Domain.Errors; -using CleanArchitecture.Domain.Events.User; using CleanArchitecture.Domain.Interfaces; using CleanArchitecture.Domain.Interfaces.Repositories; using CleanArchitecture.Domain.Notifications; +using CleanArchitecture.Shared.Events.User; using MediatR; namespace CleanArchitecture.Domain.Commands.Users.DeleteUser; diff --git a/CleanArchitecture.Domain/Commands/Users/UpdateUser/UpdateUserCommandHandler.cs b/CleanArchitecture.Domain/Commands/Users/UpdateUser/UpdateUserCommandHandler.cs index 83ad83f..518ea37 100644 --- a/CleanArchitecture.Domain/Commands/Users/UpdateUser/UpdateUserCommandHandler.cs +++ b/CleanArchitecture.Domain/Commands/Users/UpdateUser/UpdateUserCommandHandler.cs @@ -2,10 +2,10 @@ using System.Threading; using System.Threading.Tasks; using CleanArchitecture.Domain.Enums; using CleanArchitecture.Domain.Errors; -using CleanArchitecture.Domain.Events.User; using CleanArchitecture.Domain.Interfaces; using CleanArchitecture.Domain.Interfaces.Repositories; using CleanArchitecture.Domain.Notifications; +using CleanArchitecture.Shared.Events.User; using MediatR; namespace CleanArchitecture.Domain.Commands.Users.UpdateUser; diff --git a/CleanArchitecture.Domain/DomainEvents/IDomainEventStore.cs b/CleanArchitecture.Domain/DomainEvents/IDomainEventStore.cs index 68b17b5..f27f89e 100644 --- a/CleanArchitecture.Domain/DomainEvents/IDomainEventStore.cs +++ b/CleanArchitecture.Domain/DomainEvents/IDomainEventStore.cs @@ -1,4 +1,5 @@ using System.Threading.Tasks; +using CleanArchitecture.Shared.Events; namespace CleanArchitecture.Domain.DomainEvents; diff --git a/CleanArchitecture.Domain/DomainEvents/StoredDomainEvent.cs b/CleanArchitecture.Domain/DomainEvents/StoredDomainEvent.cs index 5220441..f443e98 100644 --- a/CleanArchitecture.Domain/DomainEvents/StoredDomainEvent.cs +++ b/CleanArchitecture.Domain/DomainEvents/StoredDomainEvent.cs @@ -1,4 +1,5 @@ using System; +using CleanArchitecture.Shared.Events; namespace CleanArchitecture.Domain.DomainEvents; diff --git a/CleanArchitecture.Domain/EventHandler/Fanout/FanoutEventHandler.cs b/CleanArchitecture.Domain/EventHandler/Fanout/FanoutEventHandler.cs index 83e5a74..76f70d2 100644 --- a/CleanArchitecture.Domain/EventHandler/Fanout/FanoutEventHandler.cs +++ b/CleanArchitecture.Domain/EventHandler/Fanout/FanoutEventHandler.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using CleanArchitecture.Domain.Constants; -using CleanArchitecture.Domain.DomainEvents; using CleanArchitecture.Domain.Rabbitmq; +using CleanArchitecture.Shared.Events; namespace CleanArchitecture.Domain.EventHandler.Fanout; diff --git a/CleanArchitecture.Domain/EventHandler/Fanout/IFanoutEventHandler.cs b/CleanArchitecture.Domain/EventHandler/Fanout/IFanoutEventHandler.cs index c80cd3c..26453ac 100644 --- a/CleanArchitecture.Domain/EventHandler/Fanout/IFanoutEventHandler.cs +++ b/CleanArchitecture.Domain/EventHandler/Fanout/IFanoutEventHandler.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using CleanArchitecture.Domain.DomainEvents; +using CleanArchitecture.Shared.Events; namespace CleanArchitecture.Domain.EventHandler.Fanout; diff --git a/CleanArchitecture.Domain/EventHandler/TenantEventHandler.cs b/CleanArchitecture.Domain/EventHandler/TenantEventHandler.cs index 7803f55..9f14c43 100644 --- a/CleanArchitecture.Domain/EventHandler/TenantEventHandler.cs +++ b/CleanArchitecture.Domain/EventHandler/TenantEventHandler.cs @@ -1,7 +1,7 @@ using System.Threading; using System.Threading.Tasks; using CleanArchitecture.Domain.Entities; -using CleanArchitecture.Domain.Events.Tenant; +using CleanArchitecture.Shared.Events.Tenant; using MediatR; using Microsoft.Extensions.Caching.Distributed; diff --git a/CleanArchitecture.Domain/EventHandler/UserEventHandler.cs b/CleanArchitecture.Domain/EventHandler/UserEventHandler.cs index 4a2263a..95d61a8 100644 --- a/CleanArchitecture.Domain/EventHandler/UserEventHandler.cs +++ b/CleanArchitecture.Domain/EventHandler/UserEventHandler.cs @@ -1,7 +1,7 @@ using System.Threading; using System.Threading.Tasks; using CleanArchitecture.Domain.Entities; -using CleanArchitecture.Domain.Events.User; +using CleanArchitecture.Shared.Events.User; using MediatR; using Microsoft.Extensions.Caching.Distributed; diff --git a/CleanArchitecture.Domain/Extensions/ServiceCollectionExtension.cs b/CleanArchitecture.Domain/Extensions/ServiceCollectionExtension.cs index 4195c2b..b579092 100644 --- a/CleanArchitecture.Domain/Extensions/ServiceCollectionExtension.cs +++ b/CleanArchitecture.Domain/Extensions/ServiceCollectionExtension.cs @@ -6,12 +6,11 @@ using CleanArchitecture.Domain.Commands.Users.CreateUser; using CleanArchitecture.Domain.Commands.Users.DeleteUser; using CleanArchitecture.Domain.Commands.Users.LoginUser; using CleanArchitecture.Domain.Commands.Users.UpdateUser; -using CleanArchitecture.Domain.DomainEvents; using CleanArchitecture.Domain.EventHandler; using CleanArchitecture.Domain.EventHandler.Fanout; -using CleanArchitecture.Domain.Events.Tenant; -using CleanArchitecture.Domain.Events.User; using CleanArchitecture.Domain.Interfaces; +using CleanArchitecture.Shared.Events.Tenant; +using CleanArchitecture.Shared.Events.User; using MediatR; using Microsoft.Extensions.DependencyInjection; diff --git a/CleanArchitecture.Domain/Interfaces/IMediatorHandler.cs b/CleanArchitecture.Domain/Interfaces/IMediatorHandler.cs index e8c5ef4..fbfa614 100644 --- a/CleanArchitecture.Domain/Interfaces/IMediatorHandler.cs +++ b/CleanArchitecture.Domain/Interfaces/IMediatorHandler.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using CleanArchitecture.Domain.Commands; -using CleanArchitecture.Domain.DomainEvents; +using CleanArchitecture.Shared.Events; using MediatR; namespace CleanArchitecture.Domain.Interfaces; diff --git a/CleanArchitecture.Domain/Notifications/DomainNotification.cs b/CleanArchitecture.Domain/Notifications/DomainNotification.cs index c228ab4..ac81d3a 100644 --- a/CleanArchitecture.Domain/Notifications/DomainNotification.cs +++ b/CleanArchitecture.Domain/Notifications/DomainNotification.cs @@ -1,5 +1,5 @@ using System; -using CleanArchitecture.Domain.DomainEvents; +using CleanArchitecture.Shared.Events; namespace CleanArchitecture.Domain.Notifications; diff --git a/CleanArchitecture.Domain/Rabbitmq/RabbitMqHandler.cs b/CleanArchitecture.Domain/Rabbitmq/RabbitMqHandler.cs index facc475..6a8fb0d 100644 --- a/CleanArchitecture.Domain/Rabbitmq/RabbitMqHandler.cs +++ b/CleanArchitecture.Domain/Rabbitmq/RabbitMqHandler.cs @@ -23,9 +23,6 @@ public sealed class RabbitMqHandler : BackgroundService private readonly IModel? _channel; - private readonly IConnection? _connection; - - public RabbitMqHandler( RabbitMqConfiguration configuration, ILogger logger) @@ -48,8 +45,8 @@ public sealed class RabbitMqHandler : BackgroundService DispatchConsumersAsync = true }; - _connection = factory.CreateConnection(); - _channel = _connection.CreateModel(); + var connection = factory.CreateConnection(); + _channel = connection.CreateModel(); } public void InitializeExchange(string exchangeName, string type = ExchangeType.Fanout) diff --git a/CleanArchitecture.Infrastructure.Tests/InMemoryBusTests.cs b/CleanArchitecture.Infrastructure.Tests/InMemoryBusTests.cs index 6f4795e..b65bcbb 100644 --- a/CleanArchitecture.Infrastructure.Tests/InMemoryBusTests.cs +++ b/CleanArchitecture.Infrastructure.Tests/InMemoryBusTests.cs @@ -3,8 +3,8 @@ using System.Threading.Tasks; using CleanArchitecture.Domain.Commands.Users.DeleteUser; using CleanArchitecture.Domain.DomainEvents; using CleanArchitecture.Domain.EventHandler.Fanout; -using CleanArchitecture.Domain.Events.User; using CleanArchitecture.Domain.Notifications; +using CleanArchitecture.Shared.Events.User; using MediatR; using NSubstitute; using Xunit; diff --git a/CleanArchitecture.Infrastructure/CleanArchitecture.Infrastructure.csproj b/CleanArchitecture.Infrastructure/CleanArchitecture.Infrastructure.csproj index 4aab3e5..6f4ac31 100644 --- a/CleanArchitecture.Infrastructure/CleanArchitecture.Infrastructure.csproj +++ b/CleanArchitecture.Infrastructure/CleanArchitecture.Infrastructure.csproj @@ -7,6 +7,7 @@ + diff --git a/CleanArchitecture.Infrastructure/EventSourcing/EventStore.cs b/CleanArchitecture.Infrastructure/EventSourcing/EventStore.cs index 361156d..9dc8c20 100644 --- a/CleanArchitecture.Infrastructure/EventSourcing/EventStore.cs +++ b/CleanArchitecture.Infrastructure/EventSourcing/EventStore.cs @@ -3,6 +3,7 @@ using CleanArchitecture.Domain.DomainEvents; using CleanArchitecture.Domain.DomainNotifications; using CleanArchitecture.Domain.Notifications; using CleanArchitecture.Infrastructure.Database; +using CleanArchitecture.Shared.Events; using Newtonsoft.Json; namespace CleanArchitecture.Infrastructure.EventSourcing; diff --git a/CleanArchitecture.Infrastructure/InMemoryBus.cs b/CleanArchitecture.Infrastructure/InMemoryBus.cs index 660a4ec..7c2ac2b 100644 --- a/CleanArchitecture.Infrastructure/InMemoryBus.cs +++ b/CleanArchitecture.Infrastructure/InMemoryBus.cs @@ -3,6 +3,7 @@ using CleanArchitecture.Domain.Commands; using CleanArchitecture.Domain.DomainEvents; using CleanArchitecture.Domain.EventHandler.Fanout; using CleanArchitecture.Domain.Interfaces; +using CleanArchitecture.Shared.Events; using MediatR; namespace CleanArchitecture.Infrastructure; diff --git a/CleanArchitecture.Shared/CleanArchitecture.Shared.csproj b/CleanArchitecture.Shared/CleanArchitecture.Shared.csproj index 7547394..bbe89de 100644 --- a/CleanArchitecture.Shared/CleanArchitecture.Shared.csproj +++ b/CleanArchitecture.Shared/CleanArchitecture.Shared.csproj @@ -6,4 +6,8 @@ + + + + diff --git a/CleanArchitecture.Domain/DomainEvents/DomainEvent.cs b/CleanArchitecture.Shared/Events/DomainEvent.cs similarity index 81% rename from CleanArchitecture.Domain/DomainEvents/DomainEvent.cs rename to CleanArchitecture.Shared/Events/DomainEvent.cs index 0219417..f541549 100644 --- a/CleanArchitecture.Domain/DomainEvents/DomainEvent.cs +++ b/CleanArchitecture.Shared/Events/DomainEvent.cs @@ -1,9 +1,8 @@ using System; using MediatR; -namespace CleanArchitecture.Domain.DomainEvents; +namespace CleanArchitecture.Shared.Events; -// Todo: Move this and all events to shared public abstract class DomainEvent : Message, INotification { public DateTime Timestamp { get; private set; } diff --git a/CleanArchitecture.Domain/DomainEvents/Message.cs b/CleanArchitecture.Shared/Events/Message.cs similarity index 90% rename from CleanArchitecture.Domain/DomainEvents/Message.cs rename to CleanArchitecture.Shared/Events/Message.cs index a99929e..70a7198 100644 --- a/CleanArchitecture.Domain/DomainEvents/Message.cs +++ b/CleanArchitecture.Shared/Events/Message.cs @@ -1,7 +1,7 @@ using System; using MediatR; -namespace CleanArchitecture.Domain.DomainEvents; +namespace CleanArchitecture.Shared.Events; public abstract class Message : IRequest { diff --git a/CleanArchitecture.Domain/Events/Tenant/TenantCreatedEvent.cs b/CleanArchitecture.Shared/Events/Tenant/TenantCreatedEvent.cs similarity index 69% rename from CleanArchitecture.Domain/Events/Tenant/TenantCreatedEvent.cs rename to CleanArchitecture.Shared/Events/Tenant/TenantCreatedEvent.cs index dc558b6..07e8afd 100644 --- a/CleanArchitecture.Domain/Events/Tenant/TenantCreatedEvent.cs +++ b/CleanArchitecture.Shared/Events/Tenant/TenantCreatedEvent.cs @@ -1,7 +1,6 @@ using System; -using CleanArchitecture.Domain.DomainEvents; -namespace CleanArchitecture.Domain.Events.Tenant; +namespace CleanArchitecture.Shared.Events.Tenant; public sealed class TenantCreatedEvent : DomainEvent { diff --git a/CleanArchitecture.Domain/Events/Tenant/TenantDeletedEvent.cs b/CleanArchitecture.Shared/Events/Tenant/TenantDeletedEvent.cs similarity index 60% rename from CleanArchitecture.Domain/Events/Tenant/TenantDeletedEvent.cs rename to CleanArchitecture.Shared/Events/Tenant/TenantDeletedEvent.cs index e96bdfd..6aabe90 100644 --- a/CleanArchitecture.Domain/Events/Tenant/TenantDeletedEvent.cs +++ b/CleanArchitecture.Shared/Events/Tenant/TenantDeletedEvent.cs @@ -1,7 +1,6 @@ using System; -using CleanArchitecture.Domain.DomainEvents; -namespace CleanArchitecture.Domain.Events.Tenant; +namespace CleanArchitecture.Shared.Events.Tenant; public sealed class TenantDeletedEvent : DomainEvent { diff --git a/CleanArchitecture.Domain/Events/Tenant/TenantUpdatedEvent.cs b/CleanArchitecture.Shared/Events/Tenant/TenantUpdatedEvent.cs similarity index 69% rename from CleanArchitecture.Domain/Events/Tenant/TenantUpdatedEvent.cs rename to CleanArchitecture.Shared/Events/Tenant/TenantUpdatedEvent.cs index 20675d1..d8a678c 100644 --- a/CleanArchitecture.Domain/Events/Tenant/TenantUpdatedEvent.cs +++ b/CleanArchitecture.Shared/Events/Tenant/TenantUpdatedEvent.cs @@ -1,7 +1,6 @@ using System; -using CleanArchitecture.Domain.DomainEvents; -namespace CleanArchitecture.Domain.Events.Tenant; +namespace CleanArchitecture.Shared.Events.Tenant; public sealed class TenantUpdatedEvent : DomainEvent { diff --git a/CleanArchitecture.Domain/Events/User/PasswordChangedEvent.cs b/CleanArchitecture.Shared/Events/User/PasswordChangedEvent.cs similarity index 61% rename from CleanArchitecture.Domain/Events/User/PasswordChangedEvent.cs rename to CleanArchitecture.Shared/Events/User/PasswordChangedEvent.cs index c5b1b25..427c407 100644 --- a/CleanArchitecture.Domain/Events/User/PasswordChangedEvent.cs +++ b/CleanArchitecture.Shared/Events/User/PasswordChangedEvent.cs @@ -1,7 +1,6 @@ using System; -using CleanArchitecture.Domain.DomainEvents; -namespace CleanArchitecture.Domain.Events.User; +namespace CleanArchitecture.Shared.Events.User; public sealed class PasswordChangedEvent : DomainEvent { diff --git a/CleanArchitecture.Domain/Events/User/UserCreatedEvent.cs b/CleanArchitecture.Shared/Events/User/UserCreatedEvent.cs similarity index 70% rename from CleanArchitecture.Domain/Events/User/UserCreatedEvent.cs rename to CleanArchitecture.Shared/Events/User/UserCreatedEvent.cs index 014c7ea..2cbae8d 100644 --- a/CleanArchitecture.Domain/Events/User/UserCreatedEvent.cs +++ b/CleanArchitecture.Shared/Events/User/UserCreatedEvent.cs @@ -1,7 +1,6 @@ using System; -using CleanArchitecture.Domain.DomainEvents; -namespace CleanArchitecture.Domain.Events.User; +namespace CleanArchitecture.Shared.Events.User; public sealed class UserCreatedEvent : DomainEvent { diff --git a/CleanArchitecture.Domain/Events/User/UserDeletedEvent.cs b/CleanArchitecture.Shared/Events/User/UserDeletedEvent.cs similarity index 70% rename from CleanArchitecture.Domain/Events/User/UserDeletedEvent.cs rename to CleanArchitecture.Shared/Events/User/UserDeletedEvent.cs index 836ae5a..6181c2d 100644 --- a/CleanArchitecture.Domain/Events/User/UserDeletedEvent.cs +++ b/CleanArchitecture.Shared/Events/User/UserDeletedEvent.cs @@ -1,7 +1,6 @@ using System; -using CleanArchitecture.Domain.DomainEvents; -namespace CleanArchitecture.Domain.Events.User; +namespace CleanArchitecture.Shared.Events.User; public sealed class UserDeletedEvent : DomainEvent { diff --git a/CleanArchitecture.Domain/Events/User/UserUpdatedEvent.cs b/CleanArchitecture.Shared/Events/User/UserUpdatedEvent.cs similarity index 70% rename from CleanArchitecture.Domain/Events/User/UserUpdatedEvent.cs rename to CleanArchitecture.Shared/Events/User/UserUpdatedEvent.cs index e72c005..3bfba45 100644 --- a/CleanArchitecture.Domain/Events/User/UserUpdatedEvent.cs +++ b/CleanArchitecture.Shared/Events/User/UserUpdatedEvent.cs @@ -1,7 +1,6 @@ using System; -using CleanArchitecture.Domain.DomainEvents; -namespace CleanArchitecture.Domain.Events.User; +namespace CleanArchitecture.Shared.Events.User; public sealed class UserUpdatedEvent : DomainEvent {