Merge pull request #864 from useautumn/fix/discounts-on-update

fix: discounts on update

Author: johnyeocx

server/src/internal/billing/v2/providers/stripe/actionBuilders/buildStripeCheckoutSessionAction.ts

@@ -7,7 +7,7 @@ import { msToSeconds, orgToReturnUrl } from "@autumn/shared";
 import type Stripe from "stripe";
 import type { AutumnContext } from "@/honoUtils/HonoEnv";
 import { buildStripeCheckoutSessionItems } from "@/internal/billing/v2/providers/stripe/utils/checkoutSessions/buildStripeCheckoutSessionItems";
-import { stripeDiscountsToParams } from "@/internal/billing/v2/providers/stripe/utils/discounts/stripeDiscountsToParams";
+import { stripeDiscountsToCheckoutParams } from "@/internal/billing/v2/providers/stripe/utils/discounts/stripeDiscountsToParams";
 
 export const buildStripeCheckoutSessionAction = ({
 	ctx,
@@ -64,7 +64,7 @@ export const buildStripeCheckoutSessionAction = ({
 
 	// 6. Build discounts for checkout session
 	const discounts = stripeDiscounts?.length
-		? stripeDiscountsToParams({ stripeDiscounts })
+		? stripeDiscountsToCheckoutParams({ stripeDiscounts })
 		: undefined;
 
 	// 7. Build params (only variable params - static params added in execute)

server/src/internal/billing/v2/providers/stripe/utils/discounts/stripeDiscountsToParams.ts

@@ -1,14 +1,35 @@
 import type { StripeDiscountWithCoupon } from "@autumn/shared";
 
 /**
- * Maps internal discount objects to Stripe API `discounts` param format.
- * Uses { promotion_code: id } when the discount originates from a promo code,
- * otherwise uses { coupon: id } for direct coupon references.
+ * Maps internal discount objects to Stripe API `discounts` param format for subscription updates.
+ * Uses { discount: id } for existing discounts (preserving original start/end),
+ * { promotion_code: id } for promo-code-based new discounts,
+ * and { coupon: id } for new coupon-based discounts.
  */
 export const stripeDiscountsToParams = ({
 	stripeDiscounts,
 }: {
 	stripeDiscounts: StripeDiscountWithCoupon[];
+}): (
+	| { discount: string }
+	| { coupon: string }
+	| { promotion_code: string }
+)[] => {
+	return stripeDiscounts.map((d) => {
+		if (d.id) return { discount: d.id };
+		if (d.promotionCodeId) return { promotion_code: d.promotionCodeId };
+		return { coupon: d.source.coupon.id };
+	});
+};
+
+/**
+ * Maps discount objects to Stripe checkout session `discounts` param format.
+ * Checkout sessions only accept { coupon } or { promotion_code } — not { discount }.
+ */
+export const stripeDiscountsToCheckoutParams = ({
+	stripeDiscounts,
+}: {
+	stripeDiscounts: StripeDiscountWithCoupon[];
 }): ({ coupon: string } | { promotion_code: string })[] => {
 	return stripeDiscounts.map((d) =>
 		d.promotionCodeId

server/tests/_temp/temp.test.ts

@@ -1,113 +1,6 @@
 import { test } from "bun:test";
-import {
-	type ApiPlanV1,
-	BillingInterval,
-	BillingMethod,
-	type CreatePlanParamsInput,
-	TierBehavior,
-	TierInfinite,
-} from "@autumn/shared";
-import { TestFeature } from "@tests/setup/v2Features";
-import { initScenario, s } from "@tests/utils/testInitUtils/initScenario";
 import chalk from "chalk";
 
-const customerId = "temp-test";
-
-test.concurrent(`${chalk.yellowBright("temp: rest update then rpc inverse update returns product to baseline")}`, async () => {
-	const productId = "only_price_interval";
-
-	const {
-		autumnV2_1: autumnV2,
-		autumnV1,
-		autumnV0,
-	} = await initScenario({
-		customerId,
-		setup: [s.products({ list: [] })],
-		actions: [],
-	});
-
-	try {
-		await autumnV2.products.delete(`${productId}_v2`);
-	} catch (_error) {}
-
-	await autumnV2.products.create<ApiPlanV1, CreatePlanParamsInput>({
-		id: `${productId}_v2`,
-		name: "Volume V2 Test",
-		items: [
-			{
-				feature_id: TestFeature.Messages,
-				price: {
-					interval: BillingInterval.Month,
-					billing_method: BillingMethod.Prepaid,
-					billing_units: 1,
-					tier_behavior: TierBehavior.VolumeBased,
-					tiers: [
-						{ to: 100, amount: 10, flat_amount: 100 },
-						{ to: TierInfinite, amount: 20, flat_amount: 90 },
-					],
-				},
-			},
-		],
-	});
-
-	const v2 = await autumnV2.products.get<ApiPlanV1>(`${productId}_v2`);
-	console.log(JSON.stringify(v2, null, 2));
-
-	// try {
-	// 	await autumnV2.products.delete(`${productId}_v1`);
-	// } catch (_error) {}
-
-	// await autumnV2.products.create<ApiPlan, CreatePlanParamsV2>({
-	// 	plan_id: `${productId}_v1`,
-	// 	name: "Volume V1 Test",
-	// 	description: "Volume V1 Test",
-	// 	group: "Volume V1 Test",
-	// 	add_on: false,
-	// 	auto_enable: true,
-	// 	items: [
-	// 		{
-	// 			feature_id: TestFeature.Messages,
-	// 			price: {
-	// 				interval: BillingInterval.Month,
-	// 				billing_method: BillingMethod.Prepaid,
-	// 				billing_units: 1,
-	// 				tier_behavior: TierBehavior.VolumeBased,
-	// 				tiers: [
-	// 					{ to: 100, amount: 10, flat_amount: 100 },
-	// 					{ to: TierInfinite, amount: 20, flat_amount: 90 },
-	// 				],
-	// 			},
-	// 		},
-	// 	],
-	// });
-
-	// const v1 = await autumnV1.products.get<ApiPlan>(productId);
-	// console.log(JSON.stringify(v1, null, 2));
-
-	// try {
-	// 	await autumnV0.products.delete(productId);
-	// } catch (_error) {}
-
-	// await autumnV0.products.create<ApiPlan, CreatePlanParamsInput>({
-	// 	id: productId,
-	// 	name: "Volume V0 Test",
-	// 	items: [
-	// 		{
-	// 			feature_id: TestFeature.Messages,
-	// 			price: {
-	// 				interval: BillingInterval.Month,
-	// 				billing_method: BillingMethod.Prepaid,
-	// 				billing_units: 1,
-	// 				tier_behavior: TierBehavior.VolumeBased,
-	// 				tiers: [
-	// 					{ to: 100, amount: 10, flat_amount: 100 },
-	// 					{ to: TierInfinite, amount: 20, flat_amount: 90 },
-	// 				],
-	// 			},
-	// 		},
-	// 	],
-	// });
-
-	// const v0 = await autumnV0.products.get<ApiPlan>(productId);
-	// console.log(JSON.stringify(v0, null, 2));
+test(`${chalk.yellowBright("temp: placeholder")}`, async () => {
+	// Placeholder test
 });