removing aggregates with more pragmatic code structure

DavidEggenberger · Nov 4, 2024 · bc1aeae · bc1aeae
1 parent 04ce116
commit bc1aeae
Show file tree

Hide file tree

Showing 68 changed files with 130 additions and 143 deletions.
diff --git a/...plication/Commands/AddMessageToChannel.cs → ...plication/Commands/AddMessageToChannel.cs b/...plication/Commands/AddMessageToChannel.cs → ...plication/Commands/AddMessageToChannel.cs
@@ -2,7 +2,7 @@
 using Modules.Channels.Features.Infrastructure.EFCore;
 using Shared.Features.Messaging.Command;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate.Application.Commands
+namespace Modules.Channels.Features.DomainFeatures.Channels.Application.Commands
 {
     public class AddMessageToChannel : ICommand
     {

diff --git a/...Application/Commands/ChangeChannelName.cs → ...Application/Commands/ChangeChannelName.cs b/...Application/Commands/ChangeChannelName.cs → ...Application/Commands/ChangeChannelName.cs
@@ -1,7 +1,7 @@
 using Modules.Channels.Features.Infrastructure.EFCore;
 using Shared.Features.Messaging.Command;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate.Application.Commands
+namespace Modules.Channels.Features.DomainFeatures.Channels.Application.Commands
 {
     public class ChangeChannelName : ICommand
     {

diff --git a/...ate/Application/Commands/CreateChannel.cs → ...els/Application/Commands/CreateChannel.cs b/...ate/Application/Commands/CreateChannel.cs → ...els/Application/Commands/CreateChannel.cs
@@ -1,7 +1,7 @@
 using Modules.Channels.Features.Infrastructure.EFCore;
 using Shared.Features.Messaging.Command;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate.Application.Commands
+namespace Modules.Channels.Features.DomainFeatures.Channels.Application.Commands
 {
     public class CreateChannel : ICommand
     {

diff --git a/...ate/Application/Commands/DeleteChannel.cs → ...els/Application/Commands/DeleteChannel.cs b/...ate/Application/Commands/DeleteChannel.cs → ...els/Application/Commands/DeleteChannel.cs
@@ -1,7 +1,7 @@
 using Modules.Channels.Features.Infrastructure.EFCore;
 using Shared.Features.Messaging.Command;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate.Application.Commands
+namespace Modules.Channels.Features.DomainFeatures.Channels.Application.Commands
 {
     public class DeleteChannel : ICommand
     {

diff --git a/...tion/Commands/DeleteMessageFromChannel.cs → ...tion/Commands/DeleteMessageFromChannel.cs b/...tion/Commands/DeleteMessageFromChannel.cs → ...tion/Commands/DeleteMessageFromChannel.cs
@@ -2,7 +2,7 @@
 using Modules.Channels.Features.Infrastructure.EFCore;
 using Shared.Features.Messaging.Command;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate.Application.Commands
+namespace Modules.Channels.Features.DomainFeatures.Channels.Application.Commands
 {
     public class DeleteMessageFromChannel : ICommand
     {

diff --git a/...ers/ChannelMessagesUpdatedEventHandler.cs → ...ers/ChannelMessagesUpdatedEventHandler.cs b/...ers/ChannelMessagesUpdatedEventHandler.cs → ...ers/ChannelMessagesUpdatedEventHandler.cs
@@ -1,7 +1,7 @@
-using Modules.Channels.Features.DomainFeatures.ChannelAggregate.Events;
+using Modules.Channels.Features.DomainFeatures.Channels.Events;
 using Shared.Features.Messaging.DomainEvent;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate.Application.EventHandlers
+namespace Modules.Channels.Features.DomainFeatures.Channels.Application.EventHandlers
 {
     public class ChannelMessagesUpdatedEventHandler : IDomainEventHandler<MessageVotesUpdatedEvent>
     {

diff --git a/...ate/Application/Queries/GetAllChannels.cs → ...els/Application/Queries/GetAllChannels.cs b/...ate/Application/Queries/GetAllChannels.cs → ...els/Application/Queries/GetAllChannels.cs
@@ -1,7 +1,7 @@
 using Modules.Channels.Features.Infrastructure.EFCore;
 using Shared.Features.Messaging.Query;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate.Application.Queries
+namespace Modules.Channels.Features.DomainFeatures.Channels.Application.Queries
 {
     public class GetAllChannels : IQuery<List<Channel>>
     {

diff --git a/...ation/Queries/GetAllMessagesForChannel.cs → ...ation/Queries/GetAllMessagesForChannel.cs b/...ation/Queries/GetAllMessagesForChannel.cs → ...ation/Queries/GetAllMessagesForChannel.cs
@@ -1,7 +1,7 @@
 using Modules.Channels.Features.Infrastructure.EFCore;
 using Shared.Features.Messaging.Query;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate.Application.Queries
+namespace Modules.Channels.Features.DomainFeatures.Channels.Application.Queries
 {
     public class AllMessagesForChannel : IQuery<List<Channel>>
     {

diff --git a/...ate/Application/Queries/GetChannelById.cs → ...els/Application/Queries/GetChannelById.cs b/...ate/Application/Queries/GetChannelById.cs → ...els/Application/Queries/GetChannelById.cs
@@ -2,7 +2,7 @@
 using Modules.Channels.Features.Infrastructure.EFCore;
 using Shared.Features.Messaging.Query;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate.Application.Queries
+namespace Modules.Channels.Features.DomainFeatures.Channels.Application.Queries
 {
     public class GetChannelById : IQuery<Channel>
     {

diff --git a/...ate/Application/Queries/GetMessageById.cs → ...els/Application/Queries/GetMessageById.cs b/...ate/Application/Queries/GetMessageById.cs → ...els/Application/Queries/GetMessageById.cs
@@ -1,6 +1,6 @@
 using Shared.Features.Messaging.Query;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate.Application.Queries
+namespace Modules.Channels.Features.DomainFeatures.Channels.Application.Queries
 {
     public class GetMessageById : IQuery<Message>
     {

diff --git a/...omainFeatures/ChannelAggregate/Channel.cs → ...atures/DomainFeatures/Channels/Channel.cs b/...omainFeatures/ChannelAggregate/Channel.cs → ...atures/DomainFeatures/Channels/Channel.cs
@@ -1,7 +1,7 @@
-using Modules.Channels.Features.DomainFeatures.ChannelAggregate.Events;
+using Modules.Channels.Features.DomainFeatures.Channels.Events;
 using Shared.Features.Domain;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate
+namespace Modules.Channels.Features.DomainFeatures.Channels
 {
     public class Channel : AggregateRoot
     {

diff --git a/...ate/Events/ChannelMessagesUpdatedEvent.cs → ...els/Events/ChannelMessagesUpdatedEvent.cs b/...ate/Events/ChannelMessagesUpdatedEvent.cs → ...els/Events/ChannelMessagesUpdatedEvent.cs
@@ -1,6 +1,6 @@
 using Shared.Features.Domain;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate.Events
+namespace Modules.Channels.Features.DomainFeatures.Channels.Events
 {
     public class ChannelMessagesUpdatedEvent : IDomainEvent
     {

diff --git a/...regate/Events/MessageVotesUpdatedEvent.cs → ...annels/Events/MessageVotesUpdatedEvent.cs b/...regate/Events/MessageVotesUpdatedEvent.cs → ...annels/Events/MessageVotesUpdatedEvent.cs
@@ -1,6 +1,6 @@
 using Shared.Features.Domain;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate.Events
+namespace Modules.Channels.Features.DomainFeatures.Channels.Events
 {
     public class MessageVotesUpdatedEvent : IDomainEvent
     {

diff --git a/...regate/Events/TopicTriggerUpdatedEvent.cs → ...annels/Events/TopicTriggerUpdatedEvent.cs b/...regate/Events/TopicTriggerUpdatedEvent.cs → ...annels/Events/TopicTriggerUpdatedEvent.cs
@@ -1,6 +1,6 @@
 using Shared.Features.Domain;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate.Events
+namespace Modules.Channels.Features.DomainFeatures.Channels.Events
 {
     public class TopicTriggerUpdatedEvent : IDomainEvent
     {

diff --git a/...te/Exceptions/InvalidVoteCastException.cs → ...ls/Exceptions/InvalidVoteCastException.cs b/...te/Exceptions/InvalidVoteCastException.cs → ...ls/Exceptions/InvalidVoteCastException.cs
@@ -1,6 +1,6 @@
 using Shared.Features.Domain.Exceptions;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate.Exceptions
+namespace Modules.Channels.Features.DomainFeatures.Channels.Exceptions
 {
     public class InvalidVoteCastException : DomainException
     {

diff --git a/...omainFeatures/ChannelAggregate/Message.cs → ...atures/DomainFeatures/Channels/Message.cs b/...omainFeatures/ChannelAggregate/Message.cs → ...atures/DomainFeatures/Channels/Message.cs
@@ -1,7 +1,7 @@
-using Modules.Channels.Features.DomainFeatures.ChannelAggregate.Events;
+using Modules.Channels.Features.DomainFeatures.Channels.Events;
 using Shared.Features.Domain;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate
+namespace Modules.Channels.Features.DomainFeatures.Channels
 {
     public class Message : Entity
     {

diff --git a/...mainFeatures/ChannelAggregate/Reaction.cs → ...tures/DomainFeatures/Channels/Reaction.cs b/...mainFeatures/ChannelAggregate/Reaction.cs → ...tures/DomainFeatures/Channels/Reaction.cs
@@ -1,6 +1,6 @@
 using Shared.Features.Domain;
 
-namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate
+namespace Modules.Channels.Features.DomainFeatures.Channels
 {
     public class Reaction : Entity
     {

diff --git a/Source/Modules/Channels/Features/Infrastructure/EFCore/ChannelsDbContext.cs b/Source/Modules/Channels/Features/Infrastructure/EFCore/ChannelsDbContext.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using Modules.Channels.Features.DomainFeatures.ChannelAggregate;
+using Modules.Channels.Features.DomainFeatures.Channels;
 using Shared.Features.EFCore;
 
 namespace Modules.Channels.Features.Infrastructure.EFCore

diff --git a/Source/Modules/Channels/Features/Infrastructure/EFCore/Configuration/ChannelConfiguration.cs b/Source/Modules/Channels/Features/Infrastructure/EFCore/Configuration/ChannelConfiguration.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Modules.Channels.Features.DomainFeatures.ChannelAggregate;
+using Modules.Channels.Features.DomainFeatures.Channels;
 
 namespace Modules.Channels.Features.Infrastructure.EFCore.Configuration
 {

diff --git a/Source/Modules/Channels/Features/Infrastructure/EFCore/Configuration/MessageConfiguration.cs b/Source/Modules/Channels/Features/Infrastructure/EFCore/Configuration/MessageConfiguration.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Modules.Channels.Features.DomainFeatures.ChannelAggregate;
+using Modules.Channels.Features.DomainFeatures.Channels;
 
 namespace Modules.Channels.Features.Infrastructure.EFCore.Configuration
 {

diff --git a/Source/Modules/Channels/Web/Server/Controllers/ChannelsController.cs b/Source/Modules/Channels/Web/Server/Controllers/ChannelsController.cs
@@ -4,9 +4,9 @@
 using AutoMapper;
 using Shared.Features.Messaging.Query;
 using Shared.Features.Messaging.Command;
-using Modules.Channels.Features.DomainFeatures.ChannelAggregate;
-using Modules.Channels.Features.DomainFeatures.ChannelAggregate.Application.Commands;
-using Modules.Channels.Features.DomainFeatures.ChannelAggregate.Application.Queries;
+using Modules.Channels.Features.DomainFeatures.Channels;
+using Modules.Channels.Features.DomainFeatures.Channels.Application.Commands;
+using Modules.Channels.Features.DomainFeatures.Channels.Application.Queries;
 using Shared.Kernel.BuildingBlocks.Authorization.Attributes;
 using Modules.Channels.Web.Shared.DTOs.ChannelAggregate;
 

diff --git a/...ers/UserUpdatedIntegrationEventHandler.cs → ...ers/UserUpdatedIntegrationEventHandler.cs b/...ers/UserUpdatedIntegrationEventHandler.cs → ...ers/UserUpdatedIntegrationEventHandler.cs
@@ -1,7 +1,7 @@
 using Modules.TenantIdentity.IntegrationEvents;
 using Shared.Features.Messaging.IntegrationEvent;
 
-namespace Modules.Subscriptions.Features.DomainFeatures.StripeCustomerAggregate.Aplication.IntegrationEventHandlers
+namespace Modules.Subscriptions.Features.DomainFeatures.StripeCustomers.Aplication.IntegrationEventHandlers
 {
     public class UserUpdatedIntegrationEventHandler : IIntegrationEventHandler<UserEmailUpdatedIntegrationEvent>
     {

diff --git a/...e/Aplication/Queries/GetStripeCustomer.cs → ...s/Aplication/Queries/GetStripeCustomer.cs b/...e/Aplication/Queries/GetStripeCustomer.cs → ...s/Aplication/Queries/GetStripeCustomer.cs
@@ -1,6 +1,6 @@
 using Shared.Features.Messaging.Query;
 
-namespace Modules.Subscriptions.Features.DomainFeatures.StripeCustomerAggregate.Aplication.Queries
+namespace Modules.Subscriptions.Features.DomainFeatures.StripeCustomers.Aplication.Queries
 {
     public class GetStripeCustomer : IQuery<StripeCustomer>
     {

diff --git a/...StripeCustomerAggregate/StripeCustomer.cs → ...eatures/StripeCustomers/StripeCustomer.cs b/...StripeCustomerAggregate/StripeCustomer.cs → ...eatures/StripeCustomers/StripeCustomer.cs
@@ -1,6 +1,6 @@
 using Shared.Features.Domain;
 
-namespace Modules.Subscriptions.Features.DomainFeatures.StripeCustomerAggregate
+namespace Modules.Subscriptions.Features.DomainFeatures.StripeCustomers
 {
     public class StripeCustomer : AggregateRoot
     {

diff --git a/...n/Commands/CreateSubscriptionForTenant.cs → ...n/Commands/CreateSubscriptionForTenant.cs b/...n/Commands/CreateSubscriptionForTenant.cs → ...n/Commands/CreateSubscriptionForTenant.cs
@@ -1,6 +1,6 @@
 using Shared.Features.Messaging.Command;
 
-namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate.Application.Commands
+namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Application.Commands
 {
     public class CreateSubscriptionForTenant : ICommand
     {

diff --git a/...pplication/Commands/DeleteSubscription.cs → ...pplication/Commands/DeleteSubscription.cs b/...pplication/Commands/DeleteSubscription.cs → ...pplication/Commands/DeleteSubscription.cs
@@ -1,6 +1,6 @@
 using Shared.Features.Messaging.Command;
 
-namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate.Application.Commands
+namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Application.Commands
 {
     public class DeleteSubscription : ICommand
     {

diff --git a/...pplication/Commands/UpdateSubscription.cs → ...pplication/Commands/UpdateSubscription.cs b/...pplication/Commands/UpdateSubscription.cs → ...pplication/Commands/UpdateSubscription.cs
@@ -1,6 +1,6 @@
 using Shared.Features.Messaging.Command;
 
-namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate.Application.Commands
+namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Application.Commands
 {
     public class UpdateSubscription : ICommand
     {

diff --git a/...ation/Queries/GetStripeCheckoutSession.cs → ...ation/Queries/GetStripeCheckoutSession.cs b/...ation/Queries/GetStripeCheckoutSession.cs → ...ation/Queries/GetStripeCheckoutSession.cs
@@ -1,6 +1,6 @@
 using Shared.Features.Messaging.Query;
 
-namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate.Application.Queries
+namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Application.Queries
 {
     public class GetStripeCheckoutSession : IQuery<Stripe.Checkout.Session>
     {

diff --git a/...bscriptionAggregate/StripeSubscription.cs → ...StripeSubscriptions/StripeSubscription.cs b/...bscriptionAggregate/StripeSubscription.cs → ...StripeSubscriptions/StripeSubscription.cs
@@ -1,8 +1,8 @@
-using Modules.Subscriptions.Features.DomainFeatures.StripeCustomerAggregate;
+using Modules.Subscriptions.Features.DomainFeatures.StripeCustomers;
 using Shared.Features.Domain;
 using Shared.Kernel.BuildingBlocks.Auth.DomainKernel;
 
-namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate
+namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions
 {
     public class StripeSubscription : AggregateRoot
     {

diff --git a/...iptionAggregate/StripeSubscriptionPlan.cs → ...peSubscriptions/StripeSubscriptionPlan.cs b/...iptionAggregate/StripeSubscriptionPlan.cs → ...peSubscriptions/StripeSubscriptionPlan.cs
@@ -1,6 +1,6 @@
 using Shared.Kernel.BuildingBlocks.Auth.DomainKernel;
 
-namespace Modules.Subscriptions.Features.DomainFeatures.SubscriptionAggregate
+namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions
 {
     public class StripeSubscriptionPlan
     {

diff --git a/...bscriptionAggregate/SubscriptionStatus.cs → ...StripeSubscriptions/SubscriptionStatus.cs b/...bscriptionAggregate/SubscriptionStatus.cs → ...StripeSubscriptions/SubscriptionStatus.cs
@@ -1,4 +1,4 @@
-namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate
+namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions
 {
     public enum SubscriptionStatus
     {

diff --git a/...Subscription.Features/Infrastructure/EFCore/Migrations/20240218050150_initial.Designer.cs b/...Subscription.Features/Infrastructure/EFCore/Migrations/20240218050150_initial.Designer.cs
diff --git a/...es/Infrastructure/EFCore/Migrations/20240328173742_StripeSubscriptionPortalId.Designer.cs b/...es/Infrastructure/EFCore/Migrations/20240328173742_StripeSubscriptionPortalId.Designer.cs
diff --git a/...cription.Features/Infrastructure/EFCore/Migrations/SubscriptionsDbContextModelSnapshot.cs b/...cription.Features/Infrastructure/EFCore/Migrations/SubscriptionsDbContextModelSnapshot.cs
@@ -23,7 +23,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
-            modelBuilder.Entity("Modules.Subscriptions.Features.DomainFeatures.StripeCustomerAggregate.StripeCustomer", b =>
+            modelBuilder.Entity("Modules.Subscriptions.Features.DomainFeatures.StripeCustomers.StripeCustomer", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
@@ -53,7 +53,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("StripeCustomers", "Subscriptions");
                 });
 
-            modelBuilder.Entity("Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate.StripeSubscription", b =>
+            modelBuilder.Entity("Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.StripeSubscription", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
@@ -97,9 +97,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("StripeSubscriptions", "Subscriptions");
                 });
 
-            modelBuilder.Entity("Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate.StripeSubscription", b =>
+            modelBuilder.Entity("Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.StripeSubscription", b =>
                 {
-                    b.HasOne("Modules.Subscriptions.Features.DomainFeatures.StripeCustomerAggregate.StripeCustomer", "StripeCustomer")
+                    b.HasOne("Modules.Subscriptions.Features.DomainFeatures.StripeCustomers.StripeCustomer", "StripeCustomer")
                         .WithMany()
                         .HasForeignKey("StripeCustomerId")
                         .OnDelete(DeleteBehavior.Cascade)

diff --git a/...on/Features/Modules.Subscription.Features/Infrastructure/EFCore/SubscriptionsDbContext.cs b/...on/Features/Modules.Subscription.Features/Infrastructure/EFCore/SubscriptionsDbContext.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
-using Modules.Subscriptions.Features.DomainFeatures.StripeCustomerAggregate;
-using Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate;
+using Modules.Subscriptions.Features.DomainFeatures.StripeCustomers;
+using Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions;
 using Shared.Features.EFCore;
 
 namespace Modules.Subscriptions.Features.Infrastructure.EFCore

diff --git a/...ures/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantSubscription.cs b/...ures/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantSubscription.cs
diff --git a/.../Queries/GetAllTenantMembershipsOfUser.cs → .../Queries/GetAllTenantMembershipsOfUser.cs b/.../Queries/GetAllTenantMembershipsOfUser.cs → .../Queries/GetAllTenantMembershipsOfUser.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Application.Queries
+namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Queries
 {
     public class GetAllTenantMembershipsOfUser : IQuery<List<TenantMembership>>
     {