From 921bce535e727547548c4ed06499dd75702de4b0 Mon Sep 17 00:00:00 2001 From: David Eggenberger Date: Mon, 28 Oct 2024 21:37:22 +0100 Subject: [PATCH] renaming aggregateRoot namespaces --- .../TenantAdminCreatedIntegrationEventHandler.cs | 2 +- .../Queries/GetStripeCustomerByStripePortalId.cs | 2 +- .../StripeCustomer.cs | 2 +- .../Application/Commands/CreateTrialingSubscription.cs | 2 +- .../Application/Commands/PauseActiveSubscription.cs | 2 +- .../Application/Commands/UpdateSubscriptionPeriod.cs | 2 +- .../Application/Queries/GetSubscriptionForTenant.cs | 2 +- .../Infrastructure/StripeSubscriptionEFConfiguration.cs | 2 +- .../StripeSubscription.cs | 4 ++-- .../StripeSubscriptionStatus.cs | 2 +- .../EFCore/Migrations/20240218050150_initial.Designer.cs | 8 ++++---- .../20240328173742_StripeSubscriptionPortalId.Designer.cs | 8 ++++---- .../Migrations/SubscriptionsDbContextModelSnapshot.cs | 8 ++++---- .../Infrastructure/EFCore/SubscriptionsDbContext.cs | 4 ++-- .../Server/Controllers/StripeSubscriptionsController.cs | 2 +- .../Web/Server/Controllers/StripeSuccessController.cs | 4 ++-- .../Subscriptions/Web/Server/WebHooks/StripeWebhook.cs | 2 +- .../Application/Commands/AddUserToTenant.cs | 2 +- .../Application/Commands/CreateTenantWithAdmin.cs | 4 ++-- .../Application/Commands/DeleteTenant.cs | 2 +- .../Application/Commands/RemoveUserFromTenant.cs | 2 +- .../Application/Commands/UpdateUserRoleInTenant.cs | 2 +- .../TenantSubscriptionUpdatedIntegrationEventHandler.cs | 2 +- .../Application/Queries/GetAllTenantMembershipsOfUser.cs | 2 +- .../Application/Queries/GetTenantByID.cs | 2 +- .../Application/Queries/GetTenantDetailsByID.cs | 2 +- .../Application/Queries/GetTenantMembershipQuery.cs | 2 +- .../Domain/Exceptions/MemberNotFoundException.cs | 2 +- .../Domain/Exceptions/TabsAlreadyClosedException.cs | 2 +- .../Domain/Exceptions/UserIsAlreadyMemberException.cs | 2 +- .../{TenantAggregate => Tenants}/Domain/Tenant.cs | 4 ++-- .../Domain/TenantConfiguration.cs | 2 +- .../Domain/TenantInvitation.cs | 2 +- .../Domain/TenantMembership.cs | 2 +- .../Infrastructure/TenantEFConfiguration.cs | 4 ++-- .../Application/Commands/CreateNewUser.cs | 2 +- .../Application/Commands/SetSelectedTenantForUser.cs | 2 +- .../Application/Commands/UpdateUser.cs | 2 +- .../Application/Queries/GetClaimsForUser.cs | 2 +- .../Application/Queries/GetUserById.cs | 2 +- .../{UserAggregate => Users}/ApplicationUser.cs | 6 +++--- .../Infrastructure/ApplicationUserEFConfiguration.cs | 2 +- .../Infrastructure/EFCore/TenantIdentityDbContext.cs | 6 +++--- .../Features/Infrastructure/UserClaimsPrincipalFactory.cs | 4 ++-- .../Server/Controllers/Aggregates/TenantsController.cs | 8 ++++---- .../Infrastructure/ExternalLoginCallbackController.cs | 4 ++-- .../Infrastructure/IdentityOperationsController.cs | 8 ++++---- .../Web/Server/TenantIdentityModuleStartup.cs | 2 +- 48 files changed, 75 insertions(+), 75 deletions(-) rename Source/Modules/Subscriptions/Features/DomainFeatures/{StripeCustomerAggregate => StripeCustomers}/Application/IntegrationEvents/TenantAdminCreatedIntegrationEventHandler.cs (97%) rename Source/Modules/Subscriptions/Features/DomainFeatures/{StripeCustomerAggregate => StripeCustomers}/Application/Queries/GetStripeCustomerByStripePortalId.cs (96%) rename Source/Modules/Subscriptions/Features/DomainFeatures/{StripeCustomerAggregate => StripeCustomers}/StripeCustomer.cs (97%) rename Source/Modules/Subscriptions/Features/DomainFeatures/{StripeSubscriptionAggregate => StripeSubscriptions}/Application/Commands/CreateTrialingSubscription.cs (98%) rename Source/Modules/Subscriptions/Features/DomainFeatures/{StripeSubscriptionAggregate => StripeSubscriptions}/Application/Commands/PauseActiveSubscription.cs (96%) rename Source/Modules/Subscriptions/Features/DomainFeatures/{StripeSubscriptionAggregate => StripeSubscriptions}/Application/Commands/UpdateSubscriptionPeriod.cs (96%) rename Source/Modules/Subscriptions/Features/DomainFeatures/{StripeSubscriptionAggregate => StripeSubscriptions}/Application/Queries/GetSubscriptionForTenant.cs (89%) rename Source/Modules/Subscriptions/Features/DomainFeatures/{StripeSubscriptionAggregate => StripeSubscriptions}/Infrastructure/StripeSubscriptionEFConfiguration.cs (91%) rename Source/Modules/Subscriptions/Features/DomainFeatures/{StripeSubscriptionAggregate => StripeSubscriptions}/StripeSubscription.cs (97%) rename Source/Modules/Subscriptions/Features/DomainFeatures/{StripeSubscriptionAggregate => StripeSubscriptions}/StripeSubscriptionStatus.cs (88%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Application/Commands/AddUserToTenant.cs (91%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Application/Commands/CreateTenantWithAdmin.cs (85%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Application/Commands/DeleteTenant.cs (91%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Application/Commands/RemoveUserFromTenant.cs (90%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Application/Commands/UpdateUserRoleInTenant.cs (91%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Application/IntegrationEvents/TenantSubscriptionUpdatedIntegrationEventHandler.cs (90%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Application/Queries/GetAllTenantMembershipsOfUser.cs (91%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Application/Queries/GetTenantByID.cs (89%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Application/Queries/GetTenantDetailsByID.cs (90%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Application/Queries/GetTenantMembershipQuery.cs (90%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Domain/Exceptions/MemberNotFoundException.cs (81%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Domain/Exceptions/TabsAlreadyClosedException.cs (70%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Domain/Exceptions/UserIsAlreadyMemberException.cs (82%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Domain/Tenant.cs (95%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Domain/TenantConfiguration.cs (63%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Domain/TenantInvitation.cs (79%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Domain/TenantMembership.cs (90%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{TenantAggregate => Tenants}/Infrastructure/TenantEFConfiguration.cs (78%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{UserAggregate => Users}/Application/Commands/CreateNewUser.cs (89%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{UserAggregate => Users}/Application/Commands/SetSelectedTenantForUser.cs (91%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{UserAggregate => Users}/Application/Commands/UpdateUser.cs (71%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{UserAggregate => Users}/Application/Queries/GetClaimsForUser.cs (95%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{UserAggregate => Users}/Application/Queries/GetUserById.cs (87%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{UserAggregate => Users}/ApplicationUser.cs (81%) rename Source/Modules/TenantIdentity/Features/DomainFeatures/{UserAggregate => Users}/Infrastructure/ApplicationUserEFConfiguration.cs (77%) diff --git a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomerAggregate/Application/IntegrationEvents/TenantAdminCreatedIntegrationEventHandler.cs b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomers/Application/IntegrationEvents/TenantAdminCreatedIntegrationEventHandler.cs similarity index 97% rename from Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomerAggregate/Application/IntegrationEvents/TenantAdminCreatedIntegrationEventHandler.cs rename to Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomers/Application/IntegrationEvents/TenantAdminCreatedIntegrationEventHandler.cs index 09731db..e59cc82 100644 --- a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomerAggregate/Application/IntegrationEvents/TenantAdminCreatedIntegrationEventHandler.cs +++ b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomers/Application/IntegrationEvents/TenantAdminCreatedIntegrationEventHandler.cs @@ -4,7 +4,7 @@ using Shared.Features.Messaging.IntegrationEvent; using Stripe; -namespace Modules.Subscriptions.Features.DomainFeatures.StripeCustomerAggregate.Application.IntegrationEvents +namespace Modules.Subscriptions.Features.DomainFeatures.StripeCustomers.Application.IntegrationEvents { public class TenantAdminCreatedIntegrationEventHandler : IIntegrationEventHandler { diff --git a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomerAggregate/Application/Queries/GetStripeCustomerByStripePortalId.cs b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomers/Application/Queries/GetStripeCustomerByStripePortalId.cs similarity index 96% rename from Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomerAggregate/Application/Queries/GetStripeCustomerByStripePortalId.cs rename to Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomers/Application/Queries/GetStripeCustomerByStripePortalId.cs index f29d125..e31f073 100644 --- a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomerAggregate/Application/Queries/GetStripeCustomerByStripePortalId.cs +++ b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomers/Application/Queries/GetStripeCustomerByStripePortalId.cs @@ -2,7 +2,7 @@ using Modules.Subscriptions.Features.Infrastructure.EFCore; using Shared.Features.Messaging.Query; -namespace Modules.Subscriptions.Features.DomainFeatures.StripeCustomerAggregate.Application.Queries +namespace Modules.Subscriptions.Features.DomainFeatures.StripeCustomers.Application.Queries { public class GetStripeCustomerByStripePortalId : IQuery { diff --git a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomerAggregate/StripeCustomer.cs b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomers/StripeCustomer.cs similarity index 97% rename from Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomerAggregate/StripeCustomer.cs rename to Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomers/StripeCustomer.cs index 601f386..9a7dbdf 100644 --- a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomerAggregate/StripeCustomer.cs +++ b/Source/Modules/Subscriptions/Features/DomainFeatures/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 : Entity { diff --git a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/Application/Commands/CreateTrialingSubscription.cs b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/CreateTrialingSubscription.cs similarity index 98% rename from Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/Application/Commands/CreateTrialingSubscription.cs rename to Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/CreateTrialingSubscription.cs index d7369a5..b994c23 100644 --- a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/Application/Commands/CreateTrialingSubscription.cs +++ b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/CreateTrialingSubscription.cs @@ -4,7 +4,7 @@ using Shared.Features.Server; using Stripe; -namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate.Application.Commands +namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Application.Commands { public class CreateTrialingSubscription : ICommand { diff --git a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/Application/Commands/PauseActiveSubscription.cs b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/PauseActiveSubscription.cs similarity index 96% rename from Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/Application/Commands/PauseActiveSubscription.cs rename to Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/PauseActiveSubscription.cs index d1d761f..6a4948c 100644 --- a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/Application/Commands/PauseActiveSubscription.cs +++ b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/PauseActiveSubscription.cs @@ -2,7 +2,7 @@ using Shared.Features.Messaging.Command; using Shared.Features.Server; -namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate.Application.Commands +namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Application.Commands { public class PauseActiveSubscription : ICommand { diff --git a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/Application/Commands/UpdateSubscriptionPeriod.cs b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/UpdateSubscriptionPeriod.cs similarity index 96% rename from Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/Application/Commands/UpdateSubscriptionPeriod.cs rename to Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/UpdateSubscriptionPeriod.cs index 476eefa..194e239 100644 --- a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/Application/Commands/UpdateSubscriptionPeriod.cs +++ b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/UpdateSubscriptionPeriod.cs @@ -2,7 +2,7 @@ using Shared.Features.Messaging.Command; using Shared.Features.Server; -namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate.Application.Commands +namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Application.Commands { public class UpdateSubscriptionPeriod : ICommand { diff --git a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/Application/Queries/GetSubscriptionForTenant.cs b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Queries/GetSubscriptionForTenant.cs similarity index 89% rename from Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/Application/Queries/GetSubscriptionForTenant.cs rename to Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Queries/GetSubscriptionForTenant.cs index 08b00bd..bf932d9 100644 --- a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/Application/Queries/GetSubscriptionForTenant.cs +++ b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Queries/GetSubscriptionForTenant.cs @@ -1,7 +1,7 @@ using Shared.Features.Messaging.Query; using Shared.Kernel.BuildingBlocks.Auth.Attributes; -namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate.Application.Queries +namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Application.Queries { [AuthorizeTenantAdmin] public class GetSubscriptionForTenant : IQuery diff --git a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/Infrastructure/StripeSubscriptionEFConfiguration.cs b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Infrastructure/StripeSubscriptionEFConfiguration.cs similarity index 91% rename from Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/Infrastructure/StripeSubscriptionEFConfiguration.cs rename to Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Infrastructure/StripeSubscriptionEFConfiguration.cs index 1ba93e0..35f615b 100644 --- a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/Infrastructure/StripeSubscriptionEFConfiguration.cs +++ b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Infrastructure/StripeSubscriptionEFConfiguration.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate.Infrastructure +namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Infrastructure { public class StripeSubscriptionEFConfiguration : IEntityTypeConfiguration { diff --git a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/StripeSubscription.cs b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/StripeSubscription.cs similarity index 97% rename from Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/StripeSubscription.cs rename to Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/StripeSubscription.cs index ef60e9f..c10f2da 100644 --- a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/StripeSubscription.cs +++ b/Source/Modules/Subscriptions/Features/DomainFeatures/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; -namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate +namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions { public class StripeSubscription : Entity { diff --git a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/StripeSubscriptionStatus.cs b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/StripeSubscriptionStatus.cs similarity index 88% rename from Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/StripeSubscriptionStatus.cs rename to Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/StripeSubscriptionStatus.cs index a2e7663..46d5229 100644 --- a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptionAggregate/StripeSubscriptionStatus.cs +++ b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/StripeSubscriptionStatus.cs @@ -1,4 +1,4 @@ -namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate +namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions { public enum StripeSubscriptionStatus { diff --git a/Source/Modules/Subscriptions/Features/Infrastructure/EFCore/Migrations/20240218050150_initial.Designer.cs b/Source/Modules/Subscriptions/Features/Infrastructure/EFCore/Migrations/20240218050150_initial.Designer.cs index d038d65..95efbac 100644 --- a/Source/Modules/Subscriptions/Features/Infrastructure/EFCore/Migrations/20240218050150_initial.Designer.cs +++ b/Source/Modules/Subscriptions/Features/Infrastructure/EFCore/Migrations/20240218050150_initial.Designer.cs @@ -26,7 +26,7 @@ protected override void BuildTargetModel(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("Id") .ValueGeneratedOnAdd() @@ -56,7 +56,7 @@ protected override void BuildTargetModel(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("Id") .ValueGeneratedOnAdd() @@ -97,9 +97,9 @@ protected override void BuildTargetModel(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/Source/Modules/Subscriptions/Features/Infrastructure/EFCore/Migrations/20240328173742_StripeSubscriptionPortalId.Designer.cs b/Source/Modules/Subscriptions/Features/Infrastructure/EFCore/Migrations/20240328173742_StripeSubscriptionPortalId.Designer.cs index 1f5b9e8..e6b8aa1 100644 --- a/Source/Modules/Subscriptions/Features/Infrastructure/EFCore/Migrations/20240328173742_StripeSubscriptionPortalId.Designer.cs +++ b/Source/Modules/Subscriptions/Features/Infrastructure/EFCore/Migrations/20240328173742_StripeSubscriptionPortalId.Designer.cs @@ -26,7 +26,7 @@ protected override void BuildTargetModel(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("Id") .ValueGeneratedOnAdd() @@ -56,7 +56,7 @@ protected override void BuildTargetModel(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("Id") .ValueGeneratedOnAdd() @@ -100,9 +100,9 @@ protected override void BuildTargetModel(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/Source/Modules/Subscriptions/Features/Infrastructure/EFCore/Migrations/SubscriptionsDbContextModelSnapshot.cs b/Source/Modules/Subscriptions/Features/Infrastructure/EFCore/Migrations/SubscriptionsDbContextModelSnapshot.cs index da7cb99..4b0e723 100644 --- a/Source/Modules/Subscriptions/Features/Infrastructure/EFCore/Migrations/SubscriptionsDbContextModelSnapshot.cs +++ b/Source/Modules/Subscriptions/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("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("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/Source/Modules/Subscriptions/Features/Infrastructure/EFCore/SubscriptionsDbContext.cs b/Source/Modules/Subscriptions/Features/Infrastructure/EFCore/SubscriptionsDbContext.cs index a4f4e41..b96592c 100644 --- a/Source/Modules/Subscriptions/Features/Infrastructure/EFCore/SubscriptionsDbContext.cs +++ b/Source/Modules/Subscriptions/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/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSubscriptionsController.cs b/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSubscriptionsController.cs index 4f57c42..52ec25d 100644 --- a/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSubscriptionsController.cs +++ b/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSubscriptionsController.cs @@ -1,5 +1,5 @@ using Microsoft.AspNetCore.Mvc; -using Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate.Application.Queries; +using Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Application.Queries; using Shared.Features.Server; using Shared.Kernel.BuildingBlocks.Auth.Attributes; diff --git a/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSuccessController.cs b/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSuccessController.cs index 8232f3f..97898c7 100644 --- a/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSuccessController.cs +++ b/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSuccessController.cs @@ -2,9 +2,9 @@ using Microsoft.AspNetCore.Mvc; using Shared.Kernel.BuildingBlocks.Auth; using Stripe.Checkout; -using Modules.Subscriptions.Features.DomainFeatures.StripeCustomerAggregate; +using Modules.Subscriptions.Features.DomainFeatures.StripeCustomers; using Shared.Features.Server; -using Modules.Subscriptions.Features.DomainFeatures.StripeCustomerAggregate.Application.Queries; +using Modules.Subscriptions.Features.DomainFeatures.StripeCustomers.Application.Queries; namespace Modules.Subscriptions.Server.Controllers { diff --git a/Source/Modules/Subscriptions/Web/Server/WebHooks/StripeWebhook.cs b/Source/Modules/Subscriptions/Web/Server/WebHooks/StripeWebhook.cs index ed2e1a4..a7cc79e 100644 --- a/Source/Modules/Subscriptions/Web/Server/WebHooks/StripeWebhook.cs +++ b/Source/Modules/Subscriptions/Web/Server/WebHooks/StripeWebhook.cs @@ -3,7 +3,7 @@ using Stripe; using Shared.Features.Server; using Modules.Subscriptions.Features.Infrastructure.Configuration; -using Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptionAggregate.Application.Commands; +using Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Application.Commands; namespace Modules.Subscriptions.Server.WebHooks { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Commands/AddUserToTenant.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/AddUserToTenant.cs similarity index 91% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Commands/AddUserToTenant.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/AddUserToTenant.cs index b965a47..8edbc7f 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Commands/AddUserToTenant.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/AddUserToTenant.cs @@ -4,7 +4,7 @@ using Shared.Kernel.BuildingBlocks.Auth; using System.Threading; -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Application.Commands +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Commands { public class AddUserToTenant : ICommand { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Commands/CreateTenantWithAdmin.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/CreateTenantWithAdmin.cs similarity index 85% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Commands/CreateTenantWithAdmin.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/CreateTenantWithAdmin.cs index a8537f8..007106e 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Commands/CreateTenantWithAdmin.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/CreateTenantWithAdmin.cs @@ -1,10 +1,10 @@ -using Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Domain; +using Modules.TenantIdentity.Features.DomainFeatures.Tenants.Domain; using Modules.TenantIdentity.Web.Shared.DTOs.Tenant; using Shared.Features.Messaging.Command; using Shared.Features.Server; using System.Threading; -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Application.Commands +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Commands { public class CreateTenantWithAdmin : ICommand { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Commands/DeleteTenant.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/DeleteTenant.cs similarity index 91% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Commands/DeleteTenant.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/DeleteTenant.cs index 23b2607..b613141 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Commands/DeleteTenant.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/DeleteTenant.cs @@ -4,7 +4,7 @@ using System.Threading; using Shared.Features.Server; -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Application.Commands +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Commands { public class DeleteTenant : ICommand { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Commands/RemoveUserFromTenant.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/RemoveUserFromTenant.cs similarity index 90% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Commands/RemoveUserFromTenant.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/RemoveUserFromTenant.cs index d547d1b..fe38c75 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Commands/RemoveUserFromTenant.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/RemoveUserFromTenant.cs @@ -2,7 +2,7 @@ using Shared.Features.Server; using System.Threading; -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Application.Commands +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Commands { public class RemoveUserFromTenant : ICommand { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Commands/UpdateUserRoleInTenant.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/UpdateUserRoleInTenant.cs similarity index 91% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Commands/UpdateUserRoleInTenant.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/UpdateUserRoleInTenant.cs index 458cd6e..4889264 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Commands/UpdateUserRoleInTenant.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/UpdateUserRoleInTenant.cs @@ -3,7 +3,7 @@ using Shared.Kernel.BuildingBlocks.Auth; using System.Threading; -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Application.Commands +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Commands { public class UpdateTenantMembership : ICommand { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/IntegrationEvents/TenantSubscriptionUpdatedIntegrationEventHandler.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/IntegrationEvents/TenantSubscriptionUpdatedIntegrationEventHandler.cs similarity index 90% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/IntegrationEvents/TenantSubscriptionUpdatedIntegrationEventHandler.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/IntegrationEvents/TenantSubscriptionUpdatedIntegrationEventHandler.cs index a6b543f..7dc323b 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/IntegrationEvents/TenantSubscriptionUpdatedIntegrationEventHandler.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/IntegrationEvents/TenantSubscriptionUpdatedIntegrationEventHandler.cs @@ -4,7 +4,7 @@ using Shared.Features.Server; using System.Threading; -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Application.IntegrationEvents +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.IntegrationEvents { public class TenantSubscriptionUpdatedIntegrationEventHandler : ServerExecutionBase, IIntegrationEventHandler { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Queries/GetAllTenantMembershipsOfUser.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetAllTenantMembershipsOfUser.cs similarity index 91% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Queries/GetAllTenantMembershipsOfUser.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetAllTenantMembershipsOfUser.cs index d40337f..4832572 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Queries/GetAllTenantMembershipsOfUser.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetAllTenantMembershipsOfUser.cs @@ -4,7 +4,7 @@ using Shared.Features.Server; using System.Threading; -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Application.Queries +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Queries { public class GetAllTenantMembershipsOfUser : IQuery> { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantByID.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantByID.cs similarity index 89% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantByID.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantByID.cs index 8faf19a..5d8116b 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantByID.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantByID.cs @@ -3,7 +3,7 @@ using Shared.Features.Server; using System.Threading; -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Application.Queries +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Queries { public class GetTenantByID : IQuery { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantDetailsByID.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantDetailsByID.cs similarity index 90% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantDetailsByID.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantDetailsByID.cs index a8a3a2f..328d735 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantDetailsByID.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantDetailsByID.cs @@ -4,7 +4,7 @@ using Shared.Features.Server; using System.Threading; -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Application.Queries +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Queries { public class GetTenantDetailsByID : IQuery { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantMembershipQuery.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantMembershipQuery.cs similarity index 90% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantMembershipQuery.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantMembershipQuery.cs index ac99aac..4da10b7 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantMembershipQuery.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantMembershipQuery.cs @@ -3,7 +3,7 @@ using Modules.TenantIdentity.Web.Shared.DTOs.Tenant; using Shared.Features.Server; -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Application.Queries +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Queries { public class GetTenantMembershipQuery : IQuery { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/Exceptions/MemberNotFoundException.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/Exceptions/MemberNotFoundException.cs similarity index 81% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/Exceptions/MemberNotFoundException.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/Exceptions/MemberNotFoundException.cs index 6afc76d..e85b0d8 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/Exceptions/MemberNotFoundException.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/Exceptions/MemberNotFoundException.cs @@ -1,4 +1,4 @@ -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Domain.Exceptions +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Domain.Exceptions { public class MemberNotFoundException : Exception { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/Exceptions/TabsAlreadyClosedException.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/Exceptions/TabsAlreadyClosedException.cs similarity index 70% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/Exceptions/TabsAlreadyClosedException.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/Exceptions/TabsAlreadyClosedException.cs index adacca3..6803e7d 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/Exceptions/TabsAlreadyClosedException.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/Exceptions/TabsAlreadyClosedException.cs @@ -1,6 +1,6 @@ using Shared.Features.Domain.Exceptions; -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Domain.Exceptions +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Domain.Exceptions { public class TabsAlreadyClosedException : DomainException { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/Exceptions/UserIsAlreadyMemberException.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/Exceptions/UserIsAlreadyMemberException.cs similarity index 82% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/Exceptions/UserIsAlreadyMemberException.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/Exceptions/UserIsAlreadyMemberException.cs index 462c740..c30a78b 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/Exceptions/UserIsAlreadyMemberException.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/Exceptions/UserIsAlreadyMemberException.cs @@ -1,4 +1,4 @@ -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Domain.Exceptions +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Domain.Exceptions { public class UserIsAlreadyMemberException : Exception { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/Tenant.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/Tenant.cs similarity index 95% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/Tenant.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/Tenant.cs index 389a394..2ebe33a 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/Tenant.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/Tenant.cs @@ -1,10 +1,10 @@ -using Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Domain.Exceptions; +using Modules.TenantIdentity.Features.DomainFeatures.Tenants.Domain.Exceptions; using Modules.TenantIdentity.Web.Shared.DTOs.Tenant; using Shared.Features.Domain; using Shared.Features.Domain.Exceptions; using Shared.Kernel.BuildingBlocks.Auth; -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Domain +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Domain { public class Tenant : Entity { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/TenantConfiguration.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/TenantConfiguration.cs similarity index 63% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/TenantConfiguration.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/TenantConfiguration.cs index aebaf85..54ee052 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/TenantConfiguration.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/TenantConfiguration.cs @@ -1,6 +1,6 @@ using Shared.Features.Domain; -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Domain +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Domain { public class TenantConfiguration : Entity { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/TenantInvitation.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/TenantInvitation.cs similarity index 79% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/TenantInvitation.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/TenantInvitation.cs index 3a90bc1..0df5b9e 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/TenantInvitation.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/TenantInvitation.cs @@ -1,7 +1,7 @@ using Shared.Features.Domain; using Shared.Kernel.BuildingBlocks.Auth; -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Domain +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Domain { public class TenantInvitation : Entity { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/TenantMembership.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/TenantMembership.cs similarity index 90% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/TenantMembership.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/TenantMembership.cs index 5b74d3a..abdde3c 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Domain/TenantMembership.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Domain/TenantMembership.cs @@ -2,7 +2,7 @@ using Shared.Features.Domain; using Shared.Kernel.BuildingBlocks.Auth; -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Domain +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Domain { public class TenantMembership : Entity { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Infrastructure/TenantEFConfiguration.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Infrastructure/TenantEFConfiguration.cs similarity index 78% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Infrastructure/TenantEFConfiguration.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Infrastructure/TenantEFConfiguration.cs index 7a74eef..92138bc 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Infrastructure/TenantEFConfiguration.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Infrastructure/TenantEFConfiguration.cs @@ -1,8 +1,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Domain; +using Modules.TenantIdentity.Features.DomainFeatures.Tenants.Domain; -namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Infrastructure +namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Infrastructure { public class TenantConfiguration : IEntityTypeConfiguration { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Application/Commands/CreateNewUser.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/CreateNewUser.cs similarity index 89% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Application/Commands/CreateNewUser.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/CreateNewUser.cs index 69d6cdd..9657c6d 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Application/Commands/CreateNewUser.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/CreateNewUser.cs @@ -2,7 +2,7 @@ using Shared.Features.Messaging.Command; using System.Threading; -namespace Modules.TenantIdentity.Features.DomainFeatures.UserAggregate.Application.Commands +namespace Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Commands { public class CreateNewUser : ICommand { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Application/Commands/SetSelectedTenantForUser.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/SetSelectedTenantForUser.cs similarity index 91% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Application/Commands/SetSelectedTenantForUser.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/SetSelectedTenantForUser.cs index e786e66..cbf683b 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Application/Commands/SetSelectedTenantForUser.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/SetSelectedTenantForUser.cs @@ -2,7 +2,7 @@ using Shared.Features.Server; using System.Threading; -namespace Modules.TenantIdentity.Features.DomainFeatures.UserAggregate.Application.Commands +namespace Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Commands { public class SetSelectedTenantForUser : ICommand { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Application/Commands/UpdateUser.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/UpdateUser.cs similarity index 71% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Application/Commands/UpdateUser.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/UpdateUser.cs index 85e8ab7..1e3d752 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Application/Commands/UpdateUser.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/UpdateUser.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Http; using Shared.Features.Messaging.Command; -namespace Modules.TenantIdentity.Features.DomainFeatures.UserAggregate.Application.Commands +namespace Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Commands { public class UpdateUser : ICommand { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Application/Queries/GetClaimsForUser.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Queries/GetClaimsForUser.cs similarity index 95% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Application/Queries/GetClaimsForUser.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Queries/GetClaimsForUser.cs index 66b364c..bb35402 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Application/Queries/GetClaimsForUser.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Queries/GetClaimsForUser.cs @@ -4,7 +4,7 @@ using System.Security.Claims; using System.Threading; -namespace Modules.TenantIdentity.Features.DomainFeatures.UserAggregate.Application.Queries +namespace Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Queries { public class GetClaimsForUser : IQuery> { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Application/Queries/GetUserById.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Queries/GetUserById.cs similarity index 87% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Application/Queries/GetUserById.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Queries/GetUserById.cs index cd52ad5..55b8b31 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Application/Queries/GetUserById.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Queries/GetUserById.cs @@ -2,7 +2,7 @@ using Shared.Features.Server; using System.Threading; -namespace Modules.TenantIdentity.Features.DomainFeatures.UserAggregate.Application.Queries +namespace Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Queries { public class GetUserById : IQuery { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/ApplicationUser.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/ApplicationUser.cs similarity index 81% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/ApplicationUser.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Users/ApplicationUser.cs index 827fa73..9a7fd1c 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/ApplicationUser.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/ApplicationUser.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Identity; -using Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Domain; -using Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Domain.Exceptions; +using Modules.TenantIdentity.Features.DomainFeatures.Tenants.Domain; +using Modules.TenantIdentity.Features.DomainFeatures.Tenants.Domain.Exceptions; using Shared.Kernel.BuildingBlocks.Auth; -namespace Modules.TenantIdentity.Features.DomainFeatures.UserAggregate +namespace Modules.TenantIdentity.Features.DomainFeatures.Users { public class ApplicationUser : IdentityUser, IApplicationUser { diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Infrastructure/ApplicationUserEFConfiguration.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Infrastructure/ApplicationUserEFConfiguration.cs similarity index 77% rename from Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Infrastructure/ApplicationUserEFConfiguration.cs rename to Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Infrastructure/ApplicationUserEFConfiguration.cs index f75a49d..1619b95 100644 --- a/Source/Modules/TenantIdentity/Features/DomainFeatures/UserAggregate/Infrastructure/ApplicationUserEFConfiguration.cs +++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Infrastructure/ApplicationUserEFConfiguration.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -namespace Modules.TenantIdentity.Features.DomainFeatures.UserAggregate.Infrastructure +namespace Modules.TenantIdentity.Features.DomainFeatures.Users.Infrastructure { public class ApplicationUserEFConfiguration : IEntityTypeConfiguration { diff --git a/Source/Modules/TenantIdentity/Features/Infrastructure/EFCore/TenantIdentityDbContext.cs b/Source/Modules/TenantIdentity/Features/Infrastructure/EFCore/TenantIdentityDbContext.cs index f3d704f..8d64ee2 100644 --- a/Source/Modules/TenantIdentity/Features/Infrastructure/EFCore/TenantIdentityDbContext.cs +++ b/Source/Modules/TenantIdentity/Features/Infrastructure/EFCore/TenantIdentityDbContext.cs @@ -5,11 +5,11 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Shared.Features.EFCore.Configuration; -using Modules.TenantIdentity.Features.DomainFeatures.UserAggregate; +using Modules.TenantIdentity.Features.DomainFeatures.Users; using Shared.Features.EFCore; using Shared.Kernel.BuildingBlocks; -using Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Domain; -using Modules.TenantIdentity.Features.DomainFeatures.UserAggregate.Infrastructure; +using Modules.TenantIdentity.Features.DomainFeatures.Tenants.Domain; +using Modules.TenantIdentity.Features.DomainFeatures.Users.Infrastructure; namespace Modules.TenantIdentity.Features.Infrastructure.EFCore { diff --git a/Source/Modules/TenantIdentity/Features/Infrastructure/UserClaimsPrincipalFactory.cs b/Source/Modules/TenantIdentity/Features/Infrastructure/UserClaimsPrincipalFactory.cs index 880be54..0f2277b 100644 --- a/Source/Modules/TenantIdentity/Features/Infrastructure/UserClaimsPrincipalFactory.cs +++ b/Source/Modules/TenantIdentity/Features/Infrastructure/UserClaimsPrincipalFactory.cs @@ -2,8 +2,8 @@ using System.Security.Claims; using Shared.Features.Messaging.Query; using Shared.Kernel.BuildingBlocks.Auth.Constants; -using Modules.TenantIdentity.Features.DomainFeatures.UserAggregate; -using Modules.TenantIdentity.Features.DomainFeatures.UserAggregate.Application.Queries; +using Modules.TenantIdentity.Features.DomainFeatures.Users; +using Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Queries; namespace Modules.TenantIdentity.Features.Infrastructure { diff --git a/Source/Modules/TenantIdentity/Web/Server/Controllers/Aggregates/TenantsController.cs b/Source/Modules/TenantIdentity/Web/Server/Controllers/Aggregates/TenantsController.cs index 11723f9..17e790e 100644 --- a/Source/Modules/TenantIdentity/Web/Server/Controllers/Aggregates/TenantsController.cs +++ b/Source/Modules/TenantIdentity/Web/Server/Controllers/Aggregates/TenantsController.cs @@ -8,11 +8,11 @@ using Modules.TenantIdentity.Web.Shared.DTOs.Tenant; using Modules.TenantIdentity.Web.Shared.DTOs.Tenant.Operations; using Shared.Kernel.BuildingBlocks.Auth.Constants; -using Modules.TenantIdentity.Features.DomainFeatures.UserAggregate; +using Modules.TenantIdentity.Features.DomainFeatures.Users; using Shared.Features.Server; -using Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Application.Queries; -using Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Application.Commands; -using Modules.TenantIdentity.Features.DomainFeatures.UserAggregate.Application.Queries; +using Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Queries; +using Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Commands; +using Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Queries; namespace Modules.TenantIdentity.Web.Server.Controllers { diff --git a/Source/Modules/TenantIdentity/Web/Server/Controllers/Infrastructure/ExternalLoginCallbackController.cs b/Source/Modules/TenantIdentity/Web/Server/Controllers/Infrastructure/ExternalLoginCallbackController.cs index d893b1b..7db1612 100644 --- a/Source/Modules/TenantIdentity/Web/Server/Controllers/Infrastructure/ExternalLoginCallbackController.cs +++ b/Source/Modules/TenantIdentity/Web/Server/Controllers/Infrastructure/ExternalLoginCallbackController.cs @@ -6,8 +6,8 @@ using Shared.Features.Server; using System; using System.Threading.Tasks; -using Modules.TenantIdentity.Features.DomainFeatures.UserAggregate; -using Modules.TenantIdentity.Features.DomainFeatures.UserAggregate.Application.Commands; +using Modules.TenantIdentity.Features.DomainFeatures.Users; +using Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Commands; namespace Modules.TenantIdentity.Web.Server.Controllers.IdentityOperations { diff --git a/Source/Modules/TenantIdentity/Web/Server/Controllers/Infrastructure/IdentityOperationsController.cs b/Source/Modules/TenantIdentity/Web/Server/Controllers/Infrastructure/IdentityOperationsController.cs index 130fc3e..2acc257 100644 --- a/Source/Modules/TenantIdentity/Web/Server/Controllers/Infrastructure/IdentityOperationsController.cs +++ b/Source/Modules/TenantIdentity/Web/Server/Controllers/Infrastructure/IdentityOperationsController.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; -using Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Application.Queries; -using Modules.TenantIdentity.Features.DomainFeatures.UserAggregate; -using Modules.TenantIdentity.Features.DomainFeatures.UserAggregate.Application.Commands; -using Modules.TenantIdentity.Features.DomainFeatures.UserAggregate.Application.Queries; +using Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Queries; +using Modules.TenantIdentity.Features.DomainFeatures.Users; +using Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Commands; +using Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Queries; using Modules.TenantIdentity.Web.Shared.DTOs.Tenant; using Modules.TenantIdentity.Web.Shared.DTOs.IdentityOperations; using Shared.Features.Server; diff --git a/Source/Modules/TenantIdentity/Web/Server/TenantIdentityModuleStartup.cs b/Source/Modules/TenantIdentity/Web/Server/TenantIdentityModuleStartup.cs index 6027677..bbefb7c 100644 --- a/Source/Modules/TenantIdentity/Web/Server/TenantIdentityModuleStartup.cs +++ b/Source/Modules/TenantIdentity/Web/Server/TenantIdentityModuleStartup.cs @@ -15,7 +15,7 @@ using System; using System.Threading.Tasks; using Modules.TenantIdentity.Features.Infrastructure.Configuration; -using Modules.TenantIdentity.Features.DomainFeatures.UserAggregate; +using Modules.TenantIdentity.Features.DomainFeatures.Users; using Shared.Features.EFCore; using Shared.Features.Configuration;