fix: persist custom catalog rows before pending plans

A deferred attach with a custom plan failed with a customer_prices foreign
key violation: the pending insert wrote customer_prices referencing custom
prices that only executeAutumnBillingPlan persisted, which the deferred
path never reaches.

Extract insertCustomCatalogRows and call it from both paths, so custom
prices, entitlements and free trials exist before any customer row
references them. Both services upsert on conflict, so promotion inserting
them again is a no-op.

Author: charlietlamb

server/src/internal/billing/v2/execute/executeAutumnActions/insertCustomCatalogRows.ts

@@ -0,0 +1,29 @@
+import type { AutumnBillingPlan } from "@autumn/shared";
+import type { AutumnContext } from "@/honoUtils/HonoEnv";
+import { EntitlementService } from "@/internal/products/entitlements/EntitlementService";
+import { FreeTrialService } from "@/internal/products/free-trials/FreeTrialService";
+import { PriceService } from "@/internal/products/prices/PriceService";
+
+/** Custom catalog rows must exist before any customer row can reference them. */
+export const insertCustomCatalogRows = async ({
+	ctx,
+	autumnBillingPlan,
+}: {
+	ctx: AutumnContext;
+	autumnBillingPlan: AutumnBillingPlan;
+}) => {
+	const { customPrices, customEntitlements, customFreeTrial } =
+		autumnBillingPlan;
+
+	if (customEntitlements) {
+		await EntitlementService.insert({ db: ctx.db, data: customEntitlements });
+	}
+
+	if (customPrices) {
+		await PriceService.insert({ db: ctx.db, data: customPrices });
+	}
+
+	if (customFreeTrial) {
+		await FreeTrialService.insert({ db: ctx.db, data: customFreeTrial });
+	}
+};

server/src/internal/billing/v2/execute/executeAutumnBillingPlan.ts

@@ -10,6 +10,7 @@ import { executeCustomerLicenseUpdates } from "@/internal/billing/v2/execute/exe
 import { executeInsertPlanLicenses } from "@/internal/billing/v2/execute/executeAutumnActions/executeInsertPlanLicenses";
 import { executeOneOffPurchaseRebalance } from "@/internal/billing/v2/execute/executeAutumnActions/executeOneOffPurchaseRebalance";
 import { executePatchCustomerProducts } from "@/internal/billing/v2/execute/executeAutumnActions/executePatchCustomerProducts";
+import { insertCustomCatalogRows } from "@/internal/billing/v2/execute/executeAutumnActions/insertCustomCatalogRows";
 import { insertNewCusProducts } from "@/internal/billing/v2/execute/executeAutumnActions/insertNewCusProducts";
 import { updateCustomerEntitlements } from "@/internal/billing/v2/execute/executeAutumnActions/updateCustomerEntitlements";
 import { executePooledBalancePlan } from "@/internal/billing/v2/pooledBalances/execute/executePooledBalancePlan";
@@ -22,9 +23,6 @@ import { CusProductService } from "@/internal/customers/cusProducts/CusProductSe
 import { CusEntService } from "@/internal/customers/cusProducts/cusEnts/CusEntitlementService";
 import { replaceScheduledPhaseCustomerProductIds } from "@/internal/customers/schedules/repos/replaceScheduledPhaseCustomerProductIds";
 import { invoiceActions } from "@/internal/invoices/actions";
-import { EntitlementService } from "@/internal/products/entitlements/EntitlementService";
-import { FreeTrialService } from "@/internal/products/free-trials/FreeTrialService";
-import { PriceService } from "@/internal/products/prices/PriceService";
 import { SubService } from "@/internal/subscriptions/SubService";
 import { workflows } from "@/queue/workflows";
 
@@ -48,40 +46,16 @@ export const executeAutumnBillingPlan = async ({
 	// an update entry to persist it.
 	await applyDerivedCustomerProductIsCustom({ ctx, autumnBillingPlan });
 
-	const {
-		insertCustomerProducts,
-		customPrices,
-		customEntitlements,
-		customFreeTrial,
-		insertCustomerEntitlements,
-	} = autumnBillingPlan;
+	const { insertCustomerProducts, insertCustomerEntitlements } =
+		autumnBillingPlan;
 	const updateCustomerProducts = getUpdateCustomerProducts({
 		autumnBillingPlan,
 	});
 	const deleteCustomerProducts = getDeleteCustomerProducts({
 		autumnBillingPlan,
 	});
 
-	if (customEntitlements) {
-		await EntitlementService.insert({
-			db,
-			data: customEntitlements,
-		});
-	}
-
-	if (customPrices) {
-		await PriceService.insert({
-			db,
-			data: customPrices,
-		});
-	}
-
-	if (customFreeTrial) {
-		await FreeTrialService.insert({
-			db,
-			data: customFreeTrial,
-		});
-	}
+	await insertCustomCatalogRows({ ctx, autumnBillingPlan });
 
 	await executeInsertPlanLicenses({
 		ctx,

server/src/internal/billing/v2/execute/insertPendingCustomerProducts.ts

@@ -1,5 +1,6 @@
 import { type BillingPlan, CusProductStatus } from "@autumn/shared";
 import type { AutumnContext } from "@/honoUtils/HonoEnv";
+import { insertCustomCatalogRows } from "@/internal/billing/v2/execute/executeAutumnActions/insertCustomCatalogRows";
 import { insertNewCusProducts } from "@/internal/billing/v2/execute/executeAutumnActions/insertNewCusProducts";
 
 export const insertPendingCustomerProducts = async ({
@@ -11,9 +12,13 @@ export const insertPendingCustomerProducts = async ({
 	billingPlan: BillingPlan;
 	metadataId: string;
 }) => {
-	const { insertCustomerProducts } = billingPlan.autumn;
+	const autumnBillingPlan = billingPlan.autumn;
+	const { insertCustomerProducts } = autumnBillingPlan;
+
 	if (!insertCustomerProducts?.length) return;
 
+	await insertCustomCatalogRows({ ctx, autumnBillingPlan });
+
 	await insertNewCusProducts({
 		ctx,
 		newCusProducts: insertCustomerProducts.map((customerProduct) => ({

server/tests/integration/billing/attach/pending-customer-products.test.ts

@@ -9,6 +9,7 @@ import { expectBalanceCorrect } from "@tests/integration/utils/expectBalanceCorr
 import { TestFeature } from "@tests/setup/v2Features.js";
 import { completeStripeCheckoutFormV2 as completeStripeCheckoutForm } from "@tests/utils/browserPool/completeStripeCheckoutFormV2";
 import { items } from "@tests/utils/fixtures/items.js";
+import { itemsV2 } from "@tests/utils/fixtures/itemsV2";
 import { products } from "@tests/utils/fixtures/products.js";
 import { timeout } from "@tests/utils/genUtils";
 import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js";
@@ -131,24 +132,24 @@ test.concurrent(
 test.concurrent(
 	`${chalk.yellowBright("stripe-checkout pending: deferred checkout inserts a pending plan that grants nothing")}`,
 	async () => {
-		const customerId = "stripe-checkout-pending-inserted";
+		const customerId = `stripe-checkout-pending-inserted-${Date.now()}`;
 		const pro = products.pro({
 			id: "pro-checkout-pending",
 			items: [items.monthlyMessages({ includedUsage: 100 })],
 		});
 
-		const { ctx, autumnV2_2, customer } = await initScenario({
+		const { ctx, autumnV1, autumnV2_2, customer } = await initScenario({
 			customerId,
-			setup: [s.customer({ testClock: false }), s.products({ list: [pro] })],
+			setup: [s.customer({ testClock: true }), s.products({ list: [pro] })],
 			actions: [],
 		});
 
-		const result = await autumnV2_2.billing.attach<AttachParamsV1Input>({
+		const result = await autumnV1.billing.attach({
 			customer_id: customerId,
-			plan_id: pro.id,
+			product_id: pro.id,
 		});
 
-		expect(result.payment_url).toBeDefined();
+		expect(result.payment_url).toContain("checkout.stripe.com");
 
 		const customerProducts = await listCustomerProducts({
 			ctx,
@@ -173,7 +174,7 @@ test.concurrent(
 test.concurrent(
 	`${chalk.yellowBright("stripe-checkout pending: completing checkout promotes the pending plan to active")}`,
 	async () => {
-		const customerId = "stripe-checkout-pending-promoted";
+		const customerId = `stripe-checkout-pending-promoted-${Date.now()}`;
 		const pro = products.pro({
 			id: "pro-checkout-promoted",
 			items: [items.monthlyMessages({ includedUsage: 100 })],
@@ -213,3 +214,42 @@ test.concurrent(
 		expect(check.allowed).toBe(true);
 	},
 );
+
+test.concurrent(
+	`${chalk.yellowBright("pending custom plan: deferred attach with custom prices inserts a pending plan")}`,
+	async () => {
+		const customerId = "pending-custom-plan-prices";
+		const pro = products.pro({
+			id: "pro-pending-custom",
+			items: [items.monthlyMessages({ includedUsage: 100 })],
+		});
+
+		const { ctx, autumnV2_2, customer } = await initScenario({
+			customerId,
+			setup: [s.customer({ testClock: false }), s.products({ list: [pro] })],
+			actions: [],
+		});
+
+		await autumnV2_2.billing.attach<AttachParamsV1Input>({
+			customer_id: customerId,
+			plan_id: pro.id,
+			customize: { price: itemsV2.monthlyPrice({ amount: 42 }) },
+			invoice_mode: {
+				enabled: true,
+				enable_plan_immediately: false,
+				finalize: true,
+			},
+		});
+
+		const customerProducts = await listCustomerProducts({
+			ctx,
+			internalCustomerId: customer?.internal_id ?? "",
+		});
+		const pendingCustomerProduct = customerProducts.find(
+			(customerProduct) => customerProduct.product.id === pro.id,
+		);
+
+		expect(pendingCustomerProduct?.status).toBe(CusProductStatus.Pending);
+		expect(pendingCustomerProduct?.customer_prices.length).toBeGreaterThan(0);
+	},
+);

server/tests/scenarios/customers/past-due-scenario.test.ts

@@ -0,0 +1,38 @@
+import { test } from "bun:test";
+import { items } from "@tests/utils/fixtures/items";
+import { products } from "@tests/utils/fixtures/products";
+import { initScenario, s } from "@tests/utils/testInitUtils/initScenario";
+import chalk from "chalk";
+
+/**
+ * Past Due Scenario
+ *
+ * Sets up a customer whose renewal was declined, leaving the Stripe
+ * subscription past_due. The initial charge has to succeed, so the card is
+ * swapped for a failing one before the clock advances.
+ *
+ * Setup:
+ * - Pro product: $20/month with 100 messages
+ * - Customer attached with a working card, then moved onto pm_card_chargeCustomerFail
+ * - Clock advanced one cycle so the renewal invoice fails
+ */
+
+test(`${chalk.yellowBright("past-due: customer with a declined renewal")}`, async () => {
+	const customerId = "past-due";
+	const messagesItem = items.monthlyMessages({ includedUsage: 100 });
+
+	const pro = products.pro({ items: [messagesItem] });
+
+	await initScenario({
+		customerId,
+		setup: [
+			s.customer({ paymentMethod: "success" }),
+			s.products({ list: [pro] }),
+		],
+		actions: [
+			s.billing.attach({ productId: pro.id }),
+			s.attachPaymentMethod({ type: "fail" }),
+			s.advanceToNextInvoice(),
+		],
+	});
+});