Merge branch 'main' into ac/pm-32394-scim-v2-feature-flag-impl

Author: JaredScar

.github/workflows/build.yml

@@ -209,13 +209,13 @@ jobs:
           if [[ "${{ github.event.pull_request.head.repo.fork }}" == "true" ]]; then
             SANITIZED_REPO_NAME=$(echo "$_GITHUB_PR_REPO_NAME" | sed "s/[^a-zA-Z0-9]/-/g") # Sanitize repo name to alphanumeric only
             IMAGE_TAG=$SANITIZED_REPO_NAME-$IMAGE_TAG # Add repo name to the tag
-            IMAGE_TAG=${IMAGE_TAG:0:128}  # Limit to 128 characters, as that's the max length for Docker image tags
           fi
 
           if [[ "$IMAGE_TAG" == "main" ]]; then
             IMAGE_TAG=dev
           fi
-
+          
+          IMAGE_TAG=${IMAGE_TAG:0:128} # Limit image tags to 128 chars
           echo "image_tag=$IMAGE_TAG" >> "$GITHUB_OUTPUT"
           echo "### :mega: Docker Image Tag: $IMAGE_TAG" >> "$GITHUB_STEP_SUMMARY"
 

src/Core/Billing/Services/Implementations/StripePaymentService.cs

@@ -661,6 +661,8 @@ public async Task<SubscriptionInfo> GetSubscriptionAsync(ISubscriber subscriber)
             subscriptionInfo.CustomerDiscount = new SubscriptionInfo.BillingCustomerDiscount(discount);
         }
 
+        await ApplySchedulePhase2DataAsync(subscription, subscriptionInfo);
+
         var (suspensionDate, unpaidPeriodEndDate) = await GetSuspensionDateAsync(subscription);
 
         if (suspensionDate.HasValue && unpaidPeriodEndDate.HasValue)
@@ -702,6 +704,74 @@ public async Task<SubscriptionInfo> GetSubscriptionAsync(ISubscriber subscriber)
         return subscriptionInfo;
     }
 
+    private async Task ApplySchedulePhase2DataAsync(Subscription subscription, SubscriptionInfo subscriptionInfo)
+    {
+        if (string.IsNullOrEmpty(subscription.ScheduleId))
+        {
+            return;
+        }
+
+        try
+        {
+            var schedule = await _stripeAdapter.GetSubscriptionScheduleAsync(subscription.ScheduleId,
+                new SubscriptionScheduleGetOptions
+                {
+                    Expand = ["phases.discounts.coupon", "phases.items.price"]
+                });
+
+            if (schedule.Status != StripeConstants.SubscriptionScheduleStatus.Active || schedule.Phases.Count < 2)
+            {
+                return;
+            }
+
+            var phase2 = schedule.Phases[1];
+            var now = subscription.TestClock?.FrozenTime ?? DateTime.UtcNow;
+
+            if (phase2.StartDate < now)
+            {
+                return;
+            }
+
+            // Override line item amounts with Phase 2 prices
+            if (phase2.Items != null && subscriptionInfo.Subscription?.Items != null)
+            {
+                var items = subscriptionInfo.Subscription.Items.ToList();
+                foreach (var phase2Item in phase2.Items)
+                {
+                    if (phase2Item.Price is not { UnitAmount: not null, ProductId: not null })
+                    {
+                        continue;
+                    }
+
+                    var matchingItem = items.FirstOrDefault(i => i.ProductId == phase2Item.Price.ProductId);
+                    if (matchingItem != null)
+                    {
+                        matchingItem.Amount = phase2Item.Price.UnitAmount.Value / 100M;
+                    }
+                }
+
+                subscriptionInfo.Subscription.Items = items;
+            }
+
+            // Override discount with Phase 2 discount
+            var phase2Discount = phase2.Discounts?.FirstOrDefault();
+            if (phase2Discount?.Coupon != null)
+            {
+                subscriptionInfo.CustomerDiscount = new SubscriptionInfo.BillingCustomerDiscount(phase2Discount.Coupon);
+            }
+        }
+        catch (StripeException ex)
+        {
+            // Fallback: user sees current Phase 1 prices instead of Phase 2 prices.
+            // Accepted tradeoff: showing current data is better than failing the page.
+            _logger.LogWarning(ex,
+                "Failed to retrieve subscription schedule ({ScheduleId}) for subscription ({SubscriptionId}), Phase 2 data resolution. Error Code: {ErrorCode}",
+                subscription.ScheduleId,
+                subscription.Id,
+                ex.StripeError?.Code);
+        }
+    }
+
     public async Task<string> AddSecretsManagerToSubscription(
         Organization org,
         StaticStore.Plan plan,

src/Core/Models/Business/SubscriptionInfo.cs

@@ -52,6 +52,20 @@ public BillingCustomerDiscount(Discount discount)
             AppliesTo = discount.Coupon?.AppliesTo?.Products;
         }
 
+        /// <summary>
+        /// Creates a BillingCustomerDiscount from a Stripe Coupon object.
+        /// Unlike <see cref="BillingCustomerDiscount(Discount)"/>, this constructor does not have
+        /// access to a Discount wrapper, so Active is unconditionally set to true.
+        /// </summary>
+        public BillingCustomerDiscount(Coupon coupon)
+        {
+            Id = coupon.Id;
+            Active = true;
+            PercentOff = coupon.PercentOff;
+            AmountOff = ConvertFromStripeMinorUnits(coupon.AmountOff);
+            AppliesTo = coupon.AppliesTo?.Products;
+        }
+
         /// <summary>
         /// The Stripe coupon ID (e.g., "cm3nHfO1").
         /// Note: Only specific coupon IDs are displayed in the UI based on feature flag configuration,
@@ -60,8 +74,8 @@ public BillingCustomerDiscount(Discount discount)
         public string? Id { get; set; }
 
         /// <summary>
-        /// True only for perpetual/recurring discounts (End == null).
-        /// False for any discount with an expiration date, even if not yet expired.
+        /// When constructed from a Discount, true only for perpetual discounts (End == null).
+        /// When constructed from a Coupon directly, always true (no end-date information available).
         /// Product decision for Milestone 2: only show perpetual discounts in UI.
         /// </summary>
         public bool Active { get; set; }