updated various folder structures

DavidEggenberger · Nov 6, 2024 · 5cfb120 · 5cfb120
1 parent 30eca13
commit 5cfb120
Show file tree

Hide file tree

Showing 52 changed files with 40 additions and 88 deletions.
diff --git a/CrispyCollab.sln b/CrispyCollab.sln
@@ -25,23 +25,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Subscriptions", "Subscripti
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TenantIdentity", "TenantIdentity", "{2EAB9402-18B3-494D-AF82-D63E296A012F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.Channels.Shared", "Source\Modules\Channels\Web\DTOs\Modules.Channels.Shared.csproj", "{88AD44BF-5583-403F-AC86-6DA7958A15C1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.Channels.Shared", "Source\Modules\Channels\Shared\Modules.Channels.Shared.csproj", "{88AD44BF-5583-403F-AC86-6DA7958A15C1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.TenantIdentity.Shared", "Source\Modules\TenantIdentity\Shared\Modules.TenantIdentity.Shared.csproj", "{4E2274AD-7009-40AD-B4A5-4A5989CE37BF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.TenantIdentity.Web.Server", "Source\Modules\TenantIdentity\Web\Server\Modules.TenantIdentity.Web.Server.csproj", "{4C83807E-706F-459F-BE57-E4EE27A60946}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.TenantIdentity.Web.Client", "Source\Modules\TenantIdentity\Web\Client\Modules.TenantIdentity.Web.Client.csproj", "{642F9A6D-7AA1-4B0E-9F38-B86693CDEA80}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.Subscriptions.Shared", "Source\Modules\Subscription\Web\DTOs\Modules.Subscriptions.Shared.csproj", "{39685BEE-EF76-4342-A745-5144E1F412F8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.Subscriptions.Shared", "Source\Modules\Subscriptions\Shared\Modules.Subscriptions.Shared.csproj", "{39685BEE-EF76-4342-A745-5144E1F412F8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.Subscriptions.Web.Server", "Source\Modules\Subscription\Web\Server\Modules.Subscriptions.Web.Server.csproj", "{F399EA8D-B9DA-45C8-BE08-30E4D89E602C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.Subscriptions.Web.Server", "Source\Modules\Subscriptions\Web\Server\Modules.Subscriptions.Web.Server.csproj", "{F399EA8D-B9DA-45C8-BE08-30E4D89E602C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.Subscriptions.Web.Client", "Source\Modules\Subscription\Web\Client\Modules.Subscriptions.Web.Client.csproj", "{3F9C319D-287D-489A-972E-00FD18C2F011}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.Subscriptions.Web.Client", "Source\Modules\Subscriptions\Web\Client\Modules.Subscriptions.Web.Client.csproj", "{3F9C319D-287D-489A-972E-00FD18C2F011}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.Channels.IntegrationEvents", "Source\Modules\Channels\IntegrationEvents\Modules.Channels.IntegrationEvents.csproj", "{8A532D91-CFA8-4BC2-9758-A05DCFAF8F91}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.Subscriptions.IntegrationEvents", "Source\Modules\Subscription\IntegrationEvents\Modules.Subscriptions.IntegrationEvents.csproj", "{89AB8CEE-2C18-48BC-83FD-C34EADE5D40E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.Subscriptions.IntegrationEvents", "Source\Modules\Subscriptions\IntegrationEvents\Modules.Subscriptions.IntegrationEvents.csproj", "{89AB8CEE-2C18-48BC-83FD-C34EADE5D40E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.TenantIdentity.IntegrationEvents", "Source\Modules\TenantIdentity\IntegrationEvents\Modules.TenantIdentity.IntegrationEvents.csproj", "{3CC1B0C5-BFD9-4CE2-9C01-9FD4BC73902C}"
 EndProject
@@ -65,7 +65,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{2F6AB579-E4C
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.TenantIdentity.Features", "Source\Modules\TenantIdentity\Features\Modules.TenantIdentity.Features\Modules.TenantIdentity.Features.csproj", "{4A908204-B4FC-4A9F-AF7A-8C85A134CC9D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.Subscriptions.Features", "Source\Modules\Subscription\Features\Modules.Subscription.Features\Modules.Subscriptions.Features.csproj", "{64C9BBFD-D05B-43CD-8213-AD3C4414D54C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.Subscriptions.Features", "Source\Modules\Subscriptions\Features\Modules.Subscriptions.Features.csproj", "{64C9BBFD-D05B-43CD-8213-AD3C4414D54C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.Channels.Features", "Source\Modules\Channels\Features\Modules.Channels.Features.csproj", "{EE30F6EF-BE5E-4BFB-B56B-63C13568FD23}"
 EndProject

diff --git a/Source/Modules/Channels/Features/DomainFeatures/Channels/Channel.cs b/Source/Modules/Channels/Features/DomainFeatures/Channels/Channel.cs
@@ -1,4 +1,6 @@
-using Modules.Channels.Features.DomainFeatures.Channels.Events;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore;
+using Modules.Channels.Features.DomainFeatures.Channels.Events;
 using Shared.Features.Domain;
 
 namespace Modules.Channels.Features.DomainFeatures.Channels
@@ -37,4 +39,14 @@ public void RemoveMessageVote(Message message, Reaction vote)
             messages.Single(m => m.Id == message.Id).RemoveVote(vote);
         }
     }
+
+    public class ChannelConfiguration : IEntityTypeConfiguration<Channel>
+    {
+        public void Configure(EntityTypeBuilder<Channel> builder)
+        {
+            builder.Navigation(b => b.Messages)
+                .HasField("messages")
+                .UsePropertyAccessMode(PropertyAccessMode.Field);
+        }
+    }
 }
diff --git a/Source/Modules/Channels/Features/DomainFeatures/Channels/Message.cs b/Source/Modules/Channels/Features/DomainFeatures/Channels/Message.cs
@@ -1,4 +1,6 @@
-using Modules.Channels.Features.DomainFeatures.Channels.Events;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore;
+using Modules.Channels.Features.DomainFeatures.Channels.Events;
 using Shared.Features.Domain;
 
 namespace Modules.Channels.Features.DomainFeatures.Channels
@@ -29,4 +31,13 @@ internal void RemoveVote(Reaction vote)
             AddDomainEvent(new MessageVotesUpdatedEvent());
         }
     }
+
+    public class MessageConfiguration : IEntityTypeConfiguration<Message>
+    {
+        public void Configure(EntityTypeBuilder<Message> builder)
+        {
+            builder.OwnsMany(x => x.MakeMessageTopicVotes)
+                .UsePropertyAccessMode(PropertyAccessMode.Field);
+        }
+    }
 }
diff --git a/Source/Modules/Channels/Features/Infrastructure/EFCore/Configuration/ChannelConfiguration.cs b/Source/Modules/Channels/Features/Infrastructure/EFCore/Configuration/ChannelConfiguration.cs
diff --git a/Source/Modules/Channels/Features/Infrastructure/EFCore/Configuration/MessageConfiguration.cs b/Source/Modules/Channels/Features/Infrastructure/EFCore/Configuration/MessageConfiguration.cs
diff --git a/.../DTOs/DTOs/ChannelAggregate/ChannelDTO.cs → ...hared/DTOs/ChannelAggregate/ChannelDTO.cs b/.../DTOs/DTOs/ChannelAggregate/ChannelDTO.cs → ...hared/DTOs/ChannelAggregate/ChannelDTO.cs
diff --git a/.../DTOs/DTOs/ChannelAggregate/MessageDTO.cs → ...hared/DTOs/ChannelAggregate/MessageDTO.cs b/.../DTOs/DTOs/ChannelAggregate/MessageDTO.cs → ...hared/DTOs/ChannelAggregate/MessageDTO.cs
diff --git a/...s/Web/DTOs/Modules.Channels.Shared.csproj → ...els/Shared/Modules.Channels.Shared.csproj b/...s/Web/DTOs/Modules.Channels.Shared.csproj → ...els/Shared/Modules.Channels.Shared.csproj
diff --git a/...ers/UserUpdatedIntegrationEventHandler.cs → ...ers/UserUpdatedIntegrationEventHandler.cs b/...ers/UserUpdatedIntegrationEventHandler.cs → ...ers/UserUpdatedIntegrationEventHandler.cs
diff --git a/...s/Aplication/Queries/GetStripeCustomer.cs → ...s/Aplication/Queries/GetStripeCustomer.cs b/...s/Aplication/Queries/GetStripeCustomer.cs → ...s/Aplication/Queries/GetStripeCustomer.cs
diff --git a/...eatures/StripeCustomers/StripeCustomer.cs → ...eatures/StripeCustomers/StripeCustomer.cs b/...eatures/StripeCustomers/StripeCustomer.cs → ...eatures/StripeCustomers/StripeCustomer.cs
diff --git a/...n/Commands/CreateSubscriptionForTenant.cs → ...n/Commands/CreateSubscriptionForTenant.cs b/...n/Commands/CreateSubscriptionForTenant.cs → ...n/Commands/CreateSubscriptionForTenant.cs
diff --git a/...pplication/Commands/DeleteSubscription.cs → ...pplication/Commands/DeleteSubscription.cs b/...pplication/Commands/DeleteSubscription.cs → ...pplication/Commands/DeleteSubscription.cs
diff --git a/...pplication/Commands/UpdateSubscription.cs → ...pplication/Commands/UpdateSubscription.cs b/...pplication/Commands/UpdateSubscription.cs → ...pplication/Commands/UpdateSubscription.cs
diff --git a/...ation/Queries/GetStripeCheckoutSession.cs → ...ation/Queries/GetStripeCheckoutSession.cs b/...ation/Queries/GetStripeCheckoutSession.cs → ...ation/Queries/GetStripeCheckoutSession.cs
diff --git a/...StripeSubscriptions/StripeSubscription.cs → ...StripeSubscriptions/StripeSubscription.cs b/...StripeSubscriptions/StripeSubscription.cs → ...StripeSubscriptions/StripeSubscription.cs
diff --git a/...peSubscriptions/StripeSubscriptionPlan.cs → ...peSubscriptions/StripeSubscriptionPlan.cs b/...peSubscriptions/StripeSubscriptionPlan.cs → ...peSubscriptions/StripeSubscriptionPlan.cs
diff --git a/...StripeSubscriptions/SubscriptionStatus.cs → ...StripeSubscriptions/SubscriptionStatus.cs b/...StripeSubscriptions/SubscriptionStatus.cs → ...StripeSubscriptions/SubscriptionStatus.cs
diff --git a/...nfiguration/SubscriptionsConfiguration.cs → ...nfiguration/SubscriptionsConfiguration.cs b/...nfiguration/SubscriptionsConfiguration.cs → ...nfiguration/SubscriptionsConfiguration.cs
diff --git a/...on/SubscriptionsConfigurationValidator.cs → ...on/SubscriptionsConfigurationValidator.cs b/...on/SubscriptionsConfigurationValidator.cs → ...on/SubscriptionsConfigurationValidator.cs
diff --git a/...ations/20240218050150_initial.Designer.cs → ...ations/20240218050150_initial.Designer.cs b/...ations/20240218050150_initial.Designer.cs → ...ations/20240218050150_initial.Designer.cs
diff --git a/...Core/Migrations/20240218050150_initial.cs → ...Core/Migrations/20240218050150_initial.cs b/...Core/Migrations/20240218050150_initial.cs → ...Core/Migrations/20240218050150_initial.cs
diff --git a/...42_StripeSubscriptionPortalId.Designer.cs → ...42_StripeSubscriptionPortalId.Designer.cs b/...42_StripeSubscriptionPortalId.Designer.cs → ...42_StripeSubscriptionPortalId.Designer.cs
diff --git a/...40328173742_StripeSubscriptionPortalId.cs → ...40328173742_StripeSubscriptionPortalId.cs b/...40328173742_StripeSubscriptionPortalId.cs → ...40328173742_StripeSubscriptionPortalId.cs
diff --git a/...ns/SubscriptionsDbContextModelSnapshot.cs → ...ns/SubscriptionsDbContextModelSnapshot.cs b/...ns/SubscriptionsDbContextModelSnapshot.cs → ...ns/SubscriptionsDbContextModelSnapshot.cs
diff --git a/...tructure/EFCore/SubscriptionsDbContext.cs → ...tructure/EFCore/SubscriptionsDbContext.cs b/...tructure/EFCore/SubscriptionsDbContext.cs → ...tructure/EFCore/SubscriptionsDbContext.cs
diff --git a/...ments/CreateStripeBillingPortalSession.cs → ...ments/CreateStripeBillingPortalSession.cs b/...ments/CreateStripeBillingPortalSession.cs → ...ments/CreateStripeBillingPortalSession.cs
diff --git a/...pePayments/CreateStripeCheckoutSession.cs → ...pePayments/CreateStripeCheckoutSession.cs b/...pePayments/CreateStripeCheckoutSession.cs → ...pePayments/CreateStripeCheckoutSession.cs
diff --git a/.../StripePayments/StripeSubscriptionPlan.cs → .../StripePayments/StripeSubscriptionPlan.cs b/.../StripePayments/StripeSubscriptionPlan.cs → .../StripePayments/StripeSubscriptionPlan.cs
diff --git a/...res/Modules.Subscriptions.Features.csproj → ...res/Modules.Subscriptions.Features.csproj b/...res/Modules.Subscriptions.Features.csproj → ...res/Modules.Subscriptions.Features.csproj
diff --git a/...scription.Features/SubscriptionsModule.cs → ...criptions/Features/SubscriptionsModule.cs b/...scription.Features/SubscriptionsModule.cs → ...criptions/Features/SubscriptionsModule.cs
diff --git a/...es.Subscriptions.IntegrationEvents.csproj → ...es.Subscriptions.IntegrationEvents.csproj b/...es.Subscriptions.IntegrationEvents.csproj → ...es.Subscriptions.IntegrationEvents.csproj
diff --git a/...tionEvents/Properties/launchSettings.json → ...tionEvents/Properties/launchSettings.json b/...tionEvents/Properties/launchSettings.json → ...tionEvents/Properties/launchSettings.json
diff --git a/.../DTOs/Modules.Subscriptions.Shared.csproj → ...hared/Modules.Subscriptions.Shared.csproj b/.../DTOs/Modules.Subscriptions.Shared.csproj → ...hared/Modules.Subscriptions.Shared.csproj
diff --git a/...n/Web/DTOs/Properties/launchSettings.json → ...ons/Shared/Properties/launchSettings.json b/...n/Web/DTOs/Properties/launchSettings.json → ...ons/Shared/Properties/launchSettings.json
diff --git a/...t/Modules.Subscriptions.Web.Client.csproj → ...t/Modules.Subscriptions.Web.Client.csproj b/...t/Modules.Subscriptions.Web.Client.csproj → ...t/Modules.Subscriptions.Web.Client.csproj
diff --git a/...er/Controllers/StripeSessionController.cs → ...er/Controllers/StripeSessionController.cs b/...er/Controllers/StripeSessionController.cs → ...er/Controllers/StripeSessionController.cs
diff --git a/...er/Controllers/StripeSuccessController.cs → ...er/Controllers/StripeSuccessController.cs b/...er/Controllers/StripeSuccessController.cs → ...er/Controllers/StripeSuccessController.cs
diff --git a/...n/Web/Server/Controllers/StripeWebhook.cs → ...s/Web/Server/Controllers/StripeWebhook.cs b/...n/Web/Server/Controllers/StripeWebhook.cs → ...s/Web/Server/Controllers/StripeWebhook.cs
diff --git a/...r/Modules.Subscriptions.Web.Server.csproj → ...r/Modules.Subscriptions.Web.Server.csproj b/...r/Modules.Subscriptions.Web.Server.csproj → ...r/Modules.Subscriptions.Web.Server.csproj
diff --git a/...Web/Server/Properties/launchSettings.json → ...Web/Server/Properties/launchSettings.json b/...Web/Server/Properties/launchSettings.json → ...Web/Server/Properties/launchSettings.json
diff --git a/.../Web/Server/SubscriptionsModuleStartup.cs → .../Web/Server/SubscriptionsModuleStartup.cs b/.../Web/Server/SubscriptionsModuleStartup.cs → .../Web/Server/SubscriptionsModuleStartup.cs
diff --git a/Source/Modules/TenantIdentity/Shared/Modules.TenantIdentity.Shared.csproj b/Source/Modules/TenantIdentity/Shared/Modules.TenantIdentity.Shared.csproj
@@ -6,4 +6,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\Subscription\Web\DTOs\Modules.Subscriptions.Shared.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/Source/Modules/TenantIdentity/Shared/Subscription/SubscriptionDTO.cs b/Source/Modules/TenantIdentity/Shared/Subscription/SubscriptionDTO.cs
diff --git a/Source/Modules/TenantIdentity/Shared/Subscription/SubscriptionPlanDTO.cs b/Source/Modules/TenantIdentity/Shared/Subscription/SubscriptionPlanDTO.cs
diff --git a/Source/Modules/TenantIdentity/Shared/Subscription/SubscriptionPlanTypeDTO.cs b/Source/Modules/TenantIdentity/Shared/Subscription/SubscriptionPlanTypeDTO.cs
diff --git a/Source/Modules/TenantIdentity/Shared/Subscription/SubscriptionStatusDTO.cs b/Source/Modules/TenantIdentity/Shared/Subscription/SubscriptionStatusDTO.cs
diff --git a/Source/Modules/TenantIdentity/Shared/Team/TeamAdminInfoDTO.cs b/Source/Modules/TenantIdentity/Shared/Team/TeamAdminInfoDTO.cs
@@ -1,4 +1,4 @@
-using WebShared.Identity.Subscription;
+using Modules.Shared.Subscriptions.Shared.DTOs;
 using WebShared.Identity.Team.AdminManagement;
 
 namespace Modules.IdentityModule.Shared

diff --git a/Source/Modules/TenantIdentity/Shared/TenantDTO.cs b/Source/Modules/TenantIdentity/Shared/TenantDTO.cs
@@ -1,4 +1,4 @@
-namespace TenantIdentity.Web.DTOs
+namespace Modules.TenantIdentity.Shared
 {
     public class TenantDTO
     {

diff --git a/...es/TenantIdentity/Web/Client/Components/Subscription/ManageSubscriptionComponent.razor.cs b/...es/TenantIdentity/Web/Client/Components/Subscription/ManageSubscriptionComponent.razor.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
+using Modules.Shared.Subscriptions.Shared.DTOs;
 using Shared.Client;
-using WebShared.Identity.Subscription;
 
 namespace Modules.TenantIdentity.Web.Client.Components
 {

diff --git a/Source/Modules/TenantIdentity/Web/Client/Modules.TenantIdentity.Web.Client.csproj b/Source/Modules/TenantIdentity/Web/Client/Modules.TenantIdentity.Web.Client.csproj
@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Shared\Client\Shared.Client.csproj" />
+    <ProjectReference Include="..\..\..\Subscription\Web\DTOs\Modules.Subscriptions.Shared.csproj" />
     <ProjectReference Include="..\..\Shared\Modules.TenantIdentity.Shared.csproj" />
     <ProjectReference Include="..\DTOs\Modules.TenantIdentity.Shared.csproj" />
   </ItemGroup>

diff --git a/Source/Modules/TenantIdentity/Web/Client/_Imports.razor b/Source/Modules/TenantIdentity/Web/Client/_Imports.razor
@@ -1,2 +1 @@
-@using Modules.TenantIdentity.Web.DTOs.Enums
-@using Modules.TenantIdentity.Web.Client.Components
+
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		@using Modules.TenantIdentity.Web.DTOs.Enums
		@using Modules.TenantIdentity.Web.Client.Components