mirror of
https://github.com/bitwarden/server
synced 2025-12-18 09:13:19 +00:00
[PM 26682]milestone 2d display discount on subscription page (#6542)
* The discount badge implementation * Address the claude pr comments * Add more unit testing * Add more test * used existing flag * Add the coupon Ids * Add more code documentation * Add some recommendation from claude * Fix addition comments and prs * Add more integration test * Fix some comment and add more test * rename the test methods * Add more unit test and comments * Resolve the null issues * Add more test * reword the comments * Rename Variable * Some code refactoring * Change the coupon ID to milestone-2c * Fix the failing Test
This commit is contained in:
@@ -1,6 +1,4 @@
|
||||
// FIXME: Update this file to be null safe and then delete the line below
|
||||
#nullable disable
|
||||
|
||||
using Bit.Core.Billing.Constants;
|
||||
using Bit.Core.Billing.Models.Business;
|
||||
using Bit.Core.Entities;
|
||||
using Bit.Core.Models.Api;
|
||||
@@ -11,7 +9,17 @@ namespace Bit.Api.Models.Response;
|
||||
|
||||
public class SubscriptionResponseModel : ResponseModel
|
||||
{
|
||||
public SubscriptionResponseModel(User user, SubscriptionInfo subscription, UserLicense license)
|
||||
|
||||
/// <param name="user">The user entity containing storage and premium subscription information</param>
|
||||
/// <param name="subscription">Subscription information retrieved from the payment provider (Stripe/Braintree)</param>
|
||||
/// <param name="license">The user's license containing expiration and feature entitlements</param>
|
||||
/// <param name="includeMilestone2Discount">
|
||||
/// Whether to include discount information in the response.
|
||||
/// Set to true when the PM23341_Milestone_2 feature flag is enabled AND
|
||||
/// you want to expose Milestone 2 discount information to the client.
|
||||
/// The discount will only be included if it matches the specific Milestone 2 coupon ID.
|
||||
/// </param>
|
||||
public SubscriptionResponseModel(User user, SubscriptionInfo subscription, UserLicense license, bool includeMilestone2Discount = false)
|
||||
: base("subscription")
|
||||
{
|
||||
Subscription = subscription.Subscription != null ? new BillingSubscription(subscription.Subscription) : null;
|
||||
@@ -22,9 +30,14 @@ public class SubscriptionResponseModel : ResponseModel
|
||||
MaxStorageGb = user.MaxStorageGb;
|
||||
License = license;
|
||||
Expiration = License.Expires;
|
||||
|
||||
// Only display the Milestone 2 subscription discount on the subscription page.
|
||||
CustomerDiscount = ShouldIncludeMilestone2Discount(includeMilestone2Discount, subscription.CustomerDiscount)
|
||||
? new BillingCustomerDiscount(subscription.CustomerDiscount!)
|
||||
: null;
|
||||
}
|
||||
|
||||
public SubscriptionResponseModel(User user, UserLicense license = null)
|
||||
public SubscriptionResponseModel(User user, UserLicense? license = null)
|
||||
: base("subscription")
|
||||
{
|
||||
StorageName = user.Storage.HasValue ? CoreHelpers.ReadableBytesSize(user.Storage.Value) : null;
|
||||
@@ -38,21 +51,109 @@ public class SubscriptionResponseModel : ResponseModel
|
||||
}
|
||||
}
|
||||
|
||||
public string StorageName { get; set; }
|
||||
public string? StorageName { get; set; }
|
||||
public double? StorageGb { get; set; }
|
||||
public short? MaxStorageGb { get; set; }
|
||||
public BillingSubscriptionUpcomingInvoice UpcomingInvoice { get; set; }
|
||||
public BillingSubscription Subscription { get; set; }
|
||||
public UserLicense License { get; set; }
|
||||
public BillingSubscriptionUpcomingInvoice? UpcomingInvoice { get; set; }
|
||||
public BillingSubscription? Subscription { get; set; }
|
||||
/// <summary>
|
||||
/// Customer discount information from Stripe for the Milestone 2 subscription discount.
|
||||
/// Only includes the specific Milestone 2 coupon (cm3nHfO1) when it's a perpetual discount (no expiration).
|
||||
/// This is for display purposes only and does not affect Stripe's automatic discount application.
|
||||
/// Other discounts may still apply in Stripe billing but are not included in this response.
|
||||
/// <para>
|
||||
/// Null when:
|
||||
/// - The PM23341_Milestone_2 feature flag is disabled
|
||||
/// - There is no active discount
|
||||
/// - The discount coupon ID doesn't match the Milestone 2 coupon (cm3nHfO1)
|
||||
/// - The instance is self-hosted
|
||||
/// </para>
|
||||
/// </summary>
|
||||
public BillingCustomerDiscount? CustomerDiscount { get; set; }
|
||||
public UserLicense? License { get; set; }
|
||||
public DateTime? Expiration { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Determines whether the Milestone 2 discount should be included in the response.
|
||||
/// </summary>
|
||||
/// <param name="includeMilestone2Discount">Whether the feature flag is enabled and discount should be considered.</param>
|
||||
/// <param name="customerDiscount">The customer discount from subscription info, if any.</param>
|
||||
/// <returns>True if the discount should be included; false otherwise.</returns>
|
||||
private static bool ShouldIncludeMilestone2Discount(
|
||||
bool includeMilestone2Discount,
|
||||
SubscriptionInfo.BillingCustomerDiscount? customerDiscount)
|
||||
{
|
||||
return includeMilestone2Discount &&
|
||||
customerDiscount != null &&
|
||||
customerDiscount.Id == StripeConstants.CouponIDs.Milestone2SubscriptionDiscount &&
|
||||
customerDiscount.Active;
|
||||
}
|
||||
}
|
||||
|
||||
public class BillingCustomerDiscount(SubscriptionInfo.BillingCustomerDiscount discount)
|
||||
/// <summary>
|
||||
/// Customer discount information from Stripe billing.
|
||||
/// </summary>
|
||||
public class BillingCustomerDiscount
|
||||
{
|
||||
public string Id { get; } = discount.Id;
|
||||
public bool Active { get; } = discount.Active;
|
||||
public decimal? PercentOff { get; } = discount.PercentOff;
|
||||
public List<string> AppliesTo { get; } = discount.AppliesTo;
|
||||
/// <summary>
|
||||
/// The Stripe coupon ID (e.g., "cm3nHfO1").
|
||||
/// </summary>
|
||||
public string? Id { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Whether the discount is a recurring/perpetual discount with no expiration date.
|
||||
/// <para>
|
||||
/// This property is true only when the discount has no end date, meaning it applies
|
||||
/// indefinitely to all future renewals. This is a product decision for Milestone 2
|
||||
/// to only display perpetual discounts in the UI.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// Note: This does NOT indicate whether the discount is "currently active" in the billing sense.
|
||||
/// A discount with a future end date is functionally active and will be applied by Stripe,
|
||||
/// but this property will be false because it has an expiration date.
|
||||
/// </para>
|
||||
/// </summary>
|
||||
public bool Active { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Percentage discount applied to the subscription (e.g., 20.0 for 20% off).
|
||||
/// Null if this is an amount-based discount.
|
||||
/// </summary>
|
||||
public decimal? PercentOff { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Fixed amount discount in USD (e.g., 14.00 for $14 off).
|
||||
/// Converted from Stripe's cent-based values (1400 cents → $14.00).
|
||||
/// Null if this is a percentage-based discount.
|
||||
/// Note: Stripe stores amounts in the smallest currency unit. This value is always in USD.
|
||||
/// </summary>
|
||||
public decimal? AmountOff { get; }
|
||||
|
||||
/// <summary>
|
||||
/// List of Stripe product IDs that this discount applies to (e.g., ["prod_premium", "prod_families"]).
|
||||
/// <para>
|
||||
/// Null: discount applies to all products with no restrictions (AppliesTo not specified in Stripe).
|
||||
/// Empty list: discount restricted to zero products (edge case - AppliesTo.Products = [] in Stripe).
|
||||
/// Non-empty list: discount applies only to the specified product IDs.
|
||||
/// </para>
|
||||
/// </summary>
|
||||
public IReadOnlyList<string>? AppliesTo { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Creates a BillingCustomerDiscount from a SubscriptionInfo.BillingCustomerDiscount.
|
||||
/// </summary>
|
||||
/// <param name="discount">The discount to convert. Must not be null.</param>
|
||||
/// <exception cref="ArgumentNullException">Thrown when discount is null.</exception>
|
||||
public BillingCustomerDiscount(SubscriptionInfo.BillingCustomerDiscount discount)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(discount);
|
||||
|
||||
Id = discount.Id;
|
||||
Active = discount.Active;
|
||||
PercentOff = discount.PercentOff;
|
||||
AmountOff = discount.AmountOff;
|
||||
AppliesTo = discount.AppliesTo;
|
||||
}
|
||||
}
|
||||
|
||||
public class BillingSubscription
|
||||
@@ -83,10 +184,10 @@ public class BillingSubscription
|
||||
public DateTime? PeriodEndDate { get; set; }
|
||||
public DateTime? CancelledDate { get; set; }
|
||||
public bool CancelAtEndDate { get; set; }
|
||||
public string Status { get; set; }
|
||||
public string? Status { get; set; }
|
||||
public bool Cancelled { get; set; }
|
||||
public IEnumerable<BillingSubscriptionItem> Items { get; set; } = new List<BillingSubscriptionItem>();
|
||||
public string CollectionMethod { get; set; }
|
||||
public string? CollectionMethod { get; set; }
|
||||
public DateTime? SuspensionDate { get; set; }
|
||||
public DateTime? UnpaidPeriodEndDate { get; set; }
|
||||
public int? GracePeriod { get; set; }
|
||||
@@ -104,11 +205,11 @@ public class BillingSubscription
|
||||
AddonSubscriptionItem = item.AddonSubscriptionItem;
|
||||
}
|
||||
|
||||
public string ProductId { get; set; }
|
||||
public string Name { get; set; }
|
||||
public string? ProductId { get; set; }
|
||||
public string? Name { get; set; }
|
||||
public decimal Amount { get; set; }
|
||||
public int Quantity { get; set; }
|
||||
public string Interval { get; set; }
|
||||
public string? Interval { get; set; }
|
||||
public bool SponsoredSubscriptionItem { get; set; }
|
||||
public bool AddonSubscriptionItem { get; set; }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user