Merge pull request #2292 from useautumn/charlie/fix-license-products-build

fix(licenses): resolve versioned license products

Author: charlietlamb

server/src/internal/licenses/repos/planLicenseRepo.ts

@@ -178,6 +178,30 @@ const listCatalogByOrgEnv = async ({
 	return rows.map(({ row }) => row);
 };
 
+const listProductsByInternalIds = async ({
+	db,
+	orgId,
+	env,
+	internalProductIds,
+}: {
+	db: DrizzleCli;
+	orgId: string;
+	env: AppEnv;
+	internalProductIds: string[];
+}) => {
+	if (internalProductIds.length === 0) return [];
+	return await db
+		.select({ id: products.id })
+		.from(products)
+		.where(
+			and(
+				eq(products.org_id, orgId),
+				eq(products.env, env),
+				inArray(products.internal_id, internalProductIds),
+			),
+		);
+};
+
 const insertMany = async ({
 	db,
 	rows,
@@ -201,6 +225,7 @@ export const planLicenseRepo = {
 	listCatalogByLicenseInternalProductIds,
 	listWithLicensePlanIdByParents,
 	listCatalogByOrgEnv,
+	listProductsByInternalIds,
 	insertMany,
 	deleteByIds,
 } as const;

server/src/internal/products/internalHandlers/handleGetProducts.ts

@@ -117,6 +117,8 @@ export const handleGetLicenseProducts = createRoute({
 		// so versioned license plans still match the latest-version list below.
 		const linkedProducts = await planLicenseRepo.listProductsByInternalIds({
 			db,
+			orgId: org.id,
+			env,
 			internalProductIds: linkedInternalIds,
 		});
 		const linkedExternalIds = new Set(

server/tests/integration/licenses/catalog-update/license-products-versioned.test.ts

@@ -0,0 +1,51 @@
+/**
+ * A parent pinned to an older license version must still expose the latest license in the catalog.
+ */
+import { expect, test } from "bun:test";
+import type { ProductV2 } from "@autumn/shared";
+import { items } from "@tests/utils/fixtures/items.js";
+import { itemsV2 } from "@tests/utils/fixtures/itemsV2.js";
+import { products } from "@tests/utils/fixtures/products.js";
+import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js";
+import chalk from "chalk";
+
+test.concurrent(
+	`${chalk.yellowBright("licenses: catalog includes latest license when parent remains pinned to v1")}`,
+	async () => {
+		const parent = products.base({
+			id: "versioned-license-catalog-parent",
+			items: [items.dashboard()],
+		});
+		const license = products.base({
+			id: "versioned-license-catalog-seat",
+			items: [items.monthlyMessages({ includedUsage: 25 })],
+		});
+		const { autumnV2_2 } = await initScenario({
+			customerId: "versioned-license-catalog",
+			setup: [
+				s.customer({ testClock: false }),
+				s.products({ list: [parent, license] }),
+			],
+			actions: [
+				s.licenses.link({
+					parentProductId: parent.id,
+					licenseProductId: license.id,
+					included: 0,
+				}),
+			],
+		});
+
+		await autumnV2_2.post("/plans.update", {
+			plan_id: license.id,
+			force_version: true,
+			items: [itemsV2.monthlyMessages({ included: 50 })],
+		});
+
+		const { products: licenseProducts } = (await autumnV2_2.get(
+			"/products/license_products",
+		)) as { products: ProductV2[] };
+		expect(licenseProducts).toContainEqual(
+			expect.objectContaining({ id: license.id, version: 2 }),
+		);
+	},
+);