encapsulated StripeSubscription and StripeCustomer

DavidEggenberger · Dec 4, 2024 · 02088c9 · 02088c9
1 parent 92c320b
commit 02088c9
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 30 deletions.
diff --git a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomers/StripeCustomer.cs b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomers/StripeCustomer.cs
@@ -7,8 +7,8 @@ namespace Modules.Subscriptions.Features.DomainFeatures.StripeCustomers
 {
     public class StripeCustomer : Entity
     {
-        public Guid UserId { get; set; }
-        public string StripePortalCustomerId { get; set; }
+        public Guid UserId { get; private set; }
+        public string StripePortalCustomerId { get; private set; }
 
         public static StripeCustomer Create(Guid userId, string stripePortalCustomerId)
         {

diff --git a/...res/DomainFeatures/StripeSubscriptions/Application/Commands/CreateTrialingSubscription.cs b/...res/DomainFeatures/StripeSubscriptions/Application/Commands/CreateTrialingSubscription.cs
@@ -8,7 +8,6 @@ namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Appl
 {
     public class CreateTrialingSubscription : Command
     {
-        public Guid UserId { get; set; }
         public Guid TenantId { get; set; }
         public string StripeCustomerId { get; set; }
         public Stripe.Subscription CreatedStripeSubscription { get; set; }

diff --git a/...atures/DomainFeatures/StripeSubscriptions/Application/Commands/PauseActiveSubscription.cs b/...atures/DomainFeatures/StripeSubscriptions/Application/Commands/PauseActiveSubscription.cs
@@ -17,7 +17,7 @@ public async Task HandleAsync(PauseActiveSubscription command, CancellationToken
         {
             var stripeSubscription = await module.SubscriptionsDbContext.StripeSubscriptions.FirstAsync(stripeSubscription => stripeSubscription.StripePortalSubscriptionId == command.Subscription.Id);
 
-            stripeSubscription.Status = StripeSubscriptionStatus.Paused;
+            stripeSubscription.UpdateStatus(StripeSubscriptionStatus.Paused);
 
             await module.SubscriptionsDbContext.SaveChangesAsync(cancellationToken);
         }

diff --git a/...tures/DomainFeatures/StripeSubscriptions/Application/Commands/UpdateSubscriptionPeriod.cs b/...tures/DomainFeatures/StripeSubscriptions/Application/Commands/UpdateSubscriptionPeriod.cs
@@ -19,9 +19,9 @@ public async Task HandleAsync(UpdateSubscriptionPeriod command, CancellationToke
 
             if (stripeSubscription.Status != StripeSubscriptionStatus.Active)
             {
-                stripeSubscription.Status = StripeSubscriptionStatus.Active;
+                stripeSubscription.UpdateStatus(StripeSubscriptionStatus.Active);
             }
-            stripeSubscription.ExpirationDate = command.Subscription.CurrentPeriodEnd;
+            stripeSubscription.UpdateExpirationDate(command.Subscription.CurrentPeriodEnd);
 
             await module.SubscriptionsDbContext.SaveChangesAsync(cancellationToken);
         }

diff --git a/...atures/DomainFeatures/StripeSubscriptions/Application/Queries/GetSubscriptionForTenant.cs b/...atures/DomainFeatures/StripeSubscriptions/Application/Queries/GetSubscriptionForTenant.cs
@@ -4,9 +4,8 @@
 namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Application.Queries
 {
     [AuthorizeTenantAdmin]
-    public class GetSubscriptionForTenant : Query<object>
+    public class GetSubscriptionForTenant : Query<StripeSubscription>
     {
-        public Guid UserId { get; set; }
         public Guid TenantId { get; set; }
     }
 }
diff --git a/...e/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/StripeSubscription.cs b/...e/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/StripeSubscription.cs
@@ -10,12 +10,12 @@ public class StripeSubscription : Entity
     {
         private StripeSubscription() { }
 
-        public string StripePortalSubscriptionId { get; set; }
-        public Guid StripeCustomerId { get; set; }
-        public StripeCustomer StripeCustomer { get; set; }
-        public DateTime? ExpirationDate { get; set; }
-        public SubscriptionPlanType PlanType { get; set; }
-        public StripeSubscriptionStatus Status { get; set; }
+        public string StripePortalSubscriptionId { get; private set; }
+        public Guid StripeCustomerId { get; private set; }
+        public StripeCustomer StripeCustomer { get; private set; }
+        public DateTime? ExpirationDate { get; private set; }
+        public SubscriptionPlanType PlanType { get; private set; }
+        public StripeSubscriptionStatus Status { get; private set; }
 
         public static StripeSubscription Create(
             DateTime? expirationDate,
@@ -35,6 +35,16 @@ public static StripeSubscription Create(
                 StripeCustomer = stripeCustomer
             };
         }
+
+        public void UpdateStatus(StripeSubscriptionStatus status)
+        {
+            Status = status;
+        }
+
+        public void UpdateExpirationDate(DateTime expirationDate)
+        {
+            ExpirationDate = expirationDate;
+        }
     }
 
     public class StripeSubscriptionEFConfiguration : IEntityTypeConfiguration<StripeSubscription>

diff --git a/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSessionController.cs b/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSessionController.cs
@@ -11,10 +11,7 @@ namespace Modules.Subscriptions.Server.Controllers
     [AuthorizeTenantAdmin]
     public class StripeSessionController : BaseController
     {
-        public StripeSessionController(IServiceProvider serviceProvider) : base(serviceProvider)
-        {
-
-        }
+        public StripeSessionController(IServiceProvider serviceProvider) : base(serviceProvider) { }
 
         [HttpPost("checkout/{subscriptionPlanType}")]
         public async Task<ActionResult> RedirectToStripePremiumSubscription([FromRoute] SubscriptionPlanType subscriptionPlanType)

diff --git a/Source/Modules/Subscriptions/Web/Server/WebHooks/StripeWebhook.cs b/Source/Modules/Subscriptions/Web/Server/WebHooks/StripeWebhook.cs
@@ -2,20 +2,16 @@
 using Microsoft.AspNetCore.Mvc;
 using Stripe;
 using Shared.Features.Server;
-using Modules.Subscriptions.Features.Infrastructure.Configuration;
 using Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Application.Commands;
+using Modules.Subscriptions.Features;
 
 namespace Modules.Subscriptions.Server.WebHooks
 {
     [Route("api/[controller]")]
     [ApiController]
-    public class StripeWebhook : BaseController
+    public class StripeWebhook : BaseController<SubscriptionsModule>
     {
-        private readonly SubscriptionsConfiguration subscriptionConfiguration;
-        public StripeWebhook(SubscriptionsConfiguration subscriptionConfiguration, IServiceProvider serviceProvider) : base(serviceProvider)
-        {
-            this.subscriptionConfiguration = subscriptionConfiguration;
-        }
+        public StripeWebhook(IServiceProvider serviceProvider) : base(serviceProvider) { }
 
         [HttpPost]
         [IgnoreAntiforgeryToken]
@@ -28,7 +24,7 @@ public async Task<IActionResult> Index()
                 var stripeEvent = EventUtility.ParseEvent(json, false);
                 var signatureHeader = Request.Headers["Stripe-Signature"];
                 stripeEvent = EventUtility.ConstructEvent(json,
-                        signatureHeader, subscriptionConfiguration.StripeEndpointSecret, throwOnApiVersionMismatch: false);
+                        signatureHeader, module.SubscriptionsConfiguration.StripeEndpointSecret, throwOnApiVersionMismatch: false);
 
                 // Minimum Events copied from https://stripe.com/docs/billing/subscriptions/build-subscriptions
                 // Sent when a customer clicks the Pay or Subscribe button in Checkout, informing you of a new purchase. (Stripe)
@@ -41,7 +37,7 @@ public async Task<IActionResult> Index()
 
                     var createTrialingSubscription = new CreateTrialingSubscription
                     {
-                        UserId = Guid.Parse(userId),
+                        ExecutingUserId = Guid.Parse(userId),
                         StripeCustomerId = subscription.CustomerId,
                         CreatedStripeSubscription = subscription
                     };
@@ -57,10 +53,10 @@ public async Task<IActionResult> Index()
 
                     var updateSubscriptionPeriod = new UpdateSubscriptionPeriod
                     {
-
+                        Subscription = subscription 
                     };
 
-
+                    await commandDispatcher.DispatchAsync(updateSubscriptionPeriod);
                 }
                 // Sent each billing interval if there is an issue with your customer’s payment method. (Stripe)
                 else if (stripeEvent.Type == Events.InvoicePaymentFailed)

diff --git a/Source/Web/Server/appsettings.Development.json b/Source/Web/Server/appsettings.Development.json
@@ -11,7 +11,8 @@
     "SQLServerConnectionString_Dev": "Server=127.0.0.1,1433;Database=ModularMonolith;User Id=SA;Password=YourSTRONG!Passw0rd;Encrypt=False;"
   },
   "SubscriptionsConfiguration": {
-    "StripeProfessionalPlanId": "_"
+    "StripeProfessionalPlanId": "prod_PKIbSqk40BHlHI",
+    "StripeEndpointSecret": "whsec_bb85d6becda7bb888045cb77583e8c580ab4394dc99a5ad86c96dfedaa54902a"
   },
   "TenantIdentityConfiguration": {
     "GoogleClientId": "_",