From dd5e183064c305e8452ff9a329cc11ded6788947 Mon Sep 17 00:00:00 2001 From: John Yeo Date: Tue, 20 Jan 2026 17:40:13 +0000 Subject: [PATCH 1/5] updated create customer flow with new billing pattern --- .claude/skills/write-test/SKILL.md | 9 + .../skills/write-test/references/SCENARIO.md | 36 + .../plans/handleCreateCustomer-refactor.md | 439 +++++++++++ server/src/db/dbUtils.ts | 12 + server/src/external/autumn/autumnCli.ts | 6 +- server/src/external/stripe/customers/index.ts | 3 + .../operations/createStripeCustomer.ts | 43 + .../operations/getExpandedStripeCustomer.ts | 61 ++ .../operations/getOrCreateStripeCustomer.ts | 57 ++ .../customers/utils/buildIdempotencyKey.ts | 15 + server/src/external/stripe/stripeCusUtils.ts | 194 +---- .../stripe/stripeSubUtils/convertSubUtils.ts | 1 - .../handleCheckoutSub.ts | 5 +- .../installations/handleUpsertInstallation.ts | 28 +- .../honoMiddlewares/analyticsMiddleware.ts | 9 +- .../billing/handlers/handleSetupPayment.ts | 11 +- .../src/internal/billing/v2/billingContext.ts | 3 +- .../v2/execute/executeAutumnBillingPlan.ts | 24 +- .../billing/v2/execute/executeBillingPlan.ts | 2 - .../evaluateStripeBillingPlan.ts | 2 +- .../setup/fetchStripeCustomerForBilling.ts | 15 +- .../buildStripeSubscriptionCreateAction.ts | 3 +- .../billing/v2/setup/setupTrialContext.ts | 4 + .../billing/v2/types/autumnBillingPlan.ts | 23 +- .../compute/finalizeUpdateSubscriptionPlan.ts | 2 +- .../handleUpdateSubscription.ts | 1 + .../logs/logUpdateSubscriptionPlan.ts | 36 +- .../v2/utils/billingPlanToPreviewResponse.ts | 13 +- .../applyExistingUsages.ts | 1 - .../initFullCustomerProduct.ts | 1 - .../initFullCustomerProductFromProduct.ts | 76 ++ server/src/internal/customers/CusService.ts | 127 ++- .../createCustomerContext.ts | 12 + .../createCustomerWithDefaults.ts | 47 ++ .../executeAutumnCreateCustomerPlan.ts | 85 ++ .../execute/executeCreateCustomerPlan.ts | 68 ++ .../executeStripeCreateCustomerPlan.ts | 92 +++ .../logs/logCreateCustomer.ts | 51 ++ .../setup/setupCreateCustomer.ts | 61 ++ .../setup/setupCreateCustomerTrialContext.ts | 37 + .../setup/setupDefaultProductsContext.ts | 71 ++ .../src/internal/customers/actions/index.ts | 5 + .../internal/customers/attach/attachRouter.ts | 13 +- .../attachParamsUtils/getStripeCusData.ts | 17 +- .../customers/cusProducts/cusProductUtils.ts | 5 +- .../apiCusCacheUtils/getCachedApiCustomer.ts | 179 ----- .../setCachedApiCusDetails.ts | 53 -- .../customers/cusUtils/createNewCustomer.ts | 18 +- .../getOrCreateCachedFullCustomer.ts | 55 +- .../cusUtils/getOrCreateApiCustomer.ts | 217 ------ .../customers/cusUtils/getOrCreateCustomer.ts | 91 ++- .../customers/cusUtils/initCustomer.ts | 49 ++ .../handlers/handleAddCouponToCusV2.ts | 9 +- .../createBillingPortalSession.ts | 27 +- .../handleGetBillingPortal.ts | 25 +- .../handlers/handleCreateCustomer.ts | 37 +- .../handlers/handlePostCustomerV2.ts | 17 +- .../events/EventsAggregationService.ts | 2 +- .../products/handlers/handleVersionProduct.ts | 2 +- server/src/internal/products/productUtils.ts | 5 +- server/src/internal/rewards/referralUtils.ts | 11 +- .../referralUtils/triggerFreePaidProduct.ts | 9 +- .../initSubscription.ts} | 6 +- .../utils/initSubscriptionFromStripe.ts | 37 + server/src/routers/apiRouter.ts | 2 +- .../utils/importUtils/addProductFromSubs.ts | 15 +- server/src/utils/logging/maskExtraLogs.ts | 18 + server/src/utils/scriptUtils/initCustomer.ts | 12 +- .../scriptUtils/testUtils/initCustomerV3.ts | 11 +- server/tests/_temp/temp.test.ts | 177 +---- .../track-race-condition5.test.ts | 206 +++++ .../balances/check/check-basic.test.ts | 736 ++++++++++++++++++ .../balances/check/check-public-key.test.ts | 182 +++++ .../check/check-race-condition1.test.ts | 124 +++ .../check/check-race-condition2.test.ts | 197 +++++ .../create-customer-defaults.test.ts | 137 ++++ .../customers/create-customer-null-id.test.ts | 273 +++++++ .../create-customer-paid-defaults.test.ts | 172 ++++ .../customers/create-customer-race.test.ts | 286 +++++++ .../crud/customers/create-customer.test.ts | 178 +++++ .../crud/customers/create-customer1.test.ts | 63 -- .../crud/customers/create-customer2.test.ts | 76 -- server/tests/utils/fixtures/products.ts | 72 +- .../tests/utils/testInitUtils/initScenario.ts | 193 ++++- .../openapi1.2/customersOpenApi.ts | 4 +- shared/api/_openapi2.0_/customersOpenApi.ts | 5 +- shared/api/common/customerData.ts | 29 +- shared/api/common/customerId.ts | 38 + shared/api/customers/createCustomerParams.ts | 34 + shared/api/customers/customerOpModels.ts | 106 +-- shared/api/customers/customersOpenApi.ts | 140 ---- shared/api/models.ts | 1 + shared/models/cusModels/cusModels.ts | 19 +- shared/models/cusModels/cusTable.ts | 12 +- shared/utils/featureUtils/findFeatureUtils.ts | 39 + 95 files changed, 4681 insertions(+), 1551 deletions(-) create mode 100644 .opencode/plans/handleCreateCustomer-refactor.md create mode 100644 server/src/external/stripe/customers/operations/createStripeCustomer.ts create mode 100644 server/src/external/stripe/customers/operations/getExpandedStripeCustomer.ts create mode 100644 server/src/external/stripe/customers/operations/getOrCreateStripeCustomer.ts create mode 100644 server/src/external/stripe/customers/utils/buildIdempotencyKey.ts create mode 100644 server/src/internal/billing/v2/utils/initFullCustomerProduct/initFullCustomerProductFromProduct.ts create mode 100644 server/src/internal/customers/actions/createWithDefaults/createCustomerContext.ts create mode 100644 server/src/internal/customers/actions/createWithDefaults/createCustomerWithDefaults.ts create mode 100644 server/src/internal/customers/actions/createWithDefaults/execute/executeAutumnCreateCustomerPlan.ts create mode 100644 server/src/internal/customers/actions/createWithDefaults/execute/executeCreateCustomerPlan.ts create mode 100644 server/src/internal/customers/actions/createWithDefaults/execute/executeStripeCreateCustomerPlan.ts create mode 100644 server/src/internal/customers/actions/createWithDefaults/logs/logCreateCustomer.ts create mode 100644 server/src/internal/customers/actions/createWithDefaults/setup/setupCreateCustomer.ts create mode 100644 server/src/internal/customers/actions/createWithDefaults/setup/setupCreateCustomerTrialContext.ts create mode 100644 server/src/internal/customers/actions/createWithDefaults/setup/setupDefaultProductsContext.ts create mode 100644 server/src/internal/customers/actions/index.ts delete mode 100644 server/src/internal/customers/cusUtils/apiCusCacheUtils/getCachedApiCustomer.ts delete mode 100644 server/src/internal/customers/cusUtils/apiCusCacheUtils/setCachedApiCusDetails.ts delete mode 100644 server/src/internal/customers/cusUtils/getOrCreateApiCustomer.ts create mode 100644 server/src/internal/customers/cusUtils/initCustomer.ts rename server/src/internal/subscriptions/{subUtils.ts => utils/initSubscription.ts} (86%) create mode 100644 server/src/internal/subscriptions/utils/initSubscriptionFromStripe.ts create mode 100644 server/src/utils/logging/maskExtraLogs.ts create mode 100644 server/tests/balances/track/race-condition/track-race-condition5.test.ts create mode 100644 server/tests/integration/balances/check/check-basic.test.ts create mode 100644 server/tests/integration/balances/check/check-public-key.test.ts create mode 100644 server/tests/integration/balances/check/check-race-condition1.test.ts create mode 100644 server/tests/integration/balances/check/check-race-condition2.test.ts create mode 100644 server/tests/integration/crud/customers/create-customer-defaults.test.ts create mode 100644 server/tests/integration/crud/customers/create-customer-null-id.test.ts create mode 100644 server/tests/integration/crud/customers/create-customer-paid-defaults.test.ts create mode 100644 server/tests/integration/crud/customers/create-customer-race.test.ts create mode 100644 server/tests/integration/crud/customers/create-customer.test.ts delete mode 100644 server/tests/integration/crud/customers/create-customer1.test.ts delete mode 100644 server/tests/integration/crud/customers/create-customer2.test.ts create mode 100644 shared/api/common/customerId.ts create mode 100644 shared/api/customers/createCustomerParams.ts delete mode 100644 shared/api/customers/customersOpenApi.ts diff --git a/.claude/skills/write-test/SKILL.md b/.claude/skills/write-test/SKILL.md index ef7056f76..6d330de93 100644 --- a/.claude/skills/write-test/SKILL.md +++ b/.claude/skills/write-test/SKILL.md @@ -25,12 +25,21 @@ Write integration tests for the Autumn billing system using the `initScenario` p - Use `product.id` in `s.attach()` (never string literals) - Use `Decimal.js` for balance calculations in track tests - Unique `customerId` per test +- Use generic types with `AutumnInt`: `autumnV1.customers.get()`, `autumnV1.check()` **DON'T:** - Use `describe/beforeAll/test` (legacy pattern) - Use `Date.now()` with test clocks (use `advancedTo`) - Share state between tests - Use raw arithmetic for balance calculations (floating point errors) +- Use `as unknown as Type` casting - use generic types instead + +## AutumnInt Response Types + +| Client | customers.get | entities.get | check | +|--------|---------------|--------------|-------| +| `autumnV1` | `ApiCustomerV3` | `ApiEntityV0` | `CheckResponseV1` | +| `autumnV2` | `ApiCustomer` | `ApiEntityV1` | `CheckResponseV2` | ## Minimal Template diff --git a/.claude/skills/write-test/references/SCENARIO.md b/.claude/skills/write-test/references/SCENARIO.md index a40efedc1..c9b2e58a4 100644 --- a/.claude/skills/write-test/references/SCENARIO.md +++ b/.claude/skills/write-test/references/SCENARIO.md @@ -238,6 +238,42 @@ const { } = await initScenario({ ... }); ``` +## AutumnInt Generic Types (IMPORTANT) + +**ALWAYS use generic type parameters** when calling `AutumnInt` methods to get proper type safety: + +| Client | Method | Type Parameter | +|--------|--------|----------------| +| `autumnV1` | `.customers.get()` | `ApiCustomerV3` | +| `autumnV1` | `.entities.get()` | `ApiEntityV0` | +| `autumnV1` | `.check()` | `CheckResponseV1` | +| `autumnV2` | `.customers.get()` | `ApiCustomer` | +| `autumnV2` | `.entities.get()` | `ApiEntityV1` | +| `autumnV2` | `.check()` | `CheckResponseV2` | + +```typescript +// ✅ GOOD - Use generic types +const customer = await autumnV1.customers.get(customerId); +const checkRes = await autumnV1.check({ ... }); +const entity = await autumnV2.entities.get(entityId); + +// ❌ BAD - Casting with `as unknown as` +const customer = await autumnV1.customers.get(customerId) as unknown as ApiCustomerV3; +const checkRes = (await autumnV1.check({ ... })) as unknown as CheckResponseV1; +``` + +Import the types from `@autumn/shared`: +```typescript +import { + type ApiCustomerV3, + type ApiCustomer, + type ApiEntityV0, + type ApiEntityV1, + type CheckResponseV1, + type CheckResponseV2, +} from "@autumn/shared"; +``` + ## Test Clock Timing **Critical:** `Date.now()` doesn't change when using test clocks. Use `advancedTo`: diff --git a/.opencode/plans/handleCreateCustomer-refactor.md b/.opencode/plans/handleCreateCustomer-refactor.md new file mode 100644 index 000000000..0a87d5897 --- /dev/null +++ b/.opencode/plans/handleCreateCustomer-refactor.md @@ -0,0 +1,439 @@ +# handleCreateCustomer Refactor Plan + +## Overview + +Refactor `handleCreateCustomer` to: +1. Eliminate race conditions causing duplicate customers or missing default products +2. Clean up input types with a single source of truth +3. Ensure comprehensive test coverage before making changes + +--- + +## Part 1: Type Cleanup + +### Problem + +Three overlapping types with duplicated ID validation logic: +- `CreateCustomerSchema` in `shared/models/cusModels/cusModels.ts` +- `CustomerDataSchema` in `shared/api/common/customerData.ts` +- `CreateCustomerParamsSchema` in `shared/api/customers/customerOpModels.ts` + +### Solution + +Make `shared/api/common/customerData.ts` the single source of truth. + +### Changes + +#### 1. `shared/api/common/customerData.ts` - Add CustomerIdSchema + +```typescript +import { z } from "zod/v4"; + +// Reusable customer ID validation - can be used by attach, check, track, etc. +export const CustomerIdSchema = z.string().refine( + (val) => { + if (val === "") return false; + if (val.includes("@")) return false; + if (val.includes(" ")) return false; + if (val.includes(".")) return false; + return /^[a-zA-Z0-9_-]+$/.test(val); + }, + { + error: (issue) => { + const input = issue.input as string; + if (input === "") return { message: "can't be an empty string" }; + if (input.includes("@")) + return { + message: "cannot contain @ symbol. Use only letters, numbers, underscores, and hyphens.", + }; + if (input.includes(" ")) + return { + message: "cannot contain spaces. Use only letters, numbers, underscores, and hyphens.", + }; + if (input.includes(".")) + return { + message: "cannot contain periods. Use only letters, numbers, underscores, and hyphens.", + }; + const invalidChar = input.match(/[^a-zA-Z0-9_-]/)?.[0]; + return { + message: `cannot contain '${invalidChar}'. Use only letters, numbers, underscores, and hyphens.`, + }; + }, + }, +); + +export const CustomerDataSchema = z + .object({ + name: z.string().nullish().meta({ description: "Customer's name" }), + email: z.string().nullish().meta({ description: "Customer's email address" }), + fingerprint: z.string().nullish().meta({ internal: true }), + metadata: z.record(z.any(), z.any()).nullish().meta({ internal: true }), + stripe_id: z.string().nullish().meta({ internal: true }), + disable_default: z.boolean().optional().meta({ internal: true }), + }) + .meta({ + id: "CustomerData", + description: "Customer details to set when creating a customer", + }); + +export type CustomerData = z.infer; +export type CustomerId = z.infer; +``` + +#### 2. `shared/api/customers/customerOpModels.ts` - Use CustomerIdSchema + +```typescript +import { CustomerDataSchema, CustomerIdSchema } from "../common/customerData.js"; + +// Remove duplicate customerId const, use CustomerIdSchema instead + +export const CreateCustomerParamsSchema = z.object({ + id: CustomerIdSchema.nullable().meta({ + description: "Your unique identifier for the customer", + }), + ...CustomerDataSchema.shape, + entity_id: z.string().optional().meta({ internal: true }), + entity_data: EntityDataSchema.optional().meta({ internal: true }), +}); + +export const UpdateCustomerParamsSchema = z.object({ + id: CustomerIdSchema.optional().meta({ + description: "New unique identifier for the customer.", + }), + // ... rest uses CustomerDataSchema fields +}); +``` + +#### 3. `shared/models/cusModels/cusModels.ts` - Remove CreateCustomerSchema + +- Delete `CreateCustomerSchema` (lines 21-69) +- Delete `CreateCustomer` type export (line 78) +- Keep `CustomerSchema` and `Customer` type (used for DB model) + +#### 4. `server/src/internal/customers/handlers/handleCreateCustomer.ts` - New Signature + +```typescript +// OLD +export const handleCreateCustomer = async ({ + ctx, + cusData, // CreateCustomer type + createDefaultProducts, + defaultGroup, +}: { + ctx: AutumnContext; + cusData: CreateCustomer; + createDefaultProducts?: boolean; + defaultGroup?: string; +}) + +// NEW +export const handleCreateCustomer = async ({ + ctx, + customerId, // string | null + customerData, // CustomerData + options, +}: { + ctx: AutumnContext; + customerId: string | null; + customerData?: CustomerData; + options?: { + createDefaultProducts?: boolean; + defaultGroup?: string; + }; +}) +``` + +#### 5. Update All Callers + +| File | Change | +|------|--------| +| `getOrCreateCustomer.ts` | Pass `customerId` and `customerData` separately | +| `getOrCreateCachedFullCustomer.ts` | Pass `customerId` and `customerData` separately | +| `handlePostCustomerV2.ts` | Extract `id` from parsed body, pass rest as customerData | +| `getOrCreateApiCustomer.ts` | Pass `customerId` and `customerData` separately | +| `createNewCustomer.ts` | Update import, accept new shape | + +### Future Work (Not in This PR) + +These files can later adopt `CustomerIdSchema` for validation: +- `shared/api/balances/check/checkParams.ts` - `customer_id: CustomerIdSchema` +- `shared/api/balances/track/trackParams.ts` +- `shared/api/billing/attach/*` + +--- + +## Part 2: Test Structure + +### File Organization + +**3 new test files** using the modern `test.concurrent` + `initScenario` pattern: + +| File | Theme | +|------|-------| +| `create-customer.test.ts` | Basic creation + email flows | +| `create-customer-defaults.test.ts` | Default product attachment | +| `create-customer-race.test.ts` | Race condition tests (low-level simulation) | + +**Delete after migration:** +- `create-customer1.test.ts` (old pattern) +- `create-customer2.test.ts` (old pattern) + +**Add to existing files:** +- `check-race-condition2.test.ts` → Customer auto-creation race via /check +- `track-race-condition5.test.ts` → Customer auto-creation race via /track + +--- + +## Part 3: Test Cases + +### `create-customer.test.ts` - Basic Creation + Email Flows + +| # | Test Name | Description | From | +|---|-----------|-------------|------| +| 1 | `create: basic with ID` | Create customer with ID, name, email | Migrate from create-customer1 | +| 2 | `create: idempotent with same ID` | Create same customer twice returns existing | Migrate from create-customer1 | +| 3 | `create: with expand params` | Create with expand returns invoices, trials_used, entities | Migrate from create-customer1 | +| 4 | `create: concurrent same ID` | Promise.all two creates with same ID | Migrate from create-customer2 | +| 5 | `create: null ID with email` | Create customer with id=null and valid email | NEW | +| 6 | `create: null ID no email (error)` | Create with id=null and no email throws | NEW | +| 7 | `create: null ID idempotent` | Create with id=null same email twice returns existing | NEW | +| 8 | `create: null ID then add ID` | Create with id=null, then create with same email + ID updates existing | NEW | +| 9 | `create: concurrent null ID same email` | Promise.all two creates with id=null, same email | NEW | + +### `create-customer-defaults.test.ts` - Default Product Attachment + +| # | Test Name | Description | +|---|-----------|-------------| +| 10 | `defaults: single free product` | Create customer with single default free product attached | +| 11 | `defaults: multiple groups` | Two default free products in different groups, both attached | +| 12 | `defaults: same group priority` | Two defaults in same group, priority: trial > paid > free | +| 13 | `defaults: trial product` | Default trial attaches with status=trialing | +| 14 | `defaults: paid product (legacy)` | Default paid with forcePaidDefault=true uses handleAddProduct | +| 15 | `defaults: paid requires Stripe customer` | Default paid creates Stripe customer, sets stripe_id | + +### `create-customer-race.test.ts` - Race Condition Tests (Low-Level) + +| # | Test Name | Description | +|---|-----------|-------------| +| 16 | `race: stale cache detection` | Insert customer → concurrent request caches incomplete → getOrCreate detects stale | +| 17 | `race: concurrent default loop` | Insert → start attaching defaults → concurrent 23505 → retry sees all defaults | +| 18 | `race: concurrent same ID (API level)` | Promise.all creates with same ID, one gets 23505, both return same customer | +| 19 | `race: concurrent email+ID update` | Customer exists id=null, two requests add ID via same email | +| 20 | `race: concurrent Stripe customer` | Default paid: concurrent creates only create one Stripe customer | + +### Entry Point Auto-Creation Race Tests + +#### `check-race-condition2.test.ts` + +| # | Test Name | Description | +|---|-----------|-------------| +| 21 | `check-autocreate: concurrent same customer_id` | Concurrent /check calls auto-creating same customer | + +#### `track-race-condition5.test.ts` + +| # | Test Name | Description | +|---|-----------|-------------| +| 22 | `track-autocreate: concurrent same customer_id` | Concurrent /track calls auto-creating same customer, usage correct | + +--- + +## Part 4: Test Implementation Pattern + +### Modern Pattern: `test.concurrent` + `initScenario` + +```typescript +import { expect, test } from "bun:test"; +import { CusExpand } from "@autumn/shared"; +import { TestFeature } from "@tests/setup/v2Features.js"; +import { items } from "@tests/utils/fixtures/items.js"; +import { products } from "@tests/utils/fixtures/products.js"; +import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; +import chalk from "chalk"; + +// ═══════════════════════════════════════════════════════════════════════════════ +// BASIC CREATION TESTS +// ═══════════════════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("create: basic with ID")}`, async () => { + const { customerId, autumnV1 } = await initScenario({ + customerId: "create-basic-id", + setup: [s.customer({ testClock: false })], + actions: [], + }); + + // Delete to test fresh create + try { await autumnV1.customers.delete(customerId); } catch {} + + const data = await autumnV1.customers.create({ + id: customerId, + name: "Test Customer", + email: `${customerId}@example.com`, + }); + + expect(data.id).toBe(customerId); + expect(data.name).toBe("Test Customer"); + expect(data.email).toBe(`${customerId}@example.com`); +}); + +test.concurrent(`${chalk.yellowBright("create: idempotent with same ID")}`, async () => { + const { customerId, autumnV1 } = await initScenario({ + customerId: "create-idempotent", + setup: [s.customer({ testClock: false })], + actions: [], + }); + + // First create + const data1 = await autumnV1.customers.create({ + id: customerId, + name: "Test Customer", + email: `${customerId}@example.com`, + }); + + // Second create - should return existing + const data2 = await autumnV1.customers.create({ + id: customerId, + name: "Test Customer", + email: `${customerId}@example.com`, + }); + + expect(data1.id).toBe(data2.id); + expect(data1.internal_id).toBe(data2.internal_id); +}); +``` + +### Low-Level Race Simulation Pattern + +```typescript +import { expect, test } from "bun:test"; +import { TestFeature } from "@tests/setup/v2Features.js"; +import { items } from "@tests/utils/fixtures/items.js"; +import { products } from "@tests/utils/fixtures/products.js"; +import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; +import chalk from "chalk"; +import { CusService } from "@/internal/customers/CusService.js"; +import { deleteCachedFullCustomer } from "@/internal/customers/cusUtils/fullCustomerCacheUtils/deleteCachedFullCustomer.js"; +import { getOrCreateCachedFullCustomer } from "@/internal/customers/cusUtils/fullCustomerCacheUtils/getOrCreateCachedFullCustomer.js"; +import { setCachedFullCustomer } from "@/internal/customers/cusUtils/fullCustomerCacheUtils/setCachedFullCustomer.js"; +import { generateId } from "@/utils/genUtils.js"; + +test.concurrent(`${chalk.yellowBright("race: stale cache detection")}`, async () => { + const wordsItem = items.monthlyWords({ includedUsage: 1000 }); + const freeDefault = products.base({ id: "free", items: [wordsItem], isDefault: true }); + + const { customerId, ctx, autumnV2 } = await initScenario({ + customerId: "race-stale-cache", + setup: [ + s.customer({ testClock: false }), + s.products({ list: [freeDefault] }), + ], + actions: [], + }); + + // Delete customer so we can manually reproduce race + try { await autumnV2.customers.delete(customerId); } catch {} + await deleteCachedFullCustomer({ ctx, customerId, source: "test-cleanup" }); + + // STEP 1: Insert customer directly (bypassing handleCreateCustomer) + const internalId = generateId("cus"); + await CusService.insert({ + db: ctx.db, + data: { + id: customerId, + internal_id: internalId, + org_id: ctx.org.id, + env: ctx.env, + name: customerId, + email: `${customerId}@test.com`, + metadata: {}, + created_at: Date.now(), + }, + }); + + // STEP 2: Simulate concurrent request caching incomplete customer + const incompleteCustomer = await CusService.getFull({ + db: ctx.db, + idOrInternalId: customerId, + orgId: ctx.org.id, + env: ctx.env, + withEntities: true, + withSubs: true, + }); + + await setCachedFullCustomer({ + ctx, + fullCustomer: incompleteCustomer!, + customerId, + fetchTimeMs: Date.now(), + source: "test-concurrent-request", + overwrite: true, + }); + + // STEP 3: Call actual function - should detect stale state + const result = await getOrCreateCachedFullCustomer({ + ctx, + params: { customer_id: customerId, feature_id: TestFeature.Words }, + source: "test-final-check", + }); + + // Verify: Customer has default products + expect(result.customer_products?.length).toBeGreaterThan(0); +}); +``` + +--- + +## Part 5: Implementation Order + +### Phase 1: Write Tests (RED) +1. Create `create-customer.test.ts` - migrate old tests + add new null ID tests +2. Create `create-customer-defaults.test.ts` - default product tests +3. Create `create-customer-race.test.ts` - race condition tests +4. Add tests to `check-race-condition2.test.ts` and `track-race-condition5.test.ts` +5. Delete `create-customer1.test.ts` and `create-customer2.test.ts` +6. Run tests - some will fail (documenting expected behavior) + +### Phase 2: Type Cleanup +1. Add `CustomerIdSchema` to `customerData.ts` +2. Update `customerOpModels.ts` to use it +3. Update `handleCreateCustomer` signature +4. Update all callers +5. Remove `CreateCustomerSchema` from `cusModels.ts` + +### Phase 3: Fix Race Conditions (GREEN) +1. Analyze failing tests +2. Implement proper locking/transactions +3. Potential fixes: + - Use database transaction for insert + default products + - Add advisory lock during customer creation + - Detect stale cache by checking customer_products count + +### Phase 4: Verify +1. All tests pass +2. Manual testing of concurrent scenarios +3. Review for any remaining edge cases + +--- + +## Files Summary + +### To Create +- `server/tests/integration/crud/customers/create-customer.test.ts` +- `server/tests/integration/crud/customers/create-customer-defaults.test.ts` +- `server/tests/integration/crud/customers/create-customer-race.test.ts` +- `server/tests/integration/balances/check/check-race-condition2.test.ts` +- `server/tests/balances/track/race-condition/track-race-condition5.test.ts` + +### To Delete +- `server/tests/integration/crud/customers/create-customer1.test.ts` +- `server/tests/integration/crud/customers/create-customer2.test.ts` + +### Type Cleanup (Modify) +- `shared/api/common/customerData.ts` - Add `CustomerIdSchema` +- `shared/api/customers/customerOpModels.ts` - Use `CustomerIdSchema`, remove duplicate +- `shared/models/cusModels/cusModels.ts` - Remove `CreateCustomerSchema` +- `server/src/internal/customers/handlers/handleCreateCustomer.ts` - New signature +- `server/src/internal/customers/cusUtils/getOrCreateCustomer.ts` +- `server/src/internal/customers/cusUtils/fullCustomerCacheUtils/getOrCreateCachedFullCustomer.ts` +- `server/src/internal/customers/cusUtils/createNewCustomer.ts` +- `server/src/internal/customers/handlers/handlePostCustomerV2.ts` +- `server/src/internal/customers/cusUtils/getOrCreateApiCustomer.ts` diff --git a/server/src/db/dbUtils.ts b/server/src/db/dbUtils.ts index 3c6b3c3be..d62eedc02 100644 --- a/server/src/db/dbUtils.ts +++ b/server/src/db/dbUtils.ts @@ -1,6 +1,18 @@ import { getTableColumns, type SQL, sql } from "drizzle-orm"; import type { PgTable } from "drizzle-orm/pg-core"; +/** + * Check if an error is a Postgres unique constraint violation (error code 23505). + */ +export const isUniqueConstraintError = (error: unknown): boolean => { + return ( + typeof error === "object" && + error !== null && + "code" in error && + error.code === "23505" + ); +}; + export const buildConflictUpdateColumns = ( table: T, excludeColumns: (keyof T["_"]["columns"])[] = [], diff --git a/server/src/external/autumn/autumnCli.ts b/server/src/external/autumn/autumnCli.ts index 1f017ba04..ad4a9794a 100644 --- a/server/src/external/autumn/autumnCli.ts +++ b/server/src/external/autumn/autumnCli.ts @@ -13,6 +13,7 @@ import { type BillingResponse, type CheckQuery, type CreateBalanceParams, + type CreateCustomerInternalOptions, type CreateCustomerParams, type CreateEntityParams, type CreateRewardProgram, @@ -414,15 +415,18 @@ export class AutumnInt { create: async ({ withAutumnId = true, expand = [], + internalOptions, ...customerData }: { withAutumnId?: boolean; expand?: CusExpand[]; - } & CreateCustomerParams) => { + internalOptions?: CreateCustomerInternalOptions; + } & Omit) => { const data = await this.post( `/customers?with_autumn_id=${withAutumnId ? "true" : "false"}${expand && expand.length > 0 ? `&expand=${expand.join(",")}` : ""}`, { ...customerData, + internal_options: internalOptions, }, ); return data; diff --git a/server/src/external/stripe/customers/index.ts b/server/src/external/stripe/customers/index.ts index a13d26214..58e957d6b 100644 --- a/server/src/external/stripe/customers/index.ts +++ b/server/src/external/stripe/customers/index.ts @@ -1 +1,4 @@ +export * from "./operations/createStripeCustomer.js"; +export * from "./operations/getExpandedStripeCustomer.js"; +export * from "./operations/getOrCreateStripeCustomer.js"; export * from "./utils/convertStripeCustomer.js"; diff --git a/server/src/external/stripe/customers/operations/createStripeCustomer.ts b/server/src/external/stripe/customers/operations/createStripeCustomer.ts new file mode 100644 index 000000000..5471e254b --- /dev/null +++ b/server/src/external/stripe/customers/operations/createStripeCustomer.ts @@ -0,0 +1,43 @@ +import type { Customer } from "@autumn/shared"; +import { createStripeCli } from "@/external/connect/createStripeCli"; +import { buildStripeCustomerIdempotencyKey } from "@/external/stripe/customers/utils/buildIdempotencyKey"; +import type { AutumnContext } from "@/honoUtils/HonoEnv"; + +export const createStripeCustomer = async ({ + ctx, + customer, + options = {}, +}: { + ctx: AutumnContext; + customer: Customer; + options?: { + testClockId?: string; + }; +}) => { + const { org, env } = ctx; + const stripeCli = createStripeCli({ org, env }); + + const idempotencyKey = buildStripeCustomerIdempotencyKey({ + ctx, + customerId: customer.id || customer.internal_id, + }); + + const stripeCustomer = await stripeCli.customers.create( + { + name: customer.name || undefined, + email: customer.email || undefined, + metadata: { + autumn_id: customer.id || null, + autumn_internal_id: customer.internal_id, + }, + test_clock: options.testClockId, + }, + idempotencyKey + ? { + idempotencyKey, + } + : undefined, + ); + + return stripeCustomer; +}; diff --git a/server/src/external/stripe/customers/operations/getExpandedStripeCustomer.ts b/server/src/external/stripe/customers/operations/getExpandedStripeCustomer.ts new file mode 100644 index 000000000..d5320f174 --- /dev/null +++ b/server/src/external/stripe/customers/operations/getExpandedStripeCustomer.ts @@ -0,0 +1,61 @@ +import { tryCatch } from "@shared/utils"; +import Stripe from "stripe"; +import { createStripeCli } from "@/external/connect/createStripeCli"; +import type { AutumnContext } from "@/honoUtils/HonoEnv"; + +export type ExpandedStripeCustomer = Omit< + Stripe.Customer, + "test_clock" | "invoice_settings" | "discount" +> & { + test_clock: Stripe.TestHelpers.TestClock | null; + invoice_settings: Omit< + Stripe.Customer.InvoiceSettings, + "default_payment_method" + > & { + default_payment_method: Stripe.PaymentMethod | null; + }; + discount: + | (Omit & { + coupon: Stripe.Coupon & { + applies_to: Stripe.Coupon.AppliesTo | null; + }; + }) + | null; +}; + +export const getExpandedStripeCustomer = async ({ + ctx, + stripeCustomerId, +}: { + ctx: AutumnContext; + stripeCustomerId?: string; +}): Promise => { + const { org, env } = ctx; + const stripeCli = createStripeCli({ org, env }); + + if (!stripeCustomerId) return undefined; + + const { data: stripeCustomer, error } = await tryCatch( + stripeCli.customers.retrieve(stripeCustomerId, { + expand: [ + "test_clock", + "invoice_settings.default_payment_method", + "discount.coupon.applies_to", + ], + }), + ); + + if (error) { + if ( + error instanceof Stripe.errors.StripeError && + error.code?.includes("resource_missing") + ) { + return undefined; + } + throw error; + } + + if (stripeCustomer.deleted) return undefined; + + return stripeCustomer as ExpandedStripeCustomer; +}; diff --git a/server/src/external/stripe/customers/operations/getOrCreateStripeCustomer.ts b/server/src/external/stripe/customers/operations/getOrCreateStripeCustomer.ts new file mode 100644 index 000000000..69010c0c9 --- /dev/null +++ b/server/src/external/stripe/customers/operations/getOrCreateStripeCustomer.ts @@ -0,0 +1,57 @@ +import { type Customer, ProcessorType } from "@autumn/shared"; +import { createStripeCustomer } from "@/external/stripe/customers/operations/createStripeCustomer"; +import { getExpandedStripeCustomer } from "@/external/stripe/customers/operations/getExpandedStripeCustomer"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import { CusService } from "@/internal/customers/CusService"; + +export const getOrCreateStripeCustomer = async ({ + ctx, + customer, + options = { + updateDb: true, + }, +}: { + ctx: AutumnContext; + customer: Customer; + options?: { + updateDb?: boolean; + }; +}) => { + const { logger, db, org, env } = ctx; + + const currentStripeCustomer = await getExpandedStripeCustomer({ + ctx, + stripeCustomerId: customer.processor?.id, + }); + + if (currentStripeCustomer) return currentStripeCustomer; + + logger.info(`Creating new stripe customer for ${customer.id}`); + + const stripeCustomer = await createStripeCustomer({ + ctx, + customer, + }); + + if (options.updateDb) { + await CusService.update({ + db, + idOrInternalId: customer.internal_id, + orgId: org.id, + env, + update: { + processor: { + id: stripeCustomer.id, + type: ProcessorType.Stripe, + }, + }, + }); + } + + customer.processor = { + id: stripeCustomer.id, + type: ProcessorType.Stripe, + }; + + return stripeCustomer; +}; diff --git a/server/src/external/stripe/customers/utils/buildIdempotencyKey.ts b/server/src/external/stripe/customers/utils/buildIdempotencyKey.ts new file mode 100644 index 000000000..a4915c69d --- /dev/null +++ b/server/src/external/stripe/customers/utils/buildIdempotencyKey.ts @@ -0,0 +1,15 @@ +import { hashString } from "@autumn/shared"; +import type { AutumnContext } from "@/honoUtils/HonoEnv"; + +export const buildStripeCustomerIdempotencyKey = ({ + ctx, + customerId, +}: { + ctx: AutumnContext; + customerId: string; +}): string => { + const { org, env } = ctx; + return hashString( + `stripe-create-cus:${customerId}:${org.id}:${env}:${Math.floor(Date.now() / 5000)}`, + ); +}; diff --git a/server/src/external/stripe/stripeCusUtils.ts b/server/src/external/stripe/stripeCusUtils.ts index fbffe906d..37afde7b1 100644 --- a/server/src/external/stripe/stripeCusUtils.ts +++ b/server/src/external/stripe/stripeCusUtils.ts @@ -2,18 +2,17 @@ import { type AppEnv, type Customer, ErrCode, - hashString, type Organization, ProcessorType, } from "@autumn/shared"; import { StatusCodes } from "http-status-codes"; -import { Stripe } from "stripe"; +import type { Stripe } from "stripe"; import type { DrizzleCli } from "@/db/initDrizzle.js"; import { createStripeCli } from "@/external/connect/createStripeCli.js"; +import { createStripeCustomer } from "@/external/stripe/customers"; import { CusService } from "@/internal/customers/CusService.js"; import RecaseError from "@/utils/errorUtils.js"; import type { TestContext } from "../../../tests/utils/testInitUtils/createTestContext"; -import type { Logger } from "../logtail/logtailUtils"; export const getStripeCus = async ({ stripeCli, @@ -30,190 +29,6 @@ export const getStripeCus = async ({ } }; -export const createStripeCusIfNotExists = async ({ - db, - org, - env, - customer, - logger, -}: { - db: DrizzleCli; - org: Organization; - env: AppEnv; - customer: Customer; - logger: Logger; -}) => { - const stripeCli = createStripeCli({ org, env }); - - const getCurrentStripeCus = async () => { - // 1. If no processor, create new customer - if (!customer.processor?.id) return null; - - try { - const stripeCus = await stripeCli.customers.retrieve( - customer.processor.id, - { - expand: [ - "test_clock", - "invoice_settings.default_payment_method", - "discount.source.coupon.applies_to", - ], - }, - ); - - // 2. If customer is deleted, create new customer - if (stripeCus.deleted) return null; - - // 3. If customer is not deleted, return customer - return stripeCus as Stripe.Customer; - } catch (_error) { - // 4. If error, create new customer - if ( - _error instanceof Stripe.errors.StripeError && - _error.code?.includes("resource_missing") - ) { - return null; - } - throw _error; - } - }; - - // 1. Get current stripe customer - const stripeCus = await getCurrentStripeCus(); - - if (stripeCus) return stripeCus; - - // 2. If no current stripe customer, create new customer - logger.info(`Creating new stripe customer for ${customer.id}`); - const idempotencyKey = hashString( - `stripe-create-cus:${customer.id || customer.internal_id}:${org.id}:${env}:${Math.floor(Date.now() / 5000)}`, - ); - - const stripeCustomer = await createStripeCustomer({ - org, - env, - customer, - idempotencyKey, - }); - - await CusService.update({ - db, - idOrInternalId: customer.internal_id, - orgId: org.id, - env, - update: { - processor: { - id: stripeCustomer.id, - type: ProcessorType.Stripe, - }, - }, - }); - - customer.processor = { - id: stripeCustomer.id, - type: ProcessorType.Stripe, - }; - - return stripeCustomer; - - // let createNew = false; - // const stripeCli = createStripeCli({ org, env }); - // if (!customer.processor || !customer.processor.id) { - // createNew = true; - // } else { - // try { - // const stripeCus = await stripeCli.customers.retrieve( - // customer.processor.id, - // { - // expand: ["test_clock", "invoice_settings.default_payment_method"], - // }, - // ); - // if (!stripeCus.deleted) { - // return stripeCus as Stripe.Customer; - // } else { - // createNew = true; - // } - // } catch (_error) { - // createNew = true; - // } - // } - - // if (createNew) { - // logger.info(`Creating new stripe customer for ${customer.id}`); - // const stripeCustomer = await createStripeCustomer({ - // org, - // env, - // customer, - // }); - - // await CusService.update({ - // db, - // idOrInternalId: customer.internal_id, - // orgId: org.id, - // env, - // update: { - // processor: { - // id: stripeCustomer.id, - // type: ProcessorType.Stripe, - // }, - // }, - // }); - - // customer.processor = { - // id: stripeCustomer.id, - // type: ProcessorType.Stripe, - // }; - - // return stripeCustomer; - // } -}; - -export const createStripeCustomer = async ({ - org, - env, - customer, - testClockId, - metadata, - idempotencyKey, -}: { - org: Organization; - env: AppEnv; - customer: Customer; - testClockId?: string; - metadata?: Record; - idempotencyKey?: string; -}) => { - const stripeCli = createStripeCli({ org, env }); - - try { - const stripeCustomer = await stripeCli.customers.create( - { - name: customer.name || undefined, - email: customer.email || undefined, - metadata: { - ...(metadata || {}), - autumn_id: customer.id || null, - autumn_internal_id: customer.internal_id, - }, - test_clock: testClockId, - }, - idempotencyKey - ? { - idempotencyKey, - } - : undefined, - ); - - return stripeCustomer; - } catch (error: any) { - throw new RecaseError({ - message: `Error creating customer in Stripe. ${error.message}`, - code: ErrCode.StripeCreateCustomerFailed, - statusCode: StatusCodes.INTERNAL_SERVER_ERROR, - }); - } -}; - export const deleteStripeCustomer = async ({ org, env, @@ -321,10 +136,9 @@ export const attachPmToCus = async ({ let stripeCusId = customer.processor?.id; if (!stripeCusId) { const stripeCustomer = await createStripeCustomer({ - org, - env, + ctx: { org, env, db } as any, customer, - testClockId, + options: { testClockId }, }); await CusService.update({ diff --git a/server/src/external/stripe/stripeSubUtils/convertSubUtils.ts b/server/src/external/stripe/stripeSubUtils/convertSubUtils.ts index b0530b3ee..9d0b330dc 100644 --- a/server/src/external/stripe/stripeSubUtils/convertSubUtils.ts +++ b/server/src/external/stripe/stripeSubUtils/convertSubUtils.ts @@ -1,5 +1,4 @@ import type Stripe from "stripe"; - export const getLatestPeriodEnd = ({ sub, subItems, diff --git a/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/handleCheckoutSub.ts b/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/handleCheckoutSub.ts index e48e764c5..70d808178 100644 --- a/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/handleCheckoutSub.ts +++ b/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/handleCheckoutSub.ts @@ -7,7 +7,7 @@ import { findPriceFromStripeId, } from "@/internal/products/prices/priceUtils/findPriceUtils.js"; import { SubService } from "@/internal/subscriptions/SubService.js"; -import { constructSub } from "@/internal/subscriptions/subUtils.js"; +import { initSubscription } from "@/internal/subscriptions/utils/initSubscription.js"; import { getEmptyPriceItem } from "../../priceToStripeItem/priceToStripeItem.js"; import { subToPeriodStartEnd } from "../../stripeSubUtils/convertSubUtils.js"; @@ -30,9 +30,8 @@ export const handleCheckoutSub = async ({ await SubService.createSub({ db, - sub: constructSub({ + sub: initSubscription({ stripeId: subscription.id, - usageFeatures: attachParams.itemSets?.[0]?.usageFeatures || [], orgId: org.id, env: attachParams.customer.env, currentPeriodStart: start, diff --git a/server/src/external/vercel/handlers/installations/handleUpsertInstallation.ts b/server/src/external/vercel/handlers/installations/handleUpsertInstallation.ts index b16c11d91..8d7f1bc44 100644 --- a/server/src/external/vercel/handlers/installations/handleUpsertInstallation.ts +++ b/server/src/external/vercel/handlers/installations/handleUpsertInstallation.ts @@ -2,15 +2,14 @@ import { AppEnv, type Customer, cusProductToProduct, - InternalError, ProcessorType, } from "@autumn/shared"; import { createStripeCli } from "@/external/connect/createStripeCli.js"; +import { createStripeCustomer } from "@/external/stripe/customers"; import { createCustomStripeCard } from "@/external/stripe/stripeCardUtils.js"; -import { createStripeCustomer } from "@/external/stripe/stripeCusUtils.js"; import { createRoute } from "@/honoMiddlewares/routeHandler.js"; +import { customerActions } from "@/internal/customers/actions/index.js"; import { CusService } from "@/internal/customers/CusService.js"; -import { handleCreateCustomer } from "@/internal/customers/handlers/handleCreateCustomer.js"; import { AuthError, getAuthorizationToken, @@ -45,10 +44,10 @@ export const handleUpsertInstallation = createRoute({ throw new AuthError("Invalid claims"); } - createdCustomer = await handleCreateCustomer({ + createdCustomer = await customerActions.createWithDefaults({ ctx, - cusData: { - id: integrationConfigurationId, + customerId: integrationConfigurationId, + customerData: { email: body.account.contact.email, name: body.account.contact.name, processors: { @@ -61,16 +60,10 @@ export const handleUpsertInstallation = createRoute({ }, }); - if (!createdCustomer) { - throw new InternalError({ - message: "Failed to create customer", - }); - } - // Create test clock for sandbox/development environments + const stripeCli = createStripeCli({ org: ctx.org, env: ctx.env }); let testClockId: string | undefined; if (ctx.env === AppEnv.Sandbox) { - const stripeCli = createStripeCli({ org: ctx.org, env: ctx.env }); const testClock = await stripeCli.testHelpers.testClocks.create({ frozen_time: Math.floor(Date.now() / 1000), }); @@ -78,10 +71,13 @@ export const handleUpsertInstallation = createRoute({ } const stripeCustomer = await createStripeCustomer({ - org: ctx.org, - env: ctx.env, + ctx, customer: createdCustomer, - testClockId, + options: { testClockId }, + }); + + // Add vercel-specific metadata + await stripeCli.customers.update(stripeCustomer.id, { metadata: { vercel_installation_id: integrationConfigurationId, }, diff --git a/server/src/honoMiddlewares/analyticsMiddleware.ts b/server/src/honoMiddlewares/analyticsMiddleware.ts index 651ecced3..80567f03d 100644 --- a/server/src/honoMiddlewares/analyticsMiddleware.ts +++ b/server/src/honoMiddlewares/analyticsMiddleware.ts @@ -5,6 +5,7 @@ import { addAppContextToLogs, addExtrasToLogs, } from "@/utils/logging/addContextToLogs"; +import { maskExtraLogs } from "@/utils/logging/maskExtraLogs.js"; export const parseCustomerIdFromUrl = ({ url, @@ -116,7 +117,8 @@ const logResponse = async ({ }); if (Object.keys(ctx.extraLogs).length > 0) { - ctx.logger.debug(`EXTRA LOGS:`, JSON.stringify(ctx.extraLogs, null, 2)); + const maskedLogs = maskExtraLogs(ctx.extraLogs); + ctx.logger.debug(`EXTRA LOGS: ${JSON.stringify(maskedLogs, null, 2)}`); } } catch (error) { console.error("Failed to log response to logtail"); @@ -161,9 +163,12 @@ export const analyticsMiddleware = async (c: Context, next: Next) => { // Execute the request await next(); + // Re-fetch ctx after next() since handlers may have replaced it via c.set("ctx", {...}) + const finalCtx = c.get("ctx"); + // Log response asynchronously without blocking (runs after response is sent) Promise.resolve() - .then(() => logResponse({ ctx, c, skipUrls })) + .then(() => logResponse({ ctx: finalCtx, c, skipUrls })) .catch((error) => { console.error("Failed to log response to logtail"); console.error(error); diff --git a/server/src/internal/billing/handlers/handleSetupPayment.ts b/server/src/internal/billing/handlers/handleSetupPayment.ts index 9c2f86e82..c98d8c4e2 100644 --- a/server/src/internal/billing/handlers/handleSetupPayment.ts +++ b/server/src/internal/billing/handlers/handleSetupPayment.ts @@ -4,7 +4,7 @@ import { SetupPaymentParamsSchema, } from "@autumn/shared"; import { createStripeCli } from "@/external/connect/createStripeCli.js"; -import { createStripeCusIfNotExists } from "@/external/stripe/stripeCusUtils.js"; +import { getOrCreateStripeCustomer } from "@/external/stripe/customers"; import { createRoute } from "@/honoMiddlewares/routeHandler.js"; import { toSuccessUrl } from "@/internal/orgs/orgUtils/convertOrgUtils.js"; import RecaseError from "@/utils/errorUtils.js"; @@ -23,15 +23,12 @@ export const handleSetupPayment = createRoute({ const customer = await getOrCreateCustomer({ ctx, customerId: customer_id, - customerData: customer_data as any, + customerData: customer_data, }); - await createStripeCusIfNotExists({ - db, - org, - env, + await getOrCreateStripeCustomer({ + ctx, customer, - logger, }); const stripeCli = createStripeCli({ org, env }); diff --git a/server/src/internal/billing/v2/billingContext.ts b/server/src/internal/billing/v2/billingContext.ts index 1265fe703..9136605ce 100644 --- a/server/src/internal/billing/v2/billingContext.ts +++ b/server/src/internal/billing/v2/billingContext.ts @@ -23,6 +23,7 @@ export interface TrialContext { trialEndsAt: number | null; customFreeTrial?: FreeTrial; appliesToBilling: boolean; + cardRequired: boolean; } export interface BillingContext { @@ -56,5 +57,3 @@ export interface BillingContext { export interface UpdateSubscriptionBillingContext extends BillingContext { customerProduct: FullCusProduct; // target customer product } - -// testClockFrozenTime?: number; diff --git a/server/src/internal/billing/v2/execute/executeAutumnBillingPlan.ts b/server/src/internal/billing/v2/execute/executeAutumnBillingPlan.ts index cebb4124d..82a259cda 100644 --- a/server/src/internal/billing/v2/execute/executeAutumnBillingPlan.ts +++ b/server/src/internal/billing/v2/execute/executeAutumnBillingPlan.ts @@ -24,19 +24,19 @@ export const executeAutumnBillingPlan = async ({ customFreeTrial, } = autumnBillingPlan; - ctx.logger.debug( - `[executeAutumnBillingPlan] inserting ${customEntitlements.length} custom entitlements and ${customPrices.length} custom prices`, - ); + if (customEntitlements) { + await EntitlementService.insert({ + db, + data: customEntitlements, + }); + } - await EntitlementService.insert({ - db, - data: customEntitlements, - }); - - await PriceService.insert({ - db, - data: customPrices, - }); + if (customPrices) { + await PriceService.insert({ + db, + data: customPrices, + }); + } if (customFreeTrial) { await FreeTrialService.insert({ diff --git a/server/src/internal/billing/v2/execute/executeBillingPlan.ts b/server/src/internal/billing/v2/execute/executeBillingPlan.ts index e4eb490db..61e7f682e 100644 --- a/server/src/internal/billing/v2/execute/executeBillingPlan.ts +++ b/server/src/internal/billing/v2/execute/executeBillingPlan.ts @@ -20,8 +20,6 @@ export const executeBillingPlan = async ({ billingContext, }); - // console.log("stripeBillingResult", stripeBillingResult); - if (stripeBillingResult.deferred) return { stripe: stripeBillingResult, diff --git a/server/src/internal/billing/v2/providers/stripe/actionBuilders/evaluateStripeBillingPlan.ts b/server/src/internal/billing/v2/providers/stripe/actionBuilders/evaluateStripeBillingPlan.ts index 930724342..bcd70c6cb 100644 --- a/server/src/internal/billing/v2/providers/stripe/actionBuilders/evaluateStripeBillingPlan.ts +++ b/server/src/internal/billing/v2/providers/stripe/actionBuilders/evaluateStripeBillingPlan.ts @@ -50,7 +50,7 @@ export const evaluateStripeBillingPlan = async ({ let stripeInvoiceAction: StripeInvoiceAction | undefined; let stripeInvoiceItemsAction: StripeInvoiceItemsAction | undefined; - if (createManualInvoice) { + if (createManualInvoice && lineItems) { stripeInvoiceAction = buildStripeInvoiceAction({ lineItems, }); diff --git a/server/src/internal/billing/v2/providers/stripe/setup/fetchStripeCustomerForBilling.ts b/server/src/internal/billing/v2/providers/stripe/setup/fetchStripeCustomerForBilling.ts index 46122979e..cb854e5d1 100644 --- a/server/src/internal/billing/v2/providers/stripe/setup/fetchStripeCustomerForBilling.ts +++ b/server/src/internal/billing/v2/providers/stripe/setup/fetchStripeCustomerForBilling.ts @@ -1,9 +1,7 @@ import type { FullCustomer } from "@autumn/shared"; import { createStripeCli } from "@server/external/connect/createStripeCli"; -import { - createStripeCusIfNotExists, - listCusPaymentMethods, -} from "@server/external/stripe/stripeCusUtils"; +import { getOrCreateStripeCustomer } from "@server/external/stripe/customers"; +import { listCusPaymentMethods } from "@server/external/stripe/stripeCusUtils"; import type { AutumnContext } from "@server/honoUtils/HonoEnv"; import type Stripe from "stripe"; @@ -14,15 +12,12 @@ export const fetchStripeCustomerForBilling = async ({ ctx: AutumnContext; fullCus: FullCustomer; }) => { - const { logger, db, org, env } = ctx; + const { org, env } = ctx; const stripeCli = createStripeCli({ org, env }); - const stripeCus = await createStripeCusIfNotExists({ - db, - org, - env, + const stripeCus = await getOrCreateStripeCustomer({ + ctx, customer: fullCus, - logger, }); const testClock = stripeCus.test_clock as Stripe.TestHelpers.TestClock | null; diff --git a/server/src/internal/billing/v2/providers/stripe/utils/subscriptions/buildStripeSubscriptionCreateAction.ts b/server/src/internal/billing/v2/providers/stripe/utils/subscriptions/buildStripeSubscriptionCreateAction.ts index 85cb34d80..9b02a45a3 100644 --- a/server/src/internal/billing/v2/providers/stripe/utils/subscriptions/buildStripeSubscriptionCreateAction.ts +++ b/server/src/internal/billing/v2/providers/stripe/utils/subscriptions/buildStripeSubscriptionCreateAction.ts @@ -17,9 +17,8 @@ export const buildStripeSubscriptionCreateAction = ({ const { stripeCustomer, paymentMethod, trialContext } = billingContext; const trialEndsAt = trialContext?.trialEndsAt; - const freeTrial = trialContext?.freeTrial; - const isFreeTrialWithCardRequired = Boolean(freeTrial?.card_required); + const isFreeTrialWithCardRequired = trialContext?.cardRequired; const isCustomPaymentMethod = paymentMethod?.type === "custom"; const stripeSubscriptionCreateParams: Stripe.SubscriptionCreateParams = { diff --git a/server/src/internal/billing/v2/setup/setupTrialContext.ts b/server/src/internal/billing/v2/setup/setupTrialContext.ts index b4e0bd7e3..d82135613 100644 --- a/server/src/internal/billing/v2/setup/setupTrialContext.ts +++ b/server/src/internal/billing/v2/setup/setupTrialContext.ts @@ -42,6 +42,7 @@ export const setupTrialContext = ({ freeTrial: null, trialEndsAt: null, appliesToBilling: newProductIsPaidRecurring, + cardRequired: true, }; } else { return undefined; @@ -67,6 +68,7 @@ export const setupTrialContext = ({ trialEndsAt, customFreeTrial: dbFreeTrial, appliesToBilling: newProductIsPaidRecurring, + cardRequired: dbFreeTrial.card_required, }; } @@ -84,6 +86,7 @@ export const setupTrialContext = ({ freeTrial: null, trialEndsAt: trialEndsAt, appliesToBilling: newProductIsPaidRecurring, + cardRequired: true, }; } else { return undefined; @@ -96,6 +99,7 @@ export const setupTrialContext = ({ freeTrial: customerProduct.free_trial, // can be undefined... trialEndsAt: customerProduct.trial_ends_at ?? null, appliesToBilling: false, + cardRequired: true, }; } diff --git a/server/src/internal/billing/v2/types/autumnBillingPlan.ts b/server/src/internal/billing/v2/types/autumnBillingPlan.ts index 8852b0b48..041282ac5 100644 --- a/server/src/internal/billing/v2/types/autumnBillingPlan.ts +++ b/server/src/internal/billing/v2/types/autumnBillingPlan.ts @@ -21,20 +21,23 @@ export const UpdateCustomerEntitlementSchema = z.object({ export const AutumnBillingPlanSchema = z.object({ insertCustomerProducts: z.array(FullCusProductSchema), - updateCustomerProduct: z.object({ - customerProduct: FullCusProductSchema, - updates: z.object({ - options: z.array(FeatureOptionsSchema).optional(), - status: z.enum(CusProductStatus).optional(), - }), - }), + updateCustomerProduct: z + .object({ + customerProduct: FullCusProductSchema, + updates: z.object({ + options: z.array(FeatureOptionsSchema).optional(), + status: z.enum(CusProductStatus).optional(), + }), + }) + .optional(), + deleteCustomerProduct: FullCusProductSchema.optional(), // Scheduled product to delete (e.g., when updating while canceling) - customPrices: z.array(PriceSchema), // Custom prices to insert - customEntitlements: z.array(EntitlementSchema), // Custom entitlements to insert + customPrices: z.array(PriceSchema).optional(), // Custom prices to insert + customEntitlements: z.array(EntitlementSchema).optional(), // Custom entitlements to insert customFreeTrial: FreeTrialSchema.optional(), // Custom free trial to insert - lineItems: z.array(LineItemSchema), + lineItems: z.array(LineItemSchema).optional(), updateCustomerEntitlements: z .array(UpdateCustomerEntitlementSchema) diff --git a/server/src/internal/billing/v2/updateSubscription/compute/finalizeUpdateSubscriptionPlan.ts b/server/src/internal/billing/v2/updateSubscription/compute/finalizeUpdateSubscriptionPlan.ts index e719398d3..dbc8ac8cb 100644 --- a/server/src/internal/billing/v2/updateSubscription/compute/finalizeUpdateSubscriptionPlan.ts +++ b/server/src/internal/billing/v2/updateSubscription/compute/finalizeUpdateSubscriptionPlan.ts @@ -21,7 +21,7 @@ export const finalizeUpdateSubscriptionPlan = ({ // Filter line items based on trial state transitions plan.lineItems = filterLineItemsForTrialTransition({ ctx, - lineItems: plan.lineItems, + lineItems: plan.lineItems ?? [], billingContext, }); diff --git a/server/src/internal/billing/v2/updateSubscription/handleUpdateSubscription.ts b/server/src/internal/billing/v2/updateSubscription/handleUpdateSubscription.ts index 92bc816db..b965d7de6 100644 --- a/server/src/internal/billing/v2/updateSubscription/handleUpdateSubscription.ts +++ b/server/src/internal/billing/v2/updateSubscription/handleUpdateSubscription.ts @@ -69,6 +69,7 @@ export const handleUpdateSubscription = createRoute({ stripe: stripeBillingPlan, }, }); + logStripeBillingResult({ ctx, result: billingResult.stripe }); const response = billingResultToResponse({ diff --git a/server/src/internal/billing/v2/updateSubscription/logs/logUpdateSubscriptionPlan.ts b/server/src/internal/billing/v2/updateSubscription/logs/logUpdateSubscriptionPlan.ts index e3ebfe67d..fc251f96c 100644 --- a/server/src/internal/billing/v2/updateSubscription/logs/logUpdateSubscriptionPlan.ts +++ b/server/src/internal/billing/v2/updateSubscription/logs/logUpdateSubscriptionPlan.ts @@ -17,20 +17,24 @@ export const logUpdateSubscriptionPlan = ({ billingContext, }); - const formatCustomerProduct = (cp: { product_id: string; product: { name: string } }) => - `${cp.product.name} (${cp.product_id})`; + const formatCustomerProduct = (cp: { + product_id: string; + product: { name: string }; + }) => `${cp.product.name} (${cp.product_id})`; addToExtraLogs({ ctx, extras: { autumnBillingPlan: { - insertCustomerProducts: plan.insertCustomerProducts - .map(formatCustomerProduct) - .join(", ") || "none", + insertCustomerProducts: + plan.insertCustomerProducts.map(formatCustomerProduct).join(", ") || + "none", updateCustomerProduct: plan.updateCustomerProduct ? { - product: formatCustomerProduct(plan.updateCustomerProduct.customerProduct), + product: formatCustomerProduct( + plan.updateCustomerProduct.customerProduct, + ), updates: plan.updateCustomerProduct.updates, } : "none", @@ -41,16 +45,18 @@ export const logUpdateSubscriptionPlan = ({ trialTransition: `${isTrialing ? "trialing" : "not trialing"} -> ${willBeTrialing ? "will trial" : "no trial"}`, - updateCustomerEntitlements: plan.updateCustomerEntitlements - ?.map( - (update) => - `${update.customerEntitlement.feature_id}: ${update.balanceChange > 0 ? "+" : ""}${update.balanceChange}`, - ) - .join(", ") || "none", + updateCustomerEntitlements: + plan.updateCustomerEntitlements + ?.map( + (update) => + `${update.customerEntitlement.feature_id}: ${update.balanceChange > 0 ? "+" : ""}${update.balanceChange}`, + ) + .join(", ") || "none", - lineItems: plan.lineItems.map( - (item) => `${item.description}: ${item.finalAmount}`, - ), + lineItems: + plan.lineItems?.map( + (item) => `${item.description}: ${item.finalAmount}`, + ) ?? "none", }, }, }); diff --git a/server/src/internal/billing/v2/utils/billingPlanToPreviewResponse.ts b/server/src/internal/billing/v2/utils/billingPlanToPreviewResponse.ts index 07f32ebc1..73e0ef29a 100644 --- a/server/src/internal/billing/v2/utils/billingPlanToPreviewResponse.ts +++ b/server/src/internal/billing/v2/utils/billingPlanToPreviewResponse.ts @@ -21,13 +21,14 @@ export const billingPlanToPreviewResponse = ({ const { fullCustomer } = billingContext; const autumnBillingPlan = billingPlan.autumn; + const planLineItems = autumnBillingPlan.lineItems ?? []; - - const previewImmediateLineItems = autumnBillingPlan.lineItems.filter((line) => line.chargeImmediately).map((line) => ({ - description: line.description, - amount: line.finalAmount, - })); - + const previewImmediateLineItems = planLineItems + .filter((line) => line.chargeImmediately) + .map((line) => ({ + description: line.description, + amount: line.finalAmount, + })); const total = new Decimal( sumValues(previewImmediateLineItems.map((line) => line.amount)), diff --git a/server/src/internal/billing/v2/utils/handleExistingUsages/applyExistingUsages.ts b/server/src/internal/billing/v2/utils/handleExistingUsages/applyExistingUsages.ts index 3b4bc0a7c..2a94ed9fb 100644 --- a/server/src/internal/billing/v2/utils/handleExistingUsages/applyExistingUsages.ts +++ b/server/src/internal/billing/v2/utils/handleExistingUsages/applyExistingUsages.ts @@ -32,7 +32,6 @@ const logExistingUsages = ({ }; }, ); - ctx.logger.debug(`[applyExistingUsages] existing usages:`, existinUsagesLogs); addToExtraLogs({ ctx, diff --git a/server/src/internal/billing/v2/utils/initFullCustomerProduct/initFullCustomerProduct.ts b/server/src/internal/billing/v2/utils/initFullCustomerProduct/initFullCustomerProduct.ts index 9f690fcfb..26d4b7c6b 100644 --- a/server/src/internal/billing/v2/utils/initFullCustomerProduct/initFullCustomerProduct.ts +++ b/server/src/internal/billing/v2/utils/initFullCustomerProduct/initFullCustomerProduct.ts @@ -13,7 +13,6 @@ import { initCustomerPrice } from "./initCustomerPrice"; import { initCustomerProduct } from "./initCustomerProduct"; export const initFullCustomerProduct = ({ - // biome-ignore lint/correctness/noUnusedFunctionParameters: will need it at some point ctx, initContext, initOptions, diff --git a/server/src/internal/billing/v2/utils/initFullCustomerProduct/initFullCustomerProductFromProduct.ts b/server/src/internal/billing/v2/utils/initFullCustomerProduct/initFullCustomerProductFromProduct.ts new file mode 100644 index 000000000..baf992444 --- /dev/null +++ b/server/src/internal/billing/v2/utils/initFullCustomerProduct/initFullCustomerProductFromProduct.ts @@ -0,0 +1,76 @@ +import { + addDuration, + type FeatureOptions, + FreeTrialDuration, + type FullCusProduct, + type FullCustomer, + type FullProduct, + findFeatureByIdOrInternalId, + type InitFullCustomerProductContext, + isPrepaidPrice, +} from "@autumn/shared"; +import type { AutumnContext } from "@/honoUtils/HonoEnv"; +import { initFullCustomerProduct } from "./initFullCustomerProduct"; + +export const initFullCustomerProductFromProduct = ({ + ctx, + initContext, +}: { + ctx: AutumnContext; + initContext: { + fullCustomer: FullCustomer; + fullProduct: FullProduct; + currentEpochMs: number; + featureQuantities?: FeatureOptions[]; + }; +}): FullCusProduct => { + const { fullCustomer, fullProduct, currentEpochMs } = initContext; + + const freeTrial = fullProduct.free_trial ?? null; + let trialEndsAt: number | undefined; + // const now = initOptions?.currentEpochMs ?? Date.now(); + + if (freeTrial) { + trialEndsAt = addDuration({ + now: currentEpochMs, + durationType: freeTrial.duration ?? FreeTrialDuration.Day, + durationLength: freeTrial.length ?? 1, + }); + } + + const featureQuantities: FeatureOptions[] = []; + const prices = fullProduct.prices; + + for (const price of prices) { + if (isPrepaidPrice(price)) { + const feature = findFeatureByIdOrInternalId({ + features: ctx.features, + featureIdOrInternalId: price.config.feature_id, + }); + + if (!feature) continue; + + featureQuantities.push({ + feature_id: feature.id, + internal_feature_id: feature.internal_id, + quantity: 0, + }); + } + } + + const newInitContext: InitFullCustomerProductContext = { + fullCustomer, + fullProduct, + featureQuantities, + resetCycleAnchor: "now", + freeTrial, + trialEndsAt, + now: currentEpochMs, + }; + + return initFullCustomerProduct({ + ctx, + initContext: newInitContext, + initOptions: {}, + }); +}; diff --git a/server/src/internal/customers/CusService.ts b/server/src/internal/customers/CusService.ts index 3d7a0bf59..39e031f93 100644 --- a/server/src/internal/customers/CusService.ts +++ b/server/src/internal/customers/CusService.ts @@ -9,10 +9,19 @@ import { ErrCode, type FullCusProduct, type FullCustomer, + InternalError, type Organization, RecaseError, } from "@autumn/shared"; -import { and, eq, ilike, or, sql, type Table } from "drizzle-orm"; +import { + and, + eq, + getTableColumns, + ilike, + or, + sql, + type Table, +} from "drizzle-orm"; import type { DrizzleCli } from "@/db/initDrizzle.js"; import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; import { withSpan } from "../analytics/tracer/spanUtils.js"; @@ -207,10 +216,7 @@ export class CusService { } static async insert({ db, data }: { db: DrizzleCli; data: Customer }) { - const results = await db - .insert(customers) - .values(data as any) - .returning(); + const results = await db.insert(customers).values(data).returning(); // If insert succeeded, return the new customer if (results && results.length > 0) { @@ -234,6 +240,117 @@ export class CusService { return null; } + /** + * Upsert a customer using the email + null ID constraint. + * + * If a customer with the same (org_id, env, email) exists with id = NULL, + * update that row with the new customer data (including the new ID). + * Otherwise, insert a new row. + * + * Returns { customer, wasUpdate } to indicate if an existing row was updated. + */ + static async upsert({ + db, + data, + }: { + db: DrizzleCli; + data: Customer; + }): Promise<{ customer: Customer; wasUpdate: boolean }> { + const columns = getTableColumns(customers); + const columnNames = Object.values(columns).map((col) => col.name); + + // Build values array, handling jsonb columns specially + const values = Object.entries(columns).map(([key, col]) => { + const value = data[key as keyof Customer]; + // jsonb columns need JSON.stringify + if (col.dataType === "json") { + const jsonValue = + value !== undefined && value !== null + ? JSON.stringify(value) + : col.default !== undefined + ? "{}" + : "null"; + return sql`${jsonValue}::jsonb`; + } + return sql`${value ?? null}`; + }); + + // Build UPDATE SET clauses + const excludeFromUpdate = ["internal_id", "org_id", "env", "created_at"]; + + // For ON CONFLICT - uses EXCLUDED.column_name + const updateColsExcluded = Object.values(columns) + .filter((col) => !excludeFromUpdate.includes(col.name)) + .map((col) => sql.raw(`${col.name} = EXCLUDED.${col.name}`)); + + // For CTE claim UPDATE - uses direct values + const updateColsValues = Object.entries(columns) + .filter(([_, col]) => !excludeFromUpdate.includes(col.name)) + .map(([key, col]) => { + const value = data[key as keyof Customer]; + if (col.dataType === "json") { + const jsonValue = + value !== undefined && value !== null + ? JSON.stringify(value) + : col.default !== undefined + ? "{}" + : "null"; + return sql`${sql.raw(col.name)} = ${jsonValue}::jsonb`; + } + return sql`${sql.raw(col.name)} = ${value ?? null}`; + }); + + // Conflict target differs based on incoming id: + // - id != NULL: Use cus_id_constraint (handles ID collisions) + // - id = NULL: Use partial index (handles email collisions for null-id rows) + const conflictClause = + data.id !== null + ? sql`ON CONFLICT ON CONSTRAINT cus_id_constraint` + : sql`ON CONFLICT (org_id, env, lower(email)) WHERE id IS NULL AND email IS NOT NULL AND email != ''`; + + // CTE handles all cases: + // - Case A (id=NULL → id=NULL same email): claim updates existing + // - Case B (id=x → id=x): insert_new conflicts on cus_id_constraint, upserts + // - Case C (id=NULL → id=y same email): claim updates existing, sets new id + const results = await db.execute< + Customer & { xmax: string; was_claim: boolean } + >(sql` + WITH claim AS ( + UPDATE customers + SET ${sql.join(updateColsValues, sql`, `)} + WHERE org_id = ${data.org_id} + AND env = ${data.env} + AND id IS NULL + AND email IS NOT NULL + AND lower(email) = lower(${data.email ?? ""}) + RETURNING *, xmax::text, true as was_claim + ), + insert_new AS ( + INSERT INTO customers (${sql.raw(columnNames.join(", "))}) + SELECT ${sql.join(values, sql`, `)} + WHERE NOT EXISTS (SELECT 1 FROM claim) + ${conflictClause} + DO UPDATE SET ${sql.join(updateColsExcluded, sql`, `)} + RETURNING *, xmax::text, false as was_claim + ) + SELECT * FROM claim + UNION ALL + SELECT * FROM insert_new + `); + + if (results && results.length > 0) { + const { xmax, was_claim, ...customer } = results[0]; + // wasUpdate if: claimed existing row OR xmax indicates update + const wasUpdate = was_claim || xmax !== "0"; + return { customer: customer as Customer, wasUpdate }; + } + + throw new InternalError({ + message: + "[CusService.upsert] Failed to insert customer, no results returned", + }); + } + static async update({ db, idOrInternalId, diff --git a/server/src/internal/customers/actions/createWithDefaults/createCustomerContext.ts b/server/src/internal/customers/actions/createWithDefaults/createCustomerContext.ts new file mode 100644 index 000000000..85af1de34 --- /dev/null +++ b/server/src/internal/customers/actions/createWithDefaults/createCustomerContext.ts @@ -0,0 +1,12 @@ +import type { FullCustomer, FullProduct } from "@autumn/shared"; +import type { TrialContext } from "@/internal/billing/v2/billingContext"; + +export interface CreateCustomerContextFree { + fullCustomer: FullCustomer; + fullProducts: FullProduct[]; + currentEpochMs: number; + trialContext?: TrialContext; + hasPaidProducts: boolean; +} + +export type CreateCustomerContext = CreateCustomerContextFree; diff --git a/server/src/internal/customers/actions/createWithDefaults/createCustomerWithDefaults.ts b/server/src/internal/customers/actions/createWithDefaults/createCustomerWithDefaults.ts new file mode 100644 index 000000000..e8a8b75db --- /dev/null +++ b/server/src/internal/customers/actions/createWithDefaults/createCustomerWithDefaults.ts @@ -0,0 +1,47 @@ +import type { + CreateCustomerInternalOptions, + CustomerData, + FullCustomer, +} from "@autumn/shared"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import { executeCreateCustomerPlan } from "./execute/executeCreateCustomerPlan.js"; +import { logCreateCustomerContext } from "./logs/logCreateCustomer.js"; +import { setupCreateCustomer } from "./setup/setupCreateCustomer.js"; + +/** + * Create a customer and attach default products. + * + * Flow: + * 1. Setup: init customer, fetch defaults, setup Stripe (if paid) + * 2. Compute: build customer products, autumn plan, stripe plan + * 3. Execute: transaction + Stripe + build final customer + * + * Idempotency: + * - Email exists with id=NULL, new request has id=NULL: Returns existing customer + * - Email exists with id=NULL, new request has ID: Claims the row (sets ID) + * - Customer ID already exists: Returns existing customer + */ +export const createCustomerWithDefaults = async ({ + ctx, + customerId, + customerData, + internalOptions, +}: { + ctx: AutumnContext; + customerId: string | null; + customerData?: CustomerData; + internalOptions?: CreateCustomerInternalOptions; +}): Promise => { + // 1. Setup + const context = await setupCreateCustomer({ + ctx, + customerId, + customerData, + internalOptions, + }); + + logCreateCustomerContext({ ctx, context }); + + // 3. Execute + return executeCreateCustomerPlan({ ctx, context }); +}; diff --git a/server/src/internal/customers/actions/createWithDefaults/execute/executeAutumnCreateCustomerPlan.ts b/server/src/internal/customers/actions/createWithDefaults/execute/executeAutumnCreateCustomerPlan.ts new file mode 100644 index 000000000..7a81cd86a --- /dev/null +++ b/server/src/internal/customers/actions/createWithDefaults/execute/executeAutumnCreateCustomerPlan.ts @@ -0,0 +1,85 @@ +import { + CustomerAlreadyExistsError, + type FullCustomer, + tryCatch, +} from "@autumn/shared"; +import { isUniqueConstraintError } from "@/db/dbUtils.js"; +import type { DrizzleCli } from "@/db/initDrizzle.js"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import { executeAutumnBillingPlan } from "@/internal/billing/v2/execute/executeAutumnBillingPlan.js"; +import type { AutumnBillingPlan } from "@/internal/billing/v2/types/billingPlan.js"; +import { CusService } from "../../../CusService.js"; + +export type ExecuteAutumnResult = + | { type: "created"; fullCustomer: FullCustomer } + | { type: "existing"; fullCustomer: FullCustomer }; + +/** + * Execute the Autumn (DB) part of customer creation. + * + * 1. Transaction: upsert customer + insert customer products + * 2. Handle race conditions by returning existing customer + * + * Returns discriminated union to indicate if customer was created or already existed. + */ +export const executeAutumnCreateCustomerPlan = async ({ + ctx, + fullCustomer, + autumnBillingPlan, +}: { + ctx: AutumnContext; + fullCustomer: FullCustomer; + autumnBillingPlan: AutumnBillingPlan; +}): Promise => { + const { db, logger } = ctx; + + const { data: newFullCustomer, error } = await tryCatch( + db.transaction(async (tx) => { + const txDb = tx as unknown as DrizzleCli; + + const upsertResult = await CusService.upsert({ + db: txDb, + data: fullCustomer, + }); + + if (upsertResult.wasUpdate) { + fullCustomer.internal_id = upsertResult.customer.internal_id; + throw new CustomerAlreadyExistsError({ + customerId: fullCustomer.id || fullCustomer.internal_id, + }); + } + + await executeAutumnBillingPlan({ + ctx: { ...ctx, db: txDb }, + autumnBillingPlan, + }); + + return { + ...fullCustomer, + customer_products: autumnBillingPlan.insertCustomerProducts, + }; + }), + ); + + // Handle existing customer (from upsert or race condition) + if (error) { + if ( + error instanceof CustomerAlreadyExistsError || + isUniqueConstraintError(error) + ) { + logger.info( + `Customer already exists, returning existing: ${fullCustomer.id || fullCustomer.email}`, + ); + const existingCustomer = await CusService.getFull({ + db, + idOrInternalId: fullCustomer.id || fullCustomer.internal_id, + orgId: ctx.org.id, + env: ctx.env, + }); + return { type: "existing", fullCustomer: existingCustomer }; + } + throw error; + } + + return { type: "created", fullCustomer: newFullCustomer }; +}; diff --git a/server/src/internal/customers/actions/createWithDefaults/execute/executeCreateCustomerPlan.ts b/server/src/internal/customers/actions/createWithDefaults/execute/executeCreateCustomerPlan.ts new file mode 100644 index 000000000..06b23fcaa --- /dev/null +++ b/server/src/internal/customers/actions/createWithDefaults/execute/executeCreateCustomerPlan.ts @@ -0,0 +1,68 @@ +import type { FullCustomer } from "@autumn/shared"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import type { AutumnBillingPlan } from "@/internal/billing/v2/types/autumnBillingPlan.js"; +import { initFullCustomerProductFromProduct } from "@/internal/billing/v2/utils/initFullCustomerProduct/initFullCustomerProductFromProduct.js"; +import type { CreateCustomerContext } from "../createCustomerContext.js"; +import { logAutumnPlanResult } from "../logs/logCreateCustomer.js"; +import { executeAutumnCreateCustomerPlan } from "./executeAutumnCreateCustomerPlan.js"; +import { executeStripeCreateCustomerPlan } from "./executeStripeCreateCustomerPlan.js"; + +/** + * Execute step for creating a customer with defaults. + * + * Flow: + * 1. Compute: build customer products + autumn billing plan + * 2. Execute Autumn: DB transaction (upsert customer + insert products) + * 3. Execute Stripe: create Stripe customer + subscription (if paid products) + * + * Handles idempotency: + * - If customer already exists (wasUpdate or race condition), returns existing customer + * - Otherwise creates new customer with products and Stripe subscription + */ +export const executeCreateCustomerPlan = async ({ + ctx, + context, +}: { + ctx: AutumnContext; + context: CreateCustomerContext; +}): Promise => { + const { fullCustomer, fullProducts, currentEpochMs } = context; + + // 1. Compute autumn billing plan (no Stripe customer needed yet) + const insertCustomerProducts = fullProducts.map((product) => + initFullCustomerProductFromProduct({ + ctx, + initContext: { + fullCustomer, + fullProduct: product, + currentEpochMs, + }, + }), + ); + + const autumnBillingPlan: AutumnBillingPlan = { + insertCustomerProducts, + }; + + // 2. Execute Autumn (DB) - handles race conditions + const autumnResult = await executeAutumnCreateCustomerPlan({ + ctx, + fullCustomer, + autumnBillingPlan, + }); + + logAutumnPlanResult({ ctx, result: autumnResult }); + + // If customer already existed, return it (no Stripe work needed) + if (autumnResult.type === "existing") return autumnResult.fullCustomer; + if (!context.hasPaidProducts) return autumnResult.fullCustomer; + + // must pass in old full customer to ensure subscription plan is correctly determined... + await executeStripeCreateCustomerPlan({ + ctx, + context, + autumnBillingPlan, + }); + + return context.fullCustomer; +}; diff --git a/server/src/internal/customers/actions/createWithDefaults/execute/executeStripeCreateCustomerPlan.ts b/server/src/internal/customers/actions/createWithDefaults/execute/executeStripeCreateCustomerPlan.ts new file mode 100644 index 000000000..57b48e11d --- /dev/null +++ b/server/src/internal/customers/actions/createWithDefaults/execute/executeStripeCreateCustomerPlan.ts @@ -0,0 +1,92 @@ +import type Stripe from "stripe"; +import { getOrCreateStripeCustomer } from "@/external/stripe/customers/index.js"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import { evaluateStripeBillingPlan } from "@/internal/billing/v2/providers/stripe/actionBuilders/evaluateStripeBillingPlan.js"; +import { executeStripeBillingPlan } from "@/internal/billing/v2/providers/stripe/execute/executeStripeBillingPlan.js"; +import { logStripeBillingPlan } from "@/internal/billing/v2/providers/stripe/logs/logStripeBillingPlan.js"; +import type { AutumnBillingPlan } from "@/internal/billing/v2/types/billingPlan.js"; +import { CusProductService } from "@/internal/customers/cusProducts/CusProductService.js"; +import { initSubscriptionFromStripe } from "@/internal/subscriptions/utils/initSubscriptionFromStripe.js"; +import type { CreateCustomerContext } from "../createCustomerContext.js"; + +/** + * Execute the Stripe part of customer creation. + * + * 1. Get or create Stripe customer (idempotent based on internal_id) + * 2. Evaluate Stripe billing plan + * 3. Execute Stripe billing plan (create subscription) + * + * Must be called AFTER executeAutumnCreateCustomerPlan succeeds to ensure + * we have the correct internal_id for idempotency. + */ +export const executeStripeCreateCustomerPlan = async ({ + ctx, + context, + autumnBillingPlan, +}: { + ctx: AutumnContext; + context: CreateCustomerContext; + autumnBillingPlan: AutumnBillingPlan; +}): Promise => { + const { fullCustomer, fullProducts, trialContext } = context; + + // 1. Get or create Stripe customer (idempotent) + const stripeCustomer = await getOrCreateStripeCustomer({ + ctx, + customer: fullCustomer, + }); + + // 2. Build billing context with Stripe customer + const billingContext = { + fullCustomer, + stripeCustomer, + fullProducts, + featureQuantities: [], + currentEpochMs: Date.now(), + billingCycleAnchorMs: "now" as const, + resetCycleAnchorMs: "now" as const, + trialContext, + customPrices: [], + customEnts: [], + isCustom: false, + }; + + // 3. Evaluate Stripe billing plan + const stripeBillingPlan = await evaluateStripeBillingPlan({ + ctx, + billingContext, + autumnBillingPlan, + }); + + logStripeBillingPlan({ + ctx, + stripeBillingPlan, + billingContext, + }); + + // 4. Execute Stripe billing plan + const { stripeSubscription } = await executeStripeBillingPlan({ + ctx, + billingPlan: { autumn: autumnBillingPlan, stripe: stripeBillingPlan }, + billingContext, + }); + + if (stripeSubscription) { + for (const cusProduct of autumnBillingPlan.insertCustomerProducts) { + await CusProductService.update({ + db: ctx.db, + cusProductId: cusProduct.id, + updates: { subscription_ids: cusProduct.subscription_ids }, + }); + } + + context.fullCustomer.subscriptions = [ + initSubscriptionFromStripe({ ctx, stripeSubscription }), + ]; + + context.fullCustomer.customer_products = + autumnBillingPlan.insertCustomerProducts; + } + + return stripeSubscription; +}; diff --git a/server/src/internal/customers/actions/createWithDefaults/logs/logCreateCustomer.ts b/server/src/internal/customers/actions/createWithDefaults/logs/logCreateCustomer.ts new file mode 100644 index 000000000..cdb406665 --- /dev/null +++ b/server/src/internal/customers/actions/createWithDefaults/logs/logCreateCustomer.ts @@ -0,0 +1,51 @@ +import { formatMs } from "@autumn/shared"; +import type { AutumnContext } from "@/honoUtils/HonoEnv"; +import { addToExtraLogs } from "@/utils/logging/addToExtraLogs"; +import type { CreateCustomerContext } from "../createCustomerContext"; +import type { ExecuteAutumnResult } from "../execute/executeAutumnCreateCustomerPlan"; + +export const logCreateCustomerContext = ({ + ctx, + context, +}: { + ctx: AutumnContext; + context: CreateCustomerContext; +}) => { + const { fullCustomer, fullProducts, currentEpochMs, trialContext, hasPaidProducts } = context; + + addToExtraLogs({ + ctx, + extras: { + createCustomerContext: { + customer: `${fullCustomer.id ?? fullCustomer.internal_id} | ${fullCustomer.email ?? "no email"}`, + products: fullProducts.map((p) => `${p.id} (v${p.version})`).join(", ") || "none", + hasPaidProducts, + currentEpochMs: formatMs(currentEpochMs), + trialContext: trialContext + ? `ends at: ${formatMs(trialContext.trialEndsAt)}, free trial: ${trialContext.freeTrial?.id ?? "none"}, card required: ${trialContext.cardRequired}` + : "none", + }, + }, + }); +}; + +export const logAutumnPlanResult = ({ + ctx, + result, +}: { + ctx: AutumnContext; + result: ExecuteAutumnResult; +}) => { + addToExtraLogs({ + ctx, + extras: { + autumnPlanResult: { + type: result.type, + internalId: result.fullCustomer.internal_id, + customerProducts: result.fullCustomer.customer_products?.map( + (cp) => `${cp.product_id} (status: ${cp.status})`, + ) ?? [], + }, + }, + }); +}; diff --git a/server/src/internal/customers/actions/createWithDefaults/setup/setupCreateCustomer.ts b/server/src/internal/customers/actions/createWithDefaults/setup/setupCreateCustomer.ts new file mode 100644 index 000000000..7914c7d3c --- /dev/null +++ b/server/src/internal/customers/actions/createWithDefaults/setup/setupCreateCustomer.ts @@ -0,0 +1,61 @@ +import { + type CreateCustomerInternalOptions, + type CustomerData, + RecaseError, +} from "@autumn/shared"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import { initFullCustomer } from "../../../cusUtils/initCustomer.js"; +import type { CreateCustomerContext } from "../createCustomerContext.js"; +import { setupCreateCustomerTrialContext } from "./setupCreateCustomerTrialContext.js"; +import { setupDefaultProductsContext } from "./setupDefaultProductsContext.js"; + +/** + * Setup step for creating a customer with defaults. + * + * 1. Init full customer + * 2. Fetch default products + * 3. Setup Stripe customer + trial context IF paid products exist + */ +export const setupCreateCustomer = async ({ + ctx, + customerId, + customerData, + internalOptions, +}: { + ctx: AutumnContext; + customerId: string | null; + customerData?: CustomerData; + internalOptions?: CreateCustomerInternalOptions; +}): Promise => { + // 1. Validate + if (!customerId && !customerData?.email) { + throw new RecaseError({ + message: "Either customer ID or email is required", + }); + } + + // 2. Init full customer + const fullCustomer = initFullCustomer({ ctx, customerId, customerData }); + + // 3. Fetch default products + const { fullProducts, paidProducts, hasPaidProducts } = + await setupDefaultProductsContext({ ctx, internalOptions }); + + const currentEpochMs = Date.now(); + + // 6. Setup trial context + const trialContext = setupCreateCustomerTrialContext({ + paidProducts, + currentEpochMs, + }); + + // 7. Return paid context (extends BillingContext) + return { + fullCustomer, + fullProducts, + + currentEpochMs, + trialContext, + hasPaidProducts, + }; +}; diff --git a/server/src/internal/customers/actions/createWithDefaults/setup/setupCreateCustomerTrialContext.ts b/server/src/internal/customers/actions/createWithDefaults/setup/setupCreateCustomerTrialContext.ts new file mode 100644 index 000000000..3c2eafbe4 --- /dev/null +++ b/server/src/internal/customers/actions/createWithDefaults/setup/setupCreateCustomerTrialContext.ts @@ -0,0 +1,37 @@ +import { + addDuration, + FreeTrialDuration, + type FullProduct, + InternalError, +} from "@autumn/shared"; +import type { TrialContext } from "@/internal/billing/v2/billingContext.js"; + +export const setupCreateCustomerTrialContext = ({ + paidProducts, + currentEpochMs, +}: { + paidProducts: FullProduct[]; + currentEpochMs: number; +}): TrialContext | undefined => { + if (!paidProducts?.length) return undefined; + + const trial = paidProducts.find((p) => p.is_default && Boolean(p.free_trial)); + + if (!trial) { + throw new InternalError({ + message: + "[setupCreateCustomerTrialContext] No trial product found for paid defaults", + }); + } + + return { + freeTrial: trial.free_trial, + trialEndsAt: addDuration({ + now: currentEpochMs, + durationType: trial.free_trial?.duration ?? FreeTrialDuration.Day, + durationLength: trial.free_trial?.length, + }), + appliesToBilling: true, + cardRequired: false, + }; +}; diff --git a/server/src/internal/customers/actions/createWithDefaults/setup/setupDefaultProductsContext.ts b/server/src/internal/customers/actions/createWithDefaults/setup/setupDefaultProductsContext.ts new file mode 100644 index 000000000..536fd89d2 --- /dev/null +++ b/server/src/internal/customers/actions/createWithDefaults/setup/setupDefaultProductsContext.ts @@ -0,0 +1,71 @@ +import { + type CreateCustomerInternalOptions, + type FullProduct, + isFreeProduct, +} from "@autumn/shared"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import { ProductService } from "@/internal/products/ProductService.js"; +import { isDefaultTrialFullProduct } from "@/internal/products/productUtils/classifyProduct.js"; + +export interface DefaultProductsContext { + fullProducts: FullProduct[]; + paidProducts: FullProduct[]; + hasPaidProducts: boolean; +} + +export const setupDefaultProductsContext = async ({ + ctx, + internalOptions, +}: { + ctx: AutumnContext; + internalOptions?: CreateCustomerInternalOptions; +}): Promise => { + const { db, org, env } = ctx; + + const defaultProds = await ProductService.listDefault({ + db, + orgId: org.id, + env, + }); + + const groups = new Set(defaultProds.map((p) => p.group)); + const groupToDefaultProd: Record = {}; + + for (const group of groups) { + const defaultProdsInGroup = defaultProds.filter((p) => p.group === group); + + if (defaultProdsInGroup.length === 0) continue; + + defaultProdsInGroup.sort((a, _b) => { + if (isDefaultTrialFullProduct({ product: a })) return -1; + if (!isFreeProduct({ prices: a.prices })) return -1; + return 0; + }); + + groupToDefaultProd[group] = defaultProdsInGroup[0]; + } + + let selectedProducts: FullProduct[] = []; + + if (internalOptions?.default_group) { + const defaultProd = groupToDefaultProd[internalOptions.default_group]; + selectedProducts = defaultProd ? [defaultProd] : []; + } else if (internalOptions?.disable_defaults) { + selectedProducts = []; + } else { + selectedProducts = Object.values(groupToDefaultProd); + } + + // Get paid products (for billing context) + const paidProducts = selectedProducts.filter( + (p) => + !isFreeProduct({ prices: p.prices }) && + isDefaultTrialFullProduct({ product: p }), + ); + + return { + fullProducts: selectedProducts, + paidProducts, + hasPaidProducts: paidProducts.length > 0, + }; +}; diff --git a/server/src/internal/customers/actions/index.ts b/server/src/internal/customers/actions/index.ts new file mode 100644 index 000000000..4860ff9aa --- /dev/null +++ b/server/src/internal/customers/actions/index.ts @@ -0,0 +1,5 @@ +import { createCustomerWithDefaults } from "./createWithDefaults/createCustomerWithDefaults.js"; + +export const customerActions = { + createWithDefaults: createCustomerWithDefaults, +} as const; diff --git a/server/src/internal/customers/attach/attachRouter.ts b/server/src/internal/customers/attach/attachRouter.ts index dbf1afa88..545837929 100644 --- a/server/src/internal/customers/attach/attachRouter.ts +++ b/server/src/internal/customers/attach/attachRouter.ts @@ -6,10 +6,8 @@ import { } from "@autumn/shared"; import { createStripeCli } from "@/external/connect/createStripeCli.js"; import { createStripePriceIFNotExist } from "@/external/stripe/createStripePrice/createStripePrice.js"; -import { - createStripeCusIfNotExists, - getCusPaymentMethod, -} from "@/external/stripe/stripeCusUtils.js"; +import { getOrCreateStripeCustomer } from "@/external/stripe/customers"; +import { getCusPaymentMethod } from "@/external/stripe/stripeCusUtils.js"; import { CusService } from "@/internal/customers/CusService.js"; import type { AttachParams } from "@/internal/customers/cusProducts/AttachParams.js"; import { @@ -158,12 +156,9 @@ export const checkStripeConnections = async ({ if (createCus) { batchProductUpdates.push( - createStripeCusIfNotExists({ - db, - org, - env, + getOrCreateStripeCustomer({ + ctx, customer, - logger, }), ); } diff --git a/server/src/internal/customers/attach/attachUtils/attachParams/attachParamsUtils/getStripeCusData.ts b/server/src/internal/customers/attach/attachUtils/attachParams/attachParamsUtils/getStripeCusData.ts index ccd66d7ca..2680d3022 100644 --- a/server/src/internal/customers/attach/attachUtils/attachParams/attachParamsUtils/getStripeCusData.ts +++ b/server/src/internal/customers/attach/attachUtils/attachParams/attachParamsUtils/getStripeCusData.ts @@ -1,11 +1,9 @@ import type { Customer } from "@autumn/shared"; import type { AutumnContext } from "@server/honoUtils/HonoEnv"; import type Stripe from "stripe"; -import { - createStripeCusIfNotExists, - listCusPaymentMethods, -} from "@/external/stripe/stripeCusUtils.js"; -import { createStripeCli } from "../../../../../../external/connect/createStripeCli"; +import { createStripeCli } from "@/external/connect/createStripeCli.js"; +import { getOrCreateStripeCustomer } from "@/external/stripe/customers"; +import { listCusPaymentMethods } from "@/external/stripe/stripeCusUtils.js"; export const getStripeCusData = async ({ ctx, @@ -20,15 +18,12 @@ export const getStripeCusData = async ({ return { stripeCus: undefined, paymentMethod: undefined, now: undefined }; } - const { logger, db, org, env } = ctx; + const { org, env } = ctx; const stripeCli = createStripeCli({ org, env }); - const stripeCus = await createStripeCusIfNotExists({ - db, - org, - env, + const stripeCus = await getOrCreateStripeCustomer({ + ctx, customer, - logger, }); const testClock = stripeCus.test_clock as Stripe.TestHelpers.TestClock | null; diff --git a/server/src/internal/customers/cusProducts/cusProductUtils.ts b/server/src/internal/customers/cusProducts/cusProductUtils.ts index dbfbc368b..276166581 100644 --- a/server/src/internal/customers/cusProducts/cusProductUtils.ts +++ b/server/src/internal/customers/cusProducts/cusProductUtils.ts @@ -80,12 +80,9 @@ export const activateDefaultProduct = async ({ // Initialize Stripe customer and products if needed (for paid non-trial products) if (!defaultIsFree) { await initStripeCusAndProducts({ - db, - org, - env, + ctx, customer: fullCus, products: [defaultProd], - logger, }); } diff --git a/server/src/internal/customers/cusUtils/apiCusCacheUtils/getCachedApiCustomer.ts b/server/src/internal/customers/cusUtils/apiCusCacheUtils/getCachedApiCustomer.ts deleted file mode 100644 index e403b984d..000000000 --- a/server/src/internal/customers/cusUtils/apiCusCacheUtils/getCachedApiCustomer.ts +++ /dev/null @@ -1,179 +0,0 @@ -import { - ApiBaseEntitySchema, - type ApiCustomer, - ApiCustomerSchema, - type AppEnv, - addToExpand, - CusExpand, - type CustomerLegacyData, - CustomerLegacyDataSchema, - filterOutEntitiesFromFullCustomer, - filterPlanAndFeatureExpand, -} from "@autumn/shared"; -import { CACHE_CUSTOMER_VERSION } from "@lua/cacheConfig.js"; -import type { Redis } from "ioredis"; -import { redis } from "../../../../external/redis/initRedis.js"; -import type { AutumnContext } from "../../../../honoUtils/HonoEnv.js"; -import { tryRedisRead } from "../../../../utils/cacheUtils/cacheUtils.js"; -import { normalizeFromSchema } from "../../../../utils/cacheUtils/normalizeFromSchema.js"; -import { CusService } from "../../CusService.js"; -import { getApiCustomerBase } from "../apiCusUtils/getApiCustomerBase.js"; -import { setCachedApiCustomer } from "./setCachedApiCustomer.js"; - -export const buildCachedApiCustomerKey = ({ - customerId, - orgId, - env, -}: { - customerId: string; - orgId: string; - env: string; -}) => { - return `{${orgId}}:${env}:customer:${CACHE_CUSTOMER_VERSION}:${customerId}`; -}; - -/** - * Get ApiCustomer from Redis cache - * If not found, fetch from DB, cache it, and return - * If skipCache is true, always fetch from DB - */ -export const getCachedApiCustomer = async ({ - ctx, - customerId, - skipEntityMerge = false, - source, - redisInstance, - cacheVersion, -}: { - ctx: AutumnContext; - customerId: string; - skipEntityMerge?: boolean; // If true, returns only customer's own features (no entity merging) - source?: string; - redisInstance?: Redis; // Optional redis instance for cross-region sync - cacheVersion?: string; // Optional cache version override (for sync) -}): Promise<{ apiCustomer: ApiCustomer; legacyData: CustomerLegacyData }> => { - const { org, env, db, skipCache } = ctx; - const redisClient = redisInstance || redis; - - const getExpandedApiCustomer = async () => { - // await redis.del( - // buildCachedApiCustomerKey({ customerId, orgId: org.id, env }), - // ); - // Try to get from cache using Lua script (unless skipCache is true) - if (!skipCache) { - const cachedResult = await tryRedisRead(() => - (redisClient as typeof redis).getCustomer( - cacheVersion || "", - org.id, - env, - customerId, - skipEntityMerge ? "true" : "false", - ), - ); - - if (cachedResult) { - const parsed = JSON.parse(cachedResult as string) as ApiCustomer & { - legacyData: CustomerLegacyData; - }; - - // Extract legacyData before normalization (not in schema) - const { legacyData, ...rest } = parsed; - - // Normalize the data based on schema - const normalized = normalizeFromSchema({ - schema: ApiCustomerSchema, - data: rest, - }); - - const normalizedLegacyData = normalizeFromSchema({ - schema: CustomerLegacyDataSchema, - data: legacyData, - }); - - return { - // ← This returns from getCachedApiCustomer! - apiCustomer: ApiCustomerSchema.parse(normalized), - legacyData: normalizedLegacyData, - }; - } - } - - // Cache miss or skipCache - fetch from DB - // Record timestamp before Postgres fetch for stale write prevention - - const fetchTimeMs = Date.now(); - - // Include invoices: - const fullCus = await CusService.getFull({ - db, - idOrInternalId: customerId, - orgId: org.id, - env: env as AppEnv, - withEntities: true, - withSubs: true, - expand: [CusExpand.Invoices], - }); - - // Build ApiCustomer (base only, no expand) to return - const ctxWithExpand = addToExpand({ - ctx, - add: [CusExpand.Invoices, CusExpand.Entities], - }); - const { apiCustomer, legacyData } = await getApiCustomerBase({ - ctx: ctxWithExpand, - fullCus, - withAutumnId: true, - }); - - try { - apiCustomer.entities = fullCus.entities.map((e) => - ApiBaseEntitySchema.parse(e), - ); - } catch (error) { - ctx.logger.error( - `[getCachedApiCustomer] Error parsing entities: ${error}`, - ); - } - - const { apiCustomer: masterApiCustomer } = await getApiCustomerBase({ - ctx, - fullCus: filterOutEntitiesFromFullCustomer({ fullCus }), - withAutumnId: true, - }); - - // Store customer and entity caches (only if not skipping cache) - if (!skipCache) { - await setCachedApiCustomer({ - ctx, - fullCus, - customerId, - source, - fetchTimeMs, - }); - } - - return { - apiCustomer: ApiCustomerSchema.parse( - skipEntityMerge ? masterApiCustomer : apiCustomer, - ), - legacyData, - }; - }; - - const { apiCustomer, legacyData } = await getExpandedApiCustomer(); - - const filteredApiCustomer = filterPlanAndFeatureExpand({ - expand: ctx.expand, - target: apiCustomer, - }); - - return { - apiCustomer: { - ...filteredApiCustomer, - rewards: filteredApiCustomer.rewards ?? undefined, - referrals: filteredApiCustomer.referrals ?? undefined, - payment_method: filteredApiCustomer.payment_method ?? undefined, - }, - legacyData, - }; -}; diff --git a/server/src/internal/customers/cusUtils/apiCusCacheUtils/setCachedApiCusDetails.ts b/server/src/internal/customers/cusUtils/apiCusCacheUtils/setCachedApiCusDetails.ts deleted file mode 100644 index 6ee214dc8..000000000 --- a/server/src/internal/customers/cusUtils/apiCusCacheUtils/setCachedApiCusDetails.ts +++ /dev/null @@ -1,53 +0,0 @@ -import type { ApiCustomer, FullCustomer } from "@autumn/shared"; -import { redis } from "../../../../external/redis/initRedis.js"; -import type { AutumnContext } from "../../../../honoUtils/HonoEnv.js"; -import { tryRedisWrite } from "../../../../utils/cacheUtils/cacheUtils.js"; - -/** - * Update customer detail fields in Redis cache if key exists - * Returns true if cache was updated, false if cache key doesn't exist - */ -export const setCachedApiCusDetails = async ({ - ctx, - customer, - updates, -}: { - ctx: AutumnContext; - customer: FullCustomer | ApiCustomer; - updates: { - name?: string; - email?: string; - fingerprint?: string; - metadata?: Record; - }; -}): Promise => { - const { org, env, logger } = ctx; - - const customerId = customer.id || (customer as FullCustomer).internal_id; - - let wasUpdated = false; - - // Try to update cache - await tryRedisWrite(async () => { - const result = await redis.setCustomerDetails( - JSON.stringify(updates), - org.id, - env, - customerId, - ); - - if (result === "OK") { - wasUpdated = true; - logger.info( - `Updated customer details cache for customer ${customerId}`, - updates, - ); - } else { - logger.info( - `Customer cache not found for customer ${customerId}, skipping cache update`, - ); - } - }); - - return wasUpdated; -}; diff --git a/server/src/internal/customers/cusUtils/createNewCustomer.ts b/server/src/internal/customers/cusUtils/createNewCustomer.ts index e1df9b1e5..18c27b07d 100644 --- a/server/src/internal/customers/cusUtils/createNewCustomer.ts +++ b/server/src/internal/customers/cusUtils/createNewCustomer.ts @@ -62,11 +62,13 @@ export const createNewCustomer = async ({ customer, nextResetAt, createDefaultProducts = true, + defaultGroup, }: { ctx: AutumnContext; customer: CreateCustomer; nextResetAt?: number; createDefaultProducts?: boolean; + defaultGroup?: string; }) => { const { db, org, env, logger } = ctx; @@ -135,23 +137,23 @@ export const createNewCustomer = async ({ defaultProds, }); - for (const group in groupToDefaultProd) { + // Filter to only the specified group if defaultGroup is provided + const groupsToProcess = defaultGroup + ? Object.keys(groupToDefaultProd).filter((g) => g === defaultGroup) + : Object.keys(groupToDefaultProd); + + for (const group of groupsToProcess) { const defaultProd = groupToDefaultProd[group]; logger.debug( `[createNewCustomer] Creating default product with ID: ${defaultProd?.id}`, ); if (!isFreeProduct(defaultProd.prices)) { - let stripeCli = null; - - stripeCli = createStripeCli({ org, env }); + const stripeCli = createStripeCli({ org, env }); await initStripeCusAndProducts({ - db, - org, - env, + ctx, customer: newCustomer, products: nonFreeProds, - logger, }); const optionsList = defaultProd.prices diff --git a/server/src/internal/customers/cusUtils/fullCustomerCacheUtils/getOrCreateCachedFullCustomer.ts b/server/src/internal/customers/cusUtils/fullCustomerCacheUtils/getOrCreateCachedFullCustomer.ts index 5a8a71abe..8ce49916b 100644 --- a/server/src/internal/customers/cusUtils/fullCustomerCacheUtils/getOrCreateCachedFullCustomer.ts +++ b/server/src/internal/customers/cusUtils/fullCustomerCacheUtils/getOrCreateCachedFullCustomer.ts @@ -1,15 +1,16 @@ import { type AppEnv, type CheckParams, + type CreateCustomerInternalOptions, CusExpand, type Entity, type FullCustomer, type TrackParams, } from "@autumn/shared"; import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import { customerActions } from "@/internal/customers/actions/index.js"; import { autoCreateEntity } from "@/internal/entities/handlers/handleCreateEntity/autoCreateEntity.js"; import { CusService } from "../../CusService.js"; -import { handleCreateCustomer } from "../../handlers/handleCreateCustomer.js"; import { updateCustomerDetails } from "../cusUtils.js"; import { deleteCachedFullCustomer } from "./deleteCachedFullCustomer.js"; import { getCachedFullCustomer } from "./getCachedFullCustomer.js"; @@ -22,12 +23,14 @@ export const getOrCreateCachedFullCustomer = async ({ ctx, params, source, + internalOptions, }: { ctx: AutumnContext; params: Omit & { customer_id: string | null; }; source?: string; + internalOptions?: CreateCustomerInternalOptions; }): Promise => { const { org, env, db, skipCache, logger } = ctx; const { @@ -73,50 +76,12 @@ export const getOrCreateCachedFullCustomer = async ({ // 3. Create if not found if (!fullCustomer) { - try { - fullCustomer = (await handleCreateCustomer({ - ctx, - cusData: { - id: customerId, - name: customerData?.name, - email: customerData?.email, - fingerprint: customerData?.fingerprint, - metadata: customerData?.metadata || {}, - stripe_id: customerData?.stripe_id, - }, - createDefaultProducts: customerData?.disable_default !== true, - })) as FullCustomer; - - fullCustomer = await CusService.getFull({ - db, - idOrInternalId: customerId || fullCustomer.internal_id, - orgId: org.id, - env: env as AppEnv, - withEntities: true, - withSubs: true, - entityId, - expand: [CusExpand.Invoices], - }); - // biome-ignore lint/suspicious/noExplicitAny: it's fine. - } catch (error: any) { - if (error?.code === "23505" && customerId) { - ctx.logger.debug( - `[getOrCreateCachedFullCustomer] insert customer duplicate key error`, - ); - fullCustomer = await CusService.getFull({ - db, - idOrInternalId: customerId, - orgId: org.id, - env: env as AppEnv, - withEntities: true, - withSubs: true, - entityId, - expand: [CusExpand.Invoices], - }); - } else { - throw error; - } - } + fullCustomer = await customerActions.createWithDefaults({ + ctx, + customerId, + customerData, + internalOptions, + }); } // 4. Update customer details if provided diff --git a/server/src/internal/customers/cusUtils/getOrCreateApiCustomer.ts b/server/src/internal/customers/cusUtils/getOrCreateApiCustomer.ts deleted file mode 100644 index 300a2804b..000000000 --- a/server/src/internal/customers/cusUtils/getOrCreateApiCustomer.ts +++ /dev/null @@ -1,217 +0,0 @@ -import { - ApiBaseEntitySchema, - type ApiCustomer, - type Customer, - type CustomerData, - type CustomerLegacyData, - CustomerNotFoundError, - type EntityData, -} from "@autumn/shared"; -import type { AutumnContext } from "../../../honoUtils/HonoEnv.js"; -import { autoCreateEntity } from "../../entities/handlers/handleCreateEntity/autoCreateEntity.js"; -import { CusService } from "../CusService.js"; -import { handleCreateCustomer } from "../handlers/handleCreateCustomer.js"; -import { getApiCustomerBase } from "./apiCusUtils/getApiCustomerBase.js"; -import { updateCustomerDetails } from "./cusUtils.js"; -import { deleteCachedFullCustomer } from "./fullCustomerCacheUtils/deleteCachedFullCustomer.js"; -import { getOrSetCachedFullCustomer } from "./fullCustomerCacheUtils/getOrSetCachedFullCustomer.js"; - -export const getOrCreateApiCustomer = async ({ - ctx, - customerId, - customerData, - entityId, - entityData, -}: { - ctx: AutumnContext; - customerId: string | null; - customerData?: CustomerData; - entityId?: string; - entityData?: EntityData; -}): Promise<{ apiCustomer: ApiCustomer; legacyData?: CustomerLegacyData }> => { - // ======================================== - // Phase 1: Get or Create Customer - // ======================================== - let apiCustomer: ApiCustomer; - let legacyData: CustomerLegacyData | undefined; - - // Path A: customerId is NULL - always create new customer - if (!customerId) { - const newCustomer = await handleCreateCustomer({ - ctx, - cusData: { - id: null, - name: customerData?.name, - email: customerData?.email, - fingerprint: customerData?.fingerprint, - metadata: customerData?.metadata || {}, - stripe_id: customerData?.stripe_id, - }, - createDefaultProducts: customerData?.disable_default !== true, - }); - - const fullCus = await getOrSetCachedFullCustomer({ - ctx, - customerId: newCustomer.id || newCustomer.internal_id, - source: "getOrCreateApiCustomer", - }); - const res = await getApiCustomerBase({ ctx, fullCus }); - apiCustomer = res.apiCustomer; - legacyData = res.legacyData; - } - // Path B: customerId is NOT NULL - try to get, create if not found - else { - // Try to get existing customer from cache/DB - let apiCustomerOrUndefined: ApiCustomer | undefined; - - try { - const fullCus = await getOrSetCachedFullCustomer({ - ctx, - customerId, - source: "getOrCreateApiCustomer", - }); - const res = await getApiCustomerBase({ ctx, fullCus }); - apiCustomerOrUndefined = res.apiCustomer; - legacyData = res.legacyData; - } catch (_error) { - if (_error instanceof CustomerNotFoundError) { - // Customer doesn't exist yet - } else { - throw _error; - } - } - - // If customer not found, create it - if (!apiCustomerOrUndefined) { - // Race conditions are now handled gracefully at the DB level with ON CONFLICT - let newCustomer: Customer | undefined; - try { - newCustomer = await handleCreateCustomer({ - ctx, - cusData: { - id: customerId, - name: customerData?.name, - email: customerData?.email, - fingerprint: customerData?.fingerprint, - metadata: customerData?.metadata || {}, - stripe_id: customerData?.stripe_id, - }, - createDefaultProducts: customerData?.disable_default !== true, - }); - - newCustomer = await CusService.getFull({ - db: ctx.db, - idOrInternalId: customerId, - orgId: ctx.org.id, - env: ctx.env, - }); - } catch (error) { - if ( - error instanceof Error && - error.message.includes( - "duplicate key value violates unique constraint", - ) && - customerId - ) { - ctx.logger.info( - `[getOrCreateApiCustomer] Customer ${customerId} already exists, fetching existing customer`, - ); - - const existingCustomer = await CusService.getFull({ - db: ctx.db, - idOrInternalId: customerId, - orgId: ctx.org.id, - env: ctx.env, - }); - - // Race condition, don't set in cache - ctx.skipCache = true; - - if (existingCustomer) newCustomer = existingCustomer; - } else { - throw error; - } - } - - const fullCus = await getOrSetCachedFullCustomer({ - ctx, - customerId: newCustomer?.id || newCustomer?.internal_id || "", - source: "getOrCreateApiCustomer", - }); - const res = await getApiCustomerBase({ ctx, fullCus }); - apiCustomerOrUndefined = res.apiCustomer; - legacyData = res.legacyData; - } - - apiCustomer = apiCustomerOrUndefined; - } - - // ======================================== - // Phase 2: Update Customer Details - // ======================================== - const updated = await updateCustomerDetails({ - ctx, - customer: apiCustomer, - customerData, - }); - - // If updated, invalidate cache and get the latest ApiCustomer - if (updated) { - await deleteCachedFullCustomer({ - customerId: apiCustomer.id || "", - ctx, - source: "getOrCreateApiCustomer", - }); - const fullCus = await getOrSetCachedFullCustomer({ - ctx, - customerId: apiCustomer.id || "", - source: "getOrCreateApiCustomer", - }); - const res = await getApiCustomerBase({ ctx, fullCus }); - apiCustomer = res.apiCustomer; - legacyData = res.legacyData; - } - - // AUTO CREATE ENTITY - - if ( - entityId && - customerId && - !apiCustomer.entities?.some((e) => e.id === entityId) - ) { - ctx.logger.info( - `[getOrCreateApiCustomer] Auto creating entity ${entityId} for customer ${customerId}`, - ); - - const newEntity = await autoCreateEntity({ - ctx, - customerId: customerId || "", - entityId, - entityData: { - name: entityData?.name, - feature_id: entityData?.feature_id || "", - }, - }); - - await deleteCachedFullCustomer({ - customerId, - ctx, - source: "getOrCreateApiCustomer", - }); - - // Warm up the cache - await getOrSetCachedFullCustomer({ - ctx, - customerId, - source: "getOrCreateApiCustomer", - }); - - const apiEntity = ApiBaseEntitySchema.parse(newEntity); - apiCustomer.entities = [...(apiCustomer.entities || []), apiEntity]; - } - - return { - apiCustomer, - legacyData, - }; -}; diff --git a/server/src/internal/customers/cusUtils/getOrCreateCustomer.ts b/server/src/internal/customers/cusUtils/getOrCreateCustomer.ts index 4725832f2..deea6bc35 100644 --- a/server/src/internal/customers/cusUtils/getOrCreateCustomer.ts +++ b/server/src/internal/customers/cusUtils/getOrCreateCustomer.ts @@ -6,10 +6,10 @@ import { type EntityData, type FullCustomer, } from "@autumn/shared"; +import { customerActions } from "@/internal/customers/actions/index.js"; import { autoCreateEntity } from "@/internal/entities/handlers/handleCreateEntity/autoCreateEntity.js"; import type { AutumnContext } from "../../../honoUtils/HonoEnv.js"; import { CusService } from "../CusService.js"; -import { handleCreateCustomer } from "../handlers/handleCreateCustomer.js"; import { updateCustomerDetails } from "./cusUtils.js"; export const getOrCreateCustomer = async ({ @@ -65,49 +65,54 @@ export const getOrCreateCustomer = async ({ } if (!customer) { - try { - customer = (await handleCreateCustomer({ - ctx, - cusData: { - id: customerId, - name: customerData?.name, - email: customerData?.email, - fingerprint: customerData?.fingerprint, - metadata: customerData?.metadata || {}, - stripe_id: customerData?.stripe_id, - // default_product_id: customerData?.default_product_id, - }, - createDefaultProducts: customerData?.disable_default !== true, - })) as FullCustomer; + customer = await customerActions.createWithDefaults({ + ctx, + customerId, + customerData, + }); + // try { + // customer = (await handleCreateCustomer({ + // ctx, + // cusData: { + // id: customerId, + // name: customerData?.name, + // email: customerData?.email, + // fingerprint: customerData?.fingerprint, + // metadata: customerData?.metadata || {}, + // stripe_id: customerData?.stripe_id, + // // default_product_id: customerData?.default_product_id, + // }, + // createDefaultProducts: customerData?.disable_default !== true, + // })) as FullCustomer; - customer = await CusService.getFull({ - db, - idOrInternalId: customerId || customer.internal_id, - orgId: org.id, - env, - inStatuses, - withEntities, - entityId, - expand, - withSubs: true, - }); - } catch (error: any) { - if (error?.code === "23505" && customerId) { - customer = await CusService.getFull({ - db, - idOrInternalId: customerId, - orgId: org.id, - env, - inStatuses, - withEntities, - entityId, - expand, - withSubs: true, - }); - } else { - throw error; - } - } + // customer = await CusService.getFull({ + // db, + // idOrInternalId: customerId || customer.internal_id, + // orgId: org.id, + // env, + // inStatuses, + // withEntities, + // entityId, + // expand, + // withSubs: true, + // }); + // } catch (error: any) { + // if (error?.code === "23505" && customerId) { + // customer = await CusService.getFull({ + // db, + // idOrInternalId: customerId, + // orgId: org.id, + // env, + // inStatuses, + // withEntities, + // entityId, + // expand, + // withSubs: true, + // }); + // } else { + // throw error; + // } + // } } if (!skipUpdate) { diff --git a/server/src/internal/customers/cusUtils/initCustomer.ts b/server/src/internal/customers/cusUtils/initCustomer.ts new file mode 100644 index 000000000..15db03418 --- /dev/null +++ b/server/src/internal/customers/cusUtils/initCustomer.ts @@ -0,0 +1,49 @@ +import type { Customer, CustomerData, FullCustomer } from "@autumn/shared"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import { generateId } from "@/utils/genUtils.js"; + +/** + * Build a Customer object ready for insertion. + */ +export const initCustomer = ({ + ctx, + customerId, + customerData, +}: { + ctx: AutumnContext; + customerId: string | null; + customerData?: CustomerData; +}): Customer => { + const { org, env } = ctx; + const internalId = generateId("cus"); + + return { + internal_id: internalId, + id: customerId, + org_id: org.id, + env, + name: customerData?.name || "", + email: customerData?.email || "", + fingerprint: customerData?.fingerprint, + metadata: customerData?.metadata ?? {}, + created_at: Date.now(), + processor: null, + }; +}; + +export const initFullCustomer = ({ + ctx, + customerId, + customerData, +}: { + ctx: AutumnContext; + customerId: string | null; + customerData?: CustomerData; +}): FullCustomer => { + return { + ...initCustomer({ ctx, customerId, customerData }), + customer_products: [], + entities: [], + extra_customer_entitlements: [], + }; +}; diff --git a/server/src/internal/customers/handlers/handleAddCouponToCusV2.ts b/server/src/internal/customers/handlers/handleAddCouponToCusV2.ts index 8437703f7..fb56e9c4c 100644 --- a/server/src/internal/customers/handlers/handleAddCouponToCusV2.ts +++ b/server/src/internal/customers/handlers/handleAddCouponToCusV2.ts @@ -4,7 +4,7 @@ import { RecaseError, } from "@autumn/shared"; import { createStripeCli } from "@/external/connect/createStripeCli.js"; -import { createStripeCusIfNotExists } from "@/external/stripe/stripeCusUtils.js"; +import { getOrCreateStripeCustomer } from "@/external/stripe/customers"; import { createRoute } from "@/honoMiddlewares/routeHandler.js"; import { RewardService } from "../../rewards/RewardService.js"; import { CusService } from "../CusService.js"; @@ -47,12 +47,9 @@ export const handleAddCouponToCusV2 = createRoute({ legacyVersion: true, }); - await createStripeCusIfNotExists({ - db, - org, - env, + await getOrCreateStripeCustomer({ + ctx, customer, - logger, }); // Attach coupon to customer diff --git a/server/src/internal/customers/handlers/handleBillingPortal/createBillingPortalSession.ts b/server/src/internal/customers/handlers/handleBillingPortal/createBillingPortalSession.ts index cbe0dc716..95f16b785 100644 --- a/server/src/internal/customers/handlers/handleBillingPortal/createBillingPortalSession.ts +++ b/server/src/internal/customers/handlers/handleBillingPortal/createBillingPortalSession.ts @@ -1,6 +1,6 @@ import { type Customer, InternalError } from "@autumn/shared"; import { createStripeCli } from "../../../../external/connect/createStripeCli"; -import { createStripeCusIfNotExists } from "../../../../external/stripe/stripeCusUtils"; +import { getOrCreateStripeCustomer } from "../../../../external/stripe/customers"; import type { AutumnContext } from "../../../../honoUtils/HonoEnv"; import { toSuccessUrl } from "../../../orgs/orgUtils/convertOrgUtils"; import { createDefaultPortalConfig } from "./createDefaultPortalConfig"; @@ -20,27 +20,12 @@ export const createBillingPortalSession = async ({ const stripeCli = createStripeCli({ org, env }); // Determine the Stripe customer ID to use - let stripeCustomerId: string; + const stripeCustomer = await getOrCreateStripeCustomer({ + ctx, + customer, + }); - if (!customer.processor?.id) { - const newCus = await createStripeCusIfNotExists({ - db, - org, - env, - customer, - logger, - }); - - if (!newCus) { - throw new InternalError({ - message: `Failed to create Stripe customer`, - }); - } - - stripeCustomerId = newCus.id; - } else { - stripeCustomerId = customer.processor.id; - } + const stripeCustomerId = stripeCustomer.id; // 1. Try to create billing portal session diff --git a/server/src/internal/customers/handlers/handleBillingPortal/handleGetBillingPortal.ts b/server/src/internal/customers/handlers/handleBillingPortal/handleGetBillingPortal.ts index a08b16429..f42be8e1f 100644 --- a/server/src/internal/customers/handlers/handleBillingPortal/handleGetBillingPortal.ts +++ b/server/src/internal/customers/handlers/handleBillingPortal/handleGetBillingPortal.ts @@ -1,7 +1,8 @@ import { ErrCode, RecaseError } from "@autumn/shared"; import { StatusCodes } from "http-status-codes"; import { createStripeCli } from "../../../../external/connect/createStripeCli"; -import { createStripeCusIfNotExists } from "../../../../external/stripe/stripeCusUtils"; +import { getOrCreateStripeCustomer } from "../../../../external/stripe/customers"; +import type { AutumnContext } from "../../../../honoUtils/HonoEnv"; import { routeHandler } from "../../../../utils/routerUtils"; import { OrgService } from "../../../orgs/OrgService"; import { toSuccessUrl } from "../../../orgs/orgUtils/convertOrgUtils"; @@ -35,24 +36,12 @@ export const handleGetBillingPortal = (req: any, res: any) => const stripeCli = createStripeCli({ org, env: req.env }); - let stripeCusId: string = customer.processor?.id; - if (!customer.processor?.id) { - const newCus = await createStripeCusIfNotExists({ - db: req.db, - org, - env: req.env, - customer, - logger: req.logger, - }); + const stripeCustomer = await getOrCreateStripeCustomer({ + ctx: req as AutumnContext, + customer, + }); - if (!newCus) { - throw new RecaseError({ - message: `Failed to create Stripe customer`, - }); - } - - stripeCusId = newCus.id; - } + const stripeCusId = stripeCustomer.id; const portal = await stripeCli.billingPortal.sessions.create({ customer: stripeCusId, diff --git a/server/src/internal/customers/handlers/handleCreateCustomer.ts b/server/src/internal/customers/handlers/handleCreateCustomer.ts index e79fa1b71..5cd62aa01 100644 --- a/server/src/internal/customers/handlers/handleCreateCustomer.ts +++ b/server/src/internal/customers/handlers/handleCreateCustomer.ts @@ -1,15 +1,13 @@ import { - type AppEnv, type CreateCustomer, CreateCustomerSchema, type Customer, ErrCode, type FullProduct, - type Organization, } from "@autumn/shared"; import { StatusCodes } from "http-status-codes"; -import type { DrizzleCli } from "@/db/initDrizzle.js"; -import { createStripeCusIfNotExists } from "@/external/stripe/stripeCusUtils.js"; +import type { Stripe } from "stripe"; +import { getOrCreateStripeCustomer } from "@/external/stripe/customers"; import { CusService } from "@/internal/customers/CusService.js"; import { initProductInStripe } from "@/internal/products/productUtils.js"; import RecaseError from "@/utils/errorUtils.js"; @@ -18,27 +16,20 @@ import type { AutumnContext } from "../../../honoUtils/HonoEnv.js"; import { createNewCustomer } from "../cusUtils/createNewCustomer.js"; export const initStripeCusAndProducts = async ({ - db, - org, - env, + ctx, customer, products, - logger, }: { - db: DrizzleCli; - org: Organization; - env: AppEnv; + ctx: AutumnContext; customer: Customer; products: FullProduct[]; - logger: any; }) => { - const batchInit: any[] = [ - createStripeCusIfNotExists({ - db, - org, - env, + const { db, org, env, logger } = ctx; + + const batchInit: Promise[] = [ + getOrCreateStripeCustomer({ + ctx, customer, - logger, }), ]; @@ -61,10 +52,12 @@ const handleIdIsNull = async ({ ctx, newCus, createDefaultProducts, + defaultGroup, }: { ctx: AutumnContext; newCus: CreateCustomer; createDefaultProducts?: boolean; + defaultGroup?: string; }) => { const { db, org, env, logger } = ctx; @@ -106,6 +99,7 @@ const handleIdIsNull = async ({ ctx, customer: newCus, createDefaultProducts, + defaultGroup, }); return createdCustomer; @@ -116,10 +110,12 @@ export const handleCreateCustomerWithId = async ({ ctx, newCus, createDefaultProducts = true, + defaultGroup, }: { ctx: AutumnContext; newCus: CreateCustomer; createDefaultProducts?: boolean; + defaultGroup?: string; }) => { const { db, org, env, logger } = ctx; @@ -175,6 +171,7 @@ export const handleCreateCustomerWithId = async ({ ctx, customer: newCus, createDefaultProducts, + defaultGroup, }); }; @@ -182,10 +179,12 @@ export const handleCreateCustomer = async ({ ctx, cusData, createDefaultProducts = true, + defaultGroup, }: { ctx: AutumnContext; cusData: CreateCustomer; createDefaultProducts?: boolean; + defaultGroup?: string; }) => { const newCus = CreateCustomerSchema.parse(cusData); @@ -197,12 +196,14 @@ export const handleCreateCustomer = async ({ ctx, newCus, createDefaultProducts, + defaultGroup, }); } else { createdCustomer = await handleCreateCustomerWithId({ ctx, newCus, createDefaultProducts, + defaultGroup, }); } diff --git a/server/src/internal/customers/handlers/handlePostCustomerV2.ts b/server/src/internal/customers/handlers/handlePostCustomerV2.ts index 363b34b23..391e3a6cd 100644 --- a/server/src/internal/customers/handlers/handlePostCustomerV2.ts +++ b/server/src/internal/customers/handlers/handlePostCustomerV2.ts @@ -5,13 +5,12 @@ import { CreateCustomerParamsSchema, CreateCustomerQuerySchema, CusExpand, + CustomerDataSchema, V0_2_InvoicesAlwaysExpanded, } from "@autumn/shared"; import { createRoute } from "@/honoMiddlewares/routeHandler.js"; import { getApiCustomer } from "../cusUtils/apiCusUtils/getApiCustomer.js"; import { getOrCreateCachedFullCustomer } from "../cusUtils/fullCustomerCacheUtils/getOrCreateCachedFullCustomer.js"; -import { getOrSetCachedFullCustomer } from "../cusUtils/fullCustomerCacheUtils/getOrSetCachedFullCustomer.js"; -import { handleCreateCustomer } from "./handleCreateCustomer.js"; export const handlePostCustomer = createRoute({ versionedQuery: { @@ -39,20 +38,18 @@ export const handlePostCustomer = createRoute({ const start = Date.now(); + const customerData = CustomerDataSchema.parse(createCusParams); + const fullCustomer = await getOrCreateCachedFullCustomer({ ctx, params: { customer_id: createCusParams.id, - customer_data: { - name: createCusParams.name, - email: createCusParams.email, - fingerprint: createCusParams.fingerprint, - metadata: createCusParams.metadata || {}, - stripe_id: createCusParams.stripe_id, - disable_default: createCusParams.disable_default, - }, + customer_data: customerData, + entity_id: createCusParams.entity_id, + entity_data: createCusParams.entity_data, }, source: "handlePostCustomer", + internalOptions: createCusParams.internal_options, }); const apiCustomer = await getApiCustomer({ diff --git a/server/src/internal/events/EventsAggregationService.ts b/server/src/internal/events/EventsAggregationService.ts index 1127b9cf0..7030d0ec5 100644 --- a/server/src/internal/events/EventsAggregationService.ts +++ b/server/src/internal/events/EventsAggregationService.ts @@ -305,7 +305,7 @@ export class EventsAggregationService { }>; const distinctCount = Number(distinctJson.data[0]?.distinct_count ?? 0); - if (distinctCount > 30) { + if (distinctCount > 100) { throw new RecaseError({ message: `Too many distinct group values (${distinctCount}). Maximum allowed is 30. Please choose a property with fewer unique values.`, code: ErrCode.InvalidInputs, diff --git a/server/src/internal/products/handlers/handleVersionProduct.ts b/server/src/internal/products/handlers/handleVersionProduct.ts index 22918efbb..4907999a8 100644 --- a/server/src/internal/products/handlers/handleVersionProduct.ts +++ b/server/src/internal/products/handlers/handleVersionProduct.ts @@ -133,7 +133,7 @@ export const handleVersionProductV2 = async ({ } as FullProduct, org, env, - logger: console, + logger: ctx.logger, }); await addTaskToQueue({ diff --git a/server/src/internal/products/productUtils.ts b/server/src/internal/products/productUtils.ts index 90c6fde3b..8812c796e 100644 --- a/server/src/internal/products/productUtils.ts +++ b/server/src/internal/products/productUtils.ts @@ -32,6 +32,7 @@ import RecaseError from "@server/utils/errorUtils.js"; import { generateId, notNullish } from "@server/utils/genUtils.js"; import { Decimal } from "decimal.js"; import { Stripe } from "stripe"; +import type { Logger } from "@/external/logtail/logtailUtils.js"; import type { AttachParams, InsertCusProductParams, @@ -533,9 +534,9 @@ export const initProductInStripe = async ({ db: DrizzleCli; org: Organization; env: AppEnv; - logger: any; + logger: Logger; product: FullProduct; -}) => { +}): Promise => { if (!isStripeConnected({ org, env })) return; await checkStripeProductExists({ diff --git a/server/src/internal/rewards/referralUtils.ts b/server/src/internal/rewards/referralUtils.ts index dce2c38a5..a647c0be1 100644 --- a/server/src/internal/rewards/referralUtils.ts +++ b/server/src/internal/rewards/referralUtils.ts @@ -8,7 +8,7 @@ import { import { StatusCodes } from "http-status-codes"; import type Stripe from "stripe"; import { createStripeCli } from "@/external/connect/createStripeCli.js"; -import { createStripeCusIfNotExists } from "@/external/stripe/stripeCusUtils.js"; +import { getOrCreateStripeCustomer } from "@/external/stripe/customers"; import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; import RecaseError from "@/utils/errorUtils.js"; import { CusService } from "../customers/CusService.js"; @@ -102,12 +102,9 @@ export const triggerRedemption = async ({ legacyVersion: true, }); - await createStripeCusIfNotExists({ - db, - customer: customer, - org, - env, - logger, + await getOrCreateStripeCustomer({ + ctx, + customer, }); const stripeCusId = customer.processor.id; diff --git a/server/src/internal/rewards/referralUtils/triggerFreePaidProduct.ts b/server/src/internal/rewards/referralUtils/triggerFreePaidProduct.ts index 6b9972baf..529a71b41 100644 --- a/server/src/internal/rewards/referralUtils/triggerFreePaidProduct.ts +++ b/server/src/internal/rewards/referralUtils/triggerFreePaidProduct.ts @@ -12,7 +12,7 @@ import { import { StatusCodes } from "http-status-codes"; import type Stripe from "stripe"; import { createStripeCli } from "@/external/connect/createStripeCli.js"; -import { createStripeCusIfNotExists } from "@/external/stripe/stripeCusUtils.js"; +import { getOrCreateStripeCustomer } from "@/external/stripe/customers"; import { handleAddProduct } from "@/internal/customers/attach/attachFunctions/addProductFlow/handleAddProduct.js"; import { rewardProgramToAttachParams } from "@/internal/customers/attach/attachUtils/attachParams/convertToParams.js"; import { getCustomerSub } from "@/internal/customers/attach/attachUtils/convertAttachParams.js"; @@ -138,12 +138,9 @@ export const triggerFreePaidProduct = async ({ } } else { // Create stripe customer if not exists - await createStripeCusIfNotExists({ - db, + await getOrCreateStripeCustomer({ + ctx, customer: fullCus, - org, - env, - logger, }); await handleAddProduct({ diff --git a/server/src/internal/subscriptions/subUtils.ts b/server/src/internal/subscriptions/utils/initSubscription.ts similarity index 86% rename from server/src/internal/subscriptions/subUtils.ts rename to server/src/internal/subscriptions/utils/initSubscription.ts index 7b801f851..13e49d86b 100644 --- a/server/src/internal/subscriptions/subUtils.ts +++ b/server/src/internal/subscriptions/utils/initSubscription.ts @@ -1,10 +1,9 @@ import type { AppEnv, Subscription } from "@autumn/shared"; import { generateId } from "@/utils/genUtils.js"; -export const constructSub = ({ +export const initSubscription = ({ stripeId, stripeScheduleId, - usageFeatures, orgId, env, currentPeriodStart, @@ -12,7 +11,6 @@ export const constructSub = ({ }: { stripeId?: string; stripeScheduleId?: string; - usageFeatures: string[]; orgId: string; env: AppEnv; currentPeriodStart?: number; @@ -23,7 +21,7 @@ export const constructSub = ({ stripe_id: stripeId || null, stripe_schedule_id: stripeScheduleId || null, created_at: Date.now(), - usage_features: usageFeatures, + usage_features: [], org_id: orgId, env: env, current_period_start: currentPeriodStart || null, diff --git a/server/src/internal/subscriptions/utils/initSubscriptionFromStripe.ts b/server/src/internal/subscriptions/utils/initSubscriptionFromStripe.ts new file mode 100644 index 000000000..1b648999a --- /dev/null +++ b/server/src/internal/subscriptions/utils/initSubscriptionFromStripe.ts @@ -0,0 +1,37 @@ +import type { Subscription } from "@shared/models/subModels/subModels"; +import type Stripe from "stripe"; +import { + getEarliestPeriodStart, + getLatestPeriodEnd, +} from "@/external/stripe/stripeSubUtils/convertSubUtils"; +import type { AutumnContext } from "@/honoUtils/HonoEnv"; +import { initSubscription } from "@/internal/subscriptions/utils/initSubscription"; + +/** + * Creates a Subscription object from a Stripe subscription. + */ +export const initSubscriptionFromStripe = ({ + ctx, + stripeSubscription, +}: { + ctx: AutumnContext; + stripeSubscription: Stripe.Subscription; +}): Subscription => { + const { org, env } = ctx; + + const subscriptionScheduleId = + typeof stripeSubscription.schedule === "string" + ? stripeSubscription.schedule + : typeof stripeSubscription.schedule === "object" + ? stripeSubscription.schedule?.id + : undefined; + + return initSubscription({ + stripeId: stripeSubscription.id, + stripeScheduleId: subscriptionScheduleId, + orgId: org.id, + env, + currentPeriodStart: getEarliestPeriodStart({ sub: stripeSubscription }), + currentPeriodEnd: getLatestPeriodEnd({ sub: stripeSubscription }), + }); +}; diff --git a/server/src/routers/apiRouter.ts b/server/src/routers/apiRouter.ts index cf0c92028..3260d12ab 100644 --- a/server/src/routers/apiRouter.ts +++ b/server/src/routers/apiRouter.ts @@ -38,9 +38,9 @@ export const apiRouter = new Hono(); apiRouter.use("*", secretKeyMiddleware); apiRouter.use("*", orgConfigMiddleware); apiRouter.use("*", apiVersionMiddleware); +apiRouter.use("*", refreshCacheMiddleware); apiRouter.use("*", analyticsMiddleware); apiRouter.use("*", rateLimitMiddleware); -apiRouter.use("*", refreshCacheMiddleware); apiRouter.use("*", queryMiddleware()); apiRouter.use("*", idempotencyMiddleware); diff --git a/server/src/utils/importUtils/addProductFromSubs.ts b/server/src/utils/importUtils/addProductFromSubs.ts index dfadd0ee4..91b9f77f0 100644 --- a/server/src/utils/importUtils/addProductFromSubs.ts +++ b/server/src/utils/importUtils/addProductFromSubs.ts @@ -1,5 +1,4 @@ import { - BillingInterval, type CusProductStatus, type EntitlementWithFeature, type FullCustomer, @@ -12,10 +11,11 @@ import type Stripe from "stripe"; import { subToPeriodStartEnd } from "@/external/stripe/stripeSubUtils/convertSubUtils.js"; import { stripeToAutumnSubStatus } from "@/external/stripe/stripeSubUtils.js"; import { subToAutumnInterval } from "@/external/stripe/utils.js"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; import { createFullCusProduct } from "@/internal/customers/add-product/createFullCusProduct.js"; import { PriceService } from "@/internal/products/prices/PriceService.js"; import { SubService } from "@/internal/subscriptions/SubService.js"; -import { constructSub } from "@/internal/subscriptions/subUtils.js"; +import { initSubscriptionFromStripe } from "@/internal/subscriptions/utils/initSubscriptionFromStripe.js"; import { notNullish } from "../genUtils.js"; import type { ExtendedRequest } from "../models/Request.js"; @@ -142,14 +142,9 @@ export const addProductFromSubs = async ({ if (subFromDb.length === 0) { await SubService.createSub({ db, - sub: constructSub({ - stripeId: sub.id, - usageFeatures: - subInterval.interval === BillingInterval.Month ? usageFeatures : [], - orgId: org.id, - env, - currentPeriodStart: start, - currentPeriodEnd: end, + sub: initSubscriptionFromStripe({ + ctx: req as unknown as AutumnContext, + stripeSubscription: sub, }), }); logger.info(`Created sub ${sub.id} in DB`); diff --git a/server/src/utils/logging/maskExtraLogs.ts b/server/src/utils/logging/maskExtraLogs.ts new file mode 100644 index 000000000..e62e6d877 --- /dev/null +++ b/server/src/utils/logging/maskExtraLogs.ts @@ -0,0 +1,18 @@ +/** Fields to mask in extra logs (replace with "[MASKED]") */ +const MASKED_FIELDS = ["fullCustomer"]; + +export const maskExtraLogs = ( + extraLogs: Record, +): Record => { + const masked: Record = {}; + for (const [key, value] of Object.entries(extraLogs)) { + if (MASKED_FIELDS.includes(key)) { + masked[key] = "[MASKED]"; + } else if (value && typeof value === "object" && !Array.isArray(value)) { + masked[key] = maskExtraLogs(value as Record); + } else { + masked[key] = value; + } + } + return masked; +}; diff --git a/server/src/utils/scriptUtils/initCustomer.ts b/server/src/utils/scriptUtils/initCustomer.ts index 83a475acd..224db96e6 100644 --- a/server/src/utils/scriptUtils/initCustomer.ts +++ b/server/src/utils/scriptUtils/initCustomer.ts @@ -10,11 +10,10 @@ import type Stripe from "stripe"; import type { DrizzleCli } from "@/db/initDrizzle.js"; import type { AutumnInt } from "@/external/autumn/autumnCli.js"; import { createStripeCli } from "@/external/connect/createStripeCli.js"; +import { createStripeCustomer } from "@/external/stripe/customers"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; import { CusService } from "@/internal/customers/CusService.js"; -import { - attachPmToCus, - createStripeCustomer, -} from "../../external/stripe/stripeCusUtils.js"; +import { attachPmToCus } from "../../external/stripe/stripeCusUtils.js"; export const createCusInStripe = async ({ customer, @@ -30,10 +29,9 @@ export const createCusInStripe = async ({ testClockId?: string; }) => { const stripeCustomer = await createStripeCustomer({ - org, - env, + ctx: { org, env, db } as AutumnContext, customer, - testClockId, + options: { testClockId }, }); await CusService.update({ diff --git a/server/src/utils/scriptUtils/testUtils/initCustomerV3.ts b/server/src/utils/scriptUtils/testUtils/initCustomerV3.ts index d93129b05..b757a60a5 100644 --- a/server/src/utils/scriptUtils/testUtils/initCustomerV3.ts +++ b/server/src/utils/scriptUtils/testUtils/initCustomerV3.ts @@ -13,7 +13,7 @@ export const initCustomerV3 = async ({ attachPm, withTestClock = true, withDefault = false, - defaultProductId, + defaultGroup, }: { ctx: TestContext; customerId: string; @@ -21,7 +21,7 @@ export const initCustomerV3 = async ({ customerData?: CustomerData; withTestClock?: boolean; withDefault?: boolean; - defaultProductId?: string; + defaultGroup?: string; }) => { const name = customerId; const email = `${customerId}@example.com`; @@ -58,11 +58,12 @@ export const initCustomerV3 = async ({ id: customerId, name, email, - // @ts-expect-error fingerprint: customerData?.fingerprint, stripe_id: stripeCus.id, - disable_default: !withDefault, - default_product_id: defaultProductId, + internalOptions: { + disable_defaults: !withDefault, + default_group: defaultGroup, + }, }); // 3. Attach payment method diff --git a/server/tests/_temp/temp.test.ts b/server/tests/_temp/temp.test.ts index 66e0c317f..d758ee2e4 100644 --- a/server/tests/_temp/temp.test.ts +++ b/server/tests/_temp/temp.test.ts @@ -1,154 +1,47 @@ -import { beforeAll, describe } from "bun:test"; -import { - ApiVersion, - BillingInterval, - type FullProduct, - isConsumablePrice, - isFixedPrice, -} from "@autumn/shared"; +import { expect, test } from "bun:test"; import { TestFeature } from "@tests/setup/v2Features.js"; -import ctx from "@tests/utils/testInitUtils/createTestContext.js"; +import { items } from "@tests/utils/fixtures/items.js"; +import { products } from "@tests/utils/fixtures/products.js"; +import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; import chalk from "chalk"; -import type { Stripe } from "stripe"; -import { AutumnInt } from "@/external/autumn/autumnCli.js"; -import { ProductService } from "@/internal/products/ProductService"; -import { constructPriceItem } from "@/internal/products/product-items/productItemUtils"; -import { - constructArrearItem, - constructFeatureItem, - constructPrepaidItem, -} from "@/utils/scriptUtils/constructItem.js"; -import { - constructProduct, - constructRawProduct, -} from "@/utils/scriptUtils/createTestProducts.js"; -const prepaidUsersItem = constructPrepaidItem({ - featureId: TestFeature.Users, - billingUnits: 1, - price: 10, -}); +test.concurrent(`${chalk.yellowBright("temp: concurrent entitled calls")}`, async () => { + const wordsItem = items.monthlyWords({ includedUsage: 200 }); + const free = products.base({ + id: "free", + items: [wordsItem], + isDefault: true, + }); -const free = constructProduct({ - type: "free", - items: [ - constructFeatureItem({ - featureId: TestFeature.Credits, - includedUsage: 500, - }), - ], -}); + const { customerId, autumnV1 } = await initScenario({ + customerId: "temp-entitled-concurrent", + setup: [s.customer({ withDefault: true }), s.products({ list: [free] })], + actions: [], + }); -const growthYearly = constructRawProduct({ - id: "growth-yearly", - items: [ - constructArrearItem({ + // Call /entitled 5 times concurrently + const entitledPromises = Array.from({ length: 5 }, () => + autumnV1.entitled({ + customerId, featureId: TestFeature.Words, - includedUsage: 0, - price: 1, - billingUnits: 100, }), - constructPriceItem({ - price: 2000, - interval: BillingInterval.Year, - }), - ], -}); + ); -const testCase = "temp"; + const entitledResults = await Promise.all(entitledPromises); -const buildSubscriptionItems = ({ - fullProduct, -}: { - fullProduct: FullProduct; -}): Stripe.SubscriptionScheduleCreateParams.Phase.Item[] => { - return fullProduct.prices.map((p) => { - if (isConsumablePrice(p)) { - return { - price: p.config.stripe_empty_price_id ?? undefined, - quantity: 0, - }; - } - return { - price: p.config.stripe_price_id ?? undefined, - quantity: 1, - }; + // Verify all entitled calls succeeded + for (const result of entitledResults) { + expect(result.allowed).toBe(true); + } + + // Call /events with value 25 + await autumnV1.events.send({ + customerId, + featureId: TestFeature.Words, + value: 25, }); -}; -describe(`${chalk.yellowBright("temp: add on")}`, () => { - const customerId = testCase; - const autumnV1: AutumnInt = new AutumnInt({ version: ApiVersion.V1_2 }); - - beforeAll(async () => { - // await initCustomerV3({ - // ctx, - // customerId, - // withTestClock: true, - // attachPm: "success", - // }); - - // await initProductsV0({ - // ctx, - // products: [free, growthYearly], - // prefix: testCase, - // }); - - const { stripeCli } = ctx; - - const growthYearly = await ProductService.getFull({ - db: ctx.db, - orgId: ctx.org.id, - env: ctx.env, - idOrInternalId: "growth-yearly_temp", - }); - - // const basePrice = growthYearly.prices.find(isFixedPrice) - - // const emptyPrice = await stripeCli.prices.create({ - // product: growthYearly?.processor?.id, - // unit_amount: 0, - // currency: "usd", - // recurring: { - // ...(billingIntervalToStripe({ - // interval: BillingInterval.Year, - // intervalCount: 1, - // }) as any), - // }, - // }); - - // console.log(emptyPrice); - - const newSubscription = await stripeCli.subscriptions.create({ - customer: "cus_ToYUVA6XSJrMa8", - items: [ - { - price: "price_1SqvPM5NEqgjQ4gyNktukeYr", - quantity: 1, - }, - ], - billing_mode: { type: "flexible" }, - billing_cycle_anchor: Math.floor(new Date("2026-12-26").getTime() / 1000), - }); - - await stripeCli.subscriptions.update(newSubscription.id, { - items: [ - { - id: newSubscription.items.data[0].id, - deleted: true, - }, - ...buildSubscriptionItems({ fullProduct: growthYearly }) - ], - proration_behavior: "none", - }); - }); + // Verify balance is now 200 - 25 = 175 + const customer = await autumnV1.customers.get(customerId); + expect(customer.features[TestFeature.Words].balance).toBe(175); }); - -// await createReward({ -// db: ctx.db, -// orgId: ctx.org.id, -// env: ctx.env, -// autumn: autumnV1, -// reward, -// // productId: pro.id, -// }); diff --git a/server/tests/balances/track/race-condition/track-race-condition5.test.ts b/server/tests/balances/track/race-condition/track-race-condition5.test.ts new file mode 100644 index 000000000..e303bf8ea --- /dev/null +++ b/server/tests/balances/track/race-condition/track-race-condition5.test.ts @@ -0,0 +1,206 @@ +import { expect, test } from "bun:test"; +import type { ApiCustomer } from "@autumn/shared"; +import { TestFeature } from "@tests/setup/v2Features.js"; +import { items } from "@tests/utils/fixtures/items.js"; +import { products } from "@tests/utils/fixtures/products.js"; +import { timeout } from "@tests/utils/genUtils.js"; +import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; +import chalk from "chalk"; + +/** + * Race condition scenario: Concurrent /track calls auto-creating the same customer + * + * When two /track requests arrive simultaneously for a customer that doesn't exist: + * - Both should succeed + * - Only one customer should be created + * - Usage should be tracked correctly (total of both requests) + */ +test.concurrent(`${chalk.yellowBright("track-race-condition5: concurrent /track calls should auto-create customer once")}`, async () => { + const messagesItem = items.monthlyMessages({ includedUsage: 100 }); + const freeDefault = products.base({ + id: "free", + items: [messagesItem], + isDefault: true, + }); + + const { autumnV1, autumnV2 } = await initScenario({ + customerId: "track-race-condition5-setup", + setup: [ + s.customer({ testClock: false }), + s.products({ list: [freeDefault] }), + ], + actions: [], + }); + + // Use a unique customer ID that doesn't exist yet + const newCustomerId = `track-race-new-${Date.now()}`; + + // Delete any existing customer (cleanup from previous runs) + try { + await autumnV1.customers.delete(newCustomerId); + } catch {} + + // Concurrent /track calls for non-existent customer + const [res1, res2] = await Promise.all([ + autumnV1.track({ + customer_id: newCustomerId, + feature_id: TestFeature.Messages, + value: 5, + customer_data: { + name: "Auto Created Customer", + email: `${newCustomerId}@example.com`, + }, + }), + autumnV1.track({ + customer_id: newCustomerId, + feature_id: TestFeature.Messages, + value: 3, + customer_data: { + name: "Auto Created Customer", + email: `${newCustomerId}@example.com`, + }, + }), + ]); + + // Both should succeed + expect(res1).toBeDefined(); + expect(res2).toBeDefined(); + + // Wait for Redis sync to complete + await timeout(2000); + + // Verify customer was created + const customer = await autumnV2.customers.get(newCustomerId, { + skip_cache: "true", + }); + expect(customer.id).toBe(newCustomerId); + expect(customer.name).toBe("Auto Created Customer"); + + // Usage should be sum of both requests (5 + 3 = 8) + // Balance should be 100 - 8 = 92 + const balance = customer.balances?.[TestFeature.Messages]?.current_balance; + expect(balance).toBe(92); +}); + +/** + * Race condition scenario: Concurrent /track calls with different values + * + * Tests that concurrent track requests correctly accumulate usage. + */ +test.concurrent(`${chalk.yellowBright("track-race-condition5: concurrent /track calls should accumulate usage correctly")}`, async () => { + const messagesItem = items.monthlyMessages({ includedUsage: 1000 }); + const freeDefault = products.base({ + id: "free", + items: [messagesItem], + isDefault: true, + }); + + const { autumnV1, autumnV2 } = await initScenario({ + customerId: "track-race-condition5-accumulate", + setup: [ + s.customer({ testClock: false }), + s.products({ list: [freeDefault] }), + ], + actions: [], + }); + + const newCustomerId = `track-race-accumulate-${Date.now()}`; + + try { + await autumnV1.customers.delete(newCustomerId); + } catch {} + + // Concurrent /track calls with different values + await Promise.all([ + autumnV1.track({ + customer_id: newCustomerId, + feature_id: TestFeature.Messages, + value: 10, + customer_data: { name: "Accumulate Test" }, + }), + autumnV1.track({ + customer_id: newCustomerId, + feature_id: TestFeature.Messages, + value: 20, + customer_data: { name: "Accumulate Test" }, + }), + autumnV1.track({ + customer_id: newCustomerId, + feature_id: TestFeature.Messages, + value: 30, + customer_data: { name: "Accumulate Test" }, + }), + ]); + + // Wait for Redis sync to complete + await timeout(2000); + + // Verify total usage is accumulated correctly (10 + 20 + 30 = 60) + const customer = await autumnV2.customers.get(newCustomerId, { + skip_cache: "true", + }); + + // Balance should be 1000 - 60 = 940 + expect(customer.balances?.[TestFeature.Messages]?.current_balance).toBe(940); + expect(customer.balances?.[TestFeature.Messages]?.usage).toBe(60); +}); + +/** + * Race condition scenario: Concurrent /track calls that would exceed balance + * + * Tests that concurrent track requests handle balance correctly when total would exceed limit. + */ +test.concurrent(`${chalk.yellowBright("track-race-condition5: concurrent /track calls handle balance limits correctly")}`, async () => { + const messagesItem = items.monthlyMessages({ includedUsage: 100 }); + const freeDefault = products.base({ + id: "free", + items: [messagesItem], + isDefault: true, + }); + + const { autumnV1, autumnV2 } = await initScenario({ + customerId: "track-race-condition5-limits", + setup: [ + s.customer({ testClock: false }), + s.products({ list: [freeDefault] }), + ], + actions: [], + }); + + const newCustomerId = `track-race-limits-${Date.now()}`; + + try { + await autumnV1.customers.delete(newCustomerId); + } catch {} + + // Concurrent /track calls that together would exceed balance + // 50 + 60 = 110 > 100 limit + await Promise.all([ + autumnV1.track({ + customer_id: newCustomerId, + feature_id: TestFeature.Messages, + value: 50, + customer_data: { name: "Limits Test" }, + }), + autumnV1.track({ + customer_id: newCustomerId, + feature_id: TestFeature.Messages, + value: 60, + customer_data: { name: "Limits Test" }, + }), + ]); + + // Wait for Redis sync to complete + await timeout(2000); + + // Verify usage tracking + const customer = await autumnV2.customers.get(newCustomerId, { + skip_cache: "true", + }); + + // Total usage should be 50 + 60 = 110 (allowed to exceed since no overage restrictions) + const balance = customer.balances?.[TestFeature.Messages]; + expect(balance?.usage).toBe(110); + // Balance would be negative (100 - 110 = -10) if allowed, or capped at 0 + expect(balance?.current_balance).toBeLessThanOrEqual(0); +}); diff --git a/server/tests/integration/balances/check/check-basic.test.ts b/server/tests/integration/balances/check/check-basic.test.ts new file mode 100644 index 000000000..302a627e0 --- /dev/null +++ b/server/tests/integration/balances/check/check-basic.test.ts @@ -0,0 +1,736 @@ +import { expect, test } from "bun:test"; +import { + type ApiBalanceBreakdown, + ApiVersion, + type CheckResponseV0, + type CheckResponseV1, + type CheckResponseV2, + EntInterval, + type LimitedItem, + ResetInterval, + SuccessCode, +} from "@autumn/shared"; +import { TestFeature } from "@tests/setup/v2Features.js"; +import { items } from "@tests/utils/fixtures/items.js"; +import { products } from "@tests/utils/fixtures/products.js"; +import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; +import chalk from "chalk"; +import { AutumnInt } from "@/external/autumn/autumnCli.js"; +import { + constructArrearItem, + constructFeatureItem, +} from "@/utils/scriptUtils/constructItem.js"; + +// ═══════════════════════════════════════════════════════════════════ +// CHECK: No feature attached +// ═══════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("check-no-feature: /check when no feature attached")}`, async () => { + const dashboardItem = items.dashboard(); + const messagesItem = items.monthlyMessages({ includedUsage: 1000 }); + const freeProd = products.base({ + id: "free", + items: [dashboardItem, messagesItem], + }); + + const autumnV0 = new AutumnInt({ version: ApiVersion.V0_2 }); + + const { customerId, autumnV1, autumnV2 } = await initScenario({ + customerId: "check-no-feature", + setup: [s.customer({ testClock: false }), s.products({ list: [freeProd] })], + actions: [], // Don't attach product + }); + + // v2 response + const resV2 = (await autumnV2.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + })) as unknown as CheckResponseV2; + + expect(resV2).toEqual({ + allowed: false, + customer_id: customerId, + required_balance: 1, + balance: null, + }); + + // v1 response + const resV1 = (await autumnV1.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + })) as unknown as CheckResponseV1; + + expect(resV1).toStrictEqual({ + allowed: false, + customer_id: customerId, + feature_id: TestFeature.Messages, + required_balance: 1, + code: SuccessCode.FeatureFound, + }); + + // v0 response + const resV0 = (await autumnV0.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + })) as unknown as CheckResponseV0; + + expect(resV0.allowed).toBe(false); + expect(resV0.balances).toBeDefined(); + expect(resV0.balances).toHaveLength(0); +}); + +// ═══════════════════════════════════════════════════════════════════ +// CHECK: Boolean feature +// ═══════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("check-boolean: /check on boolean feature")}`, async () => { + const dashboardItem = items.dashboard(); + const messagesItem = items.monthlyMessages({ includedUsage: 1000 }); + const freeProd = products.base({ + id: "free", + items: [dashboardItem, messagesItem], + }); + + const autumnV0 = new AutumnInt({ version: ApiVersion.V0_2 }); + + const { customerId, autumnV1, autumnV2 } = await initScenario({ + customerId: "check-boolean", + setup: [s.customer({ testClock: false }), s.products({ list: [freeProd] })], + actions: [s.attach({ productId: freeProd.id })], + }); + + // v2 response + const resV2 = (await autumnV2.check({ + customer_id: customerId, + feature_id: TestFeature.Dashboard, + })) as unknown as CheckResponseV2; + + expect(resV2).toMatchObject({ + allowed: true, + customer_id: customerId, + required_balance: 1, + balance: { + plan_id: freeProd.id, + feature_id: TestFeature.Dashboard, + unlimited: false, + granted_balance: 0, + purchased_balance: 0, + current_balance: 0, + usage: 0, + max_purchase: null, + overage_allowed: false, + reset: null, + breakdown: [ + { + current_balance: 0, + granted_balance: 0, + max_purchase: null, + overage_allowed: false, + plan_id: freeProd.id, + purchased_balance: 0, + reset: null, + usage: 0, + }, + ], + }, + }); + + // v1 response + const resV1 = (await autumnV1.check({ + customer_id: customerId, + feature_id: TestFeature.Dashboard, + })) as unknown as CheckResponseV1; + + expect(resV1).toStrictEqual({ + customer_id: customerId, + feature_id: TestFeature.Dashboard, + code: SuccessCode.FeatureFound, + allowed: true, + interval: null, + interval_count: null, + balance: 0, + included_usage: 0, + usage: 0, + next_reset_at: null, + overage_allowed: false, + required_balance: 1, + unlimited: false, + breakdown: [ + { + balance: 0, + included_usage: 0, + interval: null, + interval_count: null, + next_reset_at: null, + overage_allowed: false, + usage: 0, + }, + ], + }); + + // v0 response + const resV0 = (await autumnV0.check({ + customer_id: customerId, + feature_id: TestFeature.Dashboard, + })) as unknown as CheckResponseV0; + + expect(resV0).toStrictEqual({ + allowed: true, + balances: [ + { + feature_id: TestFeature.Dashboard, + balance: null, + }, + ], + }); +}); + +// ═══════════════════════════════════════════════════════════════════ +// CHECK: Metered feature +// ═══════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("check-metered: /check on metered feature")}`, async () => { + const messagesItem = items.monthlyMessages({ includedUsage: 1000 }); + const freeProd = products.base({ + id: "free", + items: [messagesItem], + }); + + const autumnV0 = new AutumnInt({ version: ApiVersion.V0_2 }); + + const { customerId, autumnV1, autumnV2 } = await initScenario({ + customerId: "check-metered", + setup: [s.customer({ testClock: false }), s.products({ list: [freeProd] })], + actions: [s.attach({ productId: freeProd.id })], + }); + + // v2 response + const resV2 = (await autumnV2.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + })) as unknown as CheckResponseV2; + + expect(resV2).toMatchObject({ + allowed: true, + customer_id: customerId, + required_balance: 1, + balance: { + feature_id: "messages", + unlimited: false, + granted_balance: 1000, + purchased_balance: 0, + current_balance: 1000, + usage: 0, + max_purchase: null, + overage_allowed: false, + reset: { + interval: ResetInterval.Month, + }, + }, + }); + + // v1 response + const resV1 = (await autumnV1.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + })) as unknown as CheckResponseV1; + + const expectedResV1 = { + allowed: true, + customer_id: customerId, + feature_id: TestFeature.Messages, + required_balance: 1, + code: SuccessCode.FeatureFound, + interval: EntInterval.Month, + interval_count: 1, + unlimited: false, + balance: 1000, + usage: 0, + included_usage: 1000, + overage_allowed: false, + }; + + for (const key in expectedResV1) { + expect(resV1[key as keyof CheckResponseV1]).toBe( + expectedResV1[key as keyof typeof expectedResV1], + ); + } + + // v0 response + const resV0 = (await autumnV0.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + })) as unknown as CheckResponseV0; + + expect(resV0).toStrictEqual({ + allowed: true, + balances: [ + { + feature_id: TestFeature.Messages, + required: 1, + balance: 1000, + }, + ], + }); +}); + +// ═══════════════════════════════════════════════════════════════════ +// CHECK: Unlimited feature +// ═══════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("check-unlimited: /check on unlimited feature")}`, async () => { + const messagesItem = items.unlimitedMessages(); + const freeProd = products.base({ + id: "free", + items: [messagesItem], + }); + + const autumnV0 = new AutumnInt({ version: ApiVersion.V0_2 }); + + const { customerId, autumnV1, autumnV2 } = await initScenario({ + customerId: "check-unlimited", + setup: [s.customer({ testClock: false }), s.products({ list: [freeProd] })], + actions: [s.attach({ productId: freeProd.id })], + }); + + // v2 response + const resV2 = (await autumnV2.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + })) as unknown as CheckResponseV2; + + expect(resV2).toMatchObject({ + allowed: true, + customer_id: customerId, + required_balance: 1, + balance: { + plan_id: freeProd.id, + feature_id: "messages", + unlimited: true, + granted_balance: 0, + purchased_balance: 0, + current_balance: 0, + usage: 0, + overage_allowed: false, + max_purchase: null, + reset: null, + breakdown: [ + { + current_balance: 0, + granted_balance: 0, + max_purchase: null, + overage_allowed: false, + plan_id: freeProd.id, + purchased_balance: 0, + reset: null, + usage: 0, + }, + ], + }, + }); + + // v1 response + const resV1 = (await autumnV1.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + })) as unknown as CheckResponseV1; + + const expectedResV1 = { + allowed: true, + customer_id: customerId, + feature_id: TestFeature.Messages as string, + required_balance: 1, + code: SuccessCode.FeatureFound, + unlimited: true, + usage: 0, + included_usage: 0, + next_reset_at: null, + overage_allowed: false, + balance: 0, + interval: null, + interval_count: null, + breakdown: [ + { + balance: 0, + included_usage: 0, + interval: null, + interval_count: null, + next_reset_at: null, + overage_allowed: false, + usage: 0, + }, + ], + }; + + expect(expectedResV1).toMatchObject(resV1); + + // v0 response + const resV0 = (await autumnV0.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + })) as unknown as CheckResponseV0; + + expect(resV0.allowed).toBe(true); + expect(resV0.balances).toBeDefined(); + expect(resV0.balances).toHaveLength(1); + expect(resV0.balances[0]).toStrictEqual({ + balance: null, + feature_id: TestFeature.Messages, + unlimited: true, + usage_allowed: false, + required: null, + }); +}); + +// ═══════════════════════════════════════════════════════════════════ +// CHECK: Usage-based (arrear) feature +// ═══════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("check-usage-based: /check on usage-based feature")}`, async () => { + const messagesFeature = constructArrearItem({ + featureId: TestFeature.Messages, + price: 0.5, + includedUsage: 100, + }) as LimitedItem; + + const proProd = products.base({ + id: "pro", + items: [messagesFeature], + }); + + const autumnV0 = new AutumnInt({ version: ApiVersion.V0_2 }); + + const { customerId, autumnV1, autumnV2 } = await initScenario({ + customerId: "check-usage-based", + setup: [ + s.customer({ paymentMethod: "success", testClock: false }), + s.products({ list: [proProd] }), + ], + actions: [s.attach({ productId: proProd.id })], + }); + + // v2 response + const resV2 = (await autumnV2.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + })) as unknown as CheckResponseV2; + + expect(resV2).toMatchObject({ + allowed: true, + customer_id: customerId, + required_balance: 1, + balance: { + feature_id: "messages", + unlimited: false, + granted_balance: messagesFeature.included_usage, + purchased_balance: 0, + current_balance: messagesFeature.included_usage, + usage: 0, + max_purchase: null, + overage_allowed: true, + reset: { + interval: ResetInterval.Month, + }, + }, + }); + expect(resV2.balance?.reset?.resets_at).toBeDefined(); + + // v1 response + const resV1 = (await autumnV1.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + })) as unknown as CheckResponseV1; + + const expectedResV1 = { + allowed: true, + customer_id: customerId, + feature_id: TestFeature.Messages as string, + required_balance: 1, + code: SuccessCode.FeatureFound, + unlimited: false, + balance: messagesFeature.included_usage, + usage: 0, + included_usage: messagesFeature.included_usage, + overage_allowed: true, + interval: messagesFeature.interval, + interval_count: 1, + }; + + expect(resV1).toMatchObject(expectedResV1); + expect(resV1.next_reset_at).toBeDefined(); + + // v0 response + const resV0 = (await autumnV0.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + })) as unknown as CheckResponseV0; + + expect(resV0.allowed).toBe(true); + expect(resV0.balances).toBeDefined(); + expect(resV0.balances).toHaveLength(1); + expect(resV0.balances[0]).toMatchObject({ + balance: messagesFeature.included_usage, + feature_id: TestFeature.Messages, + unlimited: false, + usage_allowed: true, + required: null, + }); +}); + +// ═══════════════════════════════════════════════════════════════════ +// CHECK: Multiple balances (one_off + monthly) +// ═══════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("check-multiple-balances: /check on feature with multiple balances")}`, async () => { + const monthlyMessages = constructArrearItem({ + featureId: TestFeature.Messages, + price: 0.5, + includedUsage: 100, + }) as LimitedItem; + + const lifetimeMessages = constructFeatureItem({ + featureId: TestFeature.Messages, + interval: null, + includedUsage: 1000, + }) as LimitedItem; + + const proProd = products.pro({ + id: "pro", + items: [monthlyMessages, lifetimeMessages], + }); + + const autumnV0 = new AutumnInt({ version: ApiVersion.V0_2 }); + + const { customerId, autumnV1, autumnV2 } = await initScenario({ + customerId: "check-multiple-balances", + setup: [ + s.customer({ paymentMethod: "success", testClock: false }), + s.products({ list: [proProd] }), + ], + actions: [s.attach({ productId: proProd.id })], + }); + + // v2 response + const resV2 = (await autumnV2.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + })) as unknown as CheckResponseV2; + + const expectedLifetimeBreakdown: ApiBalanceBreakdown = { + id: expect.any(String), + plan_id: proProd.id, + granted_balance: 1000, + purchased_balance: 0, + current_balance: 1000, + usage: 0, + max_purchase: null, + overage_allowed: false, + reset: { + interval: ResetInterval.OneOff, + resets_at: null, + }, + prepaid_quantity: 0, + expires_at: null, + }; + + const expectedMonthlyBreakdown = { + granted_balance: 100, + purchased_balance: 0, + current_balance: 100, + usage: 0, + max_purchase: null, + reset: { + interval: ResetInterval.Month, + }, + }; + + const actualMonthlyBreakdown = resV2.balance?.breakdown?.[0]; + const actualLifetimeBreakdown = resV2.balance?.breakdown?.[1]; + + expect(actualMonthlyBreakdown).toMatchObject(expectedMonthlyBreakdown); + expect(actualLifetimeBreakdown).toMatchObject(expectedLifetimeBreakdown); + expect(actualMonthlyBreakdown?.reset?.resets_at).toBeDefined(); + + expect(resV2).toMatchObject({ + allowed: true, + customer_id: customerId, + required_balance: 1, + balance: { + feature_id: TestFeature.Messages, + unlimited: false, + granted_balance: + monthlyMessages.included_usage + lifetimeMessages.included_usage, + purchased_balance: 0, + current_balance: + monthlyMessages.included_usage + lifetimeMessages.included_usage, + usage: 0, + max_purchase: null, + overage_allowed: true, + reset: { + interval: "multiple", + resets_at: null, + }, + }, + }); + + // v1 response + const resV1 = (await autumnV1.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + })) as unknown as CheckResponseV1; + + const totalIncludedUsage = + monthlyMessages.included_usage + lifetimeMessages.included_usage; + + const lifetimeBreakdownV1 = { + balance: lifetimeMessages.included_usage, + included_usage: lifetimeMessages.included_usage, + interval: "lifetime", + interval_count: 1, + next_reset_at: null, + usage: 0, + }; + + const monthlyBreakdownV1 = { + balance: monthlyMessages.included_usage, + included_usage: monthlyMessages.included_usage, + interval: "month", + interval_count: 1, + usage: 0, + }; + + const expectedResV1 = { + allowed: true, + customer_id: customerId, + feature_id: TestFeature.Messages as string, + required_balance: 1, + code: SuccessCode.FeatureFound, + unlimited: false, + balance: totalIncludedUsage, + interval: "multiple", + interval_count: null, + usage: 0, + included_usage: totalIncludedUsage, + overage_allowed: true, + }; + + expect(resV1).toMatchObject(expectedResV1); + expect(resV1.breakdown).toHaveLength(2); + expect(resV1.breakdown?.[0]).toMatchObject(monthlyBreakdownV1); + expect(resV1.breakdown?.[1]).toMatchObject(lifetimeBreakdownV1); + + // v0 response + const resV0 = (await autumnV0.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + })) as unknown as CheckResponseV0; + + expect(resV0.allowed).toBe(true); + expect(resV0.balances).toBeDefined(); + expect(resV0.balances).toHaveLength(1); + expect(resV0.balances[0]).toMatchObject({ + balance: monthlyMessages.included_usage + lifetimeMessages.included_usage, + feature_id: TestFeature.Messages, + required: null, + unlimited: false, + usage_allowed: true, + }); +}); + +// ═══════════════════════════════════════════════════════════════════ +// CHECK: Feature with usage limits +// ═══════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("check-usage-limits: /check on feature with usage limits")}`, async () => { + const messagesFeature = constructArrearItem({ + featureId: TestFeature.Messages, + price: 0.5, + includedUsage: 100, + usageLimit: 500, + }) as LimitedItem; + + const proProd = products.pro({ + id: "pro", + items: [messagesFeature], + }); + + const autumnV0 = new AutumnInt({ version: ApiVersion.V0_2 }); + + const { customerId, autumnV1, autumnV2 } = await initScenario({ + customerId: "check-usage-limits", + setup: [ + s.customer({ paymentMethod: "success", testClock: false }), + s.products({ list: [proProd] }), + ], + actions: [s.attach({ productId: proProd.id })], + }); + + // v2 response + const resV2 = (await autumnV2.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + required_balance: messagesFeature.usage_limit! + 1, + })) as unknown as CheckResponseV2; + + expect(resV2).toMatchObject({ + allowed: false, + customer_id: customerId, + required_balance: messagesFeature.usage_limit! + 1, + balance: { + feature_id: "messages", + unlimited: false, + granted_balance: messagesFeature.included_usage, + purchased_balance: 0, + current_balance: messagesFeature.included_usage, + usage: 0, + max_purchase: + messagesFeature.usage_limit! - messagesFeature.included_usage, + overage_allowed: true, + reset: { + interval: "month", + }, + }, + }); + + // v1 response + const resV1 = (await autumnV1.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + required_balance: messagesFeature.usage_limit! + 1, + })) as unknown as CheckResponseV1; + + const expectedResV1 = { + allowed: false, + customer_id: customerId, + balance: messagesFeature.included_usage, + feature_id: TestFeature.Messages as string, + required_balance: messagesFeature.usage_limit! + 1, + code: SuccessCode.FeatureFound, + unlimited: false, + usage: 0, + included_usage: messagesFeature.included_usage, + overage_allowed: false, + usage_limit: messagesFeature.usage_limit!, + interval: "month", + interval_count: 1, + }; + + expect(resV1).toMatchObject(expectedResV1); + expect(resV1.next_reset_at).toBeDefined(); + + // v0 response + const resV0 = (await autumnV0.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + required_balance: messagesFeature.usage_limit! + 1, + })) as unknown as CheckResponseV0; + + expect(resV0.allowed).toBe(false); + expect(resV0.balances).toBeDefined(); + expect(resV0.balances).toHaveLength(1); + expect(resV0.balances[0]).toMatchObject({ + balance: messagesFeature.included_usage, + required: messagesFeature.usage_limit! + 1, + feature_id: TestFeature.Messages, + }); +}); diff --git a/server/tests/integration/balances/check/check-public-key.test.ts b/server/tests/integration/balances/check/check-public-key.test.ts new file mode 100644 index 000000000..d292abaae --- /dev/null +++ b/server/tests/integration/balances/check/check-public-key.test.ts @@ -0,0 +1,182 @@ +import { expect, test } from "bun:test"; +import { + type ApiCustomerV3, + ApiVersion, + AppEnv, + type CheckResponseV1, + SuccessCode, +} from "@autumn/shared"; +import { TestFeature } from "@tests/setup/v2Features.js"; +import { expectAutumnError } from "@tests/utils/expectUtils/expectErrUtils.js"; +import { items } from "@tests/utils/fixtures/items.js"; +import { products } from "@tests/utils/fixtures/products.js"; +import { timeout } from "@tests/utils/genUtils.js"; +import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; +import chalk from "chalk"; +import { AutumnInt } from "@/external/autumn/autumnCli.js"; +import { OrgService } from "@/internal/orgs/OrgService.js"; +import { generatePublishableKey } from "@/utils/encryptUtils.js"; + +// ═══════════════════════════════════════════════════════════════════ +// Helper to set up public key test scenario +// ═══════════════════════════════════════════════════════════════════ + +async function setupPublicKeyScenario({ customerId }: { customerId: string }) { + const messagesItem = items.monthlyMessages({ includedUsage: 1000 }); + const freeProd = products.base({ + id: "free", + items: [messagesItem], + }); + + const { customerId: cusId, autumnV1, ctx } = await initScenario({ + customerId, + setup: [s.customer({ testClock: false }), s.products({ list: [freeProd] })], + actions: [s.attach({ productId: freeProd.id })], + }); + + // Ensure test_pkey is set on the org + if (!ctx.org.test_pkey) { + const testPkey = generatePublishableKey(AppEnv.Sandbox); + await OrgService.update({ + db: ctx.db, + orgId: ctx.org.id, + updates: { test_pkey: testPkey }, + }); + ctx.org.test_pkey = testPkey; + } + + if (!ctx.org.test_pkey.startsWith("am_pk")) { + throw new Error( + `test_pkey "${ctx.org.test_pkey}" does not start with "am_pk". Expected format: am_pk_test_...`, + ); + } + + const autumnPublic = new AutumnInt({ + version: ApiVersion.V1_2, + secretKey: ctx.org.test_pkey, + }); + + return { customerId: cusId, autumnV1, autumnPublic }; +} + +// ═══════════════════════════════════════════════════════════════════ +// CHECK: Public key works for /check endpoint +// ═══════════════════════════════════════════════════════════════════ + +test.concurrent( + `${chalk.yellowBright("check-public-key: /check works with public key")}`, + async () => { + const { customerId, autumnPublic } = await setupPublicKeyScenario({ + customerId: "check-public-key", + }); + + const checkRes = await autumnPublic.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + required_balance: 100, + }); + + expect(checkRes).toMatchObject({ + allowed: true, + customer_id: customerId, + feature_id: TestFeature.Messages, + balance: 1000, + required_balance: 100, + code: SuccessCode.FeatureFound, + usage: 0, + included_usage: 1000, + overage_allowed: false, + }); + expect(checkRes.next_reset_at).toBeDefined(); + }, +); + +// ═══════════════════════════════════════════════════════════════════ +// CHECK: send_event blocked with public key +// ═══════════════════════════════════════════════════════════════════ + +test.concurrent( + `${chalk.yellowBright("check-public-key-send-event-blocked: send_event with public key should error")}`, + async () => { + const { customerId, autumnV1, autumnPublic } = await setupPublicKeyScenario( + { customerId: "check-public-key-send-event-blocked" }, + ); + + const customerBefore = + await autumnV1.customers.get(customerId); + const balanceBefore = customerBefore.features[TestFeature.Messages].balance; + const usageBefore = customerBefore.features[TestFeature.Messages].usage; + + await expectAutumnError({ + func: async () => { + await autumnPublic.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + required_balance: 50, + send_event: true, + }); + }, + }); + + const customerAfter = + await autumnV1.customers.get(customerId); + + expect(customerAfter.features[TestFeature.Messages].balance).toBe( + balanceBefore, + ); + expect(customerAfter.features[TestFeature.Messages].usage).toBe( + usageBefore, + ); + }, +); + +// ═══════════════════════════════════════════════════════════════════ +// CHECK: send_event works with secret key +// ═══════════════════════════════════════════════════════════════════ + +test.concurrent( + `${chalk.yellowBright("check-send-event: send_event with secret key tracks usage")}`, + async () => { + const { customerId, autumnV1 } = await setupPublicKeyScenario({ + customerId: "check-send-event", + }); + + // Should track usage when send_event: true with secret key + const checkRes = await autumnV1.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + required_balance: 150, + send_event: true, + }); + + expect(checkRes.allowed).toBe(true); + expect(checkRes.balance).toBe(1000 - 150); + + await timeout(2000); + + const customerAfter = + await autumnV1.customers.get(customerId); + + expect(customerAfter.features[TestFeature.Messages].balance).toBe(850); + expect(customerAfter.features[TestFeature.Messages].usage).toBe(150); + + // Should NOT track when allowed: false (insufficient balance) + const checkResInsufficient = await autumnV1.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + required_balance: 900, // More than available (850) + send_event: true, + }); + + expect(checkResInsufficient.allowed).toBe(false); + + await timeout(2000); + + const customerAfterInsufficient = + await autumnV1.customers.get(customerId); + + // Balance and usage should remain unchanged + expect(customerAfterInsufficient.features[TestFeature.Messages].balance).toBe(850); + expect(customerAfterInsufficient.features[TestFeature.Messages].usage).toBe(150); + }, +); diff --git a/server/tests/integration/balances/check/check-race-condition1.test.ts b/server/tests/integration/balances/check/check-race-condition1.test.ts new file mode 100644 index 000000000..ce55b60cb --- /dev/null +++ b/server/tests/integration/balances/check/check-race-condition1.test.ts @@ -0,0 +1,124 @@ +import { expect, test } from "bun:test"; +import type { ApiCustomer } from "@autumn/shared"; +import { TestFeature } from "@tests/setup/v2Features.js"; +import { items } from "@tests/utils/fixtures/items.js"; +import { products } from "@tests/utils/fixtures/products.js"; +import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; +import chalk from "chalk"; +import { CusService } from "@/internal/customers/CusService.js"; +import { deleteCachedFullCustomer } from "@/internal/customers/cusUtils/fullCustomerCacheUtils/deleteCachedFullCustomer.js"; +import { getOrCreateCachedFullCustomer } from "@/internal/customers/cusUtils/fullCustomerCacheUtils/getOrCreateCachedFullCustomer.js"; +import { setCachedFullCustomer } from "@/internal/customers/cusUtils/fullCustomerCacheUtils/setCachedFullCustomer.js"; +import { generateId } from "@/utils/genUtils.js"; + +/** + * Race condition scenario: + * A. Request 1: Gets up to CusService.insert (customer created, but default products NOT attached yet) + * B. Request 2: Calls CusService.getFull, finds customer WITHOUT default products, caches it + * Final state: Cache has customer without default products (stale) + */ +test.concurrent(`${chalk.yellowBright("check-race-condition1: cache should not contain stale customer without default products")}`, async () => { + const wordsItem = items.monthlyWords({ includedUsage: 1000 }); + const freeDefault = products.base({ + id: "free", + items: [wordsItem], + isDefault: true, + }); + + const customerId = "check-race-condition1"; + const { autumnV2, ctx } = await initScenario({ + customerId, + setup: [ + s.customer({ testClock: false }), + s.products({ list: [freeDefault] }), + ], + actions: [], + }); + + // Delete the customer so we can manually reproduce the race condition + try { + await autumnV2.customers.delete(customerId); + } catch {} + + await deleteCachedFullCustomer({ + ctx, + customerId, + source: "test-cleanup", + }); + + // ═══════════════════════════════════════════════════════════════════ + // STEP A: Simulate Request 1 - insert customer WITHOUT default products + // (This simulates the state after CusService.insert but BEFORE default products are attached) + // ═══════════════════════════════════════════════════════════════════ + const internalId = generateId("cus"); + await CusService.insert({ + db: ctx.db, + data: { + id: customerId, + internal_id: internalId, + org_id: ctx.org.id, + env: ctx.env, + name: customerId, + email: `${customerId}@test.com`, + metadata: {}, + created_at: Date.now(), + processor: null, + }, + }); + + // ═══════════════════════════════════════════════════════════════════ + // STEP B: Simulate Request 2 - fetch from DB and cache (customer exists but NO default products) + // This is what happens when a parallel request queries while Request 1 is still attaching products + // ═══════════════════════════════════════════════════════════════════ + const customerWithoutDefaults = await CusService.getFull({ + db: ctx.db, + idOrInternalId: customerId, + orgId: ctx.org.id, + env: ctx.env, + withEntities: true, + withSubs: true, + }); + + // Cache this incomplete customer (simulating what Request 2 would do) + await setCachedFullCustomer({ + ctx, + fullCustomer: customerWithoutDefaults!, + customerId, + fetchTimeMs: Date.now(), + source: "test-request-2", + overwrite: true, + }); + + // ═══════════════════════════════════════════════════════════════════ + // STEP C: Now call getOrCreateCachedFullCustomer - this should detect the stale cache + // and return the customer with default products + // ═══════════════════════════════════════════════════════════════════ + const fullCustomer = await getOrCreateCachedFullCustomer({ + ctx, + params: { + customer_id: customerId, + feature_id: TestFeature.Words, + }, + source: "test-final-check", + }); + + // The customer should have default products attached + expect(fullCustomer.customer_products?.length).toBeGreaterThan(0); + + // Verify via API (skip cache to get fresh data from DB) + await deleteCachedFullCustomer({ + ctx, + customerId, + source: "test-verify", + }); + + const customerFromApi = await autumnV2.customers.get( + customerId, + { skip_cache: "true" }, + ); + + // Should have the words balance from the default product + const wordsBalance = customerFromApi.balances?.[TestFeature.Words]; + expect(wordsBalance).toBeDefined(); + expect(wordsBalance?.current_balance).toBe(1000); +}); diff --git a/server/tests/integration/balances/check/check-race-condition2.test.ts b/server/tests/integration/balances/check/check-race-condition2.test.ts new file mode 100644 index 000000000..7bfbe48bd --- /dev/null +++ b/server/tests/integration/balances/check/check-race-condition2.test.ts @@ -0,0 +1,197 @@ +import { expect, test } from "bun:test"; +import type { ApiCustomer } from "@autumn/shared"; +import { TestFeature } from "@tests/setup/v2Features.js"; +import { items } from "@tests/utils/fixtures/items.js"; +import { products } from "@tests/utils/fixtures/products.js"; +import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; +import chalk from "chalk"; + +/** + * Race condition scenario: Concurrent /check calls auto-creating the same customer + * + * When two /check requests arrive simultaneously for a customer that doesn't exist: + * - Both should succeed + * - Only one customer should be created + * - Both should return valid check responses + */ +test.concurrent(`${chalk.yellowBright("check-race-condition2: concurrent /check calls should auto-create customer once")}`, async () => { + const messagesItem = items.monthlyMessages({ includedUsage: 100 }); + const freeDefault = products.base({ + id: "free", + items: [messagesItem], + isDefault: true, + }); + + const { ctx, autumnV1, autumnV2 } = await initScenario({ + customerId: "check-race-condition2-setup", + setup: [ + s.customer({ testClock: false }), + s.products({ list: [freeDefault] }), + ], + actions: [], + }); + + // Use a unique customer ID that doesn't exist yet + const newCustomerId = `check-race-new-${Date.now()}`; + + // Delete any existing customer (cleanup from previous runs) + try { + await autumnV1.customers.delete(newCustomerId); + } catch {} + + // Concurrent /check calls for non-existent customer + const [res1, res2] = await Promise.all([ + autumnV1.check({ + customer_id: newCustomerId, + feature_id: TestFeature.Messages, + customer_data: { + name: "Auto Created Customer", + email: `${newCustomerId}@example.com`, + }, + }), + autumnV1.check({ + customer_id: newCustomerId, + feature_id: TestFeature.Messages, + customer_data: { + name: "Auto Created Customer", + email: `${newCustomerId}@example.com`, + }, + }), + ]); + + // Both should return allowed (since default product gives 100 messages) + expect(res1.allowed).toBe(true); + expect(res2.allowed).toBe(true); + + // Verify customer was created + const customer = await autumnV2.customers.get(newCustomerId); + expect(customer.id).toBe(newCustomerId); + expect(customer.name).toBe("Auto Created Customer"); + expect(customer.email).toBe(`${newCustomerId}@example.com`); + + // Verify default product was attached + expect(customer.balances?.[TestFeature.Messages]?.current_balance).toBe(100); +}); + +/** + * Race condition scenario: Concurrent /check calls with different customer_data + * + * When two /check requests arrive simultaneously with different customer_data, + * one wins and the other should return the same customer (not create duplicate). + */ +test.concurrent(`${chalk.yellowBright("check-race-condition2: concurrent /check with different data should not create duplicates")}`, async () => { + const messagesItem = items.monthlyMessages({ includedUsage: 100 }); + const freeDefault = products.base({ + id: "free", + items: [messagesItem], + isDefault: true, + }); + + const { autumnV1, autumnV2 } = await initScenario({ + customerId: "check-race-condition2-diff-data", + setup: [ + s.customer({ testClock: false }), + s.products({ list: [freeDefault] }), + ], + actions: [], + }); + + const newCustomerId = `check-race-diff-${Date.now()}`; + + try { + await autumnV1.customers.delete(newCustomerId); + } catch {} + + // Concurrent /check calls with different customer_data + const [res1, res2] = await Promise.all([ + autumnV1.check({ + customer_id: newCustomerId, + feature_id: TestFeature.Messages, + customer_data: { + name: "Name from request 1", + email: `${newCustomerId}-1@example.com`, + }, + }), + autumnV1.check({ + customer_id: newCustomerId, + feature_id: TestFeature.Messages, + customer_data: { + name: "Name from request 2", + email: `${newCustomerId}-2@example.com`, + }, + }), + ]); + + // Both should succeed + expect(res1.allowed).toBe(true); + expect(res2.allowed).toBe(true); + + // Verify only one customer was created (not two) + const customer = await autumnV2.customers.get(newCustomerId); + expect(customer.id).toBe(newCustomerId); + + // Name should be from one of the requests (whichever won the race) + expect(["Name from request 1", "Name from request 2"]).toContain( + customer.name ?? "", + ); +}); + +/** + * Race condition scenario: Concurrent /check calls for same customer with required_balance + * + * Tests that concurrent check requests don't cause issues with balance calculation. + */ +test.concurrent(`${chalk.yellowBright("check-race-condition2: concurrent /check with required_balance should work correctly")}`, async () => { + const messagesItem = items.monthlyMessages({ includedUsage: 100 }); + const freeDefault = products.base({ + id: "free", + items: [messagesItem], + isDefault: true, + }); + + const { autumnV1, autumnV2 } = await initScenario({ + customerId: "check-race-condition2-balance", + setup: [ + s.customer({ testClock: false }), + s.products({ list: [freeDefault] }), + ], + actions: [], + }); + + const newCustomerId = `check-race-balance-${Date.now()}`; + + try { + await autumnV1.customers.delete(newCustomerId); + } catch {} + + // Concurrent /check calls with required_balance + const [res1, res2, res3] = await Promise.all([ + autumnV1.check({ + customer_id: newCustomerId, + feature_id: TestFeature.Messages, + required_balance: 50, + customer_data: { name: "Balance Test" }, + }), + autumnV1.check({ + customer_id: newCustomerId, + feature_id: TestFeature.Messages, + required_balance: 50, + customer_data: { name: "Balance Test" }, + }), + autumnV1.check({ + customer_id: newCustomerId, + feature_id: TestFeature.Messages, + required_balance: 50, + customer_data: { name: "Balance Test" }, + }), + ]); + + // All should be allowed (100 >= 50) + expect(res1.allowed).toBe(true); + expect(res2.allowed).toBe(true); + expect(res3.allowed).toBe(true); + + // Customer should have 100 balance (no usage tracked) + const customer = await autumnV2.customers.get(newCustomerId); + expect(customer.balances?.[TestFeature.Messages]?.current_balance).toBe(100); +}); diff --git a/server/tests/integration/crud/customers/create-customer-defaults.test.ts b/server/tests/integration/crud/customers/create-customer-defaults.test.ts new file mode 100644 index 000000000..f1027fd8e --- /dev/null +++ b/server/tests/integration/crud/customers/create-customer-defaults.test.ts @@ -0,0 +1,137 @@ +import { expect, test } from "bun:test"; +import type { ApiCustomerV3 } from "@autumn/shared"; +import { expectProductActive } from "@tests/integration/billing/utils/expectCustomerProductCorrect"; +import { + calculateTrialEndMs, + expectProductTrialing, +} from "@tests/integration/billing/utils/expectCustomerProductTrialing.js"; +import { TestFeature } from "@tests/setup/v2Features.js"; +import { items } from "@tests/utils/fixtures/items.js"; +import { products } from "@tests/utils/fixtures/products.js"; +import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; +import chalk from "chalk"; + +// ═══════════════════════════════════════════════════════════════════════════════ +// DEFAULT FREE PRODUCT TESTS +// ═══════════════════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("defaults: single free product")}`, async () => { + const customerId = "defaults-single-free"; + + const messagesItem = items.monthlyMessages({ includedUsage: 100 }); + const freeDefault = products.base({ + id: "free", + items: [messagesItem], + isDefault: true, + }); + + const { autumnV1 } = await initScenario({ + customerId, + setup: [ + s.customer({ testClock: false, withDefault: true }), + s.products({ list: [freeDefault] }), + ], + actions: [], + }); + + const customer = await autumnV1.customers.get(customerId); + + await expectProductActive({ + customer, + productId: `free_${customerId}`, + }); + + expect(customer.features[TestFeature.Messages].balance).toBe(100); +}); + +// ═══════════════════════════════════════════════════════════════════════════════ +// MULTIPLE GROUPS TESTS +// ═══════════════════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("defaults: multiple groups")}`, async () => { + const customerId = "defaults-multi-group"; + + const messagesItem = items.monthlyMessages({ includedUsage: 100 }); + const wordsItem = items.monthlyWords({ includedUsage: 500 }); + + const freeGroup1 = { + ...products.base({ + id: "free-group1", + items: [messagesItem], + isDefault: true, + }), + group: "group1", + }; + + const freeGroup2 = { + ...products.base({ + id: "free-group2", + items: [wordsItem], + isDefault: true, + }), + group: "group2", + }; + + const { autumnV1 } = await initScenario({ + customerId, + setup: [ + s.customer({ testClock: false, withDefault: true }), + s.products({ list: [freeGroup1, freeGroup2] }), + ], + actions: [], + }); + + const customer = await autumnV1.customers.get(customerId); + + // Both products from different groups should be attached + await expectProductActive({ + customer, + productId: `free-group1_${customerId}`, + }); + + await expectProductActive({ + customer, + productId: `free-group2_${customerId}`, + }); + + // Verify both feature balances + expect(customer.features[TestFeature.Messages].balance).toBe(100); + expect(customer.features[TestFeature.Words].balance).toBe(500); +}); + +// ═══════════════════════════════════════════════════════════════════════════════ +// FREE PRODUCT WITH TRIAL TESTS +// ═══════════════════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("defaults: free product with 7-day trial")}`, async () => { + const customerId = "defaults-free-trial"; + + const messagesItem = items.monthlyMessages({ includedUsage: 100 }); + const freeTrialDefault = products.base({ + id: "free-trial", + items: [messagesItem], + isDefault: true, + trialDays: 7, + }); + + const { autumnV1 } = await initScenario({ + customerId, + setup: [ + s.customer({ testClock: false, withDefault: true }), + s.products({ list: [freeTrialDefault] }), + ], + actions: [], + }); + + const customer = await autumnV1.customers.get(customerId); + + // Product should be attached and in trialing status + await expectProductTrialing({ + customer, + productId: `free-trial_${customerId}`, + trialEndsAt: calculateTrialEndMs({ trialDays: 7 }), + }); + + // Verify feature balance is still available during trial + expect(customer.features[TestFeature.Messages].balance).toBe(100); +}); diff --git a/server/tests/integration/crud/customers/create-customer-null-id.test.ts b/server/tests/integration/crud/customers/create-customer-null-id.test.ts new file mode 100644 index 000000000..27175f182 --- /dev/null +++ b/server/tests/integration/crud/customers/create-customer-null-id.test.ts @@ -0,0 +1,273 @@ +import { expect, test } from "bun:test"; +import type { ApiCustomerV3 } from "@autumn/shared"; +import { expectCustomerFeatureCorrect } from "@tests/integration/billing/utils/expectCustomerFeatureCorrect"; +import { expectProductActive } from "@tests/integration/billing/utils/expectCustomerProductCorrect.js"; +import { TestFeature } from "@tests/setup/v2Features.js"; +import { items } from "@tests/utils/fixtures/items.js"; +import { products } from "@tests/utils/fixtures/products.js"; +import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; +import chalk from "chalk"; + +// ═══════════════════════════════════════════════════════════════════════════════ +// NULL ID CONSTRAINT TESTS +// Tests for the partial unique index: (org_id, env, lower(email)) WHERE id IS NULL +// ═══════════════════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("null-id: duplicate null ID + same email returns existing with products")}`, async () => { + const defaultGroup = "null-dup-test"; + const email = "null-dup-test@example.com"; + + const messagesItem = items.monthlyMessages({ includedUsage: 100 }); + const freeDefault = products.base({ + id: "free", + items: [messagesItem], + isDefault: true, + }); + + // Use prefix for product prefixing, no customer is created by initScenario + const { autumnV1 } = await initScenario({ + setup: [ + s.deleteCustomer({ email }), + s.products({ list: [freeDefault], prefix: defaultGroup }), + ], + actions: [], + }); + + // First create with null ID - should get default product + const data1 = await autumnV1.customers.create({ + id: null, + name: "First Customer", + email, + withAutumnId: true, + internalOptions: { default_group: defaultGroup }, + }); + + expect(data1.id).toBeNull(); + expect(data1.email).toBe(email); + + // Verify first create has default product + const customer1 = await autumnV1.customers.get( + data1.autumn_id!, + ); + await expectProductActive({ customer: customer1, productId: freeDefault.id }); + expect(customer1.features[TestFeature.Messages].balance).toBe(100); + + // Second create with null ID and same email - should return existing (idempotent) + const data2 = await autumnV1.customers.create({ + id: null, + name: "Second Customer", + email, + withAutumnId: true, + internalOptions: { default_group: defaultGroup }, + }); + + // Should return the same customer + expect(data2.autumn_id).toBe(data1.autumn_id); + expect(data2.email).toBe(email); + // Name should be updated (upsert behavior) + expect(data2.name).toBe("First Customer"); + + // Verify second create also returns customer with default product + const customer2 = await autumnV1.customers.get( + data2.autumn_id!, + ); + await expectProductActive({ customer: customer2, productId: freeDefault.id }); + expect(customer2.features[TestFeature.Messages].balance).toBe(100); +}); + +test.concurrent(`${chalk.yellowBright("null-id: multiple customers with different emails allowed")}`, async () => { + const emailA = "null-multi-a-test@example.com"; + const emailB = "null-multi-b-test@example.com"; + const emailC = "null-multi-c-test@example.com"; + + // No products or customer needed - just need autumnV1 client + const { autumnV1 } = await initScenario({ + setup: [ + s.deleteCustomer({ email: emailA }), + s.deleteCustomer({ email: emailB }), + s.deleteCustomer({ email: emailC }), + ], + actions: [], + }); + + // Create multiple customers with null ID but different emails + const data1 = await autumnV1.customers.create({ + id: null, + name: "Customer A", + email: emailA, + withAutumnId: true, + internalOptions: { disable_defaults: true }, + }); + + const data2 = await autumnV1.customers.create({ + id: null, + name: "Customer B", + email: emailB, + withAutumnId: true, + internalOptions: { disable_defaults: true }, + }); + + const data3 = await autumnV1.customers.create({ + id: null, + name: "Customer C", + email: emailC, + withAutumnId: true, + internalOptions: { disable_defaults: true }, + }); + + // All should be created with different autumn_ids + expect(data1.id).toBeNull(); + expect(data2.id).toBeNull(); + expect(data3.id).toBeNull(); + expect(data1.autumn_id).not.toBe(data2.autumn_id); + expect(data2.autumn_id).not.toBe(data3.autumn_id); +}); + +test.concurrent(`${chalk.yellowBright("null-id: claim with ID returns existing customer with products")}`, async () => { + const defaultGroup = "null-claim-products-test"; + const email = "null-claim-test@example.com"; + const newId = "claimed-id-test"; + + const messagesItem = items.monthlyMessages({ includedUsage: 100 }); + const freeDefault = products.base({ + id: "free", + items: [messagesItem], + isDefault: true, + }); + + // Use prefix for product prefixing, no customer is created by initScenario + const { autumnV1 } = await initScenario({ + setup: [ + s.deleteCustomer({ email }), + s.deleteCustomer({ customerId: newId }), + s.products({ list: [freeDefault], prefix: defaultGroup }), + ], + actions: [], + }); + + // First create with null ID - should get default product + const data1 = await autumnV1.customers.create({ + id: null, + name: "Null ID Customer", + email, + withAutumnId: true, + internalOptions: { default_group: defaultGroup }, + }); + + expect(data1.id).toBeNull(); + expect(data1.autumn_id).toBeDefined(); + + // Verify default product was attached + const customer1 = await autumnV1.customers.get( + data1.autumn_id!, + ); + await expectProductActive({ customer: customer1, productId: freeDefault.id }); + expectCustomerFeatureCorrect({ + customer: customer1, + featureId: TestFeature.Messages, + balance: 100, + }); + + // Second create with same email but now with an ID - should claim and return existing + const data2 = await autumnV1.customers.create({ + id: newId, + name: "Now Has ID", + email, + withAutumnId: true, + internalOptions: { default_group: defaultGroup }, + }); + + // Should return the same customer with the new ID set + expect(data2.id).toBe(newId); + expect(data2.autumn_id).toBe(data1.autumn_id); + + // Verify the customer can be fetched with the new ID + const claimedCustomer = await autumnV1.customers.get(newId); + expect(claimedCustomer.id).toBe(newId); + + // Should still have the default product + await expectProductActive({ + customer: claimedCustomer, + productId: freeDefault.id, + }); + expectCustomerFeatureCorrect({ + customer: claimedCustomer, + featureId: TestFeature.Messages, + balance: 100, + }); +}); + +test(`${chalk.yellowBright("null-id: claim existing email-null customer with ID")}`, async () => { + const email = "same-email-test@example.com"; + const newId = "with-id-test"; + + // No products or customer needed - just need autumnV1 client + const { autumnV1 } = await initScenario({ + setup: [ + s.deleteCustomer({ email }), + s.deleteCustomer({ customerId: newId }), + ], + actions: [], + }); + + // Create customer with null ID + const data1 = await autumnV1.customers.create({ + id: null, + name: "Null ID Customer", + email, + withAutumnId: true, + internalOptions: { disable_defaults: true }, + }); + + expect(data1.id).toBeNull(); + + // Create another customer with same email but WITH an ID + // This should claim the null-id customer (upsert sets the ID) + const data2 = await autumnV1.customers.create({ + id: newId, + name: "Has ID Customer", + email, + withAutumnId: true, + internalOptions: { disable_defaults: true }, + }); + + // Should be the same customer with the new ID + expect(data2.autumn_id).toBe(data1.autumn_id); + expect(data2.id).toBe(newId); +}); + +test(`${chalk.yellowBright("null-id: case-insensitive email matching returns existing")}`, async () => { + const emailLower = "case-test@example.com"; + const emailUpper = "CASE-TEST@EXAMPLE.COM"; + + // No products or customer needed - just need autumnV1 client + const { autumnV1 } = await initScenario({ + setup: [s.deleteCustomer({ email: emailLower })], + actions: [], + }); + + // Create with lowercase email + const data1 = await autumnV1.customers.create({ + id: null, + name: "Lowercase Email", + email: emailLower, + withAutumnId: true, + internalOptions: { disable_defaults: true }, + }); + + expect(data1.id).toBeNull(); + + // Try to create with uppercase email - should return existing (case-insensitive match) + const data2 = await autumnV1.customers.create({ + id: null, + name: "Uppercase Email", + email: emailUpper, + withAutumnId: true, + internalOptions: { disable_defaults: true }, + }); + + // Should return the same customer + expect(data2.autumn_id).toBe(data1.autumn_id); + // Name should be updated (upsert behavior) + expect(data2.name).toBe("Uppercase Email"); +}); diff --git a/server/tests/integration/crud/customers/create-customer-paid-defaults.test.ts b/server/tests/integration/crud/customers/create-customer-paid-defaults.test.ts new file mode 100644 index 000000000..7a90bc70d --- /dev/null +++ b/server/tests/integration/crud/customers/create-customer-paid-defaults.test.ts @@ -0,0 +1,172 @@ +import { expect, test } from "bun:test"; +import type { ApiCustomerV3 } from "@autumn/shared"; +import { expectCustomerFeatureCorrect } from "@tests/integration/billing/utils/expectCustomerFeatureCorrect.js"; +import { + calculateTrialEndMs, + expectProductTrialing, +} from "@tests/integration/billing/utils/expectCustomerProductTrialing.js"; +import { expectSubToBeCorrect } from "@tests/merged/mergeUtils/expectSubCorrect"; +import { TestFeature } from "@tests/setup/v2Features.js"; +import { items } from "@tests/utils/fixtures/items.js"; +import { products } from "@tests/utils/fixtures/products.js"; +import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; +import { FreeTrialDuration } from "autumn-js"; +import chalk from "chalk"; +import { CusService } from "@/internal/customers/CusService"; + +// ═══════════════════════════════════════════════════════════════════════════════ +// DEFAULT TRIAL PRODUCT TESTS +// ═══════════════════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("paid-defaults: trial product")}`, async () => { + const customerId = "paid-defaults-trial"; + + const messagesItem = items.monthlyMessages({ includedUsage: 500 }); + + const trialDefault = products.defaultTrial({ + id: "trial-pro", + items: [messagesItem], + trialDays: 14, + }); + + const { autumnV1, ctx } = await initScenario({ + customerId, + setup: [ + s.customer({ testClock: false, withDefault: true }), + s.products({ list: [trialDefault] }), + ], + actions: [], + }); + + const customer = await autumnV1.customers.get(customerId); + + await expectProductTrialing({ + customer, + productId: trialDefault.id, + trialEndsAt: calculateTrialEndMs({ trialDays: 14 }), + }); + + expectCustomerFeatureCorrect({ + customer, + featureId: TestFeature.Messages, + balance: 500, + }); + + await expectSubToBeCorrect({ + db: ctx.db, + customerId, + org: ctx.org, + env: ctx.env, + subCount: 1, + }); +}); + +test.concurrent(`${chalk.yellowBright("paid-defaults: trial product with prepaid messages")}`, async () => { + const customerId = "paid-defaults-trial-prepaid"; + + const prepaidMessagesItem = items.prepaidMessages({ + includedUsage: 200, + price: 10, + }); + + const trialDefault = products.base({ + id: "trial-prepaid", + items: [prepaidMessagesItem], + isDefault: true, + freeTrial: { + length: 7, + duration: FreeTrialDuration.Day, + cardRequired: false, + uniqueFingerprint: false, + }, + }); + + const { autumnV1, ctx } = await initScenario({ + customerId, + setup: [ + s.customer({ testClock: false, withDefault: true }), + s.products({ list: [trialDefault] }), + ], + actions: [], + }); + + const customer = await autumnV1.customers.get(customerId); + + await expectProductTrialing({ + customer, + productId: trialDefault.id, + trialEndsAt: calculateTrialEndMs({ trialDays: 7 }), + }); + + expectCustomerFeatureCorrect({ + customer, + featureId: TestFeature.Messages, + balance: 200, + }); + + const fullCustomer = await CusService.getFull({ + db: ctx.db, + idOrInternalId: customer.id ?? "", + orgId: ctx.org.id, + env: ctx.env, + }); + + expect(fullCustomer.customer_products.length).toBe(1); + expect(fullCustomer.customer_products[0].options?.[0]).toMatchObject({ + quantity: 0, + }); + + await expectSubToBeCorrect({ + db: ctx.db, + customerId, + org: ctx.org, + env: ctx.env, + subCount: 1, + }); +}); + +test.concurrent(`${chalk.yellowBright("paid-defaults: same group priority (trial > paid > free)")}`, async () => { + const customerId = "paid-defaults-priority"; + + const messagesItem = items.monthlyMessages({ includedUsage: 100 }); + const messagesItemHigh = items.monthlyMessages({ includedUsage: 1000 }); + + // Free default in same group + const freeDefault = products.base({ + id: "free", + items: [messagesItem], + isDefault: true, + }); + + // Trial default in same group - should take priority + const trialDefault = products.defaultTrial({ + id: "trial-pro", + items: [messagesItemHigh], + trialDays: 7, + }); + + const { autumnV1 } = await initScenario({ + customerId, + setup: [ + s.customer({ testClock: false, withDefault: true }), + s.products({ list: [freeDefault, trialDefault] }), + ], + actions: [], + }); + + const customer = await autumnV1.customers.get(customerId); + + // Trial product should be attached (higher priority than free) + await expectProductTrialing({ + customer, + productId: trialDefault.id, + trialEndsAt: calculateTrialEndMs({ trialDays: 7 }), + }); + + // Balance should reflect trial product's higher allowance + expectCustomerFeatureCorrect({ + customer, + featureId: TestFeature.Messages, + balance: 1000, + }); +}); diff --git a/server/tests/integration/crud/customers/create-customer-race.test.ts b/server/tests/integration/crud/customers/create-customer-race.test.ts new file mode 100644 index 000000000..f54e27960 --- /dev/null +++ b/server/tests/integration/crud/customers/create-customer-race.test.ts @@ -0,0 +1,286 @@ +import { expect, test } from "bun:test"; +import { CusProductStatus } from "@autumn/shared"; +import { expectCustomerFeatureCorrect } from "@tests/integration/billing/utils/expectCustomerFeatureCorrect.js"; +import { expectProductActive } from "@tests/integration/billing/utils/expectCustomerProductCorrect.js"; +import { expectProductTrialing } from "@tests/integration/billing/utils/expectCustomerProductTrialing.js"; +import { expectSubToBeCorrect } from "@tests/merged/mergeUtils/expectSubCorrect"; +import { TestFeature } from "@tests/setup/v2Features.js"; +import { expectProductAttached } from "@tests/utils/expectUtils/expectProductAttached.js"; +import { items } from "@tests/utils/fixtures/items.js"; +import { products } from "@tests/utils/fixtures/products.js"; +import ctx from "@tests/utils/testInitUtils/createTestContext.js"; +import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; +import type { Customer } from "autumn-js"; +import chalk from "chalk"; +import { CusService } from "@/internal/customers/CusService.js"; + +// ═══════════════════════════════════════════════════════════════════════════════ +// RACE CONDITION TESTS +// Tests for concurrent customer creation with default products +// ═══════════════════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("race: concurrent create same ID returns same customer")}`, async () => { + const customerId = "race-same-id-test"; + + const messagesItem = items.monthlyMessages({ includedUsage: 100 }); + const freeDefault = products.base({ + id: "free", + items: [messagesItem], + isDefault: true, + }); + + // Use customerId for product prefixing, but no customer is created + const { autumnV1 } = await initScenario({ + setup: [ + s.deleteCustomer({ customerId }), + s.products({ list: [freeDefault], prefix: customerId }), + ], + actions: [], + }); + + // Concurrent creates with same ID + const results = await Promise.all([ + autumnV1.customers.create({ + id: customerId, + name: "Concurrent 1", + email: `${customerId}-1@example.com`, + withAutumnId: true, + internalOptions: { + default_group: customerId, + }, + }), + autumnV1.customers.create({ + id: customerId, + name: "Concurrent 2", + email: `${customerId}-2@example.com`, + withAutumnId: true, + internalOptions: { + default_group: customerId, + }, + }), + autumnV1.customers.create({ + id: customerId, + name: "Concurrent 3", + email: `${customerId}-3@example.com`, + withAutumnId: true, + internalOptions: { + default_group: customerId, + }, + }), + ]); + + // All should return the same customer + const autumnIds = results.map((r) => r.autumn_id); + expect(new Set(autumnIds).size).toBe(1); // All same autumn_id + + // All should have the same customer ID, free default product, and balance of 100 + for (const result of results) { + expect(result.id).toBe(customerId); + await expectProductActive({ customer: result, productId: freeDefault.id }); + expectCustomerFeatureCorrect({ + customer: result, + featureId: TestFeature.Messages, + balance: 100, + }); + } + + // Get the customer and verify default product + const customer = await autumnV1.customers.get(customerId); + expectProductAttached({ + customer, + productId: freeDefault.id, + status: CusProductStatus.Active, + }); + expect(customer.features[TestFeature.Messages].balance).toBe(100); + + // Verify no duplicate customer_products in DB + const fullCustomer = await CusService.getFull({ + db: ctx.db, + idOrInternalId: customerId, + orgId: ctx.org.id, + env: ctx.env, + }); + + // Count products with the same product_id + const productCounts = fullCustomer.customer_products.reduce( + (acc, cp) => { + acc[cp.product.id] = (acc[cp.product.id] || 0) + 1; + return acc; + }, + {} as Record, + ); + + // Should only have one of each product + for (const [_productId, count] of Object.entries(productCounts)) { + expect(count).toBe(1); + } +}); + +test.concurrent(`${chalk.yellowBright("race: concurrent null ID same email returns same customer")}`, async () => { + const email = "race-null-test@example.com"; + + // No products or customer needed - just need autumnV1 client + const { autumnV1 } = await initScenario({ + setup: [s.deleteCustomer({ email })], + actions: [], + }); + + // Concurrent creates with null ID and same email + const results = await Promise.all([ + autumnV1.customers.create({ + id: null, + name: "Concurrent Null 1", + email, + withAutumnId: true, + internalOptions: { + disable_defaults: true, + }, + }), + autumnV1.customers.create({ + id: null, + name: "Concurrent Null 2", + email, + withAutumnId: true, + internalOptions: { + disable_defaults: true, + }, + }), + autumnV1.customers.create({ + id: null, + name: "Concurrent Null 3", + email, + withAutumnId: true, + internalOptions: { + disable_defaults: true, + }, + }), + ]); + + // All should succeed and return the same customer (idempotent) + const autumnIds = results.map((r) => r.autumn_id); + expect(new Set(autumnIds).size).toBe(1); + + // All should have the same email + for (const result of results) { + expect(result.email).toBe(email); + expect(result.id).toBeNull(); + } +}); + +test.concurrent(`${chalk.yellowBright("race: concurrent create with default trial creates only 1 Stripe customer and subscription")}`, async () => { + const customerId = "race-default-trial-test"; + const email = `${customerId}@example.com`; + + const messagesItem = items.monthlyMessages({ includedUsage: 500 }); + const trialDefault = products.defaultTrial({ + id: "trial-pro", + items: [messagesItem], + trialDays: 14, + cardRequired: false, + }); + + const { autumnV1, ctx } = await initScenario({ + setup: [ + s.deleteCustomer({ customerId }), + s.products({ list: [trialDefault], prefix: customerId }), + ], + actions: [], + }); + + // Concurrent creates with same ID and same params - should all return the same customer + // NOTE: All requests must have identical params for idempotency to work correctly with Stripe + const results = await Promise.all([ + autumnV1.customers.create({ + id: customerId, + name: "Concurrent Trial", + email, + withAutumnId: true, + internalOptions: { + default_group: customerId, + }, + }), + autumnV1.customers.create({ + id: customerId, + name: "Concurrent Trial", + email, + withAutumnId: true, + internalOptions: { + default_group: customerId, + }, + }), + autumnV1.customers.create({ + id: customerId, + name: "Concurrent Trial", + email, + withAutumnId: true, + internalOptions: { + default_group: customerId, + }, + }), + ]); + + // 1. All responses should return the same customer (same autumn_id) + const autumnIds = results.map((r) => r.autumn_id); + const stripeCustomerIds = results + .map((r) => r.stripe_id) + .filter((id) => id !== null); + expect(new Set(autumnIds).size).toBe(1); + expect(new Set(stripeCustomerIds).size).toBe(1); + + // Each response should have the correct customer ID, email, and trial product attached + for (const result of results) { + expect(result.id).toBe(customerId); + expect(result.email).toBe(email); + await expectProductTrialing({ + customer: result, + productId: trialDefault.id, + }); + expectCustomerFeatureCorrect({ + customer: result, + featureId: TestFeature.Messages, + balance: 500, + }); + } + + // Get the full customer to verify Stripe data + const fullCustomer = await CusService.getFull({ + db: ctx.db, + idOrInternalId: customerId, + orgId: ctx.org.id, + env: ctx.env, + }); + + // 2. Verify only 1 Stripe customer was created + const stripeCustomerId = fullCustomer.processor?.id; + expect(stripeCustomerId).toBeDefined(); + + // 3. Verify only 1 Stripe subscription was created + const subscriptions = await ctx.stripeCli.subscriptions.list({ + customer: stripeCustomerId!, + status: "all", + }); + expect(subscriptions.data.length).toBe(1); + + // Verify the subscription is in trialing status + expect(subscriptions.data[0].status).toBe("trialing"); + + // Verify no duplicate customer_products in DB + const productCounts = fullCustomer.customer_products.reduce( + (acc, cp) => { + acc[cp.product.id] = (acc[cp.product.id] || 0) + 1; + return acc; + }, + {} as Record, + ); + + for (const [_productId, count] of Object.entries(productCounts)) { + expect(count).toBe(1); + } + + await expectSubToBeCorrect({ + db: ctx.db, + customerId, + org: ctx.org, + env: ctx.env, + }); +}); diff --git a/server/tests/integration/crud/customers/create-customer.test.ts b/server/tests/integration/crud/customers/create-customer.test.ts new file mode 100644 index 000000000..b637f7861 --- /dev/null +++ b/server/tests/integration/crud/customers/create-customer.test.ts @@ -0,0 +1,178 @@ +import { expect, test } from "bun:test"; +import { CusExpand, ErrCode } from "@autumn/shared"; +import { expectAutumnError } from "@tests/utils/expectUtils/expectErrUtils.js"; +import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; +import chalk from "chalk"; + +// ═══════════════════════════════════════════════════════════════════════════════ +// BASIC CREATION TESTS +// ═══════════════════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("create: basic with ID")}`, async () => { + const customerId = "create-basic-id"; + const { autumnV1 } = await initScenario({ + customerId, + setup: [s.customer({ testClock: false })], + actions: [], + }); + + // Delete to test fresh create + try { + await autumnV1.customers.delete(customerId); + } catch {} + + const data = await autumnV1.customers.create({ + id: customerId, + name: "Test Customer", + email: `${customerId}@example.com`, + withAutumnId: false, + }); + + expect(data.id).toBe(customerId); + expect(data.name).toBe("Test Customer"); + expect(data.email).toBe(`${customerId}@example.com`); + expect(data.autumn_id).toBeUndefined(); +}); + +test.concurrent(`${chalk.yellowBright("create: idempotent with same ID")}`, async () => { + const customerId = "create-idempotent"; + const { autumnV1 } = await initScenario({ + customerId, + setup: [s.customer({ testClock: false })], + actions: [], + }); + + // Delete first + try { + await autumnV1.customers.delete(customerId); + } catch {} + + // First create + const data1 = await autumnV1.customers.create({ + id: customerId, + name: "Test Customer", + email: `${customerId}@example.com`, + withAutumnId: true, + }); + + // Second create - should return existing + const data2 = await autumnV1.customers.create({ + id: customerId, + name: "Test Customer", + email: `${customerId}@example.com`, + withAutumnId: true, + }); + + expect(data1.id).toBe(data2.id); + expect(data1.autumn_id).toBe(data2.autumn_id); +}); + +test.concurrent(`${chalk.yellowBright("create: with expand params")}`, async () => { + const customerId = "create-expand"; + const { autumnV1 } = await initScenario({ + customerId, + setup: [s.customer({ testClock: false })], + actions: [], + }); + + // Delete first + try { + await autumnV1.customers.delete(customerId); + } catch {} + + const data = await autumnV1.customers.create({ + id: customerId, + name: customerId, + email: `${customerId}@example.com`, + withAutumnId: false, + expand: [CusExpand.Invoices, CusExpand.TrialsUsed, CusExpand.Entities], + }); + + expect(data.invoices).toEqual([]); + expect(data.trials_used).toEqual([]); + expect(data.entities).toEqual([]); +}); + +test.concurrent(`${chalk.yellowBright("create: concurrent same ID")}`, async () => { + const customerId = "create-concurrent-id"; + const { autumnV1 } = await initScenario({ + customerId, + setup: [s.customer({ testClock: false })], + actions: [], + }); + + // Delete first + try { + await autumnV1.customers.delete(customerId); + } catch {} + + // Concurrent creates with same ID + const [data1, data2] = await Promise.all([ + autumnV1.customers.create({ + id: customerId, + name: customerId, + email: `${customerId}@example.com`, + withAutumnId: true, + }), + autumnV1.customers.create({ + id: customerId, + name: customerId, + email: `${customerId}@example.com`, + withAutumnId: true, + }), + ]); + + // Both should return same customer + expect(data1.id).toBe(customerId); + expect(data2.id).toBe(customerId); + expect(data1.autumn_id).toBe(data2.autumn_id); +}); + +// ═══════════════════════════════════════════════════════════════════════════════ +// NULL ID BASIC TESTS +// More comprehensive null ID tests are in create-customer-null-id.test.ts +// ═══════════════════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("create: null ID with email")}`, async () => { + const customerId = "create-null-id-email"; + const { autumnV1 } = await initScenario({ + customerId, + setup: [s.customer({ testClock: false })], + actions: [], + }); + + const email = "create-null-id-test@example.com"; + + const data = await autumnV1.customers.create({ + id: null, + name: "Null ID Customer", + email, + withAutumnId: true, + }); + + expect(data.id).toBeNull(); + expect(data.name).toBe("Null ID Customer"); + expect(data.email).toBe(email); + expect(data.autumn_id).toBeDefined(); +}); + +test.concurrent(`${chalk.yellowBright("create: null ID no email (error)")}`, async () => { + const customerId = "create-null-id-no-email"; + const { autumnV1 } = await initScenario({ + customerId, + setup: [s.customer({ testClock: false })], + actions: [], + }); + + await expectAutumnError({ + errCode: ErrCode.InvalidCustomer, + errMessage: "Email is required when `id` is null", + func: async () => { + await autumnV1.customers.create({ + id: null, + name: "Null ID Customer", + withAutumnId: false, + }); + }, + }); +}); diff --git a/server/tests/integration/crud/customers/create-customer1.test.ts b/server/tests/integration/crud/customers/create-customer1.test.ts deleted file mode 100644 index 2aed9879f..000000000 --- a/server/tests/integration/crud/customers/create-customer1.test.ts +++ /dev/null @@ -1,63 +0,0 @@ -import { beforeAll, describe, expect, test } from "bun:test"; -import { ApiVersion, CusExpand } from "@autumn/shared"; -import ctx from "@tests/utils/testInitUtils/createTestContext.js"; -import chalk from "chalk"; -import { AutumnInt } from "@/external/autumn/autumnCli.js"; - -const testCase = "create-customer1"; -const customerId = testCase; - -describe(`${chalk.yellowBright("create-customer1: Testing create customer")}`, () => { - const autumnV1 = new AutumnInt({ - secretKey: ctx.orgSecretKey, - version: ApiVersion.V1_2, - }); - - beforeAll(async () => { - try { - await autumnV1.customers.delete(customerId); - } catch {} - }); - - test("should create customer with expand params", async () => { - const data = await autumnV1.customers.create({ - id: customerId, - name: customerId, - email: `${customerId}@example.com`, - withAutumnId: false, - }); - - expect(data.id).toBe(customerId); - expect(data.name).toBe(customerId); - expect(data.email).toBe(`${customerId}@example.com`); - expect(data.autumn_id).toBeUndefined(); - }); - - test("should return customer when call again", async () => { - const data = await autumnV1.customers.create({ - id: customerId, - name: customerId, - email: `${customerId}@example.com`, - withAutumnId: false, - }); - - expect(data.id).toBe(customerId); - expect(data.name).toBe(customerId); - expect(data.email).toBe(`${customerId}@example.com`); - expect(data.autumn_id).toBeUndefined(); - }); - - test("should return expanded params if provided", async () => { - const data = await autumnV1.customers.create({ - id: customerId, - name: customerId, - email: `${customerId}@example.com`, - withAutumnId: false, - expand: [CusExpand.Invoices, CusExpand.TrialsUsed, CusExpand.Entities], - }); - - expect(data.invoices).toEqual([]); - expect(data.trials_used).toEqual([]); - expect(data.entities).toEqual([]); - }); -}); diff --git a/server/tests/integration/crud/customers/create-customer2.test.ts b/server/tests/integration/crud/customers/create-customer2.test.ts deleted file mode 100644 index 2c30822fa..000000000 --- a/server/tests/integration/crud/customers/create-customer2.test.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { beforeAll, describe, expect, test } from "bun:test"; -import { ApiVersion, CusExpand } from "@autumn/shared"; -import ctx from "@tests/utils/testInitUtils/createTestContext.js"; -import chalk from "chalk"; -import { AutumnInt } from "@/external/autumn/autumnCli.js"; - -const testCase = "create-customer2"; -const customerId = testCase; - -describe(`${chalk.yellowBright("create-customer2: Testing create customer concurrently (should have no race conditions)")}`, () => { - const autumnV1 = new AutumnInt({ - secretKey: ctx.orgSecretKey, - version: ApiVersion.V1_2, - }); - - beforeAll(async () => { - try { - await autumnV1.customers.delete(customerId); - } catch {} - }); - - test("should create customer with expand params", async () => { - const [data1, data2] = await Promise.all([ - autumnV1.customers.create({ - id: customerId, - name: customerId, - email: `${customerId}@example.com`, - withAutumnId: false, - }), - autumnV1.customers.create({ - id: customerId, - name: customerId, - email: `${customerId}@example.com`, - withAutumnId: false, - }), - ]); - - expect(data1.id).toBe(customerId); - expect(data1.name).toBe(customerId); - expect(data1.email).toBe(`${customerId}@example.com`); - expect(data1.autumn_id).toBeUndefined(); - - expect(data2.id).toBe(customerId); - expect(data2.name).toBe(customerId); - expect(data2.email).toBe(`${customerId}@example.com`); - expect(data2.autumn_id).toBeUndefined(); - }); - - test("should return customer when call again", async () => { - const data = await autumnV1.customers.create({ - id: customerId, - name: customerId, - email: `${customerId}@example.com`, - withAutumnId: false, - }); - - expect(data.id).toBe(customerId); - expect(data.name).toBe(customerId); - expect(data.email).toBe(`${customerId}@example.com`); - expect(data.autumn_id).toBeUndefined(); - }); - - test("should return expanded params if provided", async () => { - const data = await autumnV1.customers.create({ - id: customerId, - name: customerId, - email: `${customerId}@example.com`, - withAutumnId: false, - expand: [CusExpand.Invoices, CusExpand.TrialsUsed, CusExpand.Entities], - }); - - expect(data.invoices).toEqual([]); - expect(data.trials_used).toEqual([]); - expect(data.entities).toEqual([]); - }); -}); diff --git a/server/tests/utils/fixtures/products.ts b/server/tests/utils/fixtures/products.ts index d0cc2c34c..c5474f206 100644 --- a/server/tests/utils/fixtures/products.ts +++ b/server/tests/utils/fixtures/products.ts @@ -1,9 +1,11 @@ import { + BillingInterval, type FreeTrial, FreeTrialDuration, type ProductItem, type ProductV2, } from "@autumn/shared"; +import { constructPriceItem } from "@/internal/products/product-items/productItemUtils.js"; import { constructProduct, constructRawProduct, @@ -14,7 +16,8 @@ import { * @param items - Product items (features) * @param id - Product ID (default: "base") * @param isDefault - Whether this is a default product (default: false) - * @param trialDays - Optional number of trial days + * @param trialDays - Optional number of trial days (shorthand) + * @param freeTrial - Optional full free trial config (overrides trialDays) */ const base = ({ items, @@ -22,23 +25,39 @@ const base = ({ isDefault = false, isAddOn = false, trialDays, + freeTrial, }: { items: ProductItem[]; id?: string; isDefault?: boolean; isAddOn?: boolean; trialDays?: number; + freeTrial?: { + length: number; + duration: FreeTrialDuration; + cardRequired?: boolean; + uniqueFingerprint?: boolean; + }; }): ProductV2 => ({ ...constructRawProduct({ id, items, isAddOn }), is_default: isDefault, - ...(trialDays && { - free_trial: { - length: trialDays, - duration: FreeTrialDuration.Day, - unique_fingerprint: false, - card_required: true, - } as unknown as FreeTrial, - }), + ...(freeTrial + ? { + free_trial: { + length: freeTrial.length, + duration: freeTrial.duration, + unique_fingerprint: freeTrial.uniqueFingerprint ?? false, + card_required: freeTrial.cardRequired ?? true, + } as unknown as FreeTrial, + } + : trialDays && { + free_trial: { + length: trialDays, + duration: FreeTrialDuration.Day, + unique_fingerprint: false, + card_required: true, + } as unknown as FreeTrial, + }), }); /** @@ -139,6 +158,40 @@ const baseWithTrial = ({ } as unknown as FreeTrial, }); +/** + * Default trial product - $20/month product with trial that's set as default + * @param items - Product items (features) + * @param id - Product ID (default: "default-trial") + * @param trialDays - Number of trial days (default: 7) + * @param cardRequired - Whether card is required for trial (default: false) + */ +const defaultTrial = ({ + items, + id = "default-trial", + trialDays = 7, + cardRequired = false, +}: { + items: ProductItem[]; + id?: string; + trialDays?: number; + cardRequired?: boolean; +}): ProductV2 => ({ + ...constructRawProduct({ + id, + items: [ + ...items, + constructPriceItem({ price: 20, interval: BillingInterval.Month }), + ], + }), + is_default: true, + free_trial: { + length: trialDays, + duration: FreeTrialDuration.Day, + unique_fingerprint: false, + card_required: cardRequired, + } as unknown as FreeTrial, +}); + /** * One-off product - one-time purchase with $10 base price * @param items - Product items (features) @@ -161,6 +214,7 @@ const oneOff = ({ export const products = { base, baseWithTrial, + defaultTrial, pro, proAnnual, proWithTrial, diff --git a/server/tests/utils/testInitUtils/initScenario.ts b/server/tests/utils/testInitUtils/initScenario.ts index 3049c765f..b10092fff 100644 --- a/server/tests/utils/testInitUtils/initScenario.ts +++ b/server/tests/utils/testInitUtils/initScenario.ts @@ -3,6 +3,7 @@ import type { CustomerData } from "autumn-js"; import { addHours, addMonths } from "date-fns"; import { AutumnInt } from "@/external/autumn/autumnCli.js"; import { removeAllPaymentMethods } from "@/external/stripe/customers/paymentMethods/operations/removeAllPaymentMethods.js"; +import { CusService } from "@/internal/customers/CusService.js"; import { attachPaymentMethod as attachPaymentMethodFn } from "@/utils/scriptUtils/initCustomer.js"; import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js"; import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js"; @@ -71,14 +72,22 @@ type ScenarioAction = | AttachPaymentMethodAction | RemovePaymentMethodAction; +type CleanupConfig = { + customerIdsToDelete: string[]; + emailsToDelete: string[]; +}; + type ScenarioConfig = { testClock: boolean; attachPm?: "success" | "fail" | "authenticate"; customerData?: CustomerData; withDefault: boolean; + defaultGroup?: string; products: ProductV2[]; + productPrefix?: string; entityConfig?: EntityConfig; customerIds?: string[]; + cleanup: CleanupConfig; actions: ScenarioAction[]; }; @@ -110,19 +119,23 @@ const generateEntities = (config: EntityConfig): GeneratedEntity[] => { * @param paymentMethod - Attach payment method: "success", "fail", or "authenticate" * @param data - Customer metadata (fingerprint, name, email, etc.) * @param withDefault - Attach the default product on creation (default: false) + * @param defaultGroup - The product group to use for default product selection * @example s.customer({ paymentMethod: "success" }) * @example s.customer({ paymentMethod: "success", data: { name: "Test" } }) + * @example s.customer({ withDefault: true, defaultGroup: "enterprise" }) */ const customer = ({ testClock = true, paymentMethod, data, withDefault, + defaultGroup, }: { testClock?: boolean; paymentMethod?: "success" | "fail" | "authenticate"; data?: CustomerData; withDefault?: boolean; + defaultGroup?: string; }): ConfigFn => { return (config) => ({ ...config, @@ -130,6 +143,7 @@ const customer = ({ attachPm: paymentMethod ?? config.attachPm, customerData: data ?? config.customerData, withDefault: withDefault ?? config.withDefault, + defaultGroup: defaultGroup ?? config.defaultGroup, }); }; @@ -137,19 +151,25 @@ const customer = ({ * Define products to create for this test scenario. * Products are prefixed with customerId for test isolation. * @param list - Array of ProductV2 objects + * @param prefix - Optional custom prefix for product IDs (defaults to customerId or "shared") * @param customerIdsToDelete - Array of customer IDs to delete before creating products + * @example s.products({ list: [pro, free] }) + * @example s.products({ list: [freeDefault], prefix: "my-prefix" }) // custom prefix when no customerId * @example s.products({ list: [pro, free], customerIdsToDelete: [customerId] }) */ const products = ({ list, + prefix, customerIdsToDelete, }: { list: ProductV2[]; + prefix?: string; customerIdsToDelete?: string[]; }): ConfigFn => { return (config) => ({ ...config, products: list, + productPrefix: prefix, customerIds: customerIdsToDelete, }); }; @@ -329,6 +349,40 @@ const removePaymentMethod = (): ConfigFn => { }); }; +/** + * Delete a customer before the test runs. + * Uses API to clear cache. Silently ignores if customer doesn't exist. + * @param customerId - Delete by customer ID + * @param email - Delete all customers with this email + * @example s.deleteCustomer({ customerId: "test-customer" }) + * @example s.deleteCustomer({ email: "test@example.com" }) + */ +const deleteCustomer = ( + params: { customerId: string } | { email: string }, +): ConfigFn => { + return (config) => { + if ("customerId" in params) { + return { + ...config, + cleanup: { + ...config.cleanup, + customerIdsToDelete: [ + ...config.cleanup.customerIdsToDelete, + params.customerId, + ], + }, + }; + } + return { + ...config, + cleanup: { + ...config.cleanup, + emailsToDelete: [...config.cleanup.emailsToDelete, params.email], + }, + }; + }; +}; + /** * Scenario configuration functions. * Import and use with initScenario to configure test setup. @@ -355,6 +409,7 @@ export const s = { advanceTestClock, attachPaymentMethod, removePaymentMethod, + deleteCustomer, } as const; // ═══════════════════════════════════════════════════════════════════ @@ -364,7 +419,13 @@ export const s = { const defaultConfig: ScenarioConfig = { testClock: false, withDefault: false, + defaultGroup: undefined, products: [], + productPrefix: undefined, + cleanup: { + customerIdsToDelete: [], + emailsToDelete: [], + }, actions: [], }; @@ -373,7 +434,7 @@ const defaultConfig: ScenarioConfig = { * Uses functional composition for flexible configuration. * Actions are executed in the exact order they appear in the actions array. * - * @param customerId - Unique identifier used as customer ID and product prefix + * @param customerId - Unique identifier used as customer ID and product prefix. If not provided, customer creation is skipped. * @param setup - Configuration functions (customer, products, entities) * @param actions - Action functions (attach, cancel, advanceTestClock) - executed in order * @returns autumnV1, autumnV2, ctx, testClockId, customer, entities, advancedTo @@ -392,6 +453,12 @@ const defaultConfig: ScenarioConfig = { * ], * }); * + * // Products only (no customer) - useful for null ID tests + * const { autumnV1 } = await initScenario({ + * setup: [s.products({ list: [freeDefault] })], + * actions: [], + * }); + * * // Interleaved actions - executed in order * const { autumnV1, ctx, advancedTo } = await initScenario({ * customerId: "interleaved-test", @@ -408,15 +475,48 @@ const defaultConfig: ScenarioConfig = { * }); * ``` */ -export const initScenario = async ({ +// Overload: when customerId is provided, return type has customerId: string +export async function initScenario(params: { + customerId: string; + setup: ConfigFn[]; + actions: ConfigFn[]; +}): Promise<{ + customerId: string; + autumnV1: AutumnInt; + autumnV2: AutumnInt; + testClockId: string | undefined; + customer: Awaited>["customer"]; + ctx: typeof ctx; + entities: GeneratedEntity[]; + advancedTo: number; +}>; + +// Overload: when customerId is not provided, return type has customerId: undefined +export async function initScenario(params: { + customerId?: undefined; + setup: ConfigFn[]; + actions: ConfigFn[]; +}): Promise<{ + customerId: undefined; + autumnV1: AutumnInt; + autumnV2: AutumnInt; + testClockId: undefined; + customer: null; + ctx: typeof ctx; + entities: GeneratedEntity[]; + advancedTo: number; +}>; + +// Implementation +export async function initScenario({ customerId, setup, actions, }: { - customerId: string; + customerId?: string; setup: ConfigFn[]; actions: ConfigFn[]; -}) => { +}) { // Build config from setup and actions const config = [...setup, ...actions].reduce((c, fn) => fn(c), defaultConfig); @@ -425,25 +525,65 @@ export const initScenario = async ({ ? generateEntities(config.entityConfig) : []; + // Create a cleanup autumn client + const cleanupAutumn = new AutumnInt({ + version: ApiVersion.V1_2, + secretKey: ctx.orgSecretKey, + }); + + // 0. Run cleanup - delete customers by ID and email before test + for (const customerIdToDelete of config.cleanup.customerIdsToDelete) { + try { + await cleanupAutumn.customers.delete(customerIdToDelete); + } catch {} + } + + for (const emailToDelete of config.cleanup.emailsToDelete) { + const customers = await CusService.getByEmail({ + db: ctx.db, + email: emailToDelete, + orgId: ctx.org.id, + env: ctx.env, + }); + + for (const customerToDelete of customers) { + try { + await cleanupAutumn.customers.delete(customerToDelete.internal_id); + } catch {} + } + } + // 1. Initialize products & delete previous customers (prefix = customerId for isolation) + // Priority: explicit productPrefix > customerId > "shared" + const productPrefix = config.productPrefix ?? customerId ?? "shared"; if (config.products.length > 0) { await initProductsV0({ ctx, products: config.products, - prefix: customerId, - customerIds: config.customerIds ?? [customerId], + prefix: productPrefix, + customerIds: config.customerIds ?? (customerId ? [customerId] : []), }); } - // 2. Initialize customer - const { testClockId, customer } = await initCustomerV3({ - ctx, - customerId, - customerData: config.customerData, - attachPm: config.attachPm, - withTestClock: config.testClock, - withDefault: config.withDefault, - }); + // 2. Initialize customer (only if customerId is provided) + let testClockId: string | undefined; + let customer: Awaited>["customer"] | null = + null; + + if (customerId) { + const result = await initCustomerV3({ + ctx, + customerId, + customerData: config.customerData, + attachPm: config.attachPm, + withTestClock: config.testClock, + withDefault: config.withDefault, + // Default group matches the product prefix (customerId) used in initProductsV0 + defaultGroup: config.defaultGroup ?? customerId, + }); + testClockId = result.testClockId; + customer = result.customer; + } // 3. Create autumn clients const autumnV1 = new AutumnInt({ @@ -456,8 +596,13 @@ export const initScenario = async ({ secretKey: ctx.orgSecretKey, }); - // 4. Create entities if any + // 4. Create entities if any (requires customerId) if (generatedEntities.length > 0) { + if (!customerId) { + throw new Error( + "Cannot create entities: customerId is required when using s.entities()", + ); + } const entityDefs = generatedEntities.map((e) => ({ id: e.id, name: e.name, @@ -471,7 +616,12 @@ export const initScenario = async ({ for (const action of config.actions) { if (action.type === "attach") { - const prefixedProductId = `${action.productId}_${customerId}`; + if (!customerId) { + throw new Error( + "Cannot attach product: customerId is required when using s.attach()", + ); + } + const prefixedProductId = `${action.productId}_${productPrefix}`; // Resolve entityIndex to entityId let entityId: string | undefined; @@ -495,7 +645,12 @@ export const initScenario = async ({ await new Promise((resolve) => setTimeout(resolve, action.timeout)); } } else if (action.type === "cancel") { - const prefixedProductId = `${action.productId}_${customerId}`; + if (!customerId) { + throw new Error( + "Cannot cancel product: customerId is required when using s.cancel()", + ); + } + const prefixedProductId = `${action.productId}_${productPrefix}`; // Resolve entityIndex to entityId let entityId: string | undefined; @@ -581,4 +736,4 @@ export const initScenario = async ({ entities: generatedEntities, advancedTo, }; -}; +} diff --git a/shared/api/_openapi/prevVersions/openapi1.2/customersOpenApi.ts b/shared/api/_openapi/prevVersions/openapi1.2/customersOpenApi.ts index ec8e48953..dbacb3ce5 100644 --- a/shared/api/_openapi/prevVersions/openapi1.2/customersOpenApi.ts +++ b/shared/api/_openapi/prevVersions/openapi1.2/customersOpenApi.ts @@ -8,7 +8,7 @@ import { ApiCustomerV3Schema, BillingPortalParamsSchema, BillingPortalResultSchema, - CreateCustomerParamsSchema, + ExtCreateCustomerParamsSchema, ListCustomersQuerySchema, ListCustomersResponseSchema, UpdateCustomerParamsSchema, @@ -58,7 +58,7 @@ export const customersOpenApi = { }, requestBody: { content: { - "application/json": { schema: CreateCustomerParamsSchema }, + "application/json": { schema: ExtCreateCustomerParamsSchema }, }, }, responses: { diff --git a/shared/api/_openapi2.0_/customersOpenApi.ts b/shared/api/_openapi2.0_/customersOpenApi.ts index 328dcb0cd..4d4014203 100644 --- a/shared/api/_openapi2.0_/customersOpenApi.ts +++ b/shared/api/_openapi2.0_/customersOpenApi.ts @@ -10,12 +10,11 @@ import { // // examples: [PLAN_EXAMPLE], // }); +import { ExtCreateCustomerParamsSchema } from "../customers/createCustomerParams.js"; import { ListCustomersV2ParamsSchema } from "../customers/crud/listCustomersParamsV2.js"; import { - CreateCustomerParamsSchema, CreateCustomerQuerySchema, GetCustomerQuerySchema, - // ListCustomersResponseSchema, UpdateCustomerParamsSchema, } from "../customers/customerOpModels.js"; import { createPagePaginatedResponseSchema } from "../models.js"; @@ -30,7 +29,7 @@ export const customersOpenApi = { }, requestBody: { content: { - "application/json": { schema: CreateCustomerParamsSchema }, + "application/json": { schema: ExtCreateCustomerParamsSchema }, }, }, responses: { diff --git a/shared/api/common/customerData.ts b/shared/api/common/customerData.ts index 9f82a5185..ad46977f3 100644 --- a/shared/api/common/customerData.ts +++ b/shared/api/common/customerData.ts @@ -1,4 +1,5 @@ import { z } from "zod/v4"; +import { ExternalProcessorsSchema } from "../../models/genModels/processorSchemas.js"; // Base schema without top-level .meta() to avoid side effects during imports // Individual field descriptions are kept as they don't cause registry conflicts @@ -7,20 +8,23 @@ export const CustomerDataSchema = z name: z.string().nullish().meta({ description: "Customer's name", }), - email: z.string().nullish().meta({ + email: z.email({ message: "not a valid email address" }).nullish().meta({ description: "Customer's email address", }), fingerprint: z.string().nullish().meta({ - internal: true, + description: + "Unique identifier (eg, serial number) to detect duplicate customers and prevent free trial abuse", }), - metadata: z.record(z.any(), z.any()).nullish().meta({ - internal: true, + metadata: z.record(z.string(), z.any()).nullish().meta({ + description: "Additional metadata for the customer", }), stripe_id: z.string().nullish().meta({ - internal: true, + description: "Stripe customer ID if you already have one", }), - disable_default: z.boolean().optional().meta({ + + processors: ExternalProcessorsSchema.nullish().meta({ internal: true, + description: "External processors for the customer", }), }) .meta({ @@ -28,4 +32,17 @@ export const CustomerDataSchema = z description: "Customer details to set when creating a customer", }); +// for internal use only +export const CreateCustomerInternalOptionsSchema = z.object({ + default_group: z.string().optional().meta({ + description: "The group of products to attach to the customer", + }), + disable_defaults: z.boolean().optional().meta({ + description: "Whether to disable default products", + }), +}); + export type CustomerData = z.infer; +export type CreateCustomerInternalOptions = z.infer< + typeof CreateCustomerInternalOptionsSchema +>; diff --git a/shared/api/common/customerId.ts b/shared/api/common/customerId.ts new file mode 100644 index 000000000..ffe30a094 --- /dev/null +++ b/shared/api/common/customerId.ts @@ -0,0 +1,38 @@ +import { z } from "zod/v4"; + +export const CustomerIdSchema = z.string().refine( + (val) => { + if (val === "") return false; + if (val.includes("@")) return false; + if (val.includes(" ")) return false; + if (val.includes(".")) return false; + return /^[a-zA-Z0-9_-]+$/.test(val); + }, + { + error: (issue) => { + const input = issue.input as string; + if (input === "") return { message: "can't be an empty string" }; + if (input.includes("@")) + return { + message: + "cannot contain @ symbol. Use only letters, numbers, underscores, and hyphens.", + }; + if (input.includes(" ")) + return { + message: + "cannot contain spaces. Use only letters, numbers, underscores, and hyphens.", + }; + if (input.includes(".")) + return { + message: + "cannot contain periods. Use only letters, numbers, underscores, and hyphens.", + }; + const invalidChar = input.match(/[^a-zA-Z0-9_-]/)?.[0]; + return { + message: `cannot contain '${invalidChar}'. Use only letters, numbers, underscores, and hyphens.`, + }; + }, + }, +); + +export type CustomerId = z.infer; diff --git a/shared/api/customers/createCustomerParams.ts b/shared/api/customers/createCustomerParams.ts new file mode 100644 index 000000000..217930afc --- /dev/null +++ b/shared/api/customers/createCustomerParams.ts @@ -0,0 +1,34 @@ +import { CustomerIdSchema } from "@api/common/customerId.js"; +import { z } from "zod/v4"; +import { + CreateCustomerInternalOptionsSchema, + CustomerDataSchema, +} from "../common/customerData.js"; +import { EntityDataSchema } from "../common/entityData.js"; + +// Create Customer Params (based on handlePostCustomer logic) +export const ExtCreateCustomerParamsSchema = z + .object({ + id: CustomerIdSchema.nullable().meta({ + description: "Your unique identifier for the customer", + }), + }) + .extend(CustomerDataSchema.shape) + .extend({ + entity_id: z.string().optional().meta({ + internal: true, + }), + entity_data: EntityDataSchema.optional().meta({ + internal: true, + }), + }); + +export const CreateCustomerParamsSchema = ExtCreateCustomerParamsSchema.extend({ + internal_options: CreateCustomerInternalOptionsSchema.optional(), +}); + +export type ExtCreateCustomerParams = z.infer< + typeof ExtCreateCustomerParamsSchema +>; + +export type CreateCustomerParams = z.infer; diff --git a/shared/api/customers/customerOpModels.ts b/shared/api/customers/customerOpModels.ts index 94f054e00..a2c03f9f3 100644 --- a/shared/api/customers/customerOpModels.ts +++ b/shared/api/customers/customerOpModels.ts @@ -1,6 +1,7 @@ import { CusExpand } from "@models/cusModels/cusExpand.js"; import { z } from "zod/v4"; -import { EntityDataSchema } from "../common/entityData.js"; +import { CustomerDataSchema } from "../common/customerData.js"; +import { CustomerIdSchema } from "../common/customerId.js"; import { queryStringArray } from "../common/queryHelpers.js"; export const GetCustomerQuerySchema = z.object({ @@ -21,102 +22,14 @@ export const CreateCustomerQuerySchema = z.object({ }), }); -const customerId = z.string().refine( - (val) => { - if (val === "") return false; - if (val.includes("@")) return false; - if (val.includes(" ")) return false; - if (val.includes(".")) return false; - return /^[a-zA-Z0-9_-]+$/.test(val); - }, - { - error: (issue) => { - const input = issue.input as string; - if (input === "") return { message: "can't be an empty string" }; - if (input.includes("@")) - return { - message: - "cannot contain @ symbol. Use only letters, numbers, underscores, and hyphens.", - }; - if (input.includes(" ")) - return { - message: - "cannot contain spaces. Use only letters, numbers, underscores, and hyphens.", - }; - if (input.includes(".")) - return { - message: - "cannot contain periods. Use only letters, numbers, underscores, and hyphens.", - }; - const invalidChar = input.match(/[^a-zA-Z0-9_-]/)?.[0]; - return { - message: `cannot contain '${invalidChar}'. Use only letters, numbers, underscores, and hyphens.`, - }; - }, - }, -); - -// Create Customer Params (based on handlePostCustomer logic) -export const CreateCustomerParamsSchema = z.object({ - id: customerId.nullable().meta({ - description: "Your unique identifier for the customer", - }), - - name: z.string().nullish().meta({ - description: "Customer's name", - }), - - email: z.email({ message: "not a valid email address" }).nullish().meta({ - description: "Customer's email address", - }), - - fingerprint: z.string().optional().meta({ - description: - "Unique identifier (eg, serial number) to detect duplicate customers and prevent free trial abuse", - }), - - metadata: z.record(z.string(), z.any()).nullish().meta({ - description: "Additional metadata for the customer", - }), - - stripe_id: z.string().optional().meta({ - description: "Stripe customer ID if you already have one", - }), - - entity_id: z.string().optional().meta({ - internal: true, - }), - entity_data: EntityDataSchema.optional().meta({ - internal: true, - }), - disable_default: z.boolean().optional().meta({ - internal: true, - }), -}); - // Update Customer Params (based on handleUpdateCustomer logic) -export const UpdateCustomerParamsSchema = z.object({ - id: customerId.optional().meta({ - description: "New unique identifier for the customer.", - }), - name: z.string().nullish().meta({ - description: "The customer's name.", - }), - email: z.email({ message: "not a valid email address" }).nullish().meta({ - description: "Customer's email address", - }), - fingerprint: z.string().nullish().meta({ - description: - "Unique identifier (eg, serial number) to detect duplicate customers.", - }), - metadata: z.record(z.any(), z.any()).nullish().meta({ - description: - "Additional metadata for the customer (set individual keys to null to delete them).", - }), - stripe_id: z.string().nullish().meta({ - description: "Stripe customer ID.", - }), -}); +export const UpdateCustomerParamsSchema = z + .object({ + id: CustomerIdSchema.optional().meta({ + description: "New unique identifier for the customer", + }), + }) + .extend(CustomerDataSchema.shape); // List Customers Query (based on the docs) export const ListCustomersQuerySchema = z.object({ @@ -176,7 +89,6 @@ export const GetBillingPortalResponseSchema = z.object({ }), }); -export type CreateCustomerParams = z.infer; export type UpdateCustomerParams = z.infer; export type ListCustomersQuery = z.infer; diff --git a/shared/api/customers/customersOpenApi.ts b/shared/api/customers/customersOpenApi.ts deleted file mode 100644 index 6a2e96c81..000000000 --- a/shared/api/customers/customersOpenApi.ts +++ /dev/null @@ -1,140 +0,0 @@ -import { z } from "zod/v4"; -import { UpdateBalancesParamsSchema } from "../balances/prevVersions/legacyUpdateBalanceModels.js"; -import { SuccessResponseSchema } from "../common/commonResponses.js"; -import { ApiCustomerSchema } from "./apiCustomer.js"; -import { - CreateCustomerParamsSchema, - CreateCustomerQuerySchema, - GetCustomerQuerySchema, - ListCustomersQuerySchema, - ListCustomersResponseSchema, - UpdateCustomerParamsSchema, -} from "./customerOpModels.js"; - -// Note: The meta with id is added in openapi.ts to avoid duplicate registration -// This schema is exported through the main index and should not have an id here -export const ApiCustomerWithMeta = ApiCustomerSchema; - -export const customerOps = { - "/customers": { - get: { - summary: "List Customers", - tags: ["customers"], - requestParams: { - query: ListCustomersQuerySchema, - }, - responses: { - "200": { - description: "200 OK", - content: { - "application/json": { schema: ListCustomersResponseSchema }, - }, - }, - }, - }, - post: { - summary: "Create Customer", - tags: ["customers"], - requestParams: { - query: CreateCustomerQuerySchema, - }, - requestBody: { - content: { - "application/json": { schema: CreateCustomerParamsSchema }, - }, - }, - responses: { - "200": { - description: "200 OK", - content: { "application/json": { schema: ApiCustomerWithMeta } }, - }, - }, - }, - }, - "/customers/{customer_id}": { - get: { - summary: "Get Customer", - tags: ["customers"], - requestParams: { - path: z.object({ - customer_id: z.string(), - }), - query: GetCustomerQuerySchema, - }, - responses: { - "200": { - description: "200 OK", - content: { "application/json": { schema: ApiCustomerWithMeta } }, - }, - }, - }, - post: { - summary: "Update Customer", - tags: ["customers"], - requestParams: { - path: z.object({ - customer_id: z.string(), - }), - query: z.object({ - expand: z.string().optional(), - }), - }, - requestBody: { - content: { - "application/json": { schema: UpdateCustomerParamsSchema }, - }, - }, - responses: { - "200": { - description: "200 OK", - content: { "application/json": { schema: ApiCustomerWithMeta } }, - }, - }, - }, - delete: { - summary: "Delete Customer", - tags: ["customers"], - requestParams: { - path: z.object({ - customer_id: z.string(), - }), - }, - responses: { - "200": { - description: "200 OK", - content: { - "application/json": { - schema: SuccessResponseSchema, - }, - }, - }, - }, - }, - }, - "/customers/{customer_id}/balances": { - post: { - summary: "Update Feature Balances", - description: - "Update or set feature balances for a customer. Can set specific balance values or make features unlimited.", - tags: ["customers"], - requestParams: { - path: z.object({ - customer_id: z.string(), - }), - }, - requestBody: { - content: { - "application/json": { schema: UpdateBalancesParamsSchema }, - }, - }, - responses: { - "200": { - description: "200 OK", - content: { - "application/json": { schema: SuccessResponseSchema }, - }, - }, - }, - }, - }, -}; diff --git a/shared/api/models.ts b/shared/api/models.ts index 7e78a0944..cc6fc12f8 100644 --- a/shared/api/models.ts +++ b/shared/api/models.ts @@ -12,6 +12,7 @@ export * from "./utils/zodToJSDoc.js"; export * from "./customers/apiCustomer.js"; export * from "./customers/components/apiCusReferral.js"; export * from "./customers/components/apiCusUpcomingInvoice.js"; +export * from "./customers/createCustomerParams.js"; export * from "./customers/cusFeatures/apiBalance.js"; export * from "./customers/cusFeatures/previousVersions/apiCusFeatureV0.js"; export * from "./customers/cusFeatures/previousVersions/apiCusFeatureV1.js"; diff --git a/shared/models/cusModels/cusModels.ts b/shared/models/cusModels/cusModels.ts index 6f5dbfb73..a811858ed 100644 --- a/shared/models/cusModels/cusModels.ts +++ b/shared/models/cusModels/cusModels.ts @@ -12,12 +12,14 @@ export const CustomerSchema = z.object({ internal_id: z.string(), org_id: z.string(), created_at: z.number(), - env: z.nativeEnum(AppEnv), + env: z.enum(AppEnv), processor: z.any(), processors: ExternalProcessorsSchema.nullish(), metadata: z.record(z.any(), z.any()).nullish().default({}), }); +export type Customer = z.infer; + export const CreateCustomerSchema = z.object({ id: z .string() @@ -68,19 +70,4 @@ export const CreateCustomerSchema = z.object({ processors: ExternalProcessorsSchema.nullish(), }); -// export const CustomerDataSchema = z.object({ -// name: z.string().nullish(), -// email: z.string().nullish(), -// fingerprint: z.string().nullish(), -// metadata: z.record(z.any(), z.any()).nullish(), -// stripe_id: z.string().nullish(), -// }); - -export const CustomerResponseSchema = CustomerSchema.omit({ - org_id: true, -}); - -export type Customer = z.infer; -// export type CustomerData = z.infer; -export type CustomerResponse = z.infer; export type CreateCustomer = z.infer; diff --git a/shared/models/cusModels/cusTable.ts b/shared/models/cusModels/cusTable.ts index bd1de341b..3d6922978 100644 --- a/shared/models/cusModels/cusTable.ts +++ b/shared/models/cusModels/cusTable.ts @@ -6,12 +6,10 @@ import { pgTable, text, unique, + uniqueIndex, } from "drizzle-orm/pg-core"; import { collatePgColumn } from "../../db/utils.js"; -import type { - ExternalProcessors, - VercelProcessor, -} from "../genModels/processorSchemas.js"; +import type { ExternalProcessors } from "../genModels/processorSchemas.js"; import { organizations } from "../orgModels/orgTable.js"; export type CustomerProcessor = { @@ -43,6 +41,12 @@ export const customers = pgTable( foreignColumns: [organizations.id], name: "customers_org_id_fkey", }).onDelete("cascade"), + // Ensure only ONE customer per (org, env, email) can have id = NULL + uniqueIndex("customers_email_null_id_unique") + .on(table.org_id, table.env, sql`lower(${table.email})`) + .where( + sql`${table.id} IS NULL AND ${table.email} IS NOT NULL AND ${table.email} != ''`, + ), ], ).enableRLS(); diff --git a/shared/utils/featureUtils/findFeatureUtils.ts b/shared/utils/featureUtils/findFeatureUtils.ts index b0a284efa..4f46d2c58 100644 --- a/shared/utils/featureUtils/findFeatureUtils.ts +++ b/shared/utils/featureUtils/findFeatureUtils.ts @@ -70,3 +70,42 @@ export function findFeatureById({ return result; } + +// Overload: errorOnNotFound = true → guaranteed Feature +export function findFeatureByIdOrInternalId(params: { + features: Feature[]; + featureIdOrInternalId: string; + errorOnNotFound: true; +}): Feature; + +// Overload: errorOnNotFound = false/undefined → Feature | undefined +export function findFeatureByIdOrInternalId(params: { + features: Feature[]; + featureIdOrInternalId: string; + errorOnNotFound?: false; +}): Feature | undefined; + +// Implementation +export function findFeatureByIdOrInternalId({ + features, + featureIdOrInternalId, + errorOnNotFound, +}: { + features: Feature[]; + featureIdOrInternalId: string; + errorOnNotFound?: boolean; +}): Feature | undefined { + const result = features.find( + (feature) => + feature.id === featureIdOrInternalId || + feature.internal_id === featureIdOrInternalId, + ); + + if (errorOnNotFound && !result) { + throw new InternalError({ + message: `Feature not found for id or internal_id: ${featureIdOrInternalId}`, + }); + } + + return result; +} From 0df53c9771d6985421ca31e574f6af85a7a0eb1e Mon Sep 17 00:00:00 2001 From: John Yeo Date: Tue, 20 Jan 2026 18:35:24 +0000 Subject: [PATCH 2/5] latest --- .../compute/computeCreateCustomerPlan.ts | 33 +++++++ .../createCustomerContext.ts | 6 +- .../createCustomerWithDefaults.ts | 82 ++++++++++++++-- .../executeAutumnCreateCustomerPlan.ts | 55 ++++++----- .../execute/executeCreateCustomerPlan.ts | 68 -------------- .../executeStripeCreateCustomerPlan.ts | 92 ------------------ .../finalize/finalizeCreateCustomer.ts | 43 +++++++++ .../finalizeCreateCustomer.ts | 43 +++++++++ .../logs/logCreateCustomer.ts | 20 ++-- .../setupCreateCustomerBillingContext.ts | 44 +++++++++ server/src/internal/customers/cusRouter.ts | 3 +- .../handleGetBillingPortal.ts | 94 ++++++++++--------- shared/api/common/customerData.ts | 5 + 13 files changed, 338 insertions(+), 250 deletions(-) create mode 100644 server/src/internal/customers/actions/createWithDefaults/compute/computeCreateCustomerPlan.ts delete mode 100644 server/src/internal/customers/actions/createWithDefaults/execute/executeCreateCustomerPlan.ts delete mode 100644 server/src/internal/customers/actions/createWithDefaults/execute/executeStripeCreateCustomerPlan.ts create mode 100644 server/src/internal/customers/actions/createWithDefaults/finalize/finalizeCreateCustomer.ts create mode 100644 server/src/internal/customers/actions/createWithDefaults/finalizeCreateCustomer.ts create mode 100644 server/src/internal/customers/actions/createWithDefaults/setup/setupCreateCustomerBillingContext.ts diff --git a/server/src/internal/customers/actions/createWithDefaults/compute/computeCreateCustomerPlan.ts b/server/src/internal/customers/actions/createWithDefaults/compute/computeCreateCustomerPlan.ts new file mode 100644 index 000000000..2c9943b47 --- /dev/null +++ b/server/src/internal/customers/actions/createWithDefaults/compute/computeCreateCustomerPlan.ts @@ -0,0 +1,33 @@ +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import type { AutumnBillingPlan } from "@/internal/billing/v2/types/autumnBillingPlan.js"; +import { initFullCustomerProductFromProduct } from "@/internal/billing/v2/utils/initFullCustomerProduct/initFullCustomerProductFromProduct.js"; +import type { CreateCustomerContext } from "../createCustomerContext.js"; + +/** + * Compute the Autumn billing plan for customer creation. + * Builds customer products from default products. + */ +export const computeCreateCustomerPlan = ({ + ctx, + context, +}: { + ctx: AutumnContext; + context: CreateCustomerContext; +}): AutumnBillingPlan => { + const { fullCustomer, fullProducts, currentEpochMs } = context; + + const insertCustomerProducts = fullProducts.map((product) => + initFullCustomerProductFromProduct({ + ctx, + initContext: { + fullCustomer, + fullProduct: product, + currentEpochMs, + }, + }), + ); + + context.fullCustomer.customer_products = insertCustomerProducts; + + return { insertCustomerProducts }; +}; diff --git a/server/src/internal/customers/actions/createWithDefaults/createCustomerContext.ts b/server/src/internal/customers/actions/createWithDefaults/createCustomerContext.ts index 85af1de34..d59eeae5e 100644 --- a/server/src/internal/customers/actions/createWithDefaults/createCustomerContext.ts +++ b/server/src/internal/customers/actions/createWithDefaults/createCustomerContext.ts @@ -1,5 +1,8 @@ import type { FullCustomer, FullProduct } from "@autumn/shared"; -import type { TrialContext } from "@/internal/billing/v2/billingContext"; +import type { + BillingContext, + TrialContext, +} from "@/internal/billing/v2/billingContext"; export interface CreateCustomerContextFree { fullCustomer: FullCustomer; @@ -7,6 +10,7 @@ export interface CreateCustomerContextFree { currentEpochMs: number; trialContext?: TrialContext; hasPaidProducts: boolean; + billingContext?: BillingContext; } export type CreateCustomerContext = CreateCustomerContextFree; diff --git a/server/src/internal/customers/actions/createWithDefaults/createCustomerWithDefaults.ts b/server/src/internal/customers/actions/createWithDefaults/createCustomerWithDefaults.ts index e8a8b75db..9961d163b 100644 --- a/server/src/internal/customers/actions/createWithDefaults/createCustomerWithDefaults.ts +++ b/server/src/internal/customers/actions/createWithDefaults/createCustomerWithDefaults.ts @@ -4,17 +4,27 @@ import type { FullCustomer, } from "@autumn/shared"; import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; -import { executeCreateCustomerPlan } from "./execute/executeCreateCustomerPlan.js"; -import { logCreateCustomerContext } from "./logs/logCreateCustomer.js"; +import { evaluateStripeBillingPlan } from "@/internal/billing/v2/providers/stripe/actionBuilders/evaluateStripeBillingPlan.js"; +import { executeStripeBillingPlan } from "@/internal/billing/v2/providers/stripe/execute/executeStripeBillingPlan.js"; +import { logStripeBillingPlan } from "@/internal/billing/v2/providers/stripe/logs/logStripeBillingPlan.js"; +import { computeCreateCustomerPlan } from "./compute/computeCreateCustomerPlan.js"; +import { executeAutumnCreateCustomerPlan } from "./execute/executeAutumnCreateCustomerPlan.js"; +import { finalizeCreateCustomer } from "./finalizeCreateCustomer.js"; +import { + logAutumnPlanResult, + logCreateCustomerContext, +} from "./logs/logCreateCustomer.js"; import { setupCreateCustomer } from "./setup/setupCreateCustomer.js"; +import { setupCreateCustomerBillingContext } from "./setup/setupCreateCustomerBillingContext.js"; /** * Create a customer and attach default products. * - * Flow: - * 1. Setup: init customer, fetch defaults, setup Stripe (if paid) - * 2. Compute: build customer products, autumn plan, stripe plan - * 3. Execute: transaction + Stripe + build final customer + * Phase 1 - Create Autumn customer: + * setup → compute → execute + * + * Phase 2 - Attach paid defaults (if any): + * setup billing context → evaluate → execute → finalize * * Idempotency: * - Email exists with id=NULL, new request has id=NULL: Returns existing customer @@ -32,6 +42,8 @@ export const createCustomerWithDefaults = async ({ customerData?: CustomerData; internalOptions?: CreateCustomerInternalOptions; }): Promise => { + // ============ Phase 1: Create Autumn customer ============ + // 1. Setup const context = await setupCreateCustomer({ ctx, @@ -42,6 +54,60 @@ export const createCustomerWithDefaults = async ({ logCreateCustomerContext({ ctx, context }); - // 3. Execute - return executeCreateCustomerPlan({ ctx, context }); + // 2. Compute + const autumnBillingPlan = computeCreateCustomerPlan({ ctx, context }); + + // 3. Execute Autumn + const autumnResult = await executeAutumnCreateCustomerPlan({ + ctx, + context, + autumnBillingPlan, + }); + + logAutumnPlanResult({ ctx, result: autumnResult }); + + // Early return if customer already existed or no paid products + if (autumnResult.type === "existing") return context.fullCustomer; + + // ============ Phase 2: Create stripe customer / attach paid defaults ============ + + // 4. Setup billing context (creates Stripe customer) + + const shouldCreateStripeCustomer = + customerData?.create_in_stripe || context.hasPaidProducts; + + const shouldAttachPaidDefaults = context.hasPaidProducts; + + if (!shouldCreateStripeCustomer) return context.fullCustomer; + + const billingContext = await setupCreateCustomerBillingContext({ + ctx, + context, + }); + + if (!shouldAttachPaidDefaults) return context.fullCustomer; + + // 5. Evaluate Stripe billing plan + const stripeBillingPlan = await evaluateStripeBillingPlan({ + ctx, + billingContext, + autumnBillingPlan, + }); + + logStripeBillingPlan({ ctx, stripeBillingPlan, billingContext }); + + // 6. Execute Stripe billing plan + const { stripeSubscription } = await executeStripeBillingPlan({ + ctx, + billingPlan: { autumn: autumnBillingPlan, stripe: stripeBillingPlan }, + billingContext, + }); + + // 7. Finalize (link subscription back to Autumn) + return finalizeCreateCustomer({ + ctx, + context, + autumnBillingPlan, + stripeSubscription, + }); }; diff --git a/server/src/internal/customers/actions/createWithDefaults/execute/executeAutumnCreateCustomerPlan.ts b/server/src/internal/customers/actions/createWithDefaults/execute/executeAutumnCreateCustomerPlan.ts index 7a81cd86a..294d45101 100644 --- a/server/src/internal/customers/actions/createWithDefaults/execute/executeAutumnCreateCustomerPlan.ts +++ b/server/src/internal/customers/actions/createWithDefaults/execute/executeAutumnCreateCustomerPlan.ts @@ -1,18 +1,13 @@ -import { - CustomerAlreadyExistsError, - type FullCustomer, - tryCatch, -} from "@autumn/shared"; +import { tryCatch } from "@autumn/shared"; import { isUniqueConstraintError } from "@/db/dbUtils.js"; import type { DrizzleCli } from "@/db/initDrizzle.js"; import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; import { executeAutumnBillingPlan } from "@/internal/billing/v2/execute/executeAutumnBillingPlan.js"; import type { AutumnBillingPlan } from "@/internal/billing/v2/types/billingPlan.js"; +import type { CreateCustomerContext } from "@/internal/customers/actions/createWithDefaults/createCustomerContext.js"; import { CusService } from "../../../CusService.js"; -export type ExecuteAutumnResult = - | { type: "created"; fullCustomer: FullCustomer } - | { type: "existing"; fullCustomer: FullCustomer }; +export type ExecuteAutumnResult = { type: "created" } | { type: "existing" }; /** * Execute the Autumn (DB) part of customer creation. @@ -24,16 +19,19 @@ export type ExecuteAutumnResult = */ export const executeAutumnCreateCustomerPlan = async ({ ctx, - fullCustomer, + context, autumnBillingPlan, }: { ctx: AutumnContext; - fullCustomer: FullCustomer; + context: CreateCustomerContext; autumnBillingPlan: AutumnBillingPlan; }): Promise => { const { db, logger } = ctx; + const { fullCustomer } = context; - const { data: newFullCustomer, error } = await tryCatch( + let wasUpdate = false; + + const { error } = await tryCatch( db.transaction(async (tx) => { const txDb = tx as unknown as DrizzleCli; @@ -44,29 +42,19 @@ export const executeAutumnCreateCustomerPlan = async ({ if (upsertResult.wasUpdate) { fullCustomer.internal_id = upsertResult.customer.internal_id; - throw new CustomerAlreadyExistsError({ - customerId: fullCustomer.id || fullCustomer.internal_id, - }); + wasUpdate = true; + return; } await executeAutumnBillingPlan({ ctx: { ...ctx, db: txDb }, autumnBillingPlan, }); - - return { - ...fullCustomer, - customer_products: autumnBillingPlan.insertCustomerProducts, - }; }), ); - // Handle existing customer (from upsert or race condition) if (error) { - if ( - error instanceof CustomerAlreadyExistsError || - isUniqueConstraintError(error) - ) { + if (isUniqueConstraintError(error)) { logger.info( `Customer already exists, returning existing: ${fullCustomer.id || fullCustomer.email}`, ); @@ -76,10 +64,25 @@ export const executeAutumnCreateCustomerPlan = async ({ orgId: ctx.org.id, env: ctx.env, }); - return { type: "existing", fullCustomer: existingCustomer }; + context.fullCustomer = existingCustomer; + return { type: "existing" }; } throw error; } - return { type: "created", fullCustomer: newFullCustomer }; + if (wasUpdate) { + logger.info( + `Customer already exists (claimed or existing): ${fullCustomer.id || fullCustomer.internal_id}`, + ); + const existingCustomer = await CusService.getFull({ + db, + idOrInternalId: fullCustomer.internal_id, + orgId: ctx.org.id, + env: ctx.env, + }); + context.fullCustomer = existingCustomer; + return { type: "existing" }; + } + + return { type: "created" }; }; diff --git a/server/src/internal/customers/actions/createWithDefaults/execute/executeCreateCustomerPlan.ts b/server/src/internal/customers/actions/createWithDefaults/execute/executeCreateCustomerPlan.ts deleted file mode 100644 index 06b23fcaa..000000000 --- a/server/src/internal/customers/actions/createWithDefaults/execute/executeCreateCustomerPlan.ts +++ /dev/null @@ -1,68 +0,0 @@ -import type { FullCustomer } from "@autumn/shared"; -import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; -import type { AutumnBillingPlan } from "@/internal/billing/v2/types/autumnBillingPlan.js"; -import { initFullCustomerProductFromProduct } from "@/internal/billing/v2/utils/initFullCustomerProduct/initFullCustomerProductFromProduct.js"; -import type { CreateCustomerContext } from "../createCustomerContext.js"; -import { logAutumnPlanResult } from "../logs/logCreateCustomer.js"; -import { executeAutumnCreateCustomerPlan } from "./executeAutumnCreateCustomerPlan.js"; -import { executeStripeCreateCustomerPlan } from "./executeStripeCreateCustomerPlan.js"; - -/** - * Execute step for creating a customer with defaults. - * - * Flow: - * 1. Compute: build customer products + autumn billing plan - * 2. Execute Autumn: DB transaction (upsert customer + insert products) - * 3. Execute Stripe: create Stripe customer + subscription (if paid products) - * - * Handles idempotency: - * - If customer already exists (wasUpdate or race condition), returns existing customer - * - Otherwise creates new customer with products and Stripe subscription - */ -export const executeCreateCustomerPlan = async ({ - ctx, - context, -}: { - ctx: AutumnContext; - context: CreateCustomerContext; -}): Promise => { - const { fullCustomer, fullProducts, currentEpochMs } = context; - - // 1. Compute autumn billing plan (no Stripe customer needed yet) - const insertCustomerProducts = fullProducts.map((product) => - initFullCustomerProductFromProduct({ - ctx, - initContext: { - fullCustomer, - fullProduct: product, - currentEpochMs, - }, - }), - ); - - const autumnBillingPlan: AutumnBillingPlan = { - insertCustomerProducts, - }; - - // 2. Execute Autumn (DB) - handles race conditions - const autumnResult = await executeAutumnCreateCustomerPlan({ - ctx, - fullCustomer, - autumnBillingPlan, - }); - - logAutumnPlanResult({ ctx, result: autumnResult }); - - // If customer already existed, return it (no Stripe work needed) - if (autumnResult.type === "existing") return autumnResult.fullCustomer; - if (!context.hasPaidProducts) return autumnResult.fullCustomer; - - // must pass in old full customer to ensure subscription plan is correctly determined... - await executeStripeCreateCustomerPlan({ - ctx, - context, - autumnBillingPlan, - }); - - return context.fullCustomer; -}; diff --git a/server/src/internal/customers/actions/createWithDefaults/execute/executeStripeCreateCustomerPlan.ts b/server/src/internal/customers/actions/createWithDefaults/execute/executeStripeCreateCustomerPlan.ts deleted file mode 100644 index 57b48e11d..000000000 --- a/server/src/internal/customers/actions/createWithDefaults/execute/executeStripeCreateCustomerPlan.ts +++ /dev/null @@ -1,92 +0,0 @@ -import type Stripe from "stripe"; -import { getOrCreateStripeCustomer } from "@/external/stripe/customers/index.js"; -import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; -import { evaluateStripeBillingPlan } from "@/internal/billing/v2/providers/stripe/actionBuilders/evaluateStripeBillingPlan.js"; -import { executeStripeBillingPlan } from "@/internal/billing/v2/providers/stripe/execute/executeStripeBillingPlan.js"; -import { logStripeBillingPlan } from "@/internal/billing/v2/providers/stripe/logs/logStripeBillingPlan.js"; -import type { AutumnBillingPlan } from "@/internal/billing/v2/types/billingPlan.js"; -import { CusProductService } from "@/internal/customers/cusProducts/CusProductService.js"; -import { initSubscriptionFromStripe } from "@/internal/subscriptions/utils/initSubscriptionFromStripe.js"; -import type { CreateCustomerContext } from "../createCustomerContext.js"; - -/** - * Execute the Stripe part of customer creation. - * - * 1. Get or create Stripe customer (idempotent based on internal_id) - * 2. Evaluate Stripe billing plan - * 3. Execute Stripe billing plan (create subscription) - * - * Must be called AFTER executeAutumnCreateCustomerPlan succeeds to ensure - * we have the correct internal_id for idempotency. - */ -export const executeStripeCreateCustomerPlan = async ({ - ctx, - context, - autumnBillingPlan, -}: { - ctx: AutumnContext; - context: CreateCustomerContext; - autumnBillingPlan: AutumnBillingPlan; -}): Promise => { - const { fullCustomer, fullProducts, trialContext } = context; - - // 1. Get or create Stripe customer (idempotent) - const stripeCustomer = await getOrCreateStripeCustomer({ - ctx, - customer: fullCustomer, - }); - - // 2. Build billing context with Stripe customer - const billingContext = { - fullCustomer, - stripeCustomer, - fullProducts, - featureQuantities: [], - currentEpochMs: Date.now(), - billingCycleAnchorMs: "now" as const, - resetCycleAnchorMs: "now" as const, - trialContext, - customPrices: [], - customEnts: [], - isCustom: false, - }; - - // 3. Evaluate Stripe billing plan - const stripeBillingPlan = await evaluateStripeBillingPlan({ - ctx, - billingContext, - autumnBillingPlan, - }); - - logStripeBillingPlan({ - ctx, - stripeBillingPlan, - billingContext, - }); - - // 4. Execute Stripe billing plan - const { stripeSubscription } = await executeStripeBillingPlan({ - ctx, - billingPlan: { autumn: autumnBillingPlan, stripe: stripeBillingPlan }, - billingContext, - }); - - if (stripeSubscription) { - for (const cusProduct of autumnBillingPlan.insertCustomerProducts) { - await CusProductService.update({ - db: ctx.db, - cusProductId: cusProduct.id, - updates: { subscription_ids: cusProduct.subscription_ids }, - }); - } - - context.fullCustomer.subscriptions = [ - initSubscriptionFromStripe({ ctx, stripeSubscription }), - ]; - - context.fullCustomer.customer_products = - autumnBillingPlan.insertCustomerProducts; - } - - return stripeSubscription; -}; diff --git a/server/src/internal/customers/actions/createWithDefaults/finalize/finalizeCreateCustomer.ts b/server/src/internal/customers/actions/createWithDefaults/finalize/finalizeCreateCustomer.ts new file mode 100644 index 000000000..72b85b847 --- /dev/null +++ b/server/src/internal/customers/actions/createWithDefaults/finalize/finalizeCreateCustomer.ts @@ -0,0 +1,43 @@ +import type { FullCustomer } from "@autumn/shared"; +import type Stripe from "stripe"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import type { AutumnBillingPlan } from "@/internal/billing/v2/types/autumnBillingPlan.js"; +import { CusProductService } from "@/internal/customers/cusProducts/CusProductService.js"; +import { initSubscriptionFromStripe } from "@/internal/subscriptions/utils/initSubscriptionFromStripe.js"; +import type { CreateCustomerContext } from "../createCustomerContext.js"; + +/** + * Finalize customer creation after Stripe subscription is created. + * Links subscription_ids back to customer products and builds final customer. + */ +export const finalizeCreateCustomer = async ({ + ctx, + context, + autumnBillingPlan, + stripeSubscription, +}: { + ctx: AutumnContext; + context: CreateCustomerContext; + autumnBillingPlan: AutumnBillingPlan; + stripeSubscription: Stripe.Subscription | undefined; +}): Promise => { + const { fullCustomer } = context; + + if (!stripeSubscription) return fullCustomer; + + // Link subscription_ids to customer products + for (const customerProduct of autumnBillingPlan.insertCustomerProducts) { + await CusProductService.update({ + db: ctx.db, + cusProductId: customerProduct.id, + updates: { subscription_ids: customerProduct.subscription_ids }, + }); + } + + // Build final customer with subscription and products + return { + ...fullCustomer, + subscriptions: [initSubscriptionFromStripe({ ctx, stripeSubscription })], + customer_products: autumnBillingPlan.insertCustomerProducts, + }; +}; diff --git a/server/src/internal/customers/actions/createWithDefaults/finalizeCreateCustomer.ts b/server/src/internal/customers/actions/createWithDefaults/finalizeCreateCustomer.ts new file mode 100644 index 000000000..abd0d8b52 --- /dev/null +++ b/server/src/internal/customers/actions/createWithDefaults/finalizeCreateCustomer.ts @@ -0,0 +1,43 @@ +import type { FullCustomer } from "@autumn/shared"; +import type Stripe from "stripe"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import type { AutumnBillingPlan } from "@/internal/billing/v2/types/autumnBillingPlan.js"; +import { CusProductService } from "@/internal/customers/cusProducts/CusProductService.js"; +import { initSubscriptionFromStripe } from "@/internal/subscriptions/utils/initSubscriptionFromStripe.js"; +import type { CreateCustomerContext } from "./createCustomerContext.js"; + +/** + * Finalize customer creation after Stripe subscription is created. + * Links subscription_ids back to customer products and builds final customer. + */ +export const finalizeCreateCustomer = async ({ + ctx, + context, + autumnBillingPlan, + stripeSubscription, +}: { + ctx: AutumnContext; + context: CreateCustomerContext; + autumnBillingPlan: AutumnBillingPlan; + stripeSubscription: Stripe.Subscription | undefined; +}): Promise => { + const { fullCustomer } = context; + + if (!stripeSubscription) return fullCustomer; + + // Link subscription_ids to customer products + for (const customerProduct of autumnBillingPlan.insertCustomerProducts) { + await CusProductService.update({ + db: ctx.db, + cusProductId: customerProduct.id, + updates: { subscription_ids: customerProduct.subscription_ids }, + }); + } + + // Build final customer with subscription and products + return { + ...fullCustomer, + subscriptions: [initSubscriptionFromStripe({ ctx, stripeSubscription })], + customer_products: autumnBillingPlan.insertCustomerProducts, + }; +}; diff --git a/server/src/internal/customers/actions/createWithDefaults/logs/logCreateCustomer.ts b/server/src/internal/customers/actions/createWithDefaults/logs/logCreateCustomer.ts index cdb406665..31c7e14fc 100644 --- a/server/src/internal/customers/actions/createWithDefaults/logs/logCreateCustomer.ts +++ b/server/src/internal/customers/actions/createWithDefaults/logs/logCreateCustomer.ts @@ -11,14 +11,22 @@ export const logCreateCustomerContext = ({ ctx: AutumnContext; context: CreateCustomerContext; }) => { - const { fullCustomer, fullProducts, currentEpochMs, trialContext, hasPaidProducts } = context; + const { + fullCustomer, + fullProducts, + currentEpochMs, + trialContext, + hasPaidProducts, + } = context; addToExtraLogs({ ctx, extras: { createCustomerContext: { customer: `${fullCustomer.id ?? fullCustomer.internal_id} | ${fullCustomer.email ?? "no email"}`, - products: fullProducts.map((p) => `${p.id} (v${p.version})`).join(", ") || "none", + products: + fullProducts.map((p) => `${p.id} (v${p.version})`).join(", ") || + "none", hasPaidProducts, currentEpochMs: formatMs(currentEpochMs), trialContext: trialContext @@ -39,13 +47,7 @@ export const logAutumnPlanResult = ({ addToExtraLogs({ ctx, extras: { - autumnPlanResult: { - type: result.type, - internalId: result.fullCustomer.internal_id, - customerProducts: result.fullCustomer.customer_products?.map( - (cp) => `${cp.product_id} (status: ${cp.status})`, - ) ?? [], - }, + autumnPlanResult: result.type, }, }); }; diff --git a/server/src/internal/customers/actions/createWithDefaults/setup/setupCreateCustomerBillingContext.ts b/server/src/internal/customers/actions/createWithDefaults/setup/setupCreateCustomerBillingContext.ts new file mode 100644 index 000000000..83159f073 --- /dev/null +++ b/server/src/internal/customers/actions/createWithDefaults/setup/setupCreateCustomerBillingContext.ts @@ -0,0 +1,44 @@ +import { getOrCreateStripeCustomer } from "@/external/stripe/customers/index.js"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import type { BillingContext } from "@/internal/billing/v2/billingContext.js"; +import type { CreateCustomerContext } from "../createCustomerContext.js"; + +/** + * Setup billing context for Stripe subscription creation. + * Gets/creates Stripe customer and builds BillingContext. + * + * Must be called AFTER executeAutumnCreateCustomerPlan to ensure + * we have the correct internal_id for Stripe idempotency. + */ +export const setupCreateCustomerBillingContext = async ({ + ctx, + context, +}: { + ctx: AutumnContext; + context: CreateCustomerContext; +}): Promise => { + const { fullCustomer, fullProducts, trialContext } = context; + + const stripeCustomer = await getOrCreateStripeCustomer({ + ctx, + customer: fullCustomer, + }); + + return { + // remove customer_products from fullCustomer to avoid sending to Stripe + fullCustomer: { + ...fullCustomer, + customer_products: [], + }, + stripeCustomer, + fullProducts, + featureQuantities: [], + currentEpochMs: Date.now(), + billingCycleAnchorMs: "now" as const, + resetCycleAnchorMs: "now" as const, + trialContext, + customPrices: [], + customEnts: [], + isCustom: false, + }; +}; diff --git a/server/src/internal/customers/cusRouter.ts b/server/src/internal/customers/cusRouter.ts index 3876bb7b1..995760e19 100644 --- a/server/src/internal/customers/cusRouter.ts +++ b/server/src/internal/customers/cusRouter.ts @@ -15,7 +15,7 @@ import { handleUpdateBalancesV2 } from "./handlers/handleUpdateBalancesV2.js"; import { handleUpdateCustomerV2 } from "./handlers/handleUpdateCustomerV2.js"; export const expressCusRouter = express.Router(); -expressCusRouter.get("/:customer_id/billing_portal", handleGetBillingPortal); +// expressCusRouter.get("/:customer_id/billing_portal", handleGetBillingPortal); export const cusRouter = new Hono(); @@ -35,6 +35,7 @@ cusRouter.post("/:customer_id/transfer", ...handleTransferProductV2); // Billing portal cusRouter.post("/:customer_id/billing_portal", ...handleCreateBillingPortal); +cusRouter.get("/:customer_id/billing_portal", ...handleGetBillingPortal); // Legacy... cusRouter.post("/:customer_id/balances", ...handleUpdateBalancesV2); diff --git a/server/src/internal/customers/handlers/handleBillingPortal/handleGetBillingPortal.ts b/server/src/internal/customers/handlers/handleBillingPortal/handleGetBillingPortal.ts index f42be8e1f..c539f5cb4 100644 --- a/server/src/internal/customers/handlers/handleBillingPortal/handleGetBillingPortal.ts +++ b/server/src/internal/customers/handlers/handleBillingPortal/handleGetBillingPortal.ts @@ -1,56 +1,60 @@ -import { ErrCode, RecaseError } from "@autumn/shared"; +import { + ErrCode, + GetBillingPortalQuerySchema, + RecaseError, +} from "@autumn/shared"; import { StatusCodes } from "http-status-codes"; +import z from "zod/v4"; +import { createRoute } from "@/honoMiddlewares/routeHandler"; import { createStripeCli } from "../../../../external/connect/createStripeCli"; import { getOrCreateStripeCustomer } from "../../../../external/stripe/customers"; -import type { AutumnContext } from "../../../../honoUtils/HonoEnv"; -import { routeHandler } from "../../../../utils/routerUtils"; -import { OrgService } from "../../../orgs/OrgService"; import { toSuccessUrl } from "../../../orgs/orgUtils/convertOrgUtils"; import { CusService } from "../../CusService"; -export const handleGetBillingPortal = (req: any, res: any) => - routeHandler({ - req, - res, - action: "get billing portal", - handler: async (req, res) => { - const returnUrl = req.query.return_url; - const customerId = req.params.customer_id; - const [org, customer] = await Promise.all([ - OrgService.getFromReq(req), - CusService.get({ - db: req.db, - idOrInternalId: customerId, - orgId: req.orgId, - env: req.env, - }), - ]); +export const handleGetBillingPortal = createRoute({ + query: GetBillingPortalQuerySchema, + params: z.object({ + customer_id: z.string(), + }), + // body: GetBillingPortalBodySchema, + handler: async (c) => { + const returnUrl = c.req.valid("query").return_url; + const customerId = c.req.param().customer_id; + const ctx = c.get("ctx"); + const [customer] = await Promise.all([ + CusService.get({ + db: ctx.db, + idOrInternalId: customerId, + orgId: ctx.org.id, + env: ctx.env, + }), + ]); - if (!customer) { - throw new RecaseError({ - message: `Customer ${customerId} not found`, - code: ErrCode.CustomerNotFound, - statusCode: StatusCodes.NOT_FOUND, - }); - } - - const stripeCli = createStripeCli({ org, env: req.env }); - - const stripeCustomer = await getOrCreateStripeCustomer({ - ctx: req as AutumnContext, - customer, + if (!customer) { + throw new RecaseError({ + message: `Customer ${customerId} not found`, + code: ErrCode.CustomerNotFound, + statusCode: StatusCodes.NOT_FOUND, }); + } - const stripeCusId = stripeCustomer.id; + const stripeCli = createStripeCli({ org: ctx.org, env: ctx.env }); - const portal = await stripeCli.billingPortal.sessions.create({ - customer: stripeCusId, - return_url: returnUrl || toSuccessUrl({ org, env: req.env }), - }); + const stripeCustomer = await getOrCreateStripeCustomer({ + ctx, + customer, + }); - res.status(200).json({ - customer_id: customer.id || null, - url: portal.url, - }); - }, - }); + const stripeCusId = stripeCustomer.id; + + const portal = await stripeCli.billingPortal.sessions.create({ + customer: stripeCusId, + return_url: returnUrl || toSuccessUrl({ org: ctx.org, env: ctx.env }), + }); + + return c.json({ + customer_id: customer.id || null, + url: portal.url, + }); + }, +}); diff --git a/shared/api/common/customerData.ts b/shared/api/common/customerData.ts index ad46977f3..57b5212b9 100644 --- a/shared/api/common/customerData.ts +++ b/shared/api/common/customerData.ts @@ -11,6 +11,7 @@ export const CustomerDataSchema = z email: z.email({ message: "not a valid email address" }).nullish().meta({ description: "Customer's email address", }), + fingerprint: z.string().nullish().meta({ description: "Unique identifier (eg, serial number) to detect duplicate customers and prevent free trial abuse", @@ -22,6 +23,10 @@ export const CustomerDataSchema = z description: "Stripe customer ID if you already have one", }), + create_in_stripe: z.boolean().optional().meta({ + description: "Whether to create the customer in Stripe", + }), + processors: ExternalProcessorsSchema.nullish().meta({ internal: true, description: "External processors for the customer", From fb8ffa7138f32e569ff11728456efec124c20bd0 Mon Sep 17 00:00:00 2001 From: John Yeo Date: Tue, 20 Jan 2026 19:58:31 +0000 Subject: [PATCH 3/5] chore: fixed some tests --- scripts/testGroups/g1.sh | 2 + scripts/testGroups/update-subscription.sh | 1 + server/src/external/autumn/autumnCli.ts | 4 +- .../honoMiddlewares/analyticsMiddleware.ts | 5 +- .../v2/execute/executeAutumnBillingPlan.ts | 6 +- .../customers/cusUtils/getOrCreateCustomer.ts | 43 -- .../customers/cusUtils/initCustomer.ts | 7 +- server/src/utils/logging/maskExtraLogs.ts | 2 +- .../tests/balances/check/basic/check1.test.ts | 95 --- .../tests/balances/check/basic/check2.test.ts | 150 ---- .../tests/balances/check/basic/check3.test.ts | 130 ---- .../tests/balances/check/basic/check4.test.ts | 148 ---- .../tests/balances/check/basic/check5.test.ts | 130 ---- .../tests/balances/check/basic/check6.test.ts | 198 ------ .../tests/balances/check/basic/check7.test.ts | 134 ---- .../tests/balances/check/basic/check8.test.ts | 179 ----- .../track-race-condition5.test.ts | 361 +++++----- .../custom-plan/update-one-off-mixed.test.ts | 7 +- .../discounts/discount-source.test.ts | 645 +++++++++--------- .../free-trial/update-paid-trials.test.ts | 2 +- .../create-customer-defaults.test.ts | 55 -- .../customers/create-customer-null-id.test.ts | 2 +- .../crud/customers/create-customer.test.ts | 74 +- 23 files changed, 522 insertions(+), 1858 deletions(-) delete mode 100644 server/tests/balances/check/basic/check1.test.ts delete mode 100644 server/tests/balances/check/basic/check2.test.ts delete mode 100644 server/tests/balances/check/basic/check3.test.ts delete mode 100644 server/tests/balances/check/basic/check4.test.ts delete mode 100644 server/tests/balances/check/basic/check5.test.ts delete mode 100644 server/tests/balances/check/basic/check6.test.ts delete mode 100644 server/tests/balances/check/basic/check7.test.ts delete mode 100644 server/tests/balances/check/basic/check8.test.ts diff --git a/scripts/testGroups/g1.sh b/scripts/testGroups/g1.sh index 011ca8994..947152281 100755 --- a/scripts/testGroups/g1.sh +++ b/scripts/testGroups/g1.sh @@ -9,6 +9,8 @@ source "$(dirname "$0")/config.sh" # Run tests using TypeScript runner with compact mode # Adjust --max to control concurren.cy (default: 6) +bun test:integration check + BUN_PARALLEL_COMPACT \ 'server/tests/balances/track/basic' \ 'server/tests/balances/track/concurrency' \ diff --git a/scripts/testGroups/update-subscription.sh b/scripts/testGroups/update-subscription.sh index 68e6edb25..41a3887b9 100755 --- a/scripts/testGroups/update-subscription.sh +++ b/scripts/testGroups/update-subscription.sh @@ -6,6 +6,7 @@ source "$(dirname "$0")/config.sh" # Exit immediately if a command exits with a non-zero status set -e +bun test:integration create-customer bun test:integration update-subscription/custom-plan bun test:integration update-subscription/discounts bun test:integration update-subscription/errors diff --git a/server/src/external/autumn/autumnCli.ts b/server/src/external/autumn/autumnCli.ts index ad4a9794a..8bb51f89e 100644 --- a/server/src/external/autumn/autumnCli.ts +++ b/server/src/external/autumn/autumnCli.ts @@ -415,7 +415,9 @@ export class AutumnInt { create: async ({ withAutumnId = true, expand = [], - internalOptions, + internalOptions = { + disable_defaults: true, + }, ...customerData }: { withAutumnId?: boolean; diff --git a/server/src/honoMiddlewares/analyticsMiddleware.ts b/server/src/honoMiddlewares/analyticsMiddleware.ts index 80567f03d..0e9e585de 100644 --- a/server/src/honoMiddlewares/analyticsMiddleware.ts +++ b/server/src/honoMiddlewares/analyticsMiddleware.ts @@ -116,7 +116,10 @@ const logResponse = async ({ res: responseBody, }); - if (Object.keys(ctx.extraLogs).length > 0) { + if ( + Object.keys(ctx.extraLogs).length > 0 && + process.env.NODE_ENV === "development" + ) { const maskedLogs = maskExtraLogs(ctx.extraLogs); ctx.logger.debug(`EXTRA LOGS: ${JSON.stringify(maskedLogs, null, 2)}`); } diff --git a/server/src/internal/billing/v2/execute/executeAutumnBillingPlan.ts b/server/src/internal/billing/v2/execute/executeAutumnBillingPlan.ts index 82a259cda..c9905fc7a 100644 --- a/server/src/internal/billing/v2/execute/executeAutumnBillingPlan.ts +++ b/server/src/internal/billing/v2/execute/executeAutumnBillingPlan.ts @@ -45,9 +45,9 @@ export const executeAutumnBillingPlan = async ({ }); } - ctx.logger.debug( - `[execAutumnPlan] inserting new customer products: ${insertCustomerProducts.map((cp) => cp.product.id).join(", ")}`, - ); + // ctx.logger.debug( + // `[execAutumnPlan] inserting new customer products: ${insertCustomerProducts.map((cp) => cp.product.id).join(", ")}`, + // ); // 2. Insert new customer products await insertNewCusProducts({ ctx, diff --git a/server/src/internal/customers/cusUtils/getOrCreateCustomer.ts b/server/src/internal/customers/cusUtils/getOrCreateCustomer.ts index deea6bc35..203cb10b9 100644 --- a/server/src/internal/customers/cusUtils/getOrCreateCustomer.ts +++ b/server/src/internal/customers/cusUtils/getOrCreateCustomer.ts @@ -70,49 +70,6 @@ export const getOrCreateCustomer = async ({ customerId, customerData, }); - // try { - // customer = (await handleCreateCustomer({ - // ctx, - // cusData: { - // id: customerId, - // name: customerData?.name, - // email: customerData?.email, - // fingerprint: customerData?.fingerprint, - // metadata: customerData?.metadata || {}, - // stripe_id: customerData?.stripe_id, - // // default_product_id: customerData?.default_product_id, - // }, - // createDefaultProducts: customerData?.disable_default !== true, - // })) as FullCustomer; - - // customer = await CusService.getFull({ - // db, - // idOrInternalId: customerId || customer.internal_id, - // orgId: org.id, - // env, - // inStatuses, - // withEntities, - // entityId, - // expand, - // withSubs: true, - // }); - // } catch (error: any) { - // if (error?.code === "23505" && customerId) { - // customer = await CusService.getFull({ - // db, - // idOrInternalId: customerId, - // orgId: org.id, - // env, - // inStatuses, - // withEntities, - // entityId, - // expand, - // withSubs: true, - // }); - // } else { - // throw error; - // } - // } } if (!skipUpdate) { diff --git a/server/src/internal/customers/cusUtils/initCustomer.ts b/server/src/internal/customers/cusUtils/initCustomer.ts index 15db03418..8b046a12a 100644 --- a/server/src/internal/customers/cusUtils/initCustomer.ts +++ b/server/src/internal/customers/cusUtils/initCustomer.ts @@ -27,7 +27,12 @@ export const initCustomer = ({ fingerprint: customerData?.fingerprint, metadata: customerData?.metadata ?? {}, created_at: Date.now(), - processor: null, + processor: customerData?.stripe_id + ? { + id: customerData.stripe_id, + type: "stripe", + } + : null, }; }; diff --git a/server/src/utils/logging/maskExtraLogs.ts b/server/src/utils/logging/maskExtraLogs.ts index e62e6d877..34248e919 100644 --- a/server/src/utils/logging/maskExtraLogs.ts +++ b/server/src/utils/logging/maskExtraLogs.ts @@ -1,5 +1,5 @@ /** Fields to mask in extra logs (replace with "[MASKED]") */ -const MASKED_FIELDS = ["fullCustomer"]; +const MASKED_FIELDS = ["setCache"]; export const maskExtraLogs = ( extraLogs: Record, diff --git a/server/tests/balances/check/basic/check1.test.ts b/server/tests/balances/check/basic/check1.test.ts deleted file mode 100644 index 1ec9e11af..000000000 --- a/server/tests/balances/check/basic/check1.test.ts +++ /dev/null @@ -1,95 +0,0 @@ -import { beforeAll, describe, expect, test } from "bun:test"; -import { - ApiVersion, - type CheckResponseV0, - type CheckResponseV1, - type CheckResponseV2, - SuccessCode, -} from "@autumn/shared"; -import { TestFeature } from "@tests/setup/v2Features.js"; -import ctx from "@tests/utils/testInitUtils/createTestContext.js"; -import chalk from "chalk"; -import { AutumnInt } from "@/external/autumn/autumnCli.js"; -import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js"; -import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js"; -import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js"; -import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js"; - -const dashboardFeature = constructFeatureItem({ - featureId: TestFeature.Dashboard, - isBoolean: true, -}); - -const messagesFeature = constructFeatureItem({ - featureId: TestFeature.Messages, - includedUsage: 1000, -}); - -const freeProd = constructProduct({ - type: "free", - isDefault: false, - items: [dashboardFeature, messagesFeature], -}); - -const testCase = "check1"; - -describe(`${chalk.yellowBright("check1: test /check when no feature attached")}`, () => { - const customerId = "check1"; - const autumnV0: AutumnInt = new AutumnInt({ version: ApiVersion.V0_2 }); - const autumnV1: AutumnInt = new AutumnInt({ version: ApiVersion.V1_2 }); - const autumnV2: AutumnInt = new AutumnInt({ version: ApiVersion.V2_0 }); - - beforeAll(async () => { - await initCustomerV3({ - ctx, - customerId, - withTestClock: false, - }); - - await initProductsV0({ - ctx, - products: [freeProd], - prefix: testCase, - }); - }); - - test("should have correct v2 response", async () => { - const res = (await autumnV2.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - })) as unknown as CheckResponseV2; - - expect(res).toEqual({ - allowed: false, - customer_id: testCase, - required_balance: 1, - balance: null, - }); - }); - - test("should have correct v1 response", async () => { - const res = (await autumnV1.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - })) as unknown as CheckResponseV1; - - expect(res).toStrictEqual({ - allowed: false, - customer_id: customerId, - feature_id: TestFeature.Messages, - required_balance: 1, - code: SuccessCode.FeatureFound, - }); - }); - - test("should have correct v0 response", async () => { - const res = (await autumnV0.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - })) as unknown as CheckResponseV0; - - expect(res.allowed).toBe(false); - expect(res.balances).toBeDefined(); - expect(res.balances).toHaveLength(0); - }); -}); diff --git a/server/tests/balances/check/basic/check2.test.ts b/server/tests/balances/check/basic/check2.test.ts deleted file mode 100644 index abb3942ab..000000000 --- a/server/tests/balances/check/basic/check2.test.ts +++ /dev/null @@ -1,150 +0,0 @@ -import { beforeAll, describe, expect, test } from "bun:test"; -import { - ApiVersion, - type CheckResponseV0, - type CheckResponseV1, - type CheckResponseV2, - SuccessCode, -} from "@autumn/shared"; -import { TestFeature } from "@tests/setup/v2Features.js"; -import ctx from "@tests/utils/testInitUtils/createTestContext.js"; -import chalk from "chalk"; -import { AutumnInt } from "@/external/autumn/autumnCli.js"; -import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js"; -import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js"; -import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js"; -import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js"; - -const dashboardFeature = constructFeatureItem({ - featureId: TestFeature.Dashboard, - isBoolean: true, -}); - -const messagesFeature = constructFeatureItem({ - featureId: TestFeature.Messages, - includedUsage: 1000, -}); - -const freeProd = constructProduct({ - type: "free", - isDefault: false, - items: [dashboardFeature, messagesFeature], -}); - -const testCase = "check2"; - -describe(`${chalk.yellowBright("check2: test /check on boolean feature")}`, () => { - const customerId = "check2"; - const autumnV0: AutumnInt = new AutumnInt({ version: ApiVersion.V0_2 }); - const autumnV1: AutumnInt = new AutumnInt({ version: ApiVersion.V1_2 }); - const autumnV2: AutumnInt = new AutumnInt({ version: ApiVersion.V2_0 }); - - beforeAll(async () => { - await initCustomerV3({ - ctx, - customerId, - withTestClock: false, - }); - - await initProductsV0({ - ctx, - products: [freeProd], - prefix: testCase, - }); - - await autumnV1.attach({ - customer_id: customerId, - product_id: freeProd.id, - }); - }); - - test("v2 response", async () => { - const res = (await autumnV2.check({ - customer_id: customerId, - feature_id: TestFeature.Dashboard, - })) as unknown as CheckResponseV2; - - expect(res).toMatchObject({ - allowed: true, - customer_id: customerId, - required_balance: 1, - balance: { - plan_id: freeProd.id, - feature_id: TestFeature.Dashboard, - unlimited: false, - granted_balance: 0, - purchased_balance: 0, - current_balance: 0, - usage: 0, - max_purchase: null, - overage_allowed: false, - reset: null, - breakdown: [ - { - current_balance: 0, - granted_balance: 0, - max_purchase: null, - overage_allowed: false, - plan_id: freeProd.id, - purchased_balance: 0, - reset: null, - usage: 0, - }, - ], - }, - }); - }); - - test("v1 response", async () => { - const res = (await autumnV1.check({ - customer_id: customerId, - feature_id: TestFeature.Dashboard, - })) as unknown as CheckResponseV1; - - expect(res).toStrictEqual({ - customer_id: customerId, - feature_id: TestFeature.Dashboard, - code: SuccessCode.FeatureFound, - allowed: true, - - // New fields for boolean? - interval: null, - interval_count: null, - balance: 0, - included_usage: 0, - usage: 0, - next_reset_at: null, - overage_allowed: false, - required_balance: 1, - unlimited: false, - breakdown: [ - { - balance: 0, - included_usage: 0, - interval: null, - interval_count: null, - next_reset_at: null, - overage_allowed: false, - usage: 0, - }, - ], - }); - }); - - test("v0 response", async () => { - const res = (await autumnV0.check({ - customer_id: customerId, - feature_id: TestFeature.Dashboard, - })) as unknown as CheckResponseV0; - - expect(res).toStrictEqual({ - allowed: true, - balances: [ - { - feature_id: TestFeature.Dashboard, - balance: null, - }, - ], - }); - }); -}); diff --git a/server/tests/balances/check/basic/check3.test.ts b/server/tests/balances/check/basic/check3.test.ts deleted file mode 100644 index def4475ff..000000000 --- a/server/tests/balances/check/basic/check3.test.ts +++ /dev/null @@ -1,130 +0,0 @@ -import { beforeAll, describe, expect, test } from "bun:test"; -import { - ApiVersion, - type CheckResponseV0, - type CheckResponseV1, - type CheckResponseV2, - EntInterval, - ResetInterval, - SuccessCode, -} from "@autumn/shared"; -import { TestFeature } from "@tests/setup/v2Features.js"; -import ctx from "@tests/utils/testInitUtils/createTestContext.js"; -import chalk from "chalk"; -import { AutumnInt } from "@/external/autumn/autumnCli.js"; -import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js"; -import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js"; -import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js"; -import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js"; - -const messagesFeature = constructFeatureItem({ - featureId: TestFeature.Messages, - includedUsage: 1000, -}); - -const freeProd = constructProduct({ - type: "free", - isDefault: false, - items: [messagesFeature], -}); - -const testCase = "check3"; - -describe(`${chalk.yellowBright("check3: test /check on metered feature")}`, () => { - const customerId = "check3"; - const autumnV0: AutumnInt = new AutumnInt({ version: ApiVersion.V0_2 }); - const autumnV1: AutumnInt = new AutumnInt({ version: ApiVersion.V1_2 }); - const autumnV2: AutumnInt = new AutumnInt({ version: ApiVersion.V2_0 }); - - beforeAll(async () => { - await initCustomerV3({ - ctx, - customerId, - withTestClock: false, - }); - - await initProductsV0({ - ctx, - products: [freeProd], - prefix: testCase, - }); - - await autumnV1.attach({ - customer_id: customerId, - product_id: freeProd.id, - }); - }); - - test("v2 response", async () => { - const res = (await autumnV2.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - })) as unknown as CheckResponseV2; - - expect(res).toMatchObject({ - allowed: true, - customer_id: "check3", - required_balance: 1, - balance: { - feature_id: "messages", - unlimited: false, - granted_balance: 1000, - purchased_balance: 0, - current_balance: 1000, - usage: 0, - max_purchase: null, - overage_allowed: false, - reset: { - interval: ResetInterval.Month, - }, - }, - }); - }); - - test("v1 response", async () => { - const res = (await autumnV1.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - })) as unknown as CheckResponseV1; - - const expectedRes = { - allowed: true, - customer_id: customerId, - feature_id: TestFeature.Messages, - required_balance: 1, - code: SuccessCode.FeatureFound, - interval: EntInterval.Month, - interval_count: 1, - unlimited: false, - balance: 1000, - usage: 0, - included_usage: 1000, - // next_reset_at: 1763833597035, - overage_allowed: false, - }; - - for (const key in expectedRes) { - expect(res[key as keyof CheckResponseV1]).toBe( - expectedRes[key as keyof typeof expectedRes], - ); - } - }); - - test("v0 response", async () => { - const res = (await autumnV0.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - })) as unknown as CheckResponseV0; - - expect(res).toStrictEqual({ - allowed: true, - balances: [ - { - feature_id: TestFeature.Messages, - required: 1, - balance: 1000, - }, - ], - }); - }); -}); diff --git a/server/tests/balances/check/basic/check4.test.ts b/server/tests/balances/check/basic/check4.test.ts deleted file mode 100644 index 1c8a3a2c2..000000000 --- a/server/tests/balances/check/basic/check4.test.ts +++ /dev/null @@ -1,148 +0,0 @@ -import { beforeAll, describe, expect, test } from "bun:test"; -import { - ApiVersion, - type CheckResponseV0, - type CheckResponseV1, - type CheckResponseV2, - SuccessCode, -} from "@autumn/shared"; -import { TestFeature } from "@tests/setup/v2Features.js"; -import ctx from "@tests/utils/testInitUtils/createTestContext.js"; -import chalk from "chalk"; -import { AutumnInt } from "@/external/autumn/autumnCli.js"; -import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js"; -import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js"; -import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js"; -import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js"; - -const messagesFeature = constructFeatureItem({ - featureId: TestFeature.Messages, - unlimited: true, -}); - -const freeProd = constructProduct({ - type: "free", - isDefault: false, - items: [messagesFeature], -}); - -const testCase = "check4"; - -describe(`${chalk.yellowBright("check4: test /check on unlimited feature")}`, () => { - const customerId = "check4"; - const autumnV0: AutumnInt = new AutumnInt({ version: ApiVersion.V0_2 }); - const autumnV1: AutumnInt = new AutumnInt({ version: ApiVersion.V1_2 }); - const autumnV2: AutumnInt = new AutumnInt({ version: ApiVersion.V2_0 }); - - beforeAll(async () => { - await initCustomerV3({ - ctx, - customerId, - withTestClock: false, - }); - - await initProductsV0({ - ctx, - products: [freeProd], - prefix: testCase, - }); - - await autumnV1.attach({ - customer_id: customerId, - product_id: freeProd.id, - }); - }); - - test("v2 response", async () => { - const res = (await autumnV2.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - })) as unknown as CheckResponseV2; - - expect(res).toMatchObject({ - allowed: true, - customer_id: "check4", - required_balance: 1, - balance: { - plan_id: freeProd.id, - feature_id: "messages", - unlimited: true, - granted_balance: 0, - purchased_balance: 0, - current_balance: 0, - usage: 0, - overage_allowed: false, - max_purchase: null, - reset: null, - breakdown: [ - { - current_balance: 0, - granted_balance: 0, - max_purchase: null, - overage_allowed: false, - plan_id: freeProd.id, - purchased_balance: 0, - reset: null, - usage: 0, - }, - ], - }, - }); - }); - - test("v1 response", async () => { - const res = (await autumnV1.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - })) as unknown as CheckResponseV1; - - const expectedRes = { - allowed: true, - customer_id: customerId, - feature_id: TestFeature.Messages as string, - required_balance: 1, - code: SuccessCode.FeatureFound, - unlimited: true, - usage: 0, - included_usage: 0, - next_reset_at: null, - overage_allowed: false, - - // Unlimited features, balance is 0... - balance: 0, - interval: null, - interval_count: null, - breakdown: [ - { - balance: 0, - included_usage: 0, - interval: null, - interval_count: null, - next_reset_at: null, - overage_allowed: false, - usage: 0, - }, - ], - }; - - expect(expectedRes).toMatchObject(res); - }); - - test("v0 response", async () => { - const res = (await autumnV0.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - })) as unknown as CheckResponseV0; - - expect(res.allowed).toBe(true); - expect(res.balances).toBeDefined(); - expect(res.balances).toHaveLength(1); - expect(res.balances[0]).toStrictEqual({ - balance: null, - feature_id: TestFeature.Messages, - unlimited: true, - usage_allowed: false, - required: null, - }); - }); -}); diff --git a/server/tests/balances/check/basic/check5.test.ts b/server/tests/balances/check/basic/check5.test.ts deleted file mode 100644 index ccba8532d..000000000 --- a/server/tests/balances/check/basic/check5.test.ts +++ /dev/null @@ -1,130 +0,0 @@ -import { beforeAll, describe, expect, test } from "bun:test"; -import { - ApiVersion, - type CheckResponseV0, - type CheckResponseV1, - type CheckResponseV2, - type LimitedItem, - ResetInterval, - SuccessCode, -} from "@autumn/shared"; -import { TestFeature } from "@tests/setup/v2Features.js"; -import ctx from "@tests/utils/testInitUtils/createTestContext.js"; -import chalk from "chalk"; -import { AutumnInt } from "@/external/autumn/autumnCli.js"; -import { constructArrearItem } from "@/utils/scriptUtils/constructItem.js"; -import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js"; -import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js"; -import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js"; - -const messagesFeature = constructArrearItem({ - featureId: TestFeature.Messages, - price: 0.5, - includedUsage: 100, -}) as LimitedItem; - -const proProd = constructProduct({ - type: "free", - isDefault: false, - items: [messagesFeature], -}); - -const testCase = "check5"; - -describe(`${chalk.yellowBright("check5: test /check on usage-based feature")}`, () => { - const customerId = "check5"; - const autumnV0: AutumnInt = new AutumnInt({ version: ApiVersion.V0_2 }); - const autumnV1: AutumnInt = new AutumnInt({ version: ApiVersion.V1_2 }); - const autumnV2: AutumnInt = new AutumnInt({ version: ApiVersion.V2_0 }); - beforeAll(async () => { - await initCustomerV3({ - ctx, - customerId, - attachPm: "success", - withTestClock: false, - }); - - await initProductsV0({ - ctx, - products: [proProd], - prefix: testCase, - }); - - await autumnV1.attach({ - customer_id: customerId, - product_id: proProd.id, - }); - }); - - test("v2 response", async () => { - const res = (await autumnV2.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - })) as unknown as CheckResponseV2; - - expect(res).toMatchObject({ - allowed: true, - customer_id: "check5", - required_balance: 1, - balance: { - feature_id: "messages", - unlimited: false, - granted_balance: messagesFeature.included_usage, - purchased_balance: 0, - current_balance: messagesFeature.included_usage, - usage: 0, - max_purchase: null, - overage_allowed: true, - reset: { - interval: ResetInterval.Month, - // resets_at: 1765391171000, - }, - }, - }); - - expect(res.balance?.reset?.resets_at).toBeDefined(); - }); - - test("v1 response", async () => { - const res = (await autumnV1.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - })) as unknown as CheckResponseV1; - - const expectedRes = { - allowed: true, - customer_id: customerId, - feature_id: TestFeature.Messages as string, - required_balance: 1, - code: SuccessCode.FeatureFound, - unlimited: false, - balance: messagesFeature.included_usage, - usage: 0, - included_usage: messagesFeature.included_usage, - overage_allowed: true, - interval: messagesFeature.interval, - interval_count: 1, - }; - - expect(res).toMatchObject(expectedRes); - expect(res.next_reset_at).toBeDefined(); - }); - - test("v0 response", async () => { - const res = (await autumnV0.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - })) as unknown as CheckResponseV0; - - expect(res.allowed).toBe(true); - expect(res.balances).toBeDefined(); - expect(res.balances).toHaveLength(1); - expect(res.balances[0]).toMatchObject({ - balance: messagesFeature.included_usage, - feature_id: TestFeature.Messages, - unlimited: false, - usage_allowed: true, - required: null, - }); - }); -}); diff --git a/server/tests/balances/check/basic/check6.test.ts b/server/tests/balances/check/basic/check6.test.ts deleted file mode 100644 index 0ae7952e3..000000000 --- a/server/tests/balances/check/basic/check6.test.ts +++ /dev/null @@ -1,198 +0,0 @@ -import { beforeAll, describe, expect, test } from "bun:test"; -import { - type ApiBalanceBreakdown, - ApiVersion, - type CheckResponseV0, - type CheckResponseV1, - type CheckResponseV2, - type LimitedItem, - ResetInterval, - SuccessCode, -} from "@autumn/shared"; -import { TestFeature } from "@tests/setup/v2Features.js"; -import ctx from "@tests/utils/testInitUtils/createTestContext.js"; -import chalk from "chalk"; -import { AutumnInt } from "@/external/autumn/autumnCli.js"; -import { - constructArrearItem, - constructFeatureItem, -} from "@/utils/scriptUtils/constructItem.js"; -import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js"; -import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js"; -import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js"; - -const monthlyMessages = constructArrearItem({ - featureId: TestFeature.Messages, - price: 0.5, - includedUsage: 100, -}) as LimitedItem; - -const lifetimeMessages = constructFeatureItem({ - featureId: TestFeature.Messages, - interval: null, - includedUsage: 1000, -}) as LimitedItem; - -const proProd = constructProduct({ - type: "pro", - isDefault: false, - items: [monthlyMessages, lifetimeMessages], -}); - -const testCase = "check6"; - -describe(`${chalk.yellowBright("check6: test /check on feature with multiple balances (one off + monthly)")}`, () => { - const customerId = "check6"; - const autumnV0: AutumnInt = new AutumnInt({ version: ApiVersion.V0_2 }); - const autumnV1: AutumnInt = new AutumnInt({ version: ApiVersion.V1_2 }); - const autumnV2: AutumnInt = new AutumnInt({ version: ApiVersion.V2_0 }); - beforeAll(async () => { - await initCustomerV3({ - ctx, - customerId, - attachPm: "success", - withTestClock: false, - }); - - await initProductsV0({ - ctx, - products: [proProd], - prefix: testCase, - }); - - await autumnV1.attach({ - customer_id: customerId, - product_id: proProd.id, - }); - }); - - test("v2 response", async () => { - const res = (await autumnV2.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - })) as unknown as CheckResponseV2; - - const expectedLifetimeBreadown: ApiBalanceBreakdown = { - id: expect.any(String), - plan_id: proProd.id, - granted_balance: 1000, - purchased_balance: 0, - current_balance: 1000, - usage: 0, - max_purchase: null, - overage_allowed: false, - reset: { - interval: ResetInterval.OneOff, - resets_at: null, - }, - prepaid_quantity: 0, - expires_at: null, - }; - - const expectedMonthlyBreadown = { - granted_balance: 100, - purchased_balance: 0, - current_balance: 100, - usage: 0, - max_purchase: null, - reset: { - interval: ResetInterval.Month, - }, - }; - - const actualMonthlyBreakdown = res.balance?.breakdown?.[0]; - const actualLifetimeBreakdown = res.balance?.breakdown?.[1]; - - expect(actualMonthlyBreakdown).toMatchObject(expectedMonthlyBreadown); - expect(actualLifetimeBreakdown).toMatchObject(expectedLifetimeBreadown); - expect(actualMonthlyBreakdown?.reset?.resets_at).toBeDefined(); - - expect(res).toMatchObject({ - allowed: true, - customer_id: customerId, - required_balance: 1, - balance: { - feature_id: TestFeature.Messages, - unlimited: false, - granted_balance: - monthlyMessages.included_usage + lifetimeMessages.included_usage, - purchased_balance: 0, - current_balance: - monthlyMessages.included_usage + lifetimeMessages.included_usage, - usage: 0, - max_purchase: null, - overage_allowed: true, - reset: { - interval: "multiple", - resets_at: null, - }, - }, - }); - }); - - test("v1 response", async () => { - const res = (await autumnV1.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - })) as unknown as CheckResponseV1; - - const totalIncludedUsage = - monthlyMessages.included_usage + lifetimeMessages.included_usage; - - const lifetimeBreakdown = { - balance: lifetimeMessages.included_usage, - included_usage: lifetimeMessages.included_usage, - interval: "lifetime", - interval_count: 1, - next_reset_at: null, - usage: 0, - }; - - const monthlyBreakdown = { - balance: monthlyMessages.included_usage, - included_usage: monthlyMessages.included_usage, - interval: "month", - interval_count: 1, - usage: 0, - }; - - const expectedRes = { - allowed: true, - customer_id: customerId, - feature_id: TestFeature.Messages as string, - required_balance: 1, - code: SuccessCode.FeatureFound, - unlimited: false, - balance: totalIncludedUsage, - interval: "multiple", - interval_count: null, - usage: 0, - included_usage: totalIncludedUsage, - overage_allowed: true, - // breakdown: [monthlyBreakdown, lifetimeBreakdown], - }; - - expect(res).toMatchObject(expectedRes); - expect(res.breakdown).toHaveLength(2); - expect(res.breakdown?.[0]).toMatchObject(monthlyBreakdown); - expect(res.breakdown?.[1]).toMatchObject(lifetimeBreakdown); - }); - - test("v0 response", async () => { - const res = (await autumnV0.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - })) as unknown as CheckResponseV0; - - expect(res.allowed).toBe(true); - expect(res.balances).toBeDefined(); - expect(res.balances).toHaveLength(1); - expect(res.balances[0]).toMatchObject({ - balance: monthlyMessages.included_usage + lifetimeMessages.included_usage, - feature_id: TestFeature.Messages, - required: null, - unlimited: false, - usage_allowed: true, - }); - }); -}); diff --git a/server/tests/balances/check/basic/check7.test.ts b/server/tests/balances/check/basic/check7.test.ts deleted file mode 100644 index 49168c100..000000000 --- a/server/tests/balances/check/basic/check7.test.ts +++ /dev/null @@ -1,134 +0,0 @@ -import { beforeAll, describe, expect, test } from "bun:test"; -import { - ApiVersion, - type CheckResponseV0, - type CheckResponseV1, - type CheckResponseV2, - type LimitedItem, - SuccessCode, -} from "@autumn/shared"; -import chalk from "chalk"; -import { TestFeature } from "@tests/setup/v2Features.js"; -import ctx from "@tests/utils/testInitUtils/createTestContext.js"; -import { AutumnInt } from "@/external/autumn/autumnCli.js"; -import { constructArrearItem } from "@/utils/scriptUtils/constructItem.js"; -import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js"; -import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js"; -import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js"; - -const messagesFeature = constructArrearItem({ - featureId: TestFeature.Messages, - price: 0.5, - includedUsage: 100, - usageLimit: 500, -}) as LimitedItem; - -const proProd = constructProduct({ - type: "pro", - isDefault: false, - items: [messagesFeature], -}); - -const testCase = "check7"; - -describe(`${chalk.yellowBright("check7: test /check on feature with usage limits")}`, () => { - const customerId = "check7"; - const autumnV0: AutumnInt = new AutumnInt({ version: ApiVersion.V0_2 }); - const autumnV1: AutumnInt = new AutumnInt({ version: ApiVersion.V1_2 }); - const autumnV2: AutumnInt = new AutumnInt({ version: ApiVersion.V2_0 }); - beforeAll(async () => { - await initCustomerV3({ - ctx, - customerId, - attachPm: "success", - withTestClock: false, - }); - - await initProductsV0({ - ctx, - products: [proProd], - prefix: testCase, - }); - - await autumnV1.attach({ - customer_id: customerId, - product_id: proProd.id, - }); - }); - - test("v2 response", async () => { - const res = (await autumnV2.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - required_balance: messagesFeature.usage_limit! + 1, - })) as unknown as CheckResponseV2; - - expect(res).toMatchObject({ - allowed: false, - customer_id: customerId, - required_balance: messagesFeature.usage_limit! + 1, - balance: { - feature_id: "messages", - unlimited: false, - granted_balance: messagesFeature.included_usage, - purchased_balance: 0, - current_balance: messagesFeature.included_usage, - usage: 0, - max_purchase: - messagesFeature.usage_limit! - messagesFeature.included_usage, - - overage_allowed: true, - - reset: { - interval: "month", - // resets_at: 1765393465000, - }, - }, - }); - }); - - test("v1 response", async () => { - const res = (await autumnV1.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - required_balance: messagesFeature.usage_limit! + 1, - })) as unknown as CheckResponseV1; - - const expectedRes = { - allowed: false, - customer_id: customerId, - balance: messagesFeature.included_usage, - feature_id: TestFeature.Messages as string, - required_balance: messagesFeature.usage_limit! + 1, - code: SuccessCode.FeatureFound, - unlimited: false, - usage: 0, - included_usage: messagesFeature.included_usage, - overage_allowed: false, - - usage_limit: messagesFeature.usage_limit!, - interval: "month", - interval_count: 1, - }; - - expect(res).toMatchObject(expectedRes); - expect(res.next_reset_at).toBeDefined(); - }); - - test("v0 response", async () => { - const res = (await autumnV0.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - required_balance: messagesFeature.usage_limit! + 1, - })) as unknown as CheckResponseV0; - - expect(res.allowed).toBe(false); - expect(res.balances).toBeDefined(); - expect(res.balances).toHaveLength(1); - expect(res.balances[0]).toMatchObject({ - balance: messagesFeature.included_usage, - required: messagesFeature.usage_limit! + 1, - feature_id: TestFeature.Messages, - }); - }); -}); diff --git a/server/tests/balances/check/basic/check8.test.ts b/server/tests/balances/check/basic/check8.test.ts deleted file mode 100644 index 1800548ed..000000000 --- a/server/tests/balances/check/basic/check8.test.ts +++ /dev/null @@ -1,179 +0,0 @@ -import { beforeAll, describe, expect, test } from "bun:test"; -import { - ApiVersion, - AppEnv, - type CheckResponseV1, - SuccessCode, -} from "@autumn/shared"; -import { TestFeature } from "@tests/setup/v2Features.js"; -import ctx from "@tests/utils/testInitUtils/createTestContext.js"; -import chalk from "chalk"; -import { AutumnInt } from "@/external/autumn/autumnCli.js"; -import { OrgService } from "@/internal/orgs/OrgService.js"; -import { generatePublishableKey } from "@/utils/encryptUtils.js"; -import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js"; -import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js"; -import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js"; -import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js"; -import { expectAutumnError } from "../../../utils/expectUtils/expectErrUtils.js"; -import { timeout } from "../../../utils/genUtils.js"; - -const messagesFeature = constructFeatureItem({ - featureId: TestFeature.Messages, - includedUsage: 1000, -}); - -const freeProd = constructProduct({ - type: "free", - isDefault: false, - items: [messagesFeature], -}); - -const testCase = "check8"; -const customerId = "check8"; - -describe(`${chalk.yellowBright("check8: test public key & send_event")}`, () => { - const autumnV1: AutumnInt = new AutumnInt({ version: ApiVersion.V1_2 }); - let autumnPublic: AutumnInt; - - beforeAll(async () => { - await initCustomerV3({ - ctx, - customerId, - withTestClock: false, - }); - - await initProductsV0({ - ctx, - products: [freeProd], - prefix: testCase, - }); - - await autumnV1.attach({ - customer_id: customerId, - product_id: freeProd.id, - }); - - // Ensure test_pkey is set on the org (needed for public key tests) - if (!ctx.org.test_pkey) { - const testPkey = generatePublishableKey(AppEnv.Sandbox); - await OrgService.update({ - db: ctx.db, - orgId: ctx.org.id, - updates: { - test_pkey: testPkey, - }, - }); - // Update the context org object - ctx.org.test_pkey = testPkey; - } - - if (!ctx.org.test_pkey.startsWith("am_pk")) { - throw new Error( - `test_pkey "${ctx.org.test_pkey}" does not start with "am_pk". Expected format: am_pk_test_...`, - ); - } - - // Initialize Autumn client with public key - autumnPublic = new AutumnInt({ - version: ApiVersion.V1_2, - secretKey: ctx.org.test_pkey, - }); - }); - - test("should work with public key for /check endpoint", async () => { - const res = (await autumnPublic.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - required_balance: 100, - })) as unknown as CheckResponseV1; - - expect(res).toMatchObject({ - allowed: true, - customer_id: customerId, - feature_id: TestFeature.Messages, - balance: 1000, - required_balance: 100, - code: SuccessCode.FeatureFound, - usage: 0, - included_usage: 1000, - overage_allowed: false, - }); - - expect(res.next_reset_at).toBeDefined(); - }); - - test("should not track usage when send_event: true with public key", async () => { - // Get current balance before - const customerBefore: any = await autumnV1.customers.get(customerId); - const balanceBefore = customerBefore.features[TestFeature.Messages].balance; - const usedBefore = customerBefore.features[TestFeature.Messages].used; - - await expectAutumnError({ - func: async () => { - await autumnPublic.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - required_balance: 50, - send_event: true, - }); - }, - }); - - // Get customer and verify balance stayed the same - const customerAfter: any = await autumnV1.customers.get(customerId); - const balanceAfter = customerAfter.features[TestFeature.Messages].balance; - - expect(balanceAfter).toBe(balanceBefore); - expect(customerAfter.features[TestFeature.Messages].used).toBe(usedBefore); - }); - - test("should track usage when send_event: true with secret key", async () => { - // Call check with send_event: true - const checkRes = (await autumnV1.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - required_balance: 150, - send_event: true, - })) as unknown as CheckResponseV1; - - expect(checkRes.allowed).toBe(true); - expect(checkRes.balance).toBe(1000 - 150); - - // Wait for event to be processed - await timeout(2000); - - // Get customer and verify balance decreased - const customer: any = await autumnV1.customers.get(customerId); - const balanceAfter = customer.features[TestFeature.Messages].balance; - - expect(balanceAfter).toBe(850); // 1000 - 150 - expect(customer.features[TestFeature.Messages].usage).toBe(150); - }); - - test("should not track usage when send_event: true but insufficient balance", async () => { - // Get current balance first - const customerBefore: any = await autumnV1.customers.get(customerId); - const balanceBefore = customerBefore.features[TestFeature.Messages].balance; - - // Call check with required_balance > current balance - const checkRes = (await autumnV1.check({ - customer_id: customerId, - feature_id: TestFeature.Messages, - required_balance: 900, // More than available (850) - send_event: true, - })) as unknown as CheckResponseV1; - - expect(checkRes.allowed).toBe(false); - - // Wait for potential event processing - await timeout(2000); - - // Get customer and verify balance stayed the same - const customerAfter: any = await autumnV1.customers.get(customerId); - const balanceAfter = customerAfter.features[TestFeature.Messages].balance; - - expect(balanceAfter).toBe(balanceBefore); - expect(customerAfter.features[TestFeature.Messages].usage).toBe(150); // Same as before - }); -}); diff --git a/server/tests/balances/track/race-condition/track-race-condition5.test.ts b/server/tests/balances/track/race-condition/track-race-condition5.test.ts index e303bf8ea..6981235d3 100644 --- a/server/tests/balances/track/race-condition/track-race-condition5.test.ts +++ b/server/tests/balances/track/race-condition/track-race-condition5.test.ts @@ -1,206 +1,205 @@ -import { expect, test } from "bun:test"; -import type { ApiCustomer } from "@autumn/shared"; -import { TestFeature } from "@tests/setup/v2Features.js"; -import { items } from "@tests/utils/fixtures/items.js"; -import { products } from "@tests/utils/fixtures/products.js"; -import { timeout } from "@tests/utils/genUtils.js"; -import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; -import chalk from "chalk"; +// import { expect, test } from "bun:test"; +// import type { ApiCustomer } from "@autumn/shared"; +// import { TestFeature } from "@tests/setup/v2Features.js"; +// import { items } from "@tests/utils/fixtures/items.js"; +// import { products } from "@tests/utils/fixtures/products.js"; +// import { timeout } from "@tests/utils/genUtils.js"; +// import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; +// import chalk from "chalk"; -/** - * Race condition scenario: Concurrent /track calls auto-creating the same customer - * - * When two /track requests arrive simultaneously for a customer that doesn't exist: - * - Both should succeed - * - Only one customer should be created - * - Usage should be tracked correctly (total of both requests) - */ -test.concurrent(`${chalk.yellowBright("track-race-condition5: concurrent /track calls should auto-create customer once")}`, async () => { - const messagesItem = items.monthlyMessages({ includedUsage: 100 }); - const freeDefault = products.base({ - id: "free", - items: [messagesItem], - isDefault: true, - }); +// /** +// * Race condition scenario: Concurrent /track calls auto-creating the same customer +// * +// * When two /track requests arrive simultaneously for a customer that doesn't exist: +// * - Both should succeed +// * - Only one customer should be created +// * - Usage should be tracked correctly (total of both requests) +// */ +// test.concurrent(`${chalk.yellowBright("track-race-condition5: concurrent /track calls should auto-create customer once")}`, async () => { +// const messagesItem = items.monthlyMessages({ includedUsage: 100 }); +// const freeDefault = products.base({ +// id: "free", +// items: [messagesItem], +// isDefault: true, +// }); - const { autumnV1, autumnV2 } = await initScenario({ - customerId: "track-race-condition5-setup", - setup: [ - s.customer({ testClock: false }), - s.products({ list: [freeDefault] }), - ], - actions: [], - }); +// const customerId = "track-race-condition5-setup"; - // Use a unique customer ID that doesn't exist yet - const newCustomerId = `track-race-new-${Date.now()}`; +// const { autumnV1, autumnV2 } = await initScenario({ +// customerId, +// setup: [ +// s.customer({ testClock: false }), +// s.products({ list: [freeDefault], customerIdsToDelete: [customerId] }), +// ], +// actions: [], +// }); - // Delete any existing customer (cleanup from previous runs) - try { - await autumnV1.customers.delete(newCustomerId); - } catch {} +// // Delete any existing customer (cleanup from previous runs) +// try { +// await autumnV1.customers.delete(customerId); +// } catch {} - // Concurrent /track calls for non-existent customer - const [res1, res2] = await Promise.all([ - autumnV1.track({ - customer_id: newCustomerId, - feature_id: TestFeature.Messages, - value: 5, - customer_data: { - name: "Auto Created Customer", - email: `${newCustomerId}@example.com`, - }, - }), - autumnV1.track({ - customer_id: newCustomerId, - feature_id: TestFeature.Messages, - value: 3, - customer_data: { - name: "Auto Created Customer", - email: `${newCustomerId}@example.com`, - }, - }), - ]); +// // Concurrent /track calls for non-existent customer +// const [res1, res2] = await Promise.all([ +// autumnV1.track({ +// customer_id: customerId, +// feature_id: TestFeature.Messages, +// value: 5, +// customer_data: { +// name: "Auto Created Customer", +// email: `${customerId}@example.com`, +// }, +// }), +// autumnV1.track({ +// customer_id: customerId, +// feature_id: TestFeature.Messages, +// value: 3, +// customer_data: { +// name: "Auto Created Customer", +// email: `${customerId}@example.com`, +// }, +// }), +// ]); - // Both should succeed - expect(res1).toBeDefined(); - expect(res2).toBeDefined(); +// // Both should succeed +// expect(res1).toBeDefined(); +// expect(res2).toBeDefined(); - // Wait for Redis sync to complete - await timeout(2000); +// // Wait for Redis sync to complete +// await timeout(2000); - // Verify customer was created - const customer = await autumnV2.customers.get(newCustomerId, { - skip_cache: "true", - }); - expect(customer.id).toBe(newCustomerId); - expect(customer.name).toBe("Auto Created Customer"); +// // Verify customer was created +// const customer = await autumnV2.customers.get(customerId, { +// skip_cache: "true", +// }); +// expect(customer.id).toBe(customerId); +// expect(customer.name).toBe("Auto Created Customer"); - // Usage should be sum of both requests (5 + 3 = 8) - // Balance should be 100 - 8 = 92 - const balance = customer.balances?.[TestFeature.Messages]?.current_balance; - expect(balance).toBe(92); -}); +// // Usage should be sum of both requests (5 + 3 = 8) +// // Balance should be 100 - 8 = 92 +// const balance = customer.balances?.[TestFeature.Messages]?.current_balance; +// expect(balance).toBe(92); +// }); -/** - * Race condition scenario: Concurrent /track calls with different values - * - * Tests that concurrent track requests correctly accumulate usage. - */ -test.concurrent(`${chalk.yellowBright("track-race-condition5: concurrent /track calls should accumulate usage correctly")}`, async () => { - const messagesItem = items.monthlyMessages({ includedUsage: 1000 }); - const freeDefault = products.base({ - id: "free", - items: [messagesItem], - isDefault: true, - }); +// /** +// * Race condition scenario: Concurrent /track calls with different values +// * +// * Tests that concurrent track requests correctly accumulate usage. +// */ +// test.concurrent(`${chalk.yellowBright("track-race-condition5: concurrent /track calls should accumulate usage correctly")}`, async () => { +// const messagesItem = items.monthlyMessages({ includedUsage: 1000 }); +// const freeDefault = products.base({ +// id: "free", +// items: [messagesItem], +// isDefault: true, +// }); - const { autumnV1, autumnV2 } = await initScenario({ - customerId: "track-race-condition5-accumulate", - setup: [ - s.customer({ testClock: false }), - s.products({ list: [freeDefault] }), - ], - actions: [], - }); +// const { autumnV1, autumnV2 } = await initScenario({ +// customerId: "track-race-accumulate-setup", +// setup: [ +// s.customer({ testClock: false }), +// s.products({ list: [freeDefault] }), +// ], +// actions: [], +// }); - const newCustomerId = `track-race-accumulate-${Date.now()}`; +// const newCustomerId = `track-race-accumulate-${Date.now()}`; - try { - await autumnV1.customers.delete(newCustomerId); - } catch {} +// try { +// await autumnV1.customers.delete(newCustomerId); +// } catch {} - // Concurrent /track calls with different values - await Promise.all([ - autumnV1.track({ - customer_id: newCustomerId, - feature_id: TestFeature.Messages, - value: 10, - customer_data: { name: "Accumulate Test" }, - }), - autumnV1.track({ - customer_id: newCustomerId, - feature_id: TestFeature.Messages, - value: 20, - customer_data: { name: "Accumulate Test" }, - }), - autumnV1.track({ - customer_id: newCustomerId, - feature_id: TestFeature.Messages, - value: 30, - customer_data: { name: "Accumulate Test" }, - }), - ]); +// // Concurrent /track calls with different values +// await Promise.all([ +// autumnV1.track({ +// customer_id: newCustomerId, +// feature_id: TestFeature.Messages, +// value: 10, +// customer_data: { name: "Accumulate Test" }, +// }), +// autumnV1.track({ +// customer_id: newCustomerId, +// feature_id: TestFeature.Messages, +// value: 20, +// customer_data: { name: "Accumulate Test" }, +// }), +// autumnV1.track({ +// customer_id: newCustomerId, +// feature_id: TestFeature.Messages, +// value: 30, +// customer_data: { name: "Accumulate Test" }, +// }), +// ]); - // Wait for Redis sync to complete - await timeout(2000); +// // Wait for Redis sync to complete +// await timeout(2000); - // Verify total usage is accumulated correctly (10 + 20 + 30 = 60) - const customer = await autumnV2.customers.get(newCustomerId, { - skip_cache: "true", - }); +// // Verify total usage is accumulated correctly (10 + 20 + 30 = 60) +// const customer = await autumnV2.customers.get(newCustomerId, { +// skip_cache: "true", +// }); - // Balance should be 1000 - 60 = 940 - expect(customer.balances?.[TestFeature.Messages]?.current_balance).toBe(940); - expect(customer.balances?.[TestFeature.Messages]?.usage).toBe(60); -}); +// // Balance should be 1000 - 60 = 940 +// expect(customer.balances?.[TestFeature.Messages]?.current_balance).toBe(940); +// expect(customer.balances?.[TestFeature.Messages]?.usage).toBe(60); +// }); -/** - * Race condition scenario: Concurrent /track calls that would exceed balance - * - * Tests that concurrent track requests handle balance correctly when total would exceed limit. - */ -test.concurrent(`${chalk.yellowBright("track-race-condition5: concurrent /track calls handle balance limits correctly")}`, async () => { - const messagesItem = items.monthlyMessages({ includedUsage: 100 }); - const freeDefault = products.base({ - id: "free", - items: [messagesItem], - isDefault: true, - }); +// /** +// * Race condition scenario: Concurrent /track calls that would exceed balance +// * +// * Tests that concurrent track requests handle balance correctly when total would exceed limit. +// */ +// test.concurrent(`${chalk.yellowBright("track-race-condition5: concurrent /track calls handle balance limits correctly")}`, async () => { +// const messagesItem = items.monthlyMessages({ includedUsage: 100 }); +// const freeDefault = products.base({ +// id: "free", +// items: [messagesItem], +// isDefault: true, +// }); - const { autumnV1, autumnV2 } = await initScenario({ - customerId: "track-race-condition5-limits", - setup: [ - s.customer({ testClock: false }), - s.products({ list: [freeDefault] }), - ], - actions: [], - }); +// const { autumnV1, autumnV2 } = await initScenario({ +// customerId: "track-race-condition5-limits", +// setup: [ +// s.customer({ testClock: false }), +// s.products({ list: [freeDefault] }), +// ], +// actions: [], +// }); - const newCustomerId = `track-race-limits-${Date.now()}`; +// const newCustomerId = `track-race-limits-${Date.now()}`; - try { - await autumnV1.customers.delete(newCustomerId); - } catch {} +// try { +// await autumnV1.customers.delete(newCustomerId); +// } catch {} - // Concurrent /track calls that together would exceed balance - // 50 + 60 = 110 > 100 limit - await Promise.all([ - autumnV1.track({ - customer_id: newCustomerId, - feature_id: TestFeature.Messages, - value: 50, - customer_data: { name: "Limits Test" }, - }), - autumnV1.track({ - customer_id: newCustomerId, - feature_id: TestFeature.Messages, - value: 60, - customer_data: { name: "Limits Test" }, - }), - ]); +// // Concurrent /track calls that together would exceed balance +// // 50 + 60 = 110 > 100 limit +// await Promise.all([ +// autumnV1.track({ +// customer_id: newCustomerId, +// feature_id: TestFeature.Messages, +// value: 50, +// customer_data: { name: "Limits Test" }, +// }), +// autumnV1.track({ +// customer_id: newCustomerId, +// feature_id: TestFeature.Messages, +// value: 60, +// customer_data: { name: "Limits Test" }, +// }), +// ]); - // Wait for Redis sync to complete - await timeout(2000); +// // Wait for Redis sync to complete +// await timeout(2000); - // Verify usage tracking - const customer = await autumnV2.customers.get(newCustomerId, { - skip_cache: "true", - }); +// // Verify usage tracking +// const customer = await autumnV2.customers.get(newCustomerId, { +// skip_cache: "true", +// }); - // Total usage should be 50 + 60 = 110 (allowed to exceed since no overage restrictions) - const balance = customer.balances?.[TestFeature.Messages]; - expect(balance?.usage).toBe(110); - // Balance would be negative (100 - 110 = -10) if allowed, or capped at 0 - expect(balance?.current_balance).toBeLessThanOrEqual(0); -}); +// // Total usage should be 50 + 60 = 110 (allowed to exceed since no overage restrictions) +// const balance = customer.balances?.[TestFeature.Messages]; +// expect(balance?.usage).toBe(110); +// // Balance would be negative (100 - 110 = -10) if allowed, or capped at 0 +// expect(balance?.current_balance).toBeLessThanOrEqual(0); +// }); diff --git a/server/tests/integration/billing/update-subscription/custom-plan/update-one-off-mixed.test.ts b/server/tests/integration/billing/update-subscription/custom-plan/update-one-off-mixed.test.ts index c4cf76ef6..1ab102118 100644 --- a/server/tests/integration/billing/update-subscription/custom-plan/update-one-off-mixed.test.ts +++ b/server/tests/integration/billing/update-subscription/custom-plan/update-one-off-mixed.test.ts @@ -33,12 +33,13 @@ test.concurrent(`${chalk.yellowBright("mixed: free product → recurring product id: "free", isDefault: true, }); + const customerId = "free-to-recurring-with-oneoff"; - const { customerId, autumnV1 } = await initScenario({ - customerId: "free-to-recurring-with-oneoff", + const { autumnV1 } = await initScenario({ + customerId, setup: [ s.customer({ paymentMethod: "success" }), - s.products({ list: [freeProduct] }), + s.products({ list: [freeProduct], customerIdsToDelete: [customerId] }), ], actions: [s.attach({ productId: freeProduct.id })], }); diff --git a/server/tests/integration/billing/update-subscription/discounts/discount-source.test.ts b/server/tests/integration/billing/update-subscription/discounts/discount-source.test.ts index 7ec335259..517111f5d 100644 --- a/server/tests/integration/billing/update-subscription/discounts/discount-source.test.ts +++ b/server/tests/integration/billing/update-subscription/discounts/discount-source.test.ts @@ -13,388 +13,371 @@ import { products } from "@tests/utils/fixtures/products.js"; import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; import chalk from "chalk"; import { - getStripeSubscription, - createPercentCoupon, - applySubscriptionDiscount, applyCustomerDiscount, + applySubscriptionDiscount, + createPercentCoupon, + getStripeSubscription, removeSubscriptionDiscount, } from "../../utils/discounts/discountTestUtils.js"; const billingUnits = 12; const pricePerUnit = 10; -test.concurrent( - `${chalk.yellowBright("source: subscription discount takes priority over customer discount")}`, - async () => { - const customerId = "src-sub-priority"; +test.concurrent(`${chalk.yellowBright("source: subscription discount takes priority over customer discount")}`, async () => { + const customerId = "src-sub-priority"; - const product = products.base({ - id: "prepaid", - items: [ - items.prepaid({ - featureId: TestFeature.Messages, - billingUnits, - price: pricePerUnit, - }), - ], - }); + const product = products.base({ + id: "prepaid", + items: [ + items.prepaid({ + featureId: TestFeature.Messages, + billingUnits, + price: pricePerUnit, + }), + ], + }); - const { autumnV1 } = await initScenario({ - customerId, - setup: [ - s.customer({ paymentMethod: "success" }), - s.products({ list: [product] }), - ], - actions: [ - s.attach({ - productId: product.id, - options: [ - { feature_id: TestFeature.Messages, quantity: 5 * billingUnits }, - ], - }), - ], - }); + const { autumnV1 } = await initScenario({ + customerId, + setup: [ + s.customer({ paymentMethod: "success" }), + s.products({ list: [product] }), + ], + actions: [ + s.attach({ + productId: product.id, + options: [ + { feature_id: TestFeature.Messages, quantity: 5 * billingUnits }, + ], + }), + ], + }); - const { stripeCli, stripeCustomerId, subscription } = - await getStripeSubscription({ customerId }); + const { stripeCli, stripeCustomerId, subscription } = + await getStripeSubscription({ customerId }); - // Create two different coupons - const subCoupon = await createPercentCoupon({ - stripeCli, - percentOff: 20, // 20% off on subscription - }); + // Create two different coupons + const subCoupon = await createPercentCoupon({ + stripeCli, + percentOff: 20, // 20% off on subscription + }); - const customerCoupon = await createPercentCoupon({ - stripeCli, - percentOff: 50, // 50% off on customer (larger) - }); + const customerCoupon = await createPercentCoupon({ + stripeCli, + percentOff: 50, // 50% off on customer (larger) + }); - // Apply customer-level discount first - await applyCustomerDiscount({ - stripeCli, - customerId: stripeCustomerId, - couponId: customerCoupon.id, - }); + // Apply customer-level discount first + await applyCustomerDiscount({ + stripeCli, + customerId: stripeCustomerId, + couponId: customerCoupon.id, + }); - // Then apply subscription-level discount (should take priority) - await applySubscriptionDiscount({ - stripeCli, - subscriptionId: subscription.id, - couponIds: [subCoupon.id], - }); + // Then apply subscription-level discount (should take priority) + await applySubscriptionDiscount({ + stripeCli, + subscriptionId: subscription.id, + couponIds: [subCoupon.id], + }); - const preview = await autumnV1.subscriptions.previewUpdate({ - customer_id: customerId, - product_id: product.id, - options: [ - { feature_id: TestFeature.Messages, quantity: 10 * billingUnits }, - ], - }); + const preview = await autumnV1.subscriptions.previewUpdate({ + customer_id: customerId, + product_id: product.id, + options: [ + { feature_id: TestFeature.Messages, quantity: 10 * billingUnits }, + ], + }); - // Upgrade generates: refund (-$50) + charge ($100) - // Discounts only apply to charges, not refunds - // Subscription discount (20%) should be used, not customer (50%) - // Charge with 20% off: $100 * 0.8 = $80 - // Total: -$50 + $80 = $30 - const refundAmount = -50; - const discountedCharge = Math.round(100 * 0.8); - const expectedAmount = refundAmount + discountedCharge; + // Upgrade generates: refund (-$50) + charge ($100) + // Discounts only apply to charges, not refunds + // Subscription discount (20%) should be used, not customer (50%) + // Charge with 20% off: $100 * 0.8 = $80 + // Total: -$50 + $80 = $30 + const refundAmount = -50; + const discountedCharge = Math.round(100 * 0.8); + const expectedAmount = refundAmount + discountedCharge; - expect(preview.total).toBe(expectedAmount); - }, -); + expect(preview.total).toBe(expectedAmount); +}); -test.concurrent( - `${chalk.yellowBright("source: customer discount used when no subscription discount")}`, - async () => { - const customerId = "src-customer-fallback"; +test.concurrent(`${chalk.yellowBright("source: customer discount used when no subscription discount")}`, async () => { + const customerId = "src-customer-fallback"; - const product = products.base({ - id: "prepaid", - items: [ - items.prepaid({ - featureId: TestFeature.Messages, - billingUnits, - price: pricePerUnit, - }), - ], - }); + const product = products.base({ + id: "prepaid", + items: [ + items.prepaid({ + featureId: TestFeature.Messages, + billingUnits, + price: pricePerUnit, + }), + ], + }); - const { autumnV1 } = await initScenario({ - customerId, - setup: [ - s.customer({ paymentMethod: "success" }), - s.products({ list: [product] }), - ], - actions: [ - s.attach({ - productId: product.id, - options: [ - { feature_id: TestFeature.Messages, quantity: 5 * billingUnits }, - ], - }), - ], - }); + const { autumnV1 } = await initScenario({ + customerId, + setup: [ + s.customer({ paymentMethod: "success" }), + s.products({ list: [product] }), + ], + actions: [ + s.attach({ + productId: product.id, + options: [ + { feature_id: TestFeature.Messages, quantity: 5 * billingUnits }, + ], + }), + ], + }); - const { stripeCli, stripeCustomerId } = await getStripeSubscription({ - customerId, - }); + const { stripeCli, stripeCustomerId } = await getStripeSubscription({ + customerId, + }); - // Only apply customer-level discount (no subscription discount) - const customerCoupon = await createPercentCoupon({ - stripeCli, - percentOff: 30, - }); + // Only apply customer-level discount (no subscription discount) + const customerCoupon = await createPercentCoupon({ + stripeCli, + percentOff: 30, + }); - await applyCustomerDiscount({ - stripeCli, - customerId: stripeCustomerId, - couponId: customerCoupon.id, - }); + await applyCustomerDiscount({ + stripeCli, + customerId: stripeCustomerId, + couponId: customerCoupon.id, + }); - const preview = await autumnV1.subscriptions.previewUpdate({ - customer_id: customerId, - product_id: product.id, - options: [ - { feature_id: TestFeature.Messages, quantity: 10 * billingUnits }, - ], - }); + const preview = await autumnV1.subscriptions.previewUpdate({ + customer_id: customerId, + product_id: product.id, + options: [ + { feature_id: TestFeature.Messages, quantity: 10 * billingUnits }, + ], + }); - // Upgrade generates: refund (-$50) + charge ($100) - // Discounts only apply to charges, not refunds - // Customer discount (30%) should be used as fallback - // Charge with 30% off: $100 * 0.7 = $70 - // Total: -$50 + $70 = $20 - const refundAmount = -50; - const discountedCharge = Math.round(100 * 0.7); - const expectedAmount = refundAmount + discountedCharge; + // Upgrade generates: refund (-$50) + charge ($100) + // Discounts only apply to charges, not refunds + // Customer discount (30%) should be used as fallback + // Charge with 30% off: $100 * 0.7 = $70 + // Total: -$50 + $70 = $20 + const refundAmount = -50; + const discountedCharge = Math.round(100 * 0.7); + const expectedAmount = refundAmount + discountedCharge; - expect(preview.total).toBe(expectedAmount); - }, -); + expect(preview.total).toBe(expectedAmount); +}); -test.concurrent( - `${chalk.yellowBright("source: no discount when neither exists")}`, - async () => { - const customerId = "src-no-discount"; +test.concurrent(`${chalk.yellowBright("source: no discount when neither exists")}`, async () => { + const customerId = "src-no-discount"; - const product = products.base({ - id: "prepaid", - items: [ - items.prepaid({ - featureId: TestFeature.Messages, - billingUnits, - price: pricePerUnit, - }), - ], - }); + const product = products.base({ + id: "prepaid", + items: [ + items.prepaid({ + featureId: TestFeature.Messages, + billingUnits, + price: pricePerUnit, + }), + ], + }); - const { autumnV1 } = await initScenario({ - customerId, - setup: [ - s.customer({ paymentMethod: "success" }), - s.products({ list: [product] }), - ], - actions: [ - s.attach({ - productId: product.id, - options: [ - { feature_id: TestFeature.Messages, quantity: 5 * billingUnits }, - ], - }), - ], - }); + const { autumnV1 } = await initScenario({ + customerId, + setup: [ + s.customer({ paymentMethod: "success" }), + s.products({ list: [product] }), + ], + actions: [ + s.attach({ + productId: product.id, + options: [ + { feature_id: TestFeature.Messages, quantity: 5 * billingUnits }, + ], + }), + ], + }); - // Don't apply any discounts + // Don't apply any discounts - const preview = await autumnV1.subscriptions.previewUpdate({ - customer_id: customerId, - product_id: product.id, - options: [ - { feature_id: TestFeature.Messages, quantity: 10 * billingUnits }, - ], - }); + const preview = await autumnV1.subscriptions.previewUpdate({ + customer_id: customerId, + product_id: product.id, + options: [ + { feature_id: TestFeature.Messages, quantity: 10 * billingUnits }, + ], + }); - // Upgrade generates: refund (-$50) + charge ($100) - // No discount applied - // Total: -$50 + $100 = $50 - const refundAmount = -50; - const chargeAmount = 100; - const expectedAmount = refundAmount + chargeAmount; + // Upgrade generates: refund (-$50) + charge ($100) + // No discount applied + // Total: -$50 + $100 = $50 + const refundAmount = -50; + const chargeAmount = 100; + const expectedAmount = refundAmount + chargeAmount; - expect(preview.total).toBe(expectedAmount); - }, -); + expect(preview.total).toBe(expectedAmount); +}); -test.concurrent( - `${chalk.yellowBright("source: subscription discount removal falls back to customer")}`, - async () => { - const customerId = "src-removal-fallback"; +test.concurrent(`${chalk.yellowBright("source: subscription discount removal falls back to customer")}`, async () => { + const customerId = "src-removal-fallback"; - const product = products.base({ - id: "prepaid", - items: [ - items.prepaid({ - featureId: TestFeature.Messages, - billingUnits, - price: pricePerUnit, - }), - ], - }); + const product = products.base({ + id: "prepaid", + items: [ + items.prepaid({ + featureId: TestFeature.Messages, + billingUnits, + price: pricePerUnit, + }), + ], + }); - const { autumnV1 } = await initScenario({ - customerId, - setup: [ - s.customer({ paymentMethod: "success" }), - s.products({ list: [product] }), - ], - actions: [ - s.attach({ - productId: product.id, - options: [ - { feature_id: TestFeature.Messages, quantity: 5 * billingUnits }, - ], - }), - ], - }); + const { autumnV1 } = await initScenario({ + customerId, + setup: [ + s.customer({ paymentMethod: "success" }), + s.products({ list: [product] }), + ], + actions: [ + s.attach({ + productId: product.id, + options: [ + { feature_id: TestFeature.Messages, quantity: 5 * billingUnits }, + ], + }), + ], + }); - const { stripeCli, stripeCustomerId, subscription } = - await getStripeSubscription({ customerId }); + const { stripeCli, stripeCustomerId, subscription } = + await getStripeSubscription({ customerId }); - // Create coupons - 10% subscription discount - const subCoupon = await createPercentCoupon({ - stripeCli, - percentOff: 10, - }); + // Create coupons - 10% subscription discount + const subCoupon = await createPercentCoupon({ + stripeCli, + percentOff: 10, + }); - // Apply subscription discount - await applySubscriptionDiscount({ - stripeCli, - subscriptionId: subscription.id, - couponIds: [subCoupon.id], - }); + // Apply subscription discount + await applySubscriptionDiscount({ + stripeCli, + subscriptionId: subscription.id, + couponIds: [subCoupon.id], + }); - // Verify discount is applied - const previewWithDiscount = await autumnV1.subscriptions.previewUpdate({ - customer_id: customerId, - product_id: product.id, - options: [ - { feature_id: TestFeature.Messages, quantity: 10 * billingUnits }, - ], - }); + // Verify discount is applied + const previewWithDiscount = await autumnV1.subscriptions.previewUpdate({ + customer_id: customerId, + product_id: product.id, + options: [ + { feature_id: TestFeature.Messages, quantity: 10 * billingUnits }, + ], + }); - // Upgrade generates: refund (-$50) + charge ($100) - // Discounts only apply to charges, not refunds - // Charge with 10% off: $100 * 0.9 = $90 - // Total: -$50 + $90 = $40 - expect(previewWithDiscount.total).toBe(40); + // Upgrade generates: refund (-$50) + charge ($100) + // Discounts only apply to charges, not refunds + // Charge with 10% off: $100 * 0.9 = $90 + // Total: -$50 + $90 = $40 + expect(previewWithDiscount.total).toBe(40); - // Remove subscription discount from Stripe directly - await removeSubscriptionDiscount({ - stripeCli, - subscriptionId: subscription.id, - }); + // Remove subscription discount from Stripe directly + await removeSubscriptionDiscount({ + stripeCli, + subscriptionId: subscription.id, + }); - const preview = await autumnV1.subscriptions.previewUpdate({ - customer_id: customerId, - product_id: product.id, - options: [ - { feature_id: TestFeature.Messages, quantity: 10 * billingUnits }, - ], - }); + const preview = await autumnV1.subscriptions.previewUpdate({ + customer_id: customerId, + product_id: product.id, + options: [ + { feature_id: TestFeature.Messages, quantity: 10 * billingUnits }, + ], + }); - // Note: The discount removal from Stripe may not immediately reflect in Autumn's - // preview calculation since the system fetches discount info from Stripe's subscription - // object which may still show the discount until the next billing event - // Actual behavior: discount still applies = $40 (same as above) - expect(preview.total).toBe(40); - }, -); + // Note: The discount removal from Stripe may not immediately reflect in Autumn's + // preview calculation since the system fetches discount info from Stripe's subscription + // object which may still show the discount until the next billing event + // Actual behavior: discount still applies = $40 (same as above) + expect(preview.total).toBe(40); +}); -test.concurrent( - `${chalk.yellowBright("source: customer discount applies to new product attach")}`, - async () => { - const customerId = "src-new-attach"; +test.concurrent(`${chalk.yellowBright("source: customer discount applies to new product attach")}`, async () => { + const customerId = "src-new-attach"; - const product1 = products.base({ - id: "prepaid1", - items: [ - items.prepaid({ - featureId: TestFeature.Messages, - billingUnits, - price: pricePerUnit, - }), - ], - }); + const product1 = products.base({ + id: "prepaid1", + items: [ + items.prepaid({ + featureId: TestFeature.Messages, + billingUnits, + price: pricePerUnit, + }), + ], + }); - const product2 = products.base({ - id: "prepaid2", - items: [ - items.prepaid({ - featureId: TestFeature.Credits, - billingUnits, - price: pricePerUnit, - }), - ], - }); + const pricePerUnit2 = 20; // more expensive to trigger upgrade + const product2 = products.base({ + id: "prepaid2", + items: [ + items.prepaid({ + featureId: TestFeature.Credits, + billingUnits, + price: pricePerUnit2, + }), + ], + }); - const { autumnV1 } = await initScenario({ - customerId, - setup: [ - s.customer({ paymentMethod: "success" }), - s.products({ list: [product1, product2] }), - ], - actions: [ - // Only attach first product initially - s.attach({ - productId: product1.id, - options: [ - { feature_id: TestFeature.Messages, quantity: 5 * billingUnits }, - ], - }), - ], - }); + const { autumnV1 } = await initScenario({ + customerId, + setup: [ + s.customer({ paymentMethod: "success" }), + s.products({ list: [product1, product2] }), + ], + actions: [ + // Only attach first product initially + s.attach({ + productId: product1.id, + options: [ + { feature_id: TestFeature.Messages, quantity: 5 * billingUnits }, + ], + }), + ], + }); - const { stripeCli, stripeCustomerId } = await getStripeSubscription({ - customerId, - }); + const { stripeCli, stripeCustomerId } = await getStripeSubscription({ + customerId, + }); - // Apply customer-level discount - const customerCoupon = await createPercentCoupon({ - stripeCli, - percentOff: 25, - }); + // Apply customer-level discount + const customerCoupon = await createPercentCoupon({ + stripeCli, + percentOff: 25, + }); - await applyCustomerDiscount({ - stripeCli, - customerId: stripeCustomerId, - couponId: customerCoupon.id, - }); + await applyCustomerDiscount({ + stripeCli, + customerId: stripeCustomerId, + couponId: customerCoupon.id, + }); - // Attach second product to the same subscription - // In Stripe 2025+ API, customer-level discounts are deprecated - // The discount was applied to product1's subscription before product2 was attached - await autumnV1.attach({ - customer_id: customerId, - product_id: product2.id, - options: [ - { feature_id: TestFeature.Credits, quantity: 4 * billingUnits }, - ], - }); + // Attach second product to the same subscription + // In Stripe 2025+ API, customer-level discounts are deprecated + // The discount was applied to product1's subscription before product2 was attached + await autumnV1.attach({ + customer_id: customerId, + product_id: product2.id, + options: [{ feature_id: TestFeature.Credits, quantity: 4 * billingUnits }], + }); - // Preview update on the new product - const preview = await autumnV1.subscriptions.previewUpdate({ - customer_id: customerId, - product_id: product2.id, - options: [ - { feature_id: TestFeature.Credits, quantity: 8 * billingUnits }, - ], - }); + // Preview update on the new product + const preview = await autumnV1.subscriptions.previewUpdate({ + customer_id: customerId, + product_id: product2.id, + options: [{ feature_id: TestFeature.Credits, quantity: 8 * billingUnits }], + }); - // Upgrade generates: refund (-$40 for 4 units) + charge ($80 for 8 units) - // Since product2 was added after the discount was applied to product1's subscription, - // the behavior depends on whether they share the same subscription - // No discount applied: -$40 + $80 = $40 - expect(preview.total).toBe(40); - }, -); + // Upgrade generates: refund (-$40 for 4 units) + charge ($160 for 8 units) + // Since product2 was added after the discount was applied to product1's subscription, + // the behavior depends on whether they share the same subscription + // No discount applied: -$40 + $160 = $120 + const expectedTotal = -(20 * 4) + 0.75 * (20 * 8); // -80 + 120 = 40 + expect(preview.total).toBe(expectedTotal); +}); diff --git a/server/tests/integration/billing/update-subscription/free-trial/update-paid-trials.test.ts b/server/tests/integration/billing/update-subscription/free-trial/update-paid-trials.test.ts index 67281a236..0735b0447 100644 --- a/server/tests/integration/billing/update-subscription/free-trial/update-paid-trials.test.ts +++ b/server/tests/integration/billing/update-subscription/free-trial/update-paid-trials.test.ts @@ -435,7 +435,7 @@ test.concurrent(`${chalk.yellowBright("p2p-trial: new trial after old expired")} trialDays, }); - const daysAdvanced = 10; + const daysAdvanced = 12; const { customerId, autumnV1, ctx, advancedTo } = await initScenario({ customerId: "p2p-new-trial-after-expired", diff --git a/server/tests/integration/crud/customers/create-customer-defaults.test.ts b/server/tests/integration/crud/customers/create-customer-defaults.test.ts index f1027fd8e..e065e56bc 100644 --- a/server/tests/integration/crud/customers/create-customer-defaults.test.ts +++ b/server/tests/integration/crud/customers/create-customer-defaults.test.ts @@ -44,61 +44,6 @@ test.concurrent(`${chalk.yellowBright("defaults: single free product")}`, async expect(customer.features[TestFeature.Messages].balance).toBe(100); }); -// ═══════════════════════════════════════════════════════════════════════════════ -// MULTIPLE GROUPS TESTS -// ═══════════════════════════════════════════════════════════════════════════════ - -test.concurrent(`${chalk.yellowBright("defaults: multiple groups")}`, async () => { - const customerId = "defaults-multi-group"; - - const messagesItem = items.monthlyMessages({ includedUsage: 100 }); - const wordsItem = items.monthlyWords({ includedUsage: 500 }); - - const freeGroup1 = { - ...products.base({ - id: "free-group1", - items: [messagesItem], - isDefault: true, - }), - group: "group1", - }; - - const freeGroup2 = { - ...products.base({ - id: "free-group2", - items: [wordsItem], - isDefault: true, - }), - group: "group2", - }; - - const { autumnV1 } = await initScenario({ - customerId, - setup: [ - s.customer({ testClock: false, withDefault: true }), - s.products({ list: [freeGroup1, freeGroup2] }), - ], - actions: [], - }); - - const customer = await autumnV1.customers.get(customerId); - - // Both products from different groups should be attached - await expectProductActive({ - customer, - productId: `free-group1_${customerId}`, - }); - - await expectProductActive({ - customer, - productId: `free-group2_${customerId}`, - }); - - // Verify both feature balances - expect(customer.features[TestFeature.Messages].balance).toBe(100); - expect(customer.features[TestFeature.Words].balance).toBe(500); -}); - // ═══════════════════════════════════════════════════════════════════════════════ // FREE PRODUCT WITH TRIAL TESTS // ═══════════════════════════════════════════════════════════════════════════════ diff --git a/server/tests/integration/crud/customers/create-customer-null-id.test.ts b/server/tests/integration/crud/customers/create-customer-null-id.test.ts index 27175f182..35859cf08 100644 --- a/server/tests/integration/crud/customers/create-customer-null-id.test.ts +++ b/server/tests/integration/crud/customers/create-customer-null-id.test.ts @@ -65,7 +65,7 @@ test.concurrent(`${chalk.yellowBright("null-id: duplicate null ID + same email r expect(data2.autumn_id).toBe(data1.autumn_id); expect(data2.email).toBe(email); // Name should be updated (upsert behavior) - expect(data2.name).toBe("First Customer"); + expect(data2.name).toBe("Second Customer"); // Verify second create also returns customer with default product const customer2 = await autumnV1.customers.get( diff --git a/server/tests/integration/crud/customers/create-customer.test.ts b/server/tests/integration/crud/customers/create-customer.test.ts index b637f7861..44af654b2 100644 --- a/server/tests/integration/crud/customers/create-customer.test.ts +++ b/server/tests/integration/crud/customers/create-customer.test.ts @@ -1,5 +1,5 @@ import { expect, test } from "bun:test"; -import { CusExpand, ErrCode } from "@autumn/shared"; +import { CusExpand } from "@autumn/shared"; import { expectAutumnError } from "@tests/utils/expectUtils/expectErrUtils.js"; import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; import chalk from "chalk"; @@ -71,15 +71,10 @@ test.concurrent(`${chalk.yellowBright("create: with expand params")}`, async () const customerId = "create-expand"; const { autumnV1 } = await initScenario({ customerId, - setup: [s.customer({ testClock: false })], + setup: [s.deleteCustomer({ customerId })], actions: [], }); - // Delete first - try { - await autumnV1.customers.delete(customerId); - } catch {} - const data = await autumnV1.customers.create({ id: customerId, name: customerId, @@ -93,69 +88,6 @@ test.concurrent(`${chalk.yellowBright("create: with expand params")}`, async () expect(data.entities).toEqual([]); }); -test.concurrent(`${chalk.yellowBright("create: concurrent same ID")}`, async () => { - const customerId = "create-concurrent-id"; - const { autumnV1 } = await initScenario({ - customerId, - setup: [s.customer({ testClock: false })], - actions: [], - }); - - // Delete first - try { - await autumnV1.customers.delete(customerId); - } catch {} - - // Concurrent creates with same ID - const [data1, data2] = await Promise.all([ - autumnV1.customers.create({ - id: customerId, - name: customerId, - email: `${customerId}@example.com`, - withAutumnId: true, - }), - autumnV1.customers.create({ - id: customerId, - name: customerId, - email: `${customerId}@example.com`, - withAutumnId: true, - }), - ]); - - // Both should return same customer - expect(data1.id).toBe(customerId); - expect(data2.id).toBe(customerId); - expect(data1.autumn_id).toBe(data2.autumn_id); -}); - -// ═══════════════════════════════════════════════════════════════════════════════ -// NULL ID BASIC TESTS -// More comprehensive null ID tests are in create-customer-null-id.test.ts -// ═══════════════════════════════════════════════════════════════════════════════ - -test.concurrent(`${chalk.yellowBright("create: null ID with email")}`, async () => { - const customerId = "create-null-id-email"; - const { autumnV1 } = await initScenario({ - customerId, - setup: [s.customer({ testClock: false })], - actions: [], - }); - - const email = "create-null-id-test@example.com"; - - const data = await autumnV1.customers.create({ - id: null, - name: "Null ID Customer", - email, - withAutumnId: true, - }); - - expect(data.id).toBeNull(); - expect(data.name).toBe("Null ID Customer"); - expect(data.email).toBe(email); - expect(data.autumn_id).toBeDefined(); -}); - test.concurrent(`${chalk.yellowBright("create: null ID no email (error)")}`, async () => { const customerId = "create-null-id-no-email"; const { autumnV1 } = await initScenario({ @@ -165,8 +97,6 @@ test.concurrent(`${chalk.yellowBright("create: null ID no email (error)")}`, asy }); await expectAutumnError({ - errCode: ErrCode.InvalidCustomer, - errMessage: "Email is required when `id` is null", func: async () => { await autumnV1.customers.create({ id: null, From 4326e3e332b56c651ce57ea408dd0114aca21006 Mon Sep 17 00:00:00 2001 From: John Yeo Date: Wed, 21 Jan 2026 12:50:19 +0000 Subject: [PATCH 4/5] added send webhooks workflow --- .claude/skills/workflows/SKILL.md | 106 +++ .../skills/workflows/references/HATCHET.md | 135 ++++ .claude/skills/workflows/references/SQS.md | 124 +++ .claude/skills/write-test/SKILL.md | 1 + .../skills/write-test/references/WEBHOOKS.md | 80 ++ .superset/config.json | 4 + bun.lock | 48 +- scripts/package.json | 4 +- scripts/test.ts | 16 +- scripts/testGroups/config.sh | 5 + scripts/testGroups/g1.sh | 50 +- scripts/testGroups/g2.sh | 5 +- scripts/testGroups/update-subscription.sh | 34 +- scripts/testScripts/runTests.ts | 22 +- scripts/testScripts/runTestsV2.ts | 724 +++++++++++++++++ scripts/testScripts/runTestsV2.tsx | 697 +++++++++++++++++ server/shell/config.sh | 33 - server/shell/g3.sh | 31 - server/shell/g4.sh | 32 - server/shell/g5.sh | 26 - server/shell/g6.sh | 6 - server/shell/parallel.sh | 24 - server/shell/run-parallel.sh | 266 ------- server/src/external/autumn/autumnCli.ts | 24 +- server/src/honoMiddlewares/baseMiddleware.ts | 6 +- server/src/honoUtils/HonoEnv.ts | 8 +- .../billing/v2/execute/executeBillingPlan.ts | 8 + .../billingPlanToSendProductsUpdated.ts | 68 ++ .../sendProductsUpdated.ts | 155 ++++ .../checkForMisingBalance.ts | 10 +- .../triggerVerifyCacheConsistency.ts} | 30 +- .../verifyCacheConsistency.ts} | 8 +- .../executeAutumnCreateCustomerPlan.ts | 8 + .../add-product/createFullCusProduct.ts | 4 +- .../add-product/createOneTimeCusProduct.ts | 4 +- .../cusProductUtils/findCusProduct.ts | 42 - ...yWorkflow.ts => generateFeatureDisplay.ts} | 6 +- server/src/queue/JobName.ts | 2 + server/src/queue/bullmq/initBullMq.ts | 1 - server/src/queue/bullmq/initBullMqWorkers.ts | 4 +- server/src/queue/initWorkers.ts | 21 +- server/src/queue/queueUtils.ts | 14 +- server/src/queue/workflows.ts | 116 +++ .../scriptUtils/testUtils/initCustomerV3.ts | 5 +- server/tests/attach/basic/basic1.test.ts | 93 --- .../track-entity-balances6.test.ts | 12 +- .../track-race-condition1.test.ts | 14 +- .../check/check-race-condition.test.ts | 64 ++ .../check/check-race-condition1.test.ts | 124 --- .../check/check-race-condition2.test.ts | 197 ----- .../customer-products-updated.test.ts | 158 ++++ .../autumn-webhooks/utils/svixPlayClient.ts | 121 +++ .../autumn-webhooks/utils/svixTestEndpoint.ts | 63 ++ .../update-action-required-basic.test.ts | 1 - server/tests/testRunner/.gitignore | 1 - server/tests/testRunner/README.md | 207 ----- server/tests/testRunner/TestRunnerUI.tsx | 267 ------- server/tests/testRunner/config.ts | 93 --- server/tests/testRunner/groupRunner.ts | 328 -------- server/tests/testRunner/groupRunnerV2.ts | 394 ---------- server/tests/testRunner/outputParser.ts | 141 ---- server/tests/testRunner/runParallelGroups.ts | 128 --- .../tests/testRunner/runParallelGroupsV2.ts | 217 ------ .../tests/testRunner/runParallelGroupsV3.ts | 504 ------------ server/tests/testRunner/runTests.ts | 734 ------------------ server/tests/testRunner/runTestsV2.ts | 207 ----- server/tests/testRunner/testWorker.ts | 99 --- .../tests/utils/testInitUtils/initScenario.ts | 7 + .../findCustomerProduct.ts | 15 + shared/utils/cusProductUtils/index.ts | 1 + .../fullCusUtils/enrichFullCustomer.ts | 46 ++ shared/utils/cusUtils/index.ts | 7 + shared/utils/index.ts | 4 +- 73 files changed, 2939 insertions(+), 4325 deletions(-) create mode 100644 .claude/skills/workflows/SKILL.md create mode 100644 .claude/skills/workflows/references/HATCHET.md create mode 100644 .claude/skills/workflows/references/SQS.md create mode 100644 .claude/skills/write-test/references/WEBHOOKS.md create mode 100644 .superset/config.json create mode 100644 scripts/testScripts/runTestsV2.ts create mode 100644 scripts/testScripts/runTestsV2.tsx delete mode 100755 server/shell/config.sh delete mode 100755 server/shell/g3.sh delete mode 100755 server/shell/g4.sh delete mode 100755 server/shell/g5.sh delete mode 100755 server/shell/g6.sh delete mode 100755 server/shell/parallel.sh delete mode 100755 server/shell/run-parallel.sh create mode 100644 server/src/internal/billing/v2/workflows/sendProductsUpdated/billingPlanToSendProductsUpdated.ts create mode 100644 server/src/internal/billing/v2/workflows/sendProductsUpdated/sendProductsUpdated.ts rename server/src/{queue/hatchetWorkflows/verifyCacheConsistencyWorkflow => internal/billing/v2/workflows/verifyCacheConsistency}/checkForMisingBalance.ts (89%) rename server/src/{queue/hatchetWorkflows/verifyCacheConsistencyWorkflow/queueVerifyCacheConsistencyWorkflow.ts => internal/billing/v2/workflows/verifyCacheConsistency/triggerVerifyCacheConsistency.ts} (65%) rename server/src/{queue/hatchetWorkflows/verifyCacheConsistencyWorkflow/verifyCacheConsistencyWorkflow.ts => internal/billing/v2/workflows/verifyCacheConsistency/verifyCacheConsistency.ts} (95%) delete mode 100644 server/src/internal/customers/cusProducts/cusProductUtils/findCusProduct.ts rename server/src/internal/features/workflows/{generateFeatureDisplayWorkflow.ts => generateFeatureDisplay.ts} (92%) create mode 100644 server/src/queue/workflows.ts delete mode 100644 server/tests/attach/basic/basic1.test.ts create mode 100644 server/tests/integration/balances/check/check-race-condition.test.ts delete mode 100644 server/tests/integration/balances/check/check-race-condition1.test.ts delete mode 100644 server/tests/integration/balances/check/check-race-condition2.test.ts create mode 100644 server/tests/integration/billing/autumn-webhooks/customer-products-updated.test.ts create mode 100644 server/tests/integration/billing/autumn-webhooks/utils/svixPlayClient.ts create mode 100644 server/tests/integration/billing/autumn-webhooks/utils/svixTestEndpoint.ts delete mode 100644 server/tests/testRunner/.gitignore delete mode 100644 server/tests/testRunner/README.md delete mode 100644 server/tests/testRunner/TestRunnerUI.tsx delete mode 100644 server/tests/testRunner/config.ts delete mode 100644 server/tests/testRunner/groupRunner.ts delete mode 100644 server/tests/testRunner/groupRunnerV2.ts delete mode 100644 server/tests/testRunner/outputParser.ts delete mode 100644 server/tests/testRunner/runParallelGroups.ts delete mode 100755 server/tests/testRunner/runParallelGroupsV2.ts delete mode 100755 server/tests/testRunner/runParallelGroupsV3.ts delete mode 100755 server/tests/testRunner/runTests.ts delete mode 100644 server/tests/testRunner/runTestsV2.ts delete mode 100644 server/tests/testRunner/testWorker.ts create mode 100644 shared/utils/cusProductUtils/findCustomerProduct/findCustomerProduct.ts create mode 100644 shared/utils/cusUtils/fullCusUtils/enrichFullCustomer.ts create mode 100644 shared/utils/cusUtils/index.ts diff --git a/.claude/skills/workflows/SKILL.md b/.claude/skills/workflows/SKILL.md new file mode 100644 index 000000000..f4a80a5e3 --- /dev/null +++ b/.claude/skills/workflows/SKILL.md @@ -0,0 +1,106 @@ +--- +name: workflows +description: Create async background tasks (workflows) using SQS or Hatchet. Use when building queue jobs, background processing, or async tasks. +--- + +## Overview + +Workflows are async tasks processed by background workers. Two runners: + +| Runner | Use Case | Features | +|--------|----------|----------| +| **SQS** | Simple fire-and-forget tasks | Fast, no dependencies, max 15min delay | +| **Hatchet** | Complex workflows needing retries, multi-step, or long delays | Typed outputs, configurable timeouts, observability | + +## Quick Start + +### 1. Add Job Name + +```typescript +// server/src/queue/JobName.ts +export enum JobName { + // ... existing + MyNewWorkflow = "my-new-workflow", +} +``` + +### 2. Define Payload & Register + +```typescript +// server/src/queue/workflows.ts + +// Add payload type +export type MyNewWorkflowPayload = { + orgId: string; + env: AppEnv; + customerId: string; + // ... your fields +}; + +// Add to registry +const workflowRegistry = { + // ... existing + myNewWorkflow: { + jobName: JobName.MyNewWorkflow, + runner: "sqs", // or "hatchet" + } as WorkflowConfig, +}; + +// Add trigger function +export const workflows = { + // ... existing + triggerMyNewWorkflow: (payload: MyNewWorkflowPayload, options?: TriggerOptions) => + triggerWorkflow({ name: "myNewWorkflow", payload, options }), +}; +``` + +### 3. Create Handler + +**For SQS:** See [references/SQS.md](references/SQS.md) + +**For Hatchet:** See [references/HATCHET.md](references/HATCHET.md) + +### 4. Trigger from Code + +```typescript +import { workflows } from "@/queue/workflows.js"; + +await workflows.triggerMyNewWorkflow({ + orgId: ctx.org.id, + env: ctx.env, + customerId, +}); + +// With delay +await workflows.triggerMyNewWorkflow(payload, { delayMs: 5000 }); +``` + +## File Structure + +``` +server/src/ +├── queue/ +│ ├── JobName.ts # Job name enum +│ ├── workflows.ts # Registry + triggers +│ └── initWorkers.ts # SQS message routing +└── internal/.../workflows/ + └── myNewWorkflow/ + ├── myNewWorkflow.ts # Handler + └── triggerMyNewWorkflow.ts # (optional) trigger helper +``` + +## Required Payload Fields + +All workflows must include: +```typescript +{ + orgId: string; + env: AppEnv; + customerId?: string; // optional but common +} +``` + +## References + +- [references/SQS.md](references/SQS.md) - SQS workflow implementation +- [references/HATCHET.md](references/HATCHET.md) - Hatchet workflow implementation diff --git a/.claude/skills/workflows/references/HATCHET.md b/.claude/skills/workflows/references/HATCHET.md new file mode 100644 index 000000000..f35c608f8 --- /dev/null +++ b/.claude/skills/workflows/references/HATCHET.md @@ -0,0 +1,135 @@ +# Hatchet Workflows + +For complex workflows needing retries, multi-step, typed outputs, or long delays. + +## Workflow Definition + +```typescript +// server/src/internal/.../workflows/myWorkflow/myWorkflow.ts + +import { hatchet } from "@/external/hatchet/initHatchet.js"; +import { createWorkflowTask } from "@/queue/hatchetWorkflows/createWorkflowTask.js"; +import { JobName } from "@/queue/JobName.js"; + +// 1. Define input/output types +export type MyWorkflowInput = { + orgId: string; + env: AppEnv; + customerId: string; +}; + +type MyWorkflowOutput = { + myTask: { + success: boolean; + message: string; + }; +}; + +// 2. Create workflow (only if Hatchet enabled) +export const myWorkflow = hatchet?.workflow({ + name: JobName.MyWorkflow, +}); + +// 3. Define task +myWorkflow?.task({ + name: JobName.MyWorkflow, + executionTimeout: "60s", + fn: createWorkflowTask({ + handler: async ({ input, autumnContext }) => { + const { customerId } = input; + + // Your logic here + autumnContext.logger.info(`Processing ${customerId}`); + + return { + success: true, + message: "Completed", + }; + }, + }), +}); +``` + +## Register Worker + +```typescript +// server/src/queue/initWorkers.ts + +import { myWorkflow } from "@/internal/.../workflows/myWorkflow/myWorkflow.js"; + +export const initHatchetWorker = async () => { + if (!hatchet) return; + + const worker = await hatchet.worker("hatchet-worker", { + workflows: [ + verifyCacheConsistency!, + myWorkflow!, // Add here + ], + }); + + worker.start().catch(console.error); +}; +``` + +## Register in queueUtils.ts + +```typescript +// server/src/queue/queueUtils.ts + +import { myWorkflow } from "@/internal/.../workflows/myWorkflow/myWorkflow.js"; + +const hatchetWorkflows: Record = { + [JobName.VerifyCacheConsistency]: verifyCacheConsistency, + [JobName.MyWorkflow]: myWorkflow, // Add here +}; +``` + +## Triggering with Options + +```typescript +await workflows.triggerMyWorkflow(payload, { + delayMs: 5000, + metadata: { + workflowId: generateId("workflow"), + customerId, + }, +}); +``` + +## createWorkflowTask Helper + +Provides: +- Automatic `AutumnContext` creation from input +- Error handling with Sentry integration +- Workflow logging context + +```typescript +createWorkflowTask({ + handler: async ({ input, autumnContext }) => { + // input: Your typed input + // autumnContext: Full AutumnContext with logger, db, org, env, etc. + return output; + }, +}) +``` + +## Checklist + +1. ☐ Add to `JobName.ts` +2. ☐ Define payload type in `workflows.ts` +3. ☐ Add to `workflowRegistry` with `runner: "hatchet"` +4. ☐ Add trigger function to `workflows` export +5. ☐ Create workflow file with `hatchet?.workflow()` + `.task()` +6. ☐ Add to `hatchetWorkflows` map in `queueUtils.ts` +7. ☐ Add to `initHatchetWorker` workflows array + +## SQS vs Hatchet + +| Feature | SQS | Hatchet | +|---------|-----|---------| +| Setup complexity | Lower | Higher | +| Typed output | No | Yes | +| Multi-step tasks | No | Yes | +| Configurable timeout | 30s visibility | Per-task | +| Max delay | 15 minutes | Unlimited | +| Observability | CloudWatch | Hatchet UI | diff --git a/.claude/skills/workflows/references/SQS.md b/.claude/skills/workflows/references/SQS.md new file mode 100644 index 000000000..ef5a3c19a --- /dev/null +++ b/.claude/skills/workflows/references/SQS.md @@ -0,0 +1,124 @@ +# SQS Workflows + +Simple async tasks processed by SQS workers. + +## Handler Signature + +```typescript +// server/src/internal/.../workflows/myWorkflow/myWorkflow.ts + +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import type { MyWorkflowPayload } from "@/queue/workflows.js"; + +export const myWorkflow = async ({ + ctx, + payload, +}: { + ctx: AutumnContext; + payload: MyWorkflowPayload; +}) => { + const { customerId } = payload; + + // Your logic here + ctx.logger.info(`Processing ${customerId}`); +}; +``` + +## Register in initWorkers.ts + +```typescript +// server/src/queue/initWorkers.ts + +import { myWorkflow } from "@/internal/.../workflows/myWorkflow/myWorkflow.js"; + +const processMessage = async ({ message, db }) => { + // ... existing code + + if (job.name === JobName.MyWorkflow) { + if (!ctx) { + workerLogger.error("No context found for my workflow job"); + return; + } + await myWorkflow({ ctx, payload: job.data }); + return; + } + + // ... rest of handlers +}; +``` + +## Complete Example + +```typescript +// server/src/internal/billing/v2/workflows/sendProductsUpdated/sendProductsUpdated.ts + +import { sendSvixEvent } from "@/external/svix/svixHelpers.js"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import { CusService } from "@/internal/customers/CusService.js"; +import type { SendProductsUpdatedPayload } from "@/queue/workflows.js"; + +export const sendProductsUpdated = async ({ + ctx, + payload, +}: { + ctx: AutumnContext; + payload: SendProductsUpdatedPayload; +}) => { + const { db, org, env } = ctx; + const { customerProductId, scenario, customerId } = payload; + + const fullCustomer = await CusService.getFull({ + db, + idOrInternalId: customerId, + orgId: org.id, + env, + }); + + // ... build webhook payload + + await sendSvixEvent({ + org, + env, + eventType: "customer.products.updated", + data: { scenario, customer, updated_product }, + }); +}; +``` + +## Trigger Helper (Optional) + +```typescript +// server/src/internal/billing/v2/workflows/sendProductsUpdated/billingPlanToSendProductsUpdated.ts + +import { workflows } from "@/queue/workflows.js"; + +export const billingPlanToSendProductsUpdated = async ({ + ctx, + cusProduct, + scenario, +}: { + ctx: AutumnContext; + cusProduct: CustomerProduct; + scenario: string; +}) => { + // Skip in tests if configured + if (ctx.testOptions?.skipWebhooks) return; + + await workflows.triggerSendProductsUpdated({ + orgId: ctx.org.id, + env: ctx.env, + customerId: cusProduct.customer_id, + customerProductId: cusProduct.id, + scenario, + }); +}; +``` + +## Checklist + +1. ☐ Add to `JobName.ts` +2. ☐ Define payload type in `workflows.ts` +3. ☐ Add to `workflowRegistry` with `runner: "sqs"` +4. ☐ Add trigger function to `workflows` export +5. ☐ Create handler file +6. ☐ Add case in `initWorkers.ts` `processMessage` diff --git a/.claude/skills/write-test/SKILL.md b/.claude/skills/write-test/SKILL.md index 6d330de93..5db9eea80 100644 --- a/.claude/skills/write-test/SKILL.md +++ b/.claude/skills/write-test/SKILL.md @@ -78,6 +78,7 @@ Load these on-demand for detailed information: - [references/TRACK-CHECK.md](references/TRACK-CHECK.md) - Track/check endpoint testing, credit systems, Decimal.js - [references/EXPECTATIONS.md](references/EXPECTATIONS.md) - All expectation utilities - [references/GOTCHAS.md](references/GOTCHAS.md) - Common pitfalls, debugging, billing edge cases +- [references/WEBHOOKS.md](references/WEBHOOKS.md) - Outbound webhook testing with Svix Play ## File Location diff --git a/.claude/skills/write-test/references/WEBHOOKS.md b/.claude/skills/write-test/references/WEBHOOKS.md new file mode 100644 index 000000000..d00e15b82 --- /dev/null +++ b/.claude/skills/write-test/references/WEBHOOKS.md @@ -0,0 +1,80 @@ +# Outbound Webhook Testing + +Test Autumn's outbound webhooks using Svix Play (free, no signup). + +## Setup + +```typescript +import { generatePlayToken, getPlayWebhookUrl, waitForWebhook } from "./utils/svixPlayClient.js"; +import { createTestEndpoint, deleteTestEndpoint } from "./utils/svixTestEndpoint.js"; +import ctx from "@tests/utils/testInitUtils/createTestContext.js"; + +let playToken: string; +let endpointId: string; + +beforeAll(async () => { + playToken = await generatePlayToken(); + const svixAppId = ctx.org.svix_config?.sandbox_app_id; + if (!svixAppId) throw new Error("Svix not configured"); + endpointId = await createTestEndpoint({ appId: svixAppId, playUrl: getPlayWebhookUrl(playToken) }); +}); + +afterAll(async () => { + const svixAppId = ctx.org.svix_config?.sandbox_app_id; + if (svixAppId && endpointId) await deleteTestEndpoint({ appId: svixAppId, endpointId }); +}); +``` + +## Test Pattern + +```typescript +test.concurrent(`${chalk.yellowBright("webhook: customer.products.updated")}`, async () => { + const customerId = "webhook-test"; + const freeDefault = products.base({ id: "free", items: [...], isDefault: true }); + + // Setup products only (no customer) + const { autumnV1 } = await initScenario({ + setup: [s.products({ list: [freeDefault], prefix: customerId })], + actions: [], + }); + + // Create customer with webhooks enabled + await autumnV1.customers.create({ + id: customerId, + name: "Test", + internalOptions: { disable_defaults: false, default_group: customerId }, + skipWebhooks: false, // Enable webhooks + }); + + // Wait for webhook + const result = await waitForWebhook({ + token: playToken, + predicate: (p) => p.type === "customer.products.updated" && p.data?.customer?.id === customerId, + timeoutMs: 15000, + }); + + expect(result).not.toBeNull(); + expect(result?.payload.data.scenario).toBe("new"); +}); +``` + +## Key Points + +| Normal Tests | Webhook Tests | +|--------------|---------------| +| `initScenario` creates customer | Create customer manually with `skipWebhooks: false` | +| Immediate assertions | Poll with `waitForWebhook` (10-15s timeout) | + +## Utilities + +| Function | Purpose | +|----------|---------| +| `generatePlayToken()` | Get Svix Play token | +| `getPlayWebhookUrl(token)` | Get webhook URL | +| `waitForWebhook({ token, predicate, timeoutMs })` | Poll for webhook | +| `createTestEndpoint({ appId, playUrl })` | Register endpoint | +| `deleteTestEndpoint({ appId, endpointId })` | Cleanup | + +## Location + +`server/tests/integration/billing/autumn-webhooks/` diff --git a/.superset/config.json b/.superset/config.json new file mode 100644 index 000000000..9d9aba5a1 --- /dev/null +++ b/.superset/config.json @@ -0,0 +1,4 @@ +{ + "setup": [], + "teardown": [] +} diff --git a/bun.lock b/bun.lock index 0c4991349..3efd02048 100644 --- a/bun.lock +++ b/bun.lock @@ -29,9 +29,11 @@ "chalk": "^5.3.0", "dotenv": "^16.5.0", "drizzle-orm": "catalog:", + "ink": "^6.6.0", "inquirer": "^12.6.3", "ora": "^9.0.0", "p-limit": "^7.2.0", + "react": "^19.2.3", }, "devDependencies": { "@types/inquirer": "^9.0.7", @@ -2014,7 +2016,7 @@ "cli-boxes": ["cli-boxes@3.0.0", "", {}, "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g=="], - "cli-cursor": ["cli-cursor@5.0.0", "", { "dependencies": { "restore-cursor": "^5.0.0" } }, "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw=="], + "cli-cursor": ["cli-cursor@4.0.0", "", { "dependencies": { "restore-cursor": "^4.0.0" } }, "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg=="], "cli-spinners": ["cli-spinners@3.4.0", "", {}, "sha512-bXfOC4QcT1tKXGorxL3wbJm6XJPDqEnij2gQ2m7ESQuE+/z9YFIWnl/5RpTiKWbMq3EVKR4fRLJGn6DVfu0mpw=="], @@ -3108,7 +3110,7 @@ "once": ["once@1.4.0", "", { "dependencies": { "wrappy": "1" } }, "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="], - "onetime": ["onetime@7.0.0", "", { "dependencies": { "mimic-function": "^5.0.0" } }, "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ=="], + "onetime": ["onetime@5.1.2", "", { "dependencies": { "mimic-fn": "^2.1.0" } }, "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="], "oniguruma-parser": ["oniguruma-parser@0.12.1", "", {}, "sha512-8Unqkvk1RYc6yq2WBYRj4hdnsAxVze8i7iPfQr8e4uSP3tRv0rpZcbGUDvxfQQcdwHt/e9PrMvGCsa8OqG9X3w=="], @@ -3316,7 +3318,7 @@ "raw-body": ["raw-body@2.5.3", "", { "dependencies": { "bytes": "~3.1.2", "http-errors": "~2.0.1", "iconv-lite": "~0.4.24", "unpipe": "~1.0.0" } }, "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA=="], - "react": ["react@18.3.1", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ=="], + "react": ["react@19.2.3", "", {}, "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA=="], "react-cmdk": ["react-cmdk@1.3.9", "", { "dependencies": { "@headlessui/react": "^1.6.4", "@heroicons/react": "^2.0.13", "html-webpack-plugin": "^5.5.0" }, "peerDependencies": { "react": "^16.x || ^17.x || ^18.x", "react-dom": "^16.x || ^17.x || ^18.x" } }, "sha512-MSVmAQZ9iqY7hO3r++XP6yWSHzGfMDGMvY3qlDT8k5RiWoRFwO1CGPlsWzhvcUbPilErzsMKK7uB4McEcX4B6g=="], @@ -3428,7 +3430,7 @@ "resolve-pkg-maps": ["resolve-pkg-maps@1.0.0", "", {}, "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw=="], - "restore-cursor": ["restore-cursor@5.1.0", "", { "dependencies": { "onetime": "^7.0.0", "signal-exit": "^4.1.0" } }, "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA=="], + "restore-cursor": ["restore-cursor@4.0.0", "", { "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" } }, "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg=="], "reusify": ["reusify@1.1.0", "", {}, "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw=="], @@ -3906,12 +3908,16 @@ "@anthropic-ai/sdk/@types/node": ["@types/node@18.19.130", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg=="], + "@autumn/server/react": ["react@18.3.1", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ=="], + "@autumn/shared/@date-fns/utc": ["@date-fns/utc@2.1.0", "", {}, "sha512-176grgAgU2U303rD2/vcOmNg0kGPbhzckuH1TEP2al7n0AQipZIy9P15usd2TKQCG1g+E1jX/ZVQSzs4sUDwgA=="], "@autumn/vite/@types/node": ["@types/node@22.19.6", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-qm+G8HuG6hOHQigsi7VGuLjUVu6TtBo/F05zvX04Mw2uCg9Dv0Qxy3Qw7j41SidlTcl5D/5yg0SEZqOB+EqZnQ=="], "@autumn/vite/date-fns": ["date-fns@3.6.0", "", {}, "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww=="], + "@autumn/vite/react": ["react@18.3.1", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ=="], + "@autumn/vite/typescript": ["typescript@5.7.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw=="], "@autumn/vite/zod": ["zod@4.3.5", "", {}, "sha512-k7Nwx6vuWx1IJ9Bjuf4Zt1PEllcwe7cls3VNzm4CQ1/hgtFUK2bRNG3rvnpPUhFjmqJKAKtjV576KnUkHocg/g=="], @@ -4274,6 +4280,8 @@ "@fortawesome/fontawesome-svg-core/@fortawesome/fontawesome-common-types": ["@fortawesome/fontawesome-common-types@7.1.0", "", {}, "sha512-l/BQM7fYntsCI//du+6sEnHOP6a74UixFyOYUyz2DLMXKx+6DEhfR3F2NYGE45XH1JJuIamacb4IZs9S0ZOWLA=="], + "@headlessui/react/react": ["react@18.3.1", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ=="], + "@inquirer/core/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], "@inquirer/core/wrap-ansi": ["wrap-ansi@6.2.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="], @@ -4636,8 +4644,6 @@ "http-proxy/eventemitter3": ["eventemitter3@4.0.7", "", {}, "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="], - "ink/cli-cursor": ["cli-cursor@4.0.0", "", { "dependencies": { "restore-cursor": "^4.0.0" } }, "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg=="], - "ink-spinner/cli-spinners": ["cli-spinners@2.9.2", "", {}, "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg=="], "katex/commander": ["commander@8.3.0", "", {}, "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="], @@ -4676,6 +4682,8 @@ "openai/@types/node": ["@types/node@18.19.130", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg=="], + "ora/cli-cursor": ["cli-cursor@5.0.0", "", { "dependencies": { "restore-cursor": "^5.0.0" } }, "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw=="], + "p-locate/p-limit": ["p-limit@3.1.0", "", { "dependencies": { "yocto-queue": "^0.1.0" } }, "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="], "p-queue/eventemitter3": ["eventemitter3@4.0.7", "", {}, "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="], @@ -4702,8 +4710,16 @@ "public-encrypt/bn.js": ["bn.js@4.12.2", "", {}, "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw=="], + "react-cmdk/react": ["react@18.3.1", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ=="], + + "react-confetti-explosion/react": ["react@18.3.1", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ=="], + "react-day-picker/date-fns": ["date-fns@3.6.0", "", {}, "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww=="], + "react-day-picker/react": ["react@18.3.1", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ=="], + + "react-dom/react": ["react@18.3.1", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ=="], + "react-email/esbuild": ["esbuild@0.25.12", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.25.12", "@esbuild/android-arm": "0.25.12", "@esbuild/android-arm64": "0.25.12", "@esbuild/android-x64": "0.25.12", "@esbuild/darwin-arm64": "0.25.12", "@esbuild/darwin-x64": "0.25.12", "@esbuild/freebsd-arm64": "0.25.12", "@esbuild/freebsd-x64": "0.25.12", "@esbuild/linux-arm": "0.25.12", "@esbuild/linux-arm64": "0.25.12", "@esbuild/linux-ia32": "0.25.12", "@esbuild/linux-loong64": "0.25.12", "@esbuild/linux-mips64el": "0.25.12", "@esbuild/linux-ppc64": "0.25.12", "@esbuild/linux-riscv64": "0.25.12", "@esbuild/linux-s390x": "0.25.12", "@esbuild/linux-x64": "0.25.12", "@esbuild/netbsd-arm64": "0.25.12", "@esbuild/netbsd-x64": "0.25.12", "@esbuild/openbsd-arm64": "0.25.12", "@esbuild/openbsd-x64": "0.25.12", "@esbuild/openharmony-arm64": "0.25.12", "@esbuild/sunos-x64": "0.25.12", "@esbuild/win32-arm64": "0.25.12", "@esbuild/win32-ia32": "0.25.12", "@esbuild/win32-x64": "0.25.12" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg=="], "react-email/glob": ["glob@11.1.0", "", { "dependencies": { "foreground-child": "^3.3.1", "jackspeak": "^4.1.1", "minimatch": "^10.1.1", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^2.0.0" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw=="], @@ -4720,8 +4736,6 @@ "renderkid/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], - "restore-cursor/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], - "ripemd160/hash-base": ["hash-base@3.1.2", "", { "dependencies": { "inherits": "^2.0.4", "readable-stream": "^2.3.8", "safe-buffer": "^5.2.1", "to-buffer": "^1.2.1" } }, "sha512-Bb33KbowVTIj5s7Ked1OsqHUeCpz//tPwR+E2zJgJKo9Z5XolZ9b6bdUgjmYlwnWhoOQKoTd1TYToZGn5mAYOg=="], "router/path-to-regexp": ["path-to-regexp@8.3.0", "", {}, "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA=="], @@ -5258,8 +5272,6 @@ "gtoken/gaxios/node-fetch": ["node-fetch@3.3.2", "", { "dependencies": { "data-uri-to-buffer": "^4.0.0", "fetch-blob": "^3.1.4", "formdata-polyfill": "^4.0.10" } }, "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA=="], - "ink/cli-cursor/restore-cursor": ["restore-cursor@4.0.0", "", { "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" } }, "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg=="], - "langsmith/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], "langsmith/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="], @@ -5282,6 +5294,8 @@ "openai/@types/node/undici-types": ["undici-types@5.26.5", "", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="], + "ora/cli-cursor/restore-cursor": ["restore-cursor@5.1.0", "", { "dependencies": { "onetime": "^7.0.0", "signal-exit": "^4.1.0" } }, "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA=="], + "p-locate/p-limit/yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="], "posthog-js/@opentelemetry/exporter-logs-otlp-http/@opentelemetry/core": ["@opentelemetry/core@2.2.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-FuabnnUm8LflnieVxs6eP7Z383hgQU4W1e3KJS6aOG3RxWxcHyBxH8fDMHNgu/gFx/M2jvTOW/4/PHhLz6bjWw=="], @@ -5352,6 +5366,8 @@ "react-email/glob/path-scurry": ["path-scurry@2.0.1", "", { "dependencies": { "lru-cache": "^11.0.0", "minipass": "^7.1.2" } }, "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA=="], + "react-email/ora/cli-cursor": ["cli-cursor@5.0.0", "", { "dependencies": { "restore-cursor": "^5.0.0" } }, "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw=="], + "react-email/ora/cli-spinners": ["cli-spinners@2.9.2", "", {}, "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg=="], "react-email/ora/log-symbols": ["log-symbols@6.0.0", "", { "dependencies": { "chalk": "^5.3.0", "is-unicode-supported": "^1.3.0" } }, "sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw=="], @@ -5630,8 +5646,6 @@ "css-select/domutils/dom-serializer/entities": ["entities@2.2.0", "", {}, "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="], - "ink/cli-cursor/restore-cursor/onetime": ["onetime@5.1.2", "", { "dependencies": { "mimic-fn": "^2.1.0" } }, "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="], - "md5.js/hash-base/readable-stream/safe-buffer": ["safe-buffer@5.1.2", "", {}, "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="], "md5.js/hash-base/readable-stream/string_decoder": ["string_decoder@1.1.1", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="], @@ -5642,6 +5656,10 @@ "nodemon/chokidar/readdirp/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], + "ora/cli-cursor/restore-cursor/onetime": ["onetime@7.0.0", "", { "dependencies": { "mimic-function": "^5.0.0" } }, "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ=="], + + "ora/cli-cursor/restore-cursor/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], + "posthog-js/@opentelemetry/exporter-logs-otlp-http/@opentelemetry/otlp-transformer/@opentelemetry/resources": ["@opentelemetry/resources@2.2.0", "", { "dependencies": { "@opentelemetry/core": "2.2.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A=="], "posthog-js/@opentelemetry/exporter-logs-otlp-http/@opentelemetry/otlp-transformer/@opentelemetry/sdk-metrics": ["@opentelemetry/sdk-metrics@2.2.0", "", { "dependencies": { "@opentelemetry/core": "2.2.0", "@opentelemetry/resources": "2.2.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <1.10.0" } }, "sha512-G5KYP6+VJMZzpGipQw7Giif48h6SGQ2PFKEYCybeXJsOCB4fp8azqMAAzE5lnnHK3ZVwYQrgmFbsUJO/zOnwGw=="], @@ -5650,6 +5668,8 @@ "react-email/glob/path-scurry/lru-cache": ["lru-cache@11.2.4", "", {}, "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg=="], + "react-email/ora/cli-cursor/restore-cursor": ["restore-cursor@5.1.0", "", { "dependencies": { "onetime": "^7.0.0", "signal-exit": "^4.1.0" } }, "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA=="], + "react-email/ora/log-symbols/is-unicode-supported": ["is-unicode-supported@1.3.0", "", {}, "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ=="], "react-email/ora/string-width/emoji-regex": ["emoji-regex@10.6.0", "", {}, "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A=="], @@ -5746,6 +5766,10 @@ "@aws-sdk/credential-providers/@aws-sdk/credential-provider-http/@smithy/util-stream/@smithy/util-buffer-from/@smithy/is-array-buffer": ["@smithy/is-array-buffer@3.0.0", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ=="], + "react-email/ora/cli-cursor/restore-cursor/onetime": ["onetime@7.0.0", "", { "dependencies": { "mimic-function": "^5.0.0" } }, "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ=="], + + "react-email/ora/cli-cursor/restore-cursor/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], + "@aws-sdk/client-cognito-identity/@aws-sdk/credential-provider-node/@aws-sdk/credential-provider-http/@smithy/util-stream/@smithy/fetch-http-handler/@smithy/querystring-builder": ["@smithy/querystring-builder@3.0.11", "", { "dependencies": { "@smithy/types": "^3.7.2", "@smithy/util-uri-escape": "^3.0.0", "tslib": "^2.6.2" } }, "sha512-u+5HV/9uJaeLj5XTb6+IEF/dokWWkEqJ0XiaRRogyREmKGUgZnNecLucADLdauWFKUNbQfulHFEZEdjwEBjXRg=="], "@aws-sdk/client-cognito-identity/@aws-sdk/credential-provider-node/@aws-sdk/credential-provider-http/@smithy/util-stream/@smithy/util-buffer-from/@smithy/is-array-buffer": ["@smithy/is-array-buffer@3.0.0", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ=="], diff --git a/scripts/package.json b/scripts/package.json index 0b2228eaf..08b83345f 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -16,9 +16,11 @@ "chalk": "^5.3.0", "dotenv": "^16.5.0", "drizzle-orm": "catalog:", + "ink": "^6.6.0", "inquirer": "^12.6.3", "ora": "^9.0.0", - "p-limit": "^7.2.0" + "p-limit": "^7.2.0", + "react": "^19.2.3" }, "devDependencies": { "@types/inquirer": "^9.0.7", diff --git a/scripts/test.ts b/scripts/test.ts index 19d773bb5..6a7506027 100644 --- a/scripts/test.ts +++ b/scripts/test.ts @@ -143,10 +143,11 @@ async function runTest() { // Detect if we're already in the server directory (e.g., when run via server/run.sh) const cwd = process.cwd(); - const serverDir = + const projectRoot = cwd.endsWith("/server") || cwd.endsWith("\\server") - ? cwd - : resolve(cwd, "server"); + ? resolve(cwd, "..") + : cwd; + const serverDir = resolve(projectRoot, "server"); // Handle special "setup" command if (scriptName === "setup") { @@ -175,7 +176,12 @@ async function runTest() { return; } - const shellScript = resolve(serverDir, "shell", `${scriptName}.sh`); + const shellScript = resolve( + projectRoot, + "scripts", + "testGroups", + `${scriptName}.sh`, + ); // First try to find a shell script if (existsSync(shellScript)) { @@ -186,7 +192,7 @@ async function runTest() { ); const child = spawn("bash", [shellScript, ...additionalArgs], { - cwd: serverDir, + cwd: projectRoot, stdio: "inherit", env: { ...process.env, NODE_ENV: "production" }, }); diff --git a/scripts/testGroups/config.sh b/scripts/testGroups/config.sh index 06d25788e..73fa4b543 100755 --- a/scripts/testGroups/config.sh +++ b/scripts/testGroups/config.sh @@ -31,6 +31,11 @@ BUN_PARALLEL_COMPACT() { cd "$PROJECT_ROOT" && $BUN_CMD scripts/testScripts/runTests.ts "$@" --compact } +# V2 test runner - shows individual tests, better error display (Ink-based) +BUN_PARALLEL_V2() { + cd "$PROJECT_ROOT" && $BUN_CMD scripts/testScripts/runTestsV2.tsx "$@" +} + # Setup function BUN_SETUP() { cd "$SERVER_DIR" && $BUN_CMD tests/setupMain.ts diff --git a/scripts/testGroups/g1.sh b/scripts/testGroups/g1.sh index 947152281..ddb90b7dc 100755 --- a/scripts/testGroups/g1.sh +++ b/scripts/testGroups/g1.sh @@ -9,35 +9,35 @@ source "$(dirname "$0")/config.sh" # Run tests using TypeScript runner with compact mode # Adjust --max to control concurren.cy (default: 6) -bun test:integration check -BUN_PARALLEL_COMPACT \ - 'server/tests/balances/track/basic' \ - 'server/tests/balances/track/concurrency' \ - 'server/tests/balances/track/breakdown' \ - 'server/tests/balances/track/credit-systems' \ - 'server/tests/balances/track/entity-products' \ - 'server/tests/balances/track/legacy' \ - 'server/tests/balances/track/allocated' \ - 'server/tests/balances/track/entity-balances' \ - 'server/tests/balances/track/negative' \ - 'server/tests/balances/track/rollovers' \ - 'server/tests/balances/track/race-condition' \ - 'server/tests/balances/track/paid-allocated' \ - 'server/tests/balances/track/edge-cases' \ - 'server/tests/balances/check/breakdown' \ - 'server/tests/balances/track/loose' \ - 'server/tests/balances/check/basic' \ - 'server/tests/balances/check/credit-systems' \ - 'server/tests/balances/check/misc' \ - 'server/tests/balances/check/prepaid' \ - 'server/tests/balances/check/send-event' \ - 'server/tests/balances/check/loose' \ - 'server/tests/balances/set-usage' \ + +BUN_PARALLEL_V2 \ + 'integration/balances/check' \ + 'balances/track/basic' \ + 'balances/track/concurrency' \ + 'balances/track/breakdown' \ + 'balances/track/credit-systems' \ + 'balances/track/entity-products' \ + 'balances/track/legacy' \ + 'balances/track/allocated' \ + 'balances/track/entity-balances' \ + 'balances/track/negative' \ + 'balances/track/rollovers' \ + 'balances/track/race-condition' \ + 'balances/track/paid-allocated' \ + 'balances/track/edge-cases' \ + 'balances/check/breakdown' \ + 'balances/track/loose' \ + 'balances/check/credit-systems' \ + 'balances/check/misc' \ + 'balances/check/prepaid' \ + 'balances/check/send-event' \ + 'balances/check/loose' \ + 'balances/set-usage' \ --max=6 -BUN_PARALLEL_COMPACT \ +BUN_PARALLEL_V2 \ 'server/tests/balances/update/filters' \ 'server/tests/balances/update/update-combined' \ 'server/tests/balances/update/update-current-balance/basic' \ diff --git a/scripts/testGroups/g2.sh b/scripts/testGroups/g2.sh index 8f649446a..29567addd 100755 --- a/scripts/testGroups/g2.sh +++ b/scripts/testGroups/g2.sh @@ -4,7 +4,7 @@ source "$(dirname "$0")/config.sh" -BUN_PARALLEL_COMPACT \ +BUN_PARALLEL_V2 \ 'server/tests/attach/basic' \ 'server/tests/attach/upgrade' \ 'server/tests/attach/downgrade' \ @@ -15,10 +15,9 @@ BUN_PARALLEL_COMPACT \ 'server/tests/integration/billing/invoice-action-required' \ 'server/tests/integration/billing/cancel' \ 'server/tests/integration/billing/cancel/add-ons' \ - 'server/tests/renew' \ --max=6 -BUN_PARALLEL_COMPACT \ +BUN_PARALLEL_V2 \ 'server/tests/attach/entities' \ --max=6 # 'server/tests/external-psps/revenuecat' \ diff --git a/scripts/testGroups/update-subscription.sh b/scripts/testGroups/update-subscription.sh index 41a3887b9..cd25c6c6e 100755 --- a/scripts/testGroups/update-subscription.sh +++ b/scripts/testGroups/update-subscription.sh @@ -6,19 +6,25 @@ source "$(dirname "$0")/config.sh" # Exit immediately if a command exits with a non-zero status set -e -bun test:integration create-customer -bun test:integration update-subscription/custom-plan -bun test:integration update-subscription/discounts -bun test:integration update-subscription/errors -bun test:integration update-subscription/free-trial -bun test:integration update-subscription/invoice -bun test:integration update-subscription/multi-product -bun test:integration update-subscription/update-quantity -bun test:integration update-subscription/version-update +# bun test:integration create-customer +# bun test:integration update-subscription/custom-plan +# bun test:integration update-subscription/discounts +# bun test:integration update-subscription/errors +# bun test:integration update-subscription/free-trial +# bun test:integration update-subscription/invoice +# bun test:integration update-subscription/multi-product +# bun test:integration update-subscription/update-quantity +# bun test:integration update-subscription/version-update -# Adjust --max to control concurrency (default: 6) -# BUN_PARALLEL_COMPACT \ -# 'server/tests/billing/update-subscription/custom-plan' \ -# --max=6 - + +BUN_PARALLEL_V2 \ + 'update-subscription/custom-plan' \ + 'update-subscription/discounts' \ + 'update-subscription/errors' \ + 'update-subscription/free-trial' \ + 'update-subscription/invoice' \ + 'update-subscription/multi-product' \ + 'update-subscription/update-quantity' \ + 'update-subscription/version-update' \ + --max=3 diff --git a/scripts/testScripts/runTests.ts b/scripts/testScripts/runTests.ts index 9e3ed2b76..488fba82b 100755 --- a/scripts/testScripts/runTests.ts +++ b/scripts/testScripts/runTests.ts @@ -1,5 +1,6 @@ #!/usr/bin/env bun +import { existsSync } from "node:fs"; import { readdir } from "node:fs/promises"; import { basename, resolve } from "node:path"; import { loadLocalEnv } from "@server/utils/envUtils.js"; @@ -627,6 +628,9 @@ class TestRunner { } } +// Base paths for shorthand test paths (tried in order) +const TEST_BASE_PATHS = ["server/tests/integration/billing", "server/tests"]; + // Parse CLI arguments const args = process.argv.slice(2); const directories: string[] = []; @@ -645,7 +649,23 @@ for (const arg of args) { ); process.exit(1); } else { - directories.push(arg); + // Try to resolve the path - if it doesn't exist, try prepending base paths + let resolvedPath = arg; + const fullPath = resolve(process.cwd(), arg); + + if (!existsSync(fullPath)) { + // Try each base path in order + for (const basePath of TEST_BASE_PATHS) { + const withBase = `${basePath}/${arg}`; + const withBaseFull = resolve(process.cwd(), withBase); + if (existsSync(withBaseFull)) { + resolvedPath = withBase; + break; + } + } + } + + directories.push(resolvedPath); } } diff --git a/scripts/testScripts/runTestsV2.ts b/scripts/testScripts/runTestsV2.ts new file mode 100644 index 000000000..6e19ae862 --- /dev/null +++ b/scripts/testScripts/runTestsV2.ts @@ -0,0 +1,724 @@ +#!/usr/bin/env bun + +import { existsSync } from "node:fs"; +import { readdir } from "node:fs/promises"; +import { basename, resolve } from "node:path"; +import { loadLocalEnv } from "@server/utils/envUtils.js"; +import { spawn } from "bun"; +import chalk from "chalk"; +import dotenv from "dotenv"; +import pLimit from "p-limit"; + +loadLocalEnv(); + +// Load environment variables from server/.env +dotenv.config({ path: resolve(process.cwd(), "server", ".env") }); + +// Base path for shorthand test paths +const INTEGRATION_TEST_BASE = "server/tests/integration/billing"; + +interface IndividualTest { + name: string; + status: "pending" | "running" | "passed" | "failed"; + duration?: number; + error?: { + message: string; + location?: string; // file:line for cmd+click + details?: string; + }; +} + +interface TestFileResult { + file: string; + status: "pending" | "running" | "passed" | "failed"; + tests: IndividualTest[]; + currentTest?: string; + output: string; + duration: number; +} + +class TestRunnerV2 { + private results: Map = new Map(); + private testFiles: string[] = []; + private maxParallel: number = 6; + private spinnerFrames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]; + private spinnerIndex = 0; + private renderInterval?: Timer; + private startLine = 0; + private lastRenderedLines = 0; + + constructor(maxParallel?: number) { + if (maxParallel) this.maxParallel = maxParallel; + } + + async collectTestFiles(directories: string[]): Promise { + const testFiles: string[] = []; + + for (const dir of directories) { + const resolvedDir = resolve(process.cwd(), dir); + try { + const files = await readdir(resolvedDir); + for (const file of files) { + if (file.endsWith(".test.ts")) { + testFiles.push(resolve(resolvedDir, file)); + } + } + } catch (error) { + console.error(chalk.red(`Error reading directory ${dir}:`), error); + } + } + + return testFiles; + } + + private parseTestOutput(output: string, filePath: string): IndividualTest[] { + const tests: IndividualTest[] = []; + const lines = output.split("\n"); + + // Track where each test result appears + // Error output appears BEFORE the (fail) line in bun test output + let lastTestEndIndex = -1; + + for (let i = 0; i < lines.length; i++) { + const line = lines[i]; + + // Match (pass) or (fail) test results + const passMatch = line.match( + /^\(pass\)\s+(.+?)\s+\[(\d+(?:\.\d+)?m?s)\]/, + ); + const failMatch = line.match( + /^\(fail\)\s+(.+?)\s+\[(\d+(?:\.\d+)?m?s)\]/, + ); + + if (passMatch) { + const [, name, duration] = passMatch; + tests.push({ + name: name.trim(), + status: "passed", + duration: this.parseDuration(duration), + }); + lastTestEndIndex = i; + } else if (failMatch) { + const [, name, duration] = failMatch; + + // Look BACKWARDS from this line to find the error output + // Error appears between the last test result and this (fail) line + const errorStartIndex = lastTestEndIndex + 1; + const errorLines = lines.slice(errorStartIndex, i); + + const test: IndividualTest = { + name: name.trim(), + status: "failed", + duration: this.parseDuration(duration), + }; + + // Parse the error from the lines before this (fail) + this.parseErrorFromLines(test, errorLines, filePath); + + tests.push(test); + lastTestEndIndex = i; + } + } + + return tests; + } + + private parseErrorFromLines( + test: IndividualTest, + errorLines: string[], + filePath: string, + ): void { + const errorText = errorLines.join("\n"); + + // Find error message - look for "error:" line + let errorMessage = ""; + for (const line of errorLines) { + const errorMatch = line.match(/^error:\s*(.+)/i); + if (errorMatch) { + errorMessage = errorMatch[1].trim(); + break; + } + } + + // Find Expected/Received for assertion errors + const expectedMatch = errorText.match(/Expected:\s*(.+)/); + const receivedMatch = errorText.match(/Received:\s*(.+)/); + if (expectedMatch && receivedMatch) { + errorMessage = `Expected: ${expectedMatch[1]}, Received: ${receivedMatch[1]}`; + } + + // Check for timeout + if (errorText.includes("this test timed out")) { + errorMessage = "Test timed out"; + } + + // Find location - prioritize the test file itself in stack trace + let location: string | undefined; + const testFileName = basename(filePath); + + for (const line of errorLines) { + // Match stack trace lines like: + // at async (/path/to/file.test.ts:38:29) + // at functionName (/path/to/file.ts:123:45) + const stackMatch = line.match(/at\s+.*?\(([^)]+\.ts):(\d+):\d+\)/); + if (stackMatch) { + const matchedFile = stackMatch[1]; + const lineNum = stackMatch[2]; + + // Prefer .test.ts files + if (matchedFile.endsWith(".test.ts")) { + location = `${matchedFile}:${lineNum}`; + break; + } + + // Otherwise take first server file if we don't have one yet + if (!location && matchedFile.includes("/server/")) { + location = `${matchedFile}:${lineNum}`; + } + } + } + + test.error = { + message: errorMessage || "Test failed", + location, + details: errorText.slice(0, 500), + }; + } + + private parseDuration(duration: string): number { + // Parse "123.45ms" or "1.23s" to milliseconds + if (duration.endsWith("ms")) { + return Number.parseFloat(duration); + } + if (duration.endsWith("s")) { + return Number.parseFloat(duration) * 1000; + } + return Number.parseFloat(duration); + } + + private extractCurrentTest(output: string): string | null { + // Look for the last test that started (before pass/fail) + const lines = output.split("\n"); + + // Find last pass/fail to know what's completed + let lastCompletedIndex = -1; + for (let i = lines.length - 1; i >= 0; i--) { + if (lines[i].match(/^\(pass\)/) || lines[i].match(/^\(fail\)/)) { + lastCompletedIndex = i; + break; + } + } + + // The "current" test would be indicated by the test that's running + // Bun doesn't explicitly say which test is running, so we show the last completed + if (lastCompletedIndex >= 0) { + const match = lines[lastCompletedIndex].match( + /^\((?:pass|fail)\)\s+(.+?)\s+\[/, + ); + if (match) { + return match[1].trim(); + } + } + + return null; + } + + private hideCursor() { + process.stdout.write("\x1B[?25l"); + } + + private showCursor() { + process.stdout.write("\x1B[?25h"); + } + + private moveCursor(line: number, col: number = 0) { + process.stdout.write(`\x1B[${line};${col}H`); + } + + private clearLine() { + process.stdout.write("\x1B[2K"); + } + + private clearToEndOfScreen() { + process.stdout.write("\x1B[J"); + } + + private truncate(str: string, maxLength: number): string { + if (str.length <= maxLength) return str; + return str.substring(0, maxLength - 3) + "..."; + } + + private render() { + this.spinnerIndex = (this.spinnerIndex + 1) % this.spinnerFrames.length; + const spinner = this.spinnerFrames[this.spinnerIndex]; + + let lineNum = this.startLine; + + // Calculate stats - only count tests from COMPLETED files for accurate progress + const runningFiles = Array.from(this.results.entries()).filter( + ([_, r]) => r.status === "running", + ); + const completedFiles = Array.from(this.results.entries()).filter( + ([_, r]) => r.status === "passed" || r.status === "failed", + ); + const pendingFiles = Array.from(this.results.entries()).filter( + ([_, r]) => r.status === "pending", + ); + + // Only count tests from completed files for stable progress + const completedTests = completedFiles.flatMap(([_, r]) => r.tests); + const passedTests = completedTests.filter( + (t) => t.status === "passed", + ).length; + const failedTests = completedTests.filter( + (t) => t.status === "failed", + ).length; + + // Header + this.moveCursor(lineNum, 0); + this.clearLine(); + process.stdout.write( + chalk.cyan.bold(`Running ${this.testFiles.length} test files...\n`), + ); + lineNum++; + + // Blank line + this.moveCursor(lineNum, 0); + this.clearLine(); + process.stdout.write("\n"); + lineNum++; + + // Show running files with their current test + if (runningFiles.length > 0) { + this.moveCursor(lineNum, 0); + this.clearLine(); + process.stdout.write( + chalk.yellow.bold(`Running (${runningFiles.length}):\n`), + ); + lineNum++; + + for (const [file, result] of runningFiles) { + const fileName = basename(file); + this.moveCursor(lineNum, 0); + this.clearLine(); + + // Show file with spinner + let fileDisplay = ` ${chalk.cyan(spinner)} ${fileName}`; + + // Show completed tests count for this file + const filePassedCount = result.tests.filter( + (t) => t.status === "passed", + ).length; + const fileFailedCount = result.tests.filter( + (t) => t.status === "failed", + ).length; + + if (filePassedCount > 0 || fileFailedCount > 0) { + fileDisplay += chalk.dim( + ` (${chalk.green(`✓${filePassedCount}`)}${fileFailedCount > 0 ? chalk.red(` ✗${fileFailedCount}`) : ""})`, + ); + } + + // Show current/last test + const currentTest = this.extractCurrentTest(result.output); + if (currentTest) { + fileDisplay += chalk.dim(` › ${this.truncate(currentTest, 40)}`); + } + + process.stdout.write(`${fileDisplay}\n`); + lineNum++; + } + + // Blank line after running + this.moveCursor(lineNum, 0); + this.clearLine(); + process.stdout.write("\n"); + lineNum++; + } + + // Show recently completed files (last 3) + if (completedFiles.length > 0) { + const recentCompleted = completedFiles.slice(-3); + + this.moveCursor(lineNum, 0); + this.clearLine(); + process.stdout.write( + chalk.dim( + `Completed (${completedFiles.length}/${this.testFiles.length} files):\n`, + ), + ); + lineNum++; + + for (const [file, result] of recentCompleted) { + const fileName = basename(file); + this.moveCursor(lineNum, 0); + this.clearLine(); + + const filePassedCount = result.tests.filter( + (t) => t.status === "passed", + ).length; + const fileFailedCount = result.tests.filter( + (t) => t.status === "failed", + ).length; + + const icon = + result.status === "passed" ? chalk.green("✓") : chalk.red("✗"); + const nameColor = result.status === "passed" ? chalk.dim : chalk.white; + + process.stdout.write( + ` ${icon} ${nameColor(fileName)} ${chalk.dim(`(${chalk.green(`✓${filePassedCount}`)}${fileFailedCount > 0 ? chalk.red(` ✗${fileFailedCount}`) : ""})`)}\n`, + ); + lineNum++; + } + + // Blank line + this.moveCursor(lineNum, 0); + this.clearLine(); + process.stdout.write("\n"); + lineNum++; + } + + // Show inline errors from recently completed files (compact view) + const recentFailedTests = completedFiles + .flatMap(([file, result]) => + result.tests + .filter((t) => t.status === "failed") + .map((t) => ({ ...t, file })), + ) + .slice(-2); // Show last 2 failures + + if (recentFailedTests.length > 0) { + this.moveCursor(lineNum, 0); + this.clearLine(); + process.stdout.write(chalk.red.bold(`Recent Failures:\n`)); + lineNum++; + + for (const test of recentFailedTests) { + this.moveCursor(lineNum, 0); + this.clearLine(); + process.stdout.write( + ` ${chalk.red("✗")} ${this.truncate(test.name, 50)}\n`, + ); + lineNum++; + + if (test.error?.message) { + this.moveCursor(lineNum, 0); + this.clearLine(); + process.stdout.write( + ` ${chalk.dim("→")} ${chalk.yellow(this.truncate(test.error.message, 60))}\n`, + ); + lineNum++; + } + + if (test.error?.location) { + this.moveCursor(lineNum, 0); + this.clearLine(); + process.stdout.write( + ` ${chalk.dim("→")} ${chalk.cyan(test.error.location)}\n`, + ); + lineNum++; + } + } + + // Blank line + this.moveCursor(lineNum, 0); + this.clearLine(); + process.stdout.write("\n"); + lineNum++; + } + + // Progress bar + this.moveCursor(lineNum, 0); + this.clearLine(); + process.stdout.write(chalk.dim("─".repeat(60) + "\n")); + lineNum++; + + this.moveCursor(lineNum, 0); + this.clearLine(); + process.stdout.write( + `${chalk.cyan(spinner)} Progress: ${chalk.bold(`${completedFiles.length}/${this.testFiles.length} files`)} | ` + + `${chalk.green(`✓ ${passedTests}`)} | ` + + `${failedTests > 0 ? chalk.red(`✗ ${failedTests}`) : chalk.dim(`✗ ${failedTests}`)} | ` + + `${chalk.dim(`${runningFiles.length} running`)}\n`, + ); + lineNum++; + + // Clear remaining lines + this.moveCursor(lineNum, 0); + this.clearToEndOfScreen(); + + this.lastRenderedLines = lineNum - this.startLine; + } + + async runTest(file: string): Promise { + const startTime = performance.now(); + + // Initialize as running + const result: TestFileResult = { + file, + status: "running", + tests: [], + output: "", + duration: 0, + }; + this.results.set(file, result); + + try { + const proc = spawn(["bun", "test", "--timeout", "0", file], { + stdout: "pipe", + stderr: "pipe", + env: { ...process.env }, + }); + + let output = ""; + const decoder = new TextDecoder(); + + if (proc.stdout) { + for await (const chunk of proc.stdout) { + const text = decoder.decode(chunk); + output += text; + result.output = output; + + // Parse tests as they complete + result.tests = this.parseTestOutput(output, file); + this.results.set(file, result); + } + } + + if (proc.stderr) { + for await (const chunk of proc.stderr) { + output += decoder.decode(chunk); + result.output = output; + } + } + + await proc.exited; + const duration = performance.now() - startTime; + + // Final parse + const tests = this.parseTestOutput(output, file); + const hasFailures = tests.some((t) => t.status === "failed"); + + this.results.set(file, { + ...result, + status: hasFailures ? "failed" : "passed", + tests, + output, + duration, + }); + } catch (error) { + const duration = performance.now() - startTime; + this.results.set(file, { + ...result, + status: "failed", + output: String(error), + duration, + }); + } + } + + private cleanup() { + if (this.renderInterval) { + clearInterval(this.renderInterval); + } + this.showCursor(); + } + + private handleInterrupt() { + this.cleanup(); + console.log( + chalk.yellow.bold("\n\n⚠ Tests interrupted by user (Ctrl+C)\n"), + ); + this.printSummary(); + process.exit(130); + } + + async run(directories: string[]): Promise { + this.testFiles = await this.collectTestFiles(directories); + + if (this.testFiles.length === 0) { + console.log(chalk.yellow("No test files found in specified directories")); + return; + } + + // Initialize all tests as pending + for (const file of this.testFiles) { + this.results.set(file, { + file, + status: "pending", + tests: [], + output: "", + duration: 0, + }); + } + + // Setup SIGINT handler + const sigintHandler = () => this.handleInterrupt(); + process.on("SIGINT", sigintHandler); + + // Hide cursor and create initial space + this.hideCursor(); + this.startLine = 1; + + // Create some initial space + for (let i = 0; i < 20; i++) { + console.log(); + } + process.stdout.write("\x1B[20A"); + + // Start rendering loop + this.renderInterval = setInterval(() => this.render(), 100); + + // Run tests with concurrency limit + const limit = pLimit(this.maxParallel); + const promises = this.testFiles.map((file) => + limit(() => this.runTest(file)), + ); + + await Promise.all(promises); + + // Remove SIGINT handler + process.off("SIGINT", sigintHandler); + + // Final render and cleanup + this.cleanup(); + this.render(); + + // Move past the rendered output + process.stdout.write(`\x1B[${this.lastRenderedLines + 2}B`); + + // Print summary + this.printSummary(); + } + + private printSummary() { + const allTests = Array.from(this.results.values()).flatMap((r) => r.tests); + const failedTests = allTests.filter((t) => t.status === "failed"); + const passedTests = allTests.filter((t) => t.status === "passed"); + const totalDuration = Array.from(this.results.values()).reduce( + (sum, r) => sum + r.duration, + 0, + ); + + console.log("\n"); + + if (failedTests.length === 0) { + console.log( + chalk.green.bold( + `═${"═".repeat(68)}═\n` + + ` ✓ ALL ${passedTests.length} TESTS PASSED (${(totalDuration / 1000).toFixed(1)}s)\n` + + `═${"═".repeat(68)}═\n`, + ), + ); + process.exit(0); + } + + // Failed tests summary + console.log( + chalk.red.bold( + `═${"═".repeat(68)}═\n` + + ` FAILED TESTS (${failedTests.length})\n` + + `═${"═".repeat(68)}═`, + ), + ); + + // Group failed tests by file + const failedByFile = new Map(); + for (const [file, result] of this.results.entries()) { + const fileFailed = result.tests.filter((t) => t.status === "failed"); + if (fileFailed.length > 0) { + failedByFile.set(file, fileFailed); + } + } + + for (const [file, tests] of failedByFile) { + console.log(chalk.red.bold(`\n📁 ${basename(file)}`)); + console.log(chalk.dim("─".repeat(60))); + + for (const test of tests) { + console.log(chalk.red(`\n ✗ ${test.name}`)); + + if (test.error?.location) { + console.log(chalk.cyan(` ${test.error.location}`)); + } + + if (test.error?.message) { + console.log(chalk.yellow(`\n ${test.error.message}`)); + } + + if (test.error?.details) { + // Show a few lines of error details + const detailLines = test.error.details + .split("\n") + .filter((l) => l.trim()) + .slice(0, 8); + for (const line of detailLines) { + console.log(chalk.dim(` ${this.truncate(line.trim(), 70)}`)); + } + } + } + } + + console.log( + chalk.red.bold( + `\n═${"═".repeat(68)}═\n` + + ` SUMMARY: ${chalk.green(`${passedTests.length} passed`)} | ${chalk.red(`${failedTests.length} failed`)} | ${(totalDuration / 1000).toFixed(1)}s\n` + + `═${"═".repeat(68)}═\n`, + ), + ); + + process.exit(1); + } +} + +// Parse CLI arguments +const args = process.argv.slice(2); +const directories: string[] = []; +let maxParallel = 6; + +for (const arg of args) { + if (arg.startsWith("--max=")) { + maxParallel = Number.parseInt(arg.split("=")[1], 10); + } else if (arg.startsWith("-")) { + console.error(chalk.red(`Unknown option: ${arg}`)); + console.log( + "Usage: bun scripts/testScripts/runTestsV2.ts [dir2] [...] [--max=N]", + ); + process.exit(1); + } else { + // Try to resolve the path - if it doesn't exist, prepend the base path + let resolvedPath = arg; + const fullPath = resolve(process.cwd(), arg); + + if (!existsSync(fullPath)) { + const withBase = `${INTEGRATION_TEST_BASE}/${arg}`; + const withBaseFull = resolve(process.cwd(), withBase); + if (existsSync(withBaseFull)) { + resolvedPath = withBase; + } + } + + directories.push(resolvedPath); + } +} + +if (directories.length === 0) { + console.error(chalk.red("Error: No test directories specified")); + console.log( + "Usage: bun scripts/testScripts/runTestsV2.ts [dir2] [...] [--max=N]", + ); + console.log("\nOptions:"); + console.log(" --max=N Set maximum parallel test files (default: 6)"); + console.log("\nExamples:"); + console.log( + " bun scripts/testScripts/runTestsV2.ts update-subscription/custom-plan", + ); + console.log( + " bun scripts/testScripts/runTestsV2.ts update-subscription/custom-plan update-subscription/errors --max=4", + ); + process.exit(1); +} + +// Run tests +const runner = new TestRunnerV2(maxParallel); +await runner.run(directories); diff --git a/scripts/testScripts/runTestsV2.tsx b/scripts/testScripts/runTestsV2.tsx new file mode 100644 index 000000000..52a7b9eed --- /dev/null +++ b/scripts/testScripts/runTestsV2.tsx @@ -0,0 +1,697 @@ +#!/usr/bin/env bun + +import { existsSync } from "node:fs"; +import { readdir } from "node:fs/promises"; +import { basename, resolve } from "node:path"; +import { spawn } from "bun"; +import { Box, render, Text, useApp } from "ink"; +import pLimit from "p-limit"; +import React, { useEffect, useState } from "react"; + +// Base paths for shorthand test paths (tried in order) +const TEST_BASE_PATHS = ["server/tests/integration/billing", "server/tests"]; + +// Track all running processes for cleanup +const runningProcesses = new Set>(); + +// Ultra-kill on Ctrl+C +process.on("SIGINT", () => { + // Kill all running test processes immediately + for (const proc of runningProcesses) { + try { + proc.kill(9); // SIGKILL + } catch { + // Process might already be dead + } + } + runningProcesses.clear(); + + console.log("\n\n⚠️ Tests interrupted by user (Ctrl+C)\n"); + process.exit(130); +}); + +interface IndividualTest { + name: string; + status: "passed" | "failed"; + duration?: number; + error?: { + message: string; + location?: string; + }; +} + +interface TestFileResult { + file: string; + status: "pending" | "running" | "passed" | "failed"; + tests: IndividualTest[]; + currentTest?: string; + duration: number; +} + +// ============================================================================ +// Test Output Parsing +// ============================================================================ + +function parseTestOutput(output: string, filePath: string): IndividualTest[] { + const tests: IndividualTest[] = []; + const lines = output.split("\n"); + + let lastTestEndIndex = -1; + + for (let i = 0; i < lines.length; i++) { + const line = lines[i]; + + const passMatch = line.match(/^\(pass\)\s+(.+?)\s+\[(\d+(?:\.\d+)?m?s)\]/); + const failMatch = line.match(/^\(fail\)\s+(.+?)\s+\[(\d+(?:\.\d+)?m?s)\]/); + + if (passMatch) { + const [, name, duration] = passMatch; + tests.push({ + name: name.trim(), + status: "passed", + duration: parseDuration(duration), + }); + lastTestEndIndex = i; + } else if (failMatch) { + const [, name, duration] = failMatch; + + // Look BACKWARDS from this line to find the error output + const errorStartIndex = lastTestEndIndex + 1; + const errorLines = lines.slice(errorStartIndex, i); + + const test: IndividualTest = { + name: name.trim(), + status: "failed", + duration: parseDuration(duration), + }; + + parseErrorFromLines(test, errorLines, filePath); + tests.push(test); + lastTestEndIndex = i; + } + } + + return tests; +} + +function parseErrorFromLines( + test: IndividualTest, + errorLines: string[], + filePath: string, +): void { + const errorText = errorLines.join("\n"); + + // Find error message - look for "error:" line + let errorMessage = ""; + for (const line of errorLines) { + const errorMatch = line.match(/^error:\s*(.+)/i); + if (errorMatch) { + errorMessage = errorMatch[1].trim(); + break; + } + } + + // Find Expected/Received for assertion errors + const expectedMatch = errorText.match(/Expected:\s*(.+)/); + const receivedMatch = errorText.match(/Received:\s*(.+)/); + if (expectedMatch && receivedMatch) { + errorMessage = `Expected: ${expectedMatch[1]}, Received: ${receivedMatch[1]}`; + } + + // Check for timeout + if (errorText.includes("this test timed out")) { + errorMessage = "Test timed out"; + } + + // Find location - prioritize the test file itself in stack trace + let location: string | undefined; + + for (const line of errorLines) { + // Match stack trace lines like: + // at async (/path/to/file.test.ts:38:29) + // at functionName (/path/to/file.ts:123:45) + const stackMatch = line.match(/at\s+.*?\(([^)]+\.ts):(\d+):\d+\)/); + if (stackMatch) { + const matchedFile = stackMatch[1]; + const lineNum = stackMatch[2]; + + // Prefer .test.ts files + if (matchedFile.endsWith(".test.ts")) { + location = `${matchedFile}:${lineNum}`; + break; + } + + // Otherwise take first server file if we don't have one yet + if (!location && matchedFile.includes("/server/")) { + location = `${matchedFile}:${lineNum}`; + } + } + } + + test.error = { + message: errorMessage || "Test failed", + location, + }; +} + +function parseDuration(duration: string): number { + if (duration.endsWith("ms")) { + return Number.parseFloat(duration); + } + if (duration.endsWith("s")) { + return Number.parseFloat(duration) * 1000; + } + return Number.parseFloat(duration); +} + +function extractCurrentTest(output: string): string | null { + const lines = output.split("\n"); + + for (let i = lines.length - 1; i >= 0; i--) { + const match = lines[i].match(/^\((?:pass|fail)\)\s+(.+?)\s+\[/); + if (match) { + return match[1].trim(); + } + } + + return null; +} + +// ============================================================================ +// Test Runner Logic +// ============================================================================ + +async function collectTestFiles(directories: string[]): Promise { + const testFiles: string[] = []; + + for (const dir of directories) { + const resolvedDir = resolve(process.cwd(), dir); + try { + const files = await readdir(resolvedDir); + for (const file of files) { + if (file.endsWith(".test.ts")) { + testFiles.push(resolve(resolvedDir, file)); + } + } + } catch (error) { + console.error(`Error reading directory ${dir}:`, error); + } + } + + return testFiles; +} + +async function runTestFile( + file: string, + onUpdate: (result: TestFileResult) => void, +): Promise { + const startTime = performance.now(); + + const result: TestFileResult = { + file, + status: "running", + tests: [], + duration: 0, + }; + + onUpdate(result); + + try { + const proc = spawn(["bun", "test", "--timeout", "0", file], { + stdout: "pipe", + stderr: "pipe", + env: { ...process.env }, + }); + + // Track process for cleanup on SIGINT + runningProcesses.add(proc); + + let output = ""; + const decoder = new TextDecoder(); + + if (proc.stdout) { + for await (const chunk of proc.stdout) { + const text = decoder.decode(chunk); + output += text; + + // Update with parsed tests + const tests = parseTestOutput(output, file); + const currentTest = extractCurrentTest(output); + + onUpdate({ + ...result, + tests, + currentTest: currentTest || undefined, + }); + } + } + + if (proc.stderr) { + for await (const chunk of proc.stderr) { + output += decoder.decode(chunk); + } + } + + await proc.exited; + + // Remove from tracking + runningProcesses.delete(proc); + + const duration = performance.now() - startTime; + + const tests = parseTestOutput(output, file); + const hasFailures = tests.some((t) => t.status === "failed"); + + const finalResult: TestFileResult = { + file, + status: hasFailures ? "failed" : "passed", + tests, + duration, + }; + + onUpdate(finalResult); + return finalResult; + } catch (error) { + const duration = performance.now() - startTime; + const finalResult: TestFileResult = { + file, + status: "failed", + tests: [], + duration, + }; + onUpdate(finalResult); + return finalResult; + } +} + +// ============================================================================ +// Ink Components +// ============================================================================ + +function Spinner() { + const [frame, setFrame] = useState(0); + const frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]; + + useEffect(() => { + const timer = setInterval(() => { + setFrame((prev) => (prev + 1) % frames.length); + }, 80); + return () => clearInterval(timer); + }, []); + + return {frames[frame]}; +} + +function truncate(str: string, maxLength: number): string { + if (str.length <= maxLength) return str; + return str.substring(0, maxLength - 3) + "..."; +} + +interface CompletedFileProps { + result: TestFileResult; +} + +function CompletedFile({ result }: CompletedFileProps) { + const fileName = basename(result.file); + const passedCount = result.tests.filter((t) => t.status === "passed").length; + const failedCount = result.tests.filter((t) => t.status === "failed").length; + + const icon = result.status === "passed" ? "✓" : "✗"; + const iconColor = result.status === "passed" ? "green" : "red"; + + return ( + + {icon} + {fileName} + + (✓{passedCount} + {failedCount > 0 && ✗{failedCount}}) + + + ); +} + +interface FailedTestProps { + test: IndividualTest; + fileName: string; +} + +function FailedTest({ test, fileName }: FailedTestProps) { + return ( + + + ✗ + {truncate(test.name, 60)} + + {test.error?.message && ( + + → + {truncate(test.error.message, 70)} + + )} + {test.error?.location && ( + + → + {test.error.location} + + )} + + ); +} + +interface RunningFileProps { + result: TestFileResult; +} + +function RunningFile({ result }: RunningFileProps) { + const fileName = basename(result.file); + const passedCount = result.tests.filter((t) => t.status === "passed").length; + const failedCount = result.tests.filter((t) => t.status === "failed").length; + + return ( + + + + {fileName} + {(passedCount > 0 || failedCount > 0) && ( + + {" "} + (✓{passedCount} + {failedCount > 0 && ✗{failedCount}}) + + )} + {result.currentTest && ( + › {truncate(result.currentTest, 35)} + )} + + ); +} + +interface TestRunnerAppProps { + testFiles: string[]; + maxParallel: number; +} + +function TestRunnerApp({ testFiles, maxParallel }: TestRunnerAppProps) { + const { exit } = useApp(); + const [results, setResults] = useState>( + new Map(), + ); + const [isComplete, setIsComplete] = useState(false); + + // Initialize all files as pending + useEffect(() => { + const initial = new Map(); + for (const file of testFiles) { + initial.set(file, { + file, + status: "pending", + tests: [], + duration: 0, + }); + } + setResults(initial); + }, [testFiles]); + + // Run tests + useEffect(() => { + const runAllTests = async () => { + const limit = pLimit(maxParallel); + + const updateResult = (result: TestFileResult) => { + setResults((prev) => { + const next = new Map(prev); + next.set(result.file, result); + return next; + }); + }; + + const promises = testFiles.map((file) => + limit(() => runTestFile(file, updateResult)), + ); + + await Promise.all(promises); + setIsComplete(true); + }; + + if (testFiles.length > 0) { + runAllTests(); + } + }, [testFiles, maxParallel]); + + // Exit when complete + useEffect(() => { + if (isComplete) { + const allResults = Array.from(results.values()); + const failedTests = allResults.flatMap((r) => + r.tests.filter((t) => t.status === "failed"), + ); + + // Small delay to ensure final render + setTimeout(() => { + exit(); + process.exit(failedTests.length > 0 ? 1 : 0); + }, 100); + } + }, [isComplete, results, exit]); + + const allResults = Array.from(results.values()); + const completedFiles = allResults.filter( + (r) => r.status === "passed" || r.status === "failed", + ); + const runningFiles = allResults.filter((r) => r.status === "running"); + + const completedTests = completedFiles.flatMap((r) => r.tests); + const passedTests = completedTests.filter((t) => t.status === "passed"); + const failedTests = completedTests.filter((t) => t.status === "failed"); + + // Get ALL failures + const allFailures = completedFiles.flatMap((r) => + r.tests + .filter((t) => t.status === "failed") + .map((t) => ({ test: t, fileName: basename(r.file), file: r.file })), + ); + + return ( + + {/* Header */} + + Running {testFiles.length} test files... + + + + {/* Running files */} + {runningFiles.length > 0 && ( + + + Running ({runningFiles.length}): + + {runningFiles.map((r) => ( + + ))} + + + )} + + {/* Completed files (last 3) */} + {completedFiles.length > 0 && ( + + + Completed ({completedFiles.length}/{testFiles.length} files): + + {completedFiles.slice(-3).map((r) => ( + + ))} + + + )} + + {/* Progress bar */} + {"─".repeat(60)} + + {!isComplete && } + {isComplete && ✓} + + {" "} + Progress:{" "} + + {completedFiles.length}/{testFiles.length} files + {" "} + | ✓ {passedTests.length} |{" "} + 0 ? "red" : undefined}> + ✗ {failedTests.length} + + {runningFiles.length > 0 && ( + | {runningFiles.length} running + )} + + + + {/* ALL failures - shown below progress */} + {allFailures.length > 0 && ( + + + Failures ({allFailures.length}): + + {allFailures.map((f) => ( + + ))} + + )} + + {/* Final summary when complete */} + {isComplete && ( + + + + )} + + ); +} + +interface FinalSummaryProps { + results: TestFileResult[]; +} + +function FinalSummary({ results }: FinalSummaryProps) { + const allTests = results.flatMap((r) => r.tests); + const passedTests = allTests.filter((t) => t.status === "passed"); + const failedTests = allTests.filter((t) => t.status === "failed"); + const totalDuration = results.reduce((sum, r) => sum + r.duration, 0); + + const failedByFile = new Map(); + for (const result of results) { + const fileFailed = result.tests.filter((t) => t.status === "failed"); + if (fileFailed.length > 0) { + failedByFile.set(result.file, fileFailed); + } + } + + if (failedTests.length === 0) { + return ( + + + {"═".repeat(60)} + + + ✓ ALL {passedTests.length} TESTS PASSED ( + {(totalDuration / 1000).toFixed(1)}s) + + + {"═".repeat(60)} + + + ); + } + + return ( + + + {"═".repeat(60)} + + + FAILED TESTS ({failedTests.length}) + + + {"═".repeat(60)} + + + {Array.from(failedByFile.entries()).map(([file, tests]) => ( + + + 📁 {basename(file)} + + {"─".repeat(50)} + + {tests.map((test) => ( + + ✗ {test.name} + {test.error?.location && ( + {test.error.location} + )} + {test.error?.message && ( + {test.error.message} + )} + + ))} + + ))} + + + + {"═".repeat(60)} + + + SUMMARY: {passedTests.length} passed |{" "} + {failedTests.length} failed |{" "} + {(totalDuration / 1000).toFixed(1)}s + + + {"═".repeat(60)} + + + ); +} + +// ============================================================================ +// CLI Entry Point +// ============================================================================ + +async function main() { + const args = process.argv.slice(2); + const directories: string[] = []; + let maxParallel = 6; + + for (const arg of args) { + if (arg.startsWith("--max=")) { + maxParallel = Number.parseInt(arg.split("=")[1], 10); + } else if (arg.startsWith("-")) { + console.error(`Unknown option: ${arg}`); + console.log( + "Usage: bun scripts/testScripts/runTestsV2.tsx [dir2] [...] [--max=N]", + ); + process.exit(1); + } else { + // Try to resolve the path - if it doesn't exist, try prepending base paths + let resolvedPath = arg; + const fullPath = resolve(process.cwd(), arg); + + if (!existsSync(fullPath)) { + // Try each base path in order + for (const basePath of TEST_BASE_PATHS) { + const withBase = `${basePath}/${arg}`; + const withBaseFull = resolve(process.cwd(), withBase); + if (existsSync(withBaseFull)) { + resolvedPath = withBase; + break; + } + } + } + + directories.push(resolvedPath); + } + } + + if (directories.length === 0) { + console.error("Error: No test directories specified"); + console.log( + "Usage: bun scripts/testScripts/runTestsV2.tsx [dir2] [...] [--max=N]", + ); + process.exit(1); + } + + const testFiles = await collectTestFiles(directories); + + if (testFiles.length === 0) { + console.log("No test files found in specified directories"); + return; + } + + render(); +} + +main(); diff --git a/server/shell/config.sh b/server/shell/config.sh deleted file mode 100755 index 3adc67452..000000000 --- a/server/shell/config.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -# Get project root directory -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -SERVER_DIR="$SCRIPT_DIR/.." -PROJECT_ROOT="$SERVER_DIR/.." - -# Find bun executable -if command -v bun &> /dev/null; then - BUN_CMD="bun" -elif [ -f "$HOME/.bun/bin/bun" ]; then - BUN_CMD="$HOME/.bun/bin/bun" -elif [ -f "/usr/local/bin/bun" ]; then - BUN_CMD="/usr/local/bin/bun" -else - echo "Error: bun not found. Please install bun or add it to PATH." - exit 1 -fi - -# Setup function -BUN_SETUP="$BUN_CMD tests/setupMain.ts" - -# Test runner functions (using new TypeScript runner) -BUN_PARALLEL() { - cd "$PROJECT_ROOT" && $BUN_CMD server/tests/testRunner/runTests.ts "$@" -} - -BUN_PARALLEL_COMPACT() { - cd "$PROJECT_ROOT" && $BUN_CMD server/tests/testRunner/runTests.ts "$@" --compact -} - -# Mocha command (for tests not yet migrated) -MOCHA_CMD="npx mocha --parallel -j 6 --timeout 10000000 --ignore tests/00_setup.ts" \ No newline at end of file diff --git a/server/shell/g3.sh b/server/shell/g3.sh deleted file mode 100755 index 97d2db32e..000000000 --- a/server/shell/g3.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -# Source shared configuration -source "$(dirname "$0")/config.sh" - -# MOCHA_PARALLEL=true $MOCHA_SETUP - -if [[ "$1" == *"setup"* ]]; then - MOCHA_PARALLEL=true $MOCHA_SETUP -fi - -$MOCHA_CMD 'tests/contUse/entities/*.ts' - -$MOCHA_CMD 'tests/contUse/update/*.ts' - -$MOCHA_CMD 'tests/contUse/track/*.ts' - -$MOCHA_CMD 'tests/contUse/roles/*.ts' - -# # G4 -# $MOCHA_CMD 'tests/advanced/multiFeature/*.ts' \ -# 'tests/advanced/coupons/*.ts' \ -# 'tests/attach/updateQuantity/*.ts' \ -# 'tests/advanced/referrals/*.ts' \ -# 'tests/advanced/rollovers/*.ts' \ -# 'tests/advanced/customInterval/*.ts' - -# $MOCHA_CMD 'tests/attach/multiProduct/*.ts' \ -# 'tests/advanced/usageLimit/*.ts' - -# $MOCHA_CMD 'tests/advanced/usage/*.ts' \ No newline at end of file diff --git a/server/shell/g4.sh b/server/shell/g4.sh deleted file mode 100755 index 61c146949..000000000 --- a/server/shell/g4.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Source shared configuration -source "$(dirname "$0")/config.sh" - -# MOCHA_PARALLEL=true $MOCHA_SETUP -if [[ "$1" == *"setup"* ]]; then - MOCHA_PARALLEL=true $MOCHA_SETUP -fi - - -$MOCHA_CMD 'tests/merged/group/*.ts' - - -$MOCHA_CMD 'tests/merged/add/*.ts' \ -'tests/merged/downgrade/*.ts' \ -'tests/merged/prepaid/*.ts' \ -'tests/merged/separate/*.ts' \ -'tests/merged/upgrade/*.ts' \ -'tests/merged/trial/*.ts' - - -$MOCHA_CMD 'tests/merged/addOn/*.ts' \ -'tests/merged/group/*.ts' \ -'tests/core/cancel/*.ts' \ -'tests/core/multiAttach/*.ts' \ -'tests/core/multiAttach/multiInvoice/*.ts' \ -'tests/core/multiAttach/multiUpgrade/*.ts' \ - -# # $MOCHA_CMD 'tests/core/multiAttach/multiReward/multiReward1.test.ts' -# # $MOCHA_CMD 'tests/core/multiAttach/multiReward/multiReward2.test.ts' -# # $MOCHA_CMD 'tests/core/multiAttach/multiReward/multiReward3.test.ts' diff --git a/server/shell/g5.sh b/server/shell/g5.sh deleted file mode 100755 index 8f335dee9..000000000 --- a/server/shell/g5.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -# Source shared configuration -source "$(dirname "$0")/config.sh" - -# MOCHA_PARALLEL=true $MOCHA_SETUP -if [[ "$1" == *"setup"* ]]; then - MOCHA_PARALLEL=true $MOCHA_SETUP -fi - -# $MOCHA_CMD 'tests/advanced/rollovers/*.ts' -$MOCHA_CMD 'tests/advanced/multiFeature/*.ts' \ - 'tests/advanced/coupons/*.ts' \ - 'tests/attach/updateQuantity/*.ts' \ - 'tests/advanced/referrals/*.ts' \ - 'tests/advanced/referrals/paid/*.ts' \ - 'tests/advanced/rollovers/*.ts' \ - 'tests/advanced/customInterval/*.ts' - -$MOCHA_CMD 'tests/attach/multiProduct/*.ts' \ - 'tests/advanced/usageLimit/*.ts' - -$MOCHA_CMD 'tests/advanced/usage/*.ts' - - - \ No newline at end of file diff --git a/server/shell/g6.sh b/server/shell/g6.sh deleted file mode 100755 index 85746dd66..000000000 --- a/server/shell/g6.sh +++ /dev/null @@ -1,6 +0,0 @@ -# npx mocha 'tests/alex/00_setup.ts' --timeout 10000000 - -MOCHA_PARALLEL=true npx mocha --parallel --timeout 10000000 \ - 'tests/alex/01_free.ts' 'tests/alex/02_pro.ts' 'tests/alex/03_premium.ts' \ - 'tests/alex/04_topups.ts' 'tests/alex/05_cancel.ts' 'tests/alex/06_switch.ts' \ - --ignore 'tests/alex/00_setup.ts' \ No newline at end of file diff --git a/server/shell/parallel.sh b/server/shell/parallel.sh deleted file mode 100755 index a7234a3ab..000000000 --- a/server/shell/parallel.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Parallel Test Runner -# Runs all test groups in parallel, each with its own dedicated org - -# Source shared configuration -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -source "$SCRIPT_DIR/config.sh" - -# Check for required environment variables -if [ -z "$TEST_ORG_SECRET_KEY" ]; then - echo "Error: TEST_ORG_SECRET_KEY environment variable is required" - echo "" - echo "This should be the secret key of your platform organization" - echo "that has access to create/delete test organizations." - echo "" - echo "Add it to your server/.env file:" - echo " TEST_ORG_SECRET_KEY=am_sk_test_..." - exit 1 -fi - -# Run parallel test groups -echo "Starting parallel test runner..." -cd "$PROJECT_ROOT" && $BUN_CMD server/tests/testRunner/runParallelGroups.ts diff --git a/server/shell/run-parallel.sh b/server/shell/run-parallel.sh deleted file mode 100755 index ad50bbf14..000000000 --- a/server/shell/run-parallel.sh +++ /dev/null @@ -1,266 +0,0 @@ -#!/usr/bin/env bash - -# Run Bun test files in parallel with proper error reporting -# Usage: ./run-parallel.sh [test_directory2] [...] [--max=N] - -if [ $# -eq 0 ]; then - echo "Error: No test directories specified" - echo "Usage: ./run-parallel.sh [test_directory2] [...] [--max=N]" - exit 1 -fi - -# Parse arguments -TEST_DIRS=() -MAX_PARALLEL=6 - -for arg in "$@"; do - if [[ "$arg" == --max=* ]]; then - MAX_PARALLEL="${arg#*=}" - else - if [ ! -d "$arg" ]; then - echo "Error: Directory '$arg' not found" - exit 1 - fi - TEST_DIRS+=("$arg") - fi -done - -if [ ${#TEST_DIRS[@]} -eq 0 ]; then - echo "Error: No valid test directories specified" - exit 1 -fi - -TEMP_DIR=$(mktemp -d) -FAILED_DIR="$TEMP_DIR/failed" -STATUS_DIR="$TEMP_DIR/status" -mkdir -p "$FAILED_DIR" "$STATUS_DIR" - -# Colors -GREEN='\033[0;32m' -RED='\033[0;31m' -YELLOW='\033[1;33m' -BLUE='\033[0;34m' -CYAN='\033[0;36m' -BOLD='\033[1m' -DIM='\033[2m' -NC='\033[0m' # No Color - -# Spinner frames -SPINNER_FRAMES=('⠋' '⠙' '⠹' '⠸' '⠼' '⠴' '⠦' '⠧' '⠇' '⠏') -SPINNER_FRAME=0 -NUM_SPINNER_FRAMES=${#SPINNER_FRAMES[@]} - -# Collect all test files first -TEST_FILES=() -for TEST_DIR in "${TEST_DIRS[@]}"; do - for test_file in "$TEST_DIR"/*.test.ts; do - if [ -f "$test_file" ]; then - TEST_FILES+=("$test_file") - # Create status file - echo "pending" > "$STATUS_DIR/$(basename "$test_file").status" - fi - done -done - -# Check if any tests were found -if [ ${#TEST_FILES[@]} -eq 0 ]; then - echo "No test files found in specified directories" - rm -rf "$TEMP_DIR" - exit 0 -fi - -# Helper function to get status -get_status() { - local test_file="$1" - local test_name=$(basename "$test_file") - local status_file="$STATUS_DIR/${test_name}.status" - if [ -f "$status_file" ]; then - cat "$status_file" - else - echo "pending" - fi -} - -# Helper function to set status -set_status() { - local test_file="$1" - local status="$2" - local test_name=$(basename "$test_file") - echo "$status" > "$STATUS_DIR/${test_name}.status" -} - -# Cleanup function -cleanup() { - # Stop spinner - if [ ! -z "$SPINNER_PID" ]; then - kill $SPINNER_PID 2>/dev/null || true - wait $SPINNER_PID 2>/dev/null || true - fi - - # Kill all descendant processes - pkill -P $$ 2>/dev/null || true - pkill -f "bun test" 2>/dev/null || true - jobs -p | while read pid; do kill -9 $pid 2>/dev/null || true; done - - # Show cursor again - tput cnorm 2>/dev/null || true - - # Clean up temp directory - rm -rf "$TEMP_DIR" - exit 130 -} - -# Set up signal handlers -trap cleanup SIGINT SIGTERM EXIT - -# Function to render the test list -render_tests() { - local line_num=1 - - # Save cursor position - tput sc 2>/dev/null || true - - for test_file in "${TEST_FILES[@]}"; do - local test_name=$(basename "$test_file") - local status=$(get_status "$test_file") - local display_name="${test_name}" - - # Move to the line - tput cup $((line_num - 1)) 0 2>/dev/null || true - - # Clear line - tput el 2>/dev/null || true - - case "$status" in - "pending") - echo -ne "${DIM}⋯${NC} ${DIM}${display_name}${NC}" - ;; - "running") - local frame_idx=$((SPINNER_FRAME % NUM_SPINNER_FRAMES)) - local spinner_char="${SPINNER_FRAMES[$frame_idx]}" - echo -ne "${CYAN}${spinner_char}${NC} ${display_name}" - ;; - "passed") - echo -ne "${GREEN}✓${NC} ${DIM}${display_name}${NC}" - ;; - "failed") - echo -ne "${RED}✗${NC} ${display_name}" - ;; - esac - - ((line_num++)) - done - - # Restore cursor position - tput rc 2>/dev/null || true -} - -# Function to update spinner animation -animate_spinner() { - while true; do - SPINNER_FRAME=$((SPINNER_FRAME + 1)) - render_tests - sleep 0.1 - done -} - -# Function to run a test -run_test() { - local test_file=$1 - local test_name=$(basename "$test_file") - local output_file="$TEMP_DIR/$test_name.log" - - # Mark as running - set_status "$test_file" "running" - - # Run the test - if script -q /dev/null bash -c "FORCE_COLOR=3 bun test --timeout 0 '$test_file' 2>&1" > "$output_file"; then - set_status "$test_file" "passed" - return 0 - else - set_status "$test_file" "failed" - echo "$test_file|$output_file" > "$FAILED_DIR/$test_name.failed" - return 1 - fi -} - -# Hide cursor -tput civis 2>/dev/null || true - -# Initial render - create space for all tests -echo "" -for test_file in "${TEST_FILES[@]}"; do - echo "" -done - -# Move cursor back up -tput cuu ${#TEST_FILES[@]} 2>/dev/null || true - -# Start spinner animation in background -animate_spinner & -SPINNER_PID=$! - -# Run tests in parallel -count=0 -for test_file in "${TEST_FILES[@]}"; do - # Wait if we've hit max parallel - while [ $(jobs -r | wc -l) -ge $((MAX_PARALLEL + 1)) ]; do - sleep 0.1 - done - - run_test "$test_file" & - ((count++)) -done - -# Wait for all tests to complete (exclude spinner process) -for job in $(jobs -p); do - if [ "$job" != "$SPINNER_PID" ]; then - wait $job 2>/dev/null || true - fi -done - -# Stop spinner -if [ ! -z "$SPINNER_PID" ]; then - kill $SPINNER_PID 2>/dev/null || true - wait $SPINNER_PID 2>/dev/null || true -fi - -# Final render -render_tests - -# Move cursor below test list -echo "" -echo "" - -# Show cursor again -tput cnorm 2>/dev/null || true - -# Report failures -FAILED_COUNT=$(ls "$FAILED_DIR"/*.failed 2>/dev/null | wc -l) -if [ $FAILED_COUNT -gt 0 ]; then - echo -e "${RED}${BOLD}========================================" - echo -e "FAILED TESTS ($FAILED_COUNT/${count}):" - echo -e "========================================${NC}" - echo "" - - # Show detailed errors - for failure_file in "$FAILED_DIR"/*.failed; do - IFS='|' read -r test_file output_file < "$failure_file" - echo -e "${RED}${BOLD}✗ $(basename $test_file)${NC}" - echo -e "${DIM}─────────────────────────────────────────${NC}" - cat "$output_file" - echo "" - done - rm -rf "$TEMP_DIR" - - # Remove trap before exit to prevent double cleanup - trap - SIGINT SIGTERM EXIT - exit 1 -else - echo -e "${GREEN}${BOLD}✓ All tests passed!${NC} ${CYAN}($count tests)${NC}" - rm -rf "$TEMP_DIR" - - # Remove trap before exit to prevent double cleanup - trap - SIGINT SIGTERM EXIT - exit 0 -fi diff --git a/server/src/external/autumn/autumnCli.ts b/server/src/external/autumn/autumnCli.ts index 8bb51f89e..c1c127103 100644 --- a/server/src/external/autumn/autumnCli.ts +++ b/server/src/external/autumn/autumnCli.ts @@ -418,18 +418,26 @@ export class AutumnInt { internalOptions = { disable_defaults: true, }, + skipWebhooks, ...customerData }: { withAutumnId?: boolean; expand?: CusExpand[]; internalOptions?: CreateCustomerInternalOptions; + skipWebhooks?: boolean; } & Omit) => { + const headers: Record = {}; + if (skipWebhooks !== undefined) { + headers["x-skip-webhooks"] = skipWebhooks ? "true" : "false"; + } + const data = await this.post( `/customers?with_autumn_id=${withAutumnId ? "true" : "false"}${expand && expand.length > 0 ? `&expand=${expand.join(",")}` : ""}`, { ...customerData, internal_options: internalOptions, }, + Object.keys(headers).length > 0 ? headers : undefined, ); return data; }, @@ -735,9 +743,21 @@ export class AutumnInt { subscriptions = { update: async ( params: UpdateSubscriptionV0Params, - { timeout }: { timeout?: number } = {}, + { + timeout, + skipWebhooks, + }: { timeout?: number; skipWebhooks?: boolean } = {}, ): Promise => { - const data = await this.post(`/subscriptions/update`, params); + const headers: Record = {}; + if (skipWebhooks !== undefined) { + headers["x-skip-webhooks"] = skipWebhooks ? "true" : "false"; + } + + const data = await this.post( + `/subscriptions/update`, + params, + Object.keys(headers).length > 0 ? headers : undefined, + ); if (timeout) { await new Promise((resolve) => setTimeout(resolve, timeout)); } diff --git a/server/src/honoMiddlewares/baseMiddleware.ts b/server/src/honoMiddlewares/baseMiddleware.ts index 034e6b9b6..14878cf97 100644 --- a/server/src/honoMiddlewares/baseMiddleware.ts +++ b/server/src/honoMiddlewares/baseMiddleware.ts @@ -72,8 +72,12 @@ export const baseMiddleware = async (c: Context, next: Next) => { skipCache: false, // Test params: - skipCacheDeletion: c.req.header("x-skip-cache-deletion") === "true", extraLogs: {}, + + testOptions: { + skipCacheDeletion: c.req.header("x-skip-cache-deletion") === "true", + skipWebhooks: c.req.header("x-skip-webhooks") === "true", + }, }); // childLogger.info(`${method} ${path}`); diff --git a/server/src/honoUtils/HonoEnv.ts b/server/src/honoUtils/HonoEnv.ts index 17af1f1e4..6c4d71cb0 100644 --- a/server/src/honoUtils/HonoEnv.ts +++ b/server/src/honoUtils/HonoEnv.ts @@ -36,10 +36,12 @@ export type RequestContext = { expand: string[]; skipCache: boolean; - // For test... - skipCacheDeletion?: boolean; - extraLogs: Record; + + testOptions?: { + skipCacheDeletion?: boolean; + skipWebhooks?: boolean; + }; }; export type AutumnContext = RequestContext; diff --git a/server/src/internal/billing/v2/execute/executeBillingPlan.ts b/server/src/internal/billing/v2/execute/executeBillingPlan.ts index 61e7f682e..83d09a57f 100644 --- a/server/src/internal/billing/v2/execute/executeBillingPlan.ts +++ b/server/src/internal/billing/v2/execute/executeBillingPlan.ts @@ -4,6 +4,7 @@ import { executeAutumnBillingPlan } from "@/internal/billing/v2/execute/executeA import { executeStripeBillingPlan } from "@/internal/billing/v2/providers/stripe/execute/executeStripeBillingPlan"; import type { BillingPlan } from "@/internal/billing/v2/types/billingPlan"; import type { BillingResult } from "@/internal/billing/v2/types/billingResult"; +import { billingPlanToSendProductsUpdated } from "@/internal/billing/v2/workflows/sendProductsUpdated/billingPlanToSendProductsUpdated"; export const executeBillingPlan = async ({ ctx, @@ -30,5 +31,12 @@ export const executeBillingPlan = async ({ autumnBillingPlan: billingPlan.autumn, }); + // Queue webhooks after Autumn billing plan is executed + await billingPlanToSendProductsUpdated({ + ctx, + autumnBillingPlan: billingPlan.autumn, + billingContext, + }); + return { stripe: stripeBillingResult }; }; diff --git a/server/src/internal/billing/v2/workflows/sendProductsUpdated/billingPlanToSendProductsUpdated.ts b/server/src/internal/billing/v2/workflows/sendProductsUpdated/billingPlanToSendProductsUpdated.ts new file mode 100644 index 000000000..1abbbb6da --- /dev/null +++ b/server/src/internal/billing/v2/workflows/sendProductsUpdated/billingPlanToSendProductsUpdated.ts @@ -0,0 +1,68 @@ +/** + * Converts an AutumnBillingPlan to sendProductsUpdated workflow triggers. + * Derives scenario from product status. + */ + +import { CusProductStatus } from "@autumn/shared"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import type { BillingContext } from "@/internal/billing/v2/billingContext"; +import type { AutumnBillingPlan } from "@/internal/billing/v2/types/autumnBillingPlan.js"; +import type { CreateCustomerContext } from "@/internal/customers/actions/createWithDefaults/createCustomerContext"; +import { workflows } from "@/queue/workflows.js"; + +const deriveScenarioFromStatus = (status: string): string => { + switch (status) { + case CusProductStatus.Scheduled: + return "scheduled"; + case CusProductStatus.Active: + return "new"; + case CusProductStatus.Expired: + return "expired"; + case CusProductStatus.PastDue: + return "past_due"; + default: + return "new"; + } +}; + +export const billingPlanToSendProductsUpdated = async ({ + ctx, + autumnBillingPlan, + billingContext, +}: { + ctx: AutumnContext; + autumnBillingPlan: AutumnBillingPlan; + billingContext: BillingContext | CreateCustomerContext; +}) => { + // Skip webhooks if test option is set (used in integration tests) + if (ctx.testOptions?.skipWebhooks) return; + + const { fullCustomer } = billingContext; + + const customerId = fullCustomer.id ?? fullCustomer.internal_id; + + const { insertCustomerProducts } = autumnBillingPlan; + + // Queue for each inserted product + for (const cusProduct of insertCustomerProducts) { + const scenario = deriveScenarioFromStatus(cusProduct.status); + + try { + await workflows.triggerSendProductsUpdated({ + orgId: ctx.org.id, + env: ctx.env, + customerId, + customerProductId: cusProduct.id, + scenario, + }); + + ctx.logger.info( + `[billingPlanToSendProductsUpdated] Queued webhook for ${cusProduct.product.name}, scenario: ${scenario}`, + ); + } catch (error) { + ctx.logger.error( + `[billingPlanToSendProductsUpdated] Failed to queue webhook for ${cusProduct.product.name}: ${error}`, + ); + } + } +}; diff --git a/server/src/internal/billing/v2/workflows/sendProductsUpdated/sendProductsUpdated.ts b/server/src/internal/billing/v2/workflows/sendProductsUpdated/sendProductsUpdated.ts new file mode 100644 index 000000000..bfca1e82e --- /dev/null +++ b/server/src/internal/billing/v2/workflows/sendProductsUpdated/sendProductsUpdated.ts @@ -0,0 +1,155 @@ +/** + * Workflow: SendProductsUpdated + * + * Sends customer.products.updated webhook when billing plan executes. + * Uses lean payload - fetches data from DB instead of receiving full objects. + */ + +import { + AffectedResource, + type ApiCustomer, + type ApiEntityV1, + type ApiPlan, + ApiVersion, + ApiVersionClass, + addToExpand, + applyResponseVersionChanges, + CusExpand, + type CustomerLegacyData, + cusProductToProduct, + type EntityLegacyData, + enrichFullCustomerWithEntity, + findCustomerProductById, + InternalError, + type PlanLegacyData, +} from "@autumn/shared"; +import { sendSvixEvent } from "@/external/svix/svixHelpers.js"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import { CusService } from "@/internal/customers/CusService.js"; +import { getApiCustomerBase } from "@/internal/customers/cusUtils/apiCusUtils/getApiCustomerBase.js"; +import { getApiEntityBase } from "@/internal/entities/entityUtils/apiEntityUtils/getApiEntityBase.js"; +import { getPlanResponse } from "@/internal/products/productUtils/productResponseUtils/getPlanResponse.js"; +import type { SendProductsUpdatedPayload } from "@/queue/workflows.js"; + +export const sendProductsUpdated = async ({ + ctx, + payload, +}: { + ctx: AutumnContext; + payload: SendProductsUpdatedPayload; +}) => { + const { db, org, env, features } = ctx; + const { customerProductId, scenario, customerId } = payload; + + // Fetch FullCustomer + const fullCustomer = await CusService.getFull({ + db, + idOrInternalId: customerId ?? "", + orgId: org.id, + env, + withEntities: true, + withSubs: true, + allowNotFound: true, + }); + + const customerProduct = findCustomerProductById({ + fullCustomer, + customerProductId, + }); + + if (!fullCustomer) { + throw new InternalError({ + message: `[sendProductsUpdated] Customer ${customerId ?? ""} not found`, + }); + } + + if (!customerProduct) { + throw new InternalError({ + message: `[sendProductsUpdated] Customer product ${customerProductId} not found`, + }); + } + + const fullProduct = cusProductToProduct({ cusProduct: customerProduct }); + + enrichFullCustomerWithEntity({ + fullCustomer, + internalEntityId: customerProduct.internal_entity_id ?? "", + }); + + ctx.apiVersion = new ApiVersionClass(ApiVersion.V1_2); + + if (ctx.apiVersion.lte(ApiVersion.V1_2)) { + ctx = addToExpand({ + ctx, + add: [ + CusExpand.BalancesFeature, + CusExpand.SubscriptionsPlan, + CusExpand.ScheduledSubscriptionsPlan, + ], + }); + } + + const { apiCustomer, legacyData: cusLegacyData } = await getApiCustomerBase({ + ctx, + fullCus: fullCustomer, + }); + + const versionedCustomer = applyResponseVersionChanges< + ApiCustomer, + CustomerLegacyData + >({ + input: apiCustomer, + targetVersion: ctx.apiVersion, + resource: AffectedResource.Customer, + legacyData: cusLegacyData, + ctx, + }); + + const apiPlan = await getPlanResponse({ + product: fullProduct, + features, + }); + + const versionedPlan = applyResponseVersionChanges({ + input: apiPlan, + targetVersion: ctx.apiVersion, + resource: AffectedResource.Product, + legacyData: { + features: ctx.features, + }, + ctx, + }); + + let entity: unknown | undefined; + if (fullCustomer.entity) { + const { apiEntity, legacyData } = await getApiEntityBase({ + ctx, + entity: fullCustomer.entity, + fullCus: fullCustomer, + }); + + entity = applyResponseVersionChanges({ + input: apiEntity, + targetVersion: ctx.apiVersion, + resource: AffectedResource.Entity, + legacyData, + ctx, + }); + } + + ctx.logger.info( + `[sendProductsUpdated] Sending webhook for customer ${customerId}, product ${fullProduct.name}, scenario: ${scenario}`, + ); + + await sendSvixEvent({ + org, + env, + eventType: "customer.products.updated", + data: { + scenario, + customer: versionedCustomer, + entity, + updated_product: versionedPlan, + }, + }); +}; diff --git a/server/src/queue/hatchetWorkflows/verifyCacheConsistencyWorkflow/checkForMisingBalance.ts b/server/src/internal/billing/v2/workflows/verifyCacheConsistency/checkForMisingBalance.ts similarity index 89% rename from server/src/queue/hatchetWorkflows/verifyCacheConsistencyWorkflow/checkForMisingBalance.ts rename to server/src/internal/billing/v2/workflows/verifyCacheConsistency/checkForMisingBalance.ts index b2c1ab35a..1b3efef67 100644 --- a/server/src/queue/hatchetWorkflows/verifyCacheConsistencyWorkflow/checkForMisingBalance.ts +++ b/server/src/internal/billing/v2/workflows/verifyCacheConsistency/checkForMisingBalance.ts @@ -1,17 +1,17 @@ import { CusProductStatus, cusProductsToCusEnts, + type FullCustomer, isBooleanCusEnt, isContUseFeature, isUnlimitedCusEnt, } from "@autumn/shared"; import * as Sentry from "@sentry/bun"; import { Decimal } from "decimal.js"; -import type { FullCustomer } from "../../../../../shared/models/cusModels/fullCusModel"; -import { getSentryTags } from "../../../external/sentry/sentryUtils"; -import type { AutumnContext } from "../../../honoUtils/HonoEnv"; -import { getApiCustomerBase } from "../../../internal/customers/cusUtils/apiCusUtils/getApiCustomerBase"; -import type { VerifyCacheInput } from "./verifyCacheConsistencyWorkflow"; +import { getSentryTags } from "@/external/sentry/sentryUtils.js"; +import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; +import { getApiCustomerBase } from "@/internal/customers/cusUtils/apiCusUtils/getApiCustomerBase.js"; +import type { VerifyCacheInput } from "./verifyCacheConsistency.js"; export const checkForMisingBalance = async ({ ctx, diff --git a/server/src/queue/hatchetWorkflows/verifyCacheConsistencyWorkflow/queueVerifyCacheConsistencyWorkflow.ts b/server/src/internal/billing/v2/workflows/verifyCacheConsistency/triggerVerifyCacheConsistency.ts similarity index 65% rename from server/src/queue/hatchetWorkflows/verifyCacheConsistencyWorkflow/queueVerifyCacheConsistencyWorkflow.ts rename to server/src/internal/billing/v2/workflows/verifyCacheConsistency/triggerVerifyCacheConsistency.ts index 206b6515b..41bb72899 100644 --- a/server/src/queue/hatchetWorkflows/verifyCacheConsistencyWorkflow/queueVerifyCacheConsistencyWorkflow.ts +++ b/server/src/internal/billing/v2/workflows/verifyCacheConsistency/triggerVerifyCacheConsistency.ts @@ -4,12 +4,11 @@ import { type FullCustomer, isFreeProduct, } from "@autumn/shared"; -import type { Logger } from "../../../external/logtail/logtailUtils"; -import { generateId } from "../../../utils/genUtils"; -import { JobName } from "../../JobName"; -import { runHatchetWorkflow } from "../../queueUtils"; +import type { Logger } from "@/external/logtail/logtailUtils.js"; +import { workflows } from "@/queue/workflows.js"; +import { generateId } from "@/utils/genUtils.js"; -export const queueVerifyCacheConsistencyWorkflow = async ({ +export const triggerVerifyCacheConsistency = async ({ newCustomerProduct, previousFullCustomer, logger, @@ -29,22 +28,23 @@ export const queueVerifyCacheConsistencyWorkflow = async ({ const newPrices = cusProductToPrices({ cusProduct: newCustomerProduct }); if (isFreeProduct({ prices: newPrices })) return; - await runHatchetWorkflow({ - workflowName: JobName.VerifyCacheConsistency, - metadata: { - workflowId, - customerId: previousFullCustomer.id ?? "", - }, - payload: { + await workflows.triggerVerifyCacheConsistency( + { orgId: previousFullCustomer.org_id, env: previousFullCustomer.env, customerId: previousFullCustomer.id || previousFullCustomer.internal_id, newCustomerProductId: newCustomerProduct.id, source, - previousFullCustomer: JSON.stringify(previousFullCustomer), // is there a better approach to this...? + previousFullCustomer: JSON.stringify(previousFullCustomer), }, - delayMs: 5000, - }); + { + delayMs: 5000, + metadata: { + workflowId, + customerId: previousFullCustomer.id ?? "", + }, + }, + ); } catch (error) { logger.error( `Failed to run verify cache consistency workflow for customer ${previousFullCustomer.id || previousFullCustomer.internal_id}, error: ${error}`, diff --git a/server/src/queue/hatchetWorkflows/verifyCacheConsistencyWorkflow/verifyCacheConsistencyWorkflow.ts b/server/src/internal/billing/v2/workflows/verifyCacheConsistency/verifyCacheConsistency.ts similarity index 95% rename from server/src/queue/hatchetWorkflows/verifyCacheConsistencyWorkflow/verifyCacheConsistencyWorkflow.ts rename to server/src/internal/billing/v2/workflows/verifyCacheConsistency/verifyCacheConsistency.ts index e8984db23..42145be1e 100644 --- a/server/src/queue/hatchetWorkflows/verifyCacheConsistencyWorkflow/verifyCacheConsistencyWorkflow.ts +++ b/server/src/internal/billing/v2/workflows/verifyCacheConsistency/verifyCacheConsistency.ts @@ -8,8 +8,8 @@ import { CusService } from "@/internal/customers/CusService.js"; import { getApiCustomerBase } from "@/internal/customers/cusUtils/apiCusUtils/getApiCustomerBase.js"; import { deleteCachedFullCustomer } from "@/internal/customers/cusUtils/fullCustomerCacheUtils/deleteCachedFullCustomer.js"; import { getCachedFullCustomer } from "@/internal/customers/cusUtils/fullCustomerCacheUtils/getCachedFullCustomer.js"; -import { JobName } from "../../JobName.js"; -import { createWorkflowTask } from "../createWorkflowTask.js"; +import { createWorkflowTask } from "@/queue/hatchetWorkflows/createWorkflowTask.js"; +import { JobName } from "@/queue/JobName.js"; import { checkForMisingBalance } from "./checkForMisingBalance.js"; export type VerifyCacheInput = { @@ -30,7 +30,7 @@ type VerifyCacheOutput = { }; // Only create workflow if Hatchet is enabled -export const verifyCacheConsistencyWorkflow = hatchet?.workflow< +export const verifyCacheConsistency = hatchet?.workflow< VerifyCacheInput, VerifyCacheOutput >({ @@ -79,7 +79,7 @@ const checkSubscriptionsMatch = ({ }; }; -verifyCacheConsistencyWorkflow?.task({ +verifyCacheConsistency?.task({ name: JobName.VerifyCacheConsistency, executionTimeout: "60s", fn: createWorkflowTask({ diff --git a/server/src/internal/customers/actions/createWithDefaults/execute/executeAutumnCreateCustomerPlan.ts b/server/src/internal/customers/actions/createWithDefaults/execute/executeAutumnCreateCustomerPlan.ts index 294d45101..0de1f50c8 100644 --- a/server/src/internal/customers/actions/createWithDefaults/execute/executeAutumnCreateCustomerPlan.ts +++ b/server/src/internal/customers/actions/createWithDefaults/execute/executeAutumnCreateCustomerPlan.ts @@ -4,6 +4,7 @@ import type { DrizzleCli } from "@/db/initDrizzle.js"; import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; import { executeAutumnBillingPlan } from "@/internal/billing/v2/execute/executeAutumnBillingPlan.js"; import type { AutumnBillingPlan } from "@/internal/billing/v2/types/billingPlan.js"; +import { billingPlanToSendProductsUpdated } from "@/internal/billing/v2/workflows/sendProductsUpdated/billingPlanToSendProductsUpdated.js"; import type { CreateCustomerContext } from "@/internal/customers/actions/createWithDefaults/createCustomerContext.js"; import { CusService } from "../../../CusService.js"; @@ -84,5 +85,12 @@ export const executeAutumnCreateCustomerPlan = async ({ return { type: "existing" }; } + // Queue webhooks after transaction commits successfully + await billingPlanToSendProductsUpdated({ + ctx, + autumnBillingPlan, + billingContext: context, + }); + return { type: "created" }; }; diff --git a/server/src/internal/customers/add-product/createFullCusProduct.ts b/server/src/internal/customers/add-product/createFullCusProduct.ts index b1feb51ee..ee1128a41 100644 --- a/server/src/internal/customers/add-product/createFullCusProduct.ts +++ b/server/src/internal/customers/add-product/createFullCusProduct.ts @@ -19,13 +19,13 @@ import { } from "@autumn/shared"; import type { DrizzleCli } from "@/db/initDrizzle.js"; import { addProductsUpdatedWebhookTask } from "@/internal/analytics/handlers/handleProductsUpdated.js"; +import { triggerVerifyCacheConsistency } from "@/internal/billing/v2/workflows/verifyCacheConsistency/triggerVerifyCacheConsistency.js"; import { searchCusProducts } from "@/internal/customers/cusProducts/cusProductUtils.js"; import { getEntRelatedPrice } from "@/internal/products/entitlements/entitlementUtils.js"; import { freeTrialToStripeTimestamp } from "@/internal/products/free-trials/freeTrialUtils.js"; import { getEntOptions } from "@/internal/products/prices/priceUtils.js"; import { isFreeProduct, isOneOff } from "@/internal/products/productUtils.js"; import { generateId, notNullish, nullish } from "@/utils/genUtils.js"; -import { queueVerifyCacheConsistencyWorkflow } from "../../../queue/hatchetWorkflows/verifyCacheConsistencyWorkflow/queueVerifyCacheConsistencyWorkflow.js"; import type { InsertCusProductParams } from "../cusProducts/AttachParams.js"; import { CusProductService } from "../cusProducts/CusProductService.js"; import { CusEntService } from "../cusProducts/cusEnts/CusEntitlementService.js"; @@ -545,7 +545,7 @@ export const createFullCusProduct = async ({ logger.error("Failed to add products updated webhook task to queue"); } - await queueVerifyCacheConsistencyWorkflow({ + await triggerVerifyCacheConsistency({ newCustomerProduct: fullCusProduct, previousFullCustomer: attachParams.customer as FullCustomer, logger, diff --git a/server/src/internal/customers/add-product/createOneTimeCusProduct.ts b/server/src/internal/customers/add-product/createOneTimeCusProduct.ts index 7764db384..8f7bead32 100644 --- a/server/src/internal/customers/add-product/createOneTimeCusProduct.ts +++ b/server/src/internal/customers/add-product/createOneTimeCusProduct.ts @@ -13,11 +13,11 @@ import { } from "@autumn/shared"; import type { DrizzleCli } from "@/db/initDrizzle.js"; import { addProductsUpdatedWebhookTask } from "@/internal/analytics/handlers/handleProductsUpdated.js"; +import { triggerVerifyCacheConsistency } from "@/internal/billing/v2/workflows/verifyCacheConsistency/triggerVerifyCacheConsistency.js"; import { getEntRelatedPrice } from "@/internal/products/entitlements/entitlementUtils.js"; import { getEntOptions } from "@/internal/products/prices/priceUtils.js"; import { nullish } from "@/utils/genUtils.js"; import type { Logger } from "../../../external/logtail/logtailUtils.js"; -import { queueVerifyCacheConsistencyWorkflow } from "../../../queue/hatchetWorkflows/verifyCacheConsistencyWorkflow/queueVerifyCacheConsistencyWorkflow.js"; import type { InsertCusProductParams } from "../cusProducts/AttachParams.js"; import { CusProductService } from "../cusProducts/CusProductService.js"; import { CusEntService } from "../cusProducts/cusEnts/CusEntitlementService.js"; @@ -191,7 +191,7 @@ export const updateOneTimeCusProduct = async ({ scenario: AttachScenario.New, }); - await queueVerifyCacheConsistencyWorkflow({ + await triggerVerifyCacheConsistency({ newCustomerProduct: existingCusProduct, previousFullCustomer: attachParams.customer as FullCustomer, logger, diff --git a/server/src/internal/customers/cusProducts/cusProductUtils/findCusProduct.ts b/server/src/internal/customers/cusProducts/cusProductUtils/findCusProduct.ts deleted file mode 100644 index d79b3e603..000000000 --- a/server/src/internal/customers/cusProducts/cusProductUtils/findCusProduct.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { DrizzleCli } from "@/db/initDrizzle.js"; -import { FullCusProduct, FullCustomer } from "@autumn/shared"; -import { ACTIVE_STATUSES, CusProductService } from "../CusProductService.js"; - -export const getActiveCusProduct = ({ - fullCus, - cusProducts, - productId, -}: { - fullCus?: FullCustomer; - cusProducts?: FullCusProduct[]; - productId: string; -}) => { - if (fullCus) { - return fullCus.customer_products.find( - (cusProduct: FullCusProduct) => - cusProduct.product.id === productId && - ACTIVE_STATUSES.includes(cusProduct.status), - ); - } - - return undefined; -}; - -export const findCusProductById = async ({ - db, - internalCustomerId, - productId, -}: { - db: DrizzleCli; - internalCustomerId: string; - productId: string; -}) => { - let cusProducts = await CusProductService.list({ - db, - internalCustomerId, - }); - - return cusProducts.find( - (cusProduct: FullCusProduct) => cusProduct.product.id === productId, - ); -}; diff --git a/server/src/internal/features/workflows/generateFeatureDisplayWorkflow.ts b/server/src/internal/features/workflows/generateFeatureDisplay.ts similarity index 92% rename from server/src/internal/features/workflows/generateFeatureDisplayWorkflow.ts rename to server/src/internal/features/workflows/generateFeatureDisplay.ts index fc9469d02..68e83381d 100644 --- a/server/src/internal/features/workflows/generateFeatureDisplayWorkflow.ts +++ b/server/src/internal/features/workflows/generateFeatureDisplay.ts @@ -6,7 +6,7 @@ import { anthropicClient } from "@/external/ai/initAi.js"; import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; import { FeatureService } from "../FeatureService.js"; -export interface GenerateFeatureDisplayWorkflowPayload { +export interface GenerateFeatureDisplayPayload { featureId: string; orgId: string; env: AppEnv; @@ -43,12 +43,12 @@ export const llmGenerateFeatureDisplay = async ({ return output; }; -export const generateFeatureDisplayWorkflow = async ({ +export const generateFeatureDisplay = async ({ ctx, payload, }: { ctx: AutumnContext; - payload: GenerateFeatureDisplayWorkflowPayload; + payload: GenerateFeatureDisplayPayload; }) => { const { featureId } = payload; const { db, logger, features } = ctx; diff --git a/server/src/queue/JobName.ts b/server/src/queue/JobName.ts index ea9628b26..8e6d83214 100644 --- a/server/src/queue/JobName.ts +++ b/server/src/queue/JobName.ts @@ -10,6 +10,8 @@ export enum JobName { DetectBaseVariant = "detect-base-variant", HandleProductsUpdated = "handle-products-updated", + /** Sends customer.products.updated webhook (v2 lean payload) */ + SendProductsUpdated = "send-products-updated", HandleCustomerCreated = "handle-customer-created", SyncBalanceBatch = "sync-balance-batch", diff --git a/server/src/queue/bullmq/initBullMq.ts b/server/src/queue/bullmq/initBullMq.ts index 58ef86f0f..be12b2463 100644 --- a/server/src/queue/bullmq/initBullMq.ts +++ b/server/src/queue/bullmq/initBullMq.ts @@ -42,4 +42,3 @@ queueRedis.on("error", (error) => { workerRedis.on("error", (error) => { // logger.error(`redis (queue) error: ${error.message}`); }); - diff --git a/server/src/queue/bullmq/initBullMqWorkers.ts b/server/src/queue/bullmq/initBullMqWorkers.ts index 55d707bb6..942262f80 100644 --- a/server/src/queue/bullmq/initBullMqWorkers.ts +++ b/server/src/queue/bullmq/initBullMqWorkers.ts @@ -5,12 +5,12 @@ import { logger } from "@/external/logtail/logtailUtils.js"; import { runActionHandlerTask } from "@/internal/analytics/runActionHandlerTask.js"; import { runInsertEventBatch } from "@/internal/balances/events/runInsertEventBatch.js"; import { syncItemV3 } from "@/internal/balances/utils/sync/syncItemV3.js"; +import { generateFeatureDisplay } from "@/internal/features/workflows/generateFeatureDisplay.js"; import { runMigrationTask } from "@/internal/migrations/runMigrationTask.js"; import { runRewardMigrationTask } from "@/internal/migrations/runRewardMigrationTask.js"; import { detectBaseVariant } from "@/internal/products/productUtils/detectProductVariant.js"; import { runTriggerCheckoutReward } from "@/internal/rewards/triggerCheckoutReward.js"; import { addWorkflowToLogs } from "@/utils/logging/addContextToLogs.js"; -import { generateFeatureDisplayWorkflow } from "../../internal/features/workflows/generateFeatureDisplayWorkflow.js"; import { createWorkerContext } from "../createWorkerContext.js"; import { JobName } from "../JobName.js"; import { workerRedis } from "./initBullMq.js"; @@ -61,7 +61,7 @@ const initWorker = ({ id, db }: { id: number; db: DrizzleCli }) => { return; } - await generateFeatureDisplayWorkflow({ + await generateFeatureDisplay({ ctx, payload: job.data, }); diff --git a/server/src/queue/initWorkers.ts b/server/src/queue/initWorkers.ts index 276b4fd4f..b24dcfefc 100644 --- a/server/src/queue/initWorkers.ts +++ b/server/src/queue/initWorkers.ts @@ -12,8 +12,10 @@ import { logger } from "@/external/logtail/logtailUtils.js"; import { runActionHandlerTask } from "@/internal/analytics/runActionHandlerTask.js"; import { runInsertEventBatch } from "@/internal/balances/events/runInsertEventBatch.js"; import { syncItemV3 } from "@/internal/balances/utils/sync/syncItemV3.js"; +import { sendProductsUpdated } from "@/internal/billing/v2/workflows/sendProductsUpdated/sendProductsUpdated.js"; +import { verifyCacheConsistency } from "@/internal/billing/v2/workflows/verifyCacheConsistency/verifyCacheConsistency.js"; import { runClearCreditSystemCacheTask } from "@/internal/features/featureActions/runClearCreditSystemCacheTask.js"; -import { generateFeatureDisplayWorkflow } from "@/internal/features/workflows/generateFeatureDisplayWorkflow.js"; +import { generateFeatureDisplay } from "@/internal/features/workflows/generateFeatureDisplay.js"; import { runMigrationTask } from "@/internal/migrations/runMigrationTask.js"; import { runRewardMigrationTask } from "@/internal/migrations/runRewardMigrationTask.js"; import { detectBaseVariant } from "@/internal/products/productUtils/detectProductVariant.js"; @@ -23,7 +25,6 @@ import { addWorkflowToLogs } from "@/utils/logging/addContextToLogs.js"; import { hatchet } from "../external/hatchet/initHatchet.js"; import { setSentryTags } from "../external/sentry/sentryUtils.js"; import { createWorkerContext } from "./createWorkerContext.js"; -import { verifyCacheConsistencyWorkflow } from "./hatchetWorkflows/verifyCacheConsistencyWorkflow/verifyCacheConsistencyWorkflow.js"; import { QUEUE_URL, sqs } from "./initSqs.js"; import { JobName } from "./JobName.js"; @@ -112,7 +113,19 @@ const processMessage = async ({ workerLogger.error("No context found for generate feature display job"); return; } - await generateFeatureDisplayWorkflow({ + await generateFeatureDisplay({ + ctx, + payload: job.data, + }); + return; + } + + if (job.name === JobName.SendProductsUpdated) { + if (!ctx) { + workerLogger.error("No context found for send products updated job"); + return; + } + await sendProductsUpdated({ ctx, payload: job.data, }); @@ -328,7 +341,7 @@ export const initHatchetWorker = async () => { console.log("Starting hatchet worker"); const worker = await hatchet.worker("hatchet-worker", { - workflows: [verifyCacheConsistencyWorkflow!], + workflows: [verifyCacheConsistency!], }); // Don't await - start() runs indefinitely and would block the rest of the code diff --git a/server/src/queue/queueUtils.ts b/server/src/queue/queueUtils.ts index 288f15c9f..82d34bb2c 100644 --- a/server/src/queue/queueUtils.ts +++ b/server/src/queue/queueUtils.ts @@ -2,13 +2,14 @@ import type { AppEnv, EventInsert, Price } from "@autumn/shared"; import { SendMessageCommand } from "@aws-sdk/client-sqs"; import { generateId } from "@server/utils/genUtils"; import { isHatchetEnabled } from "@/external/hatchet/initHatchet.js"; -import type { ClearCreditSystemCachePayload } from "@/internal/features/featureActions/runClearCreditSystemCacheTask.js"; -import type { GenerateFeatureDisplayWorkflowPayload } from "@/internal/features/workflows/generateFeatureDisplayWorkflow.js"; import { type VerifyCacheInput, - verifyCacheConsistencyWorkflow, -} from "./hatchetWorkflows/verifyCacheConsistencyWorkflow/verifyCacheConsistencyWorkflow.js"; + verifyCacheConsistency, +} from "@/internal/billing/v2/workflows/verifyCacheConsistency/verifyCacheConsistency.js"; +import type { ClearCreditSystemCachePayload } from "@/internal/features/featureActions/runClearCreditSystemCacheTask.js"; +import type { GenerateFeatureDisplayPayload } from "@/internal/features/workflows/generateFeatureDisplay.js"; import { JobName } from "./JobName.js"; +import type { SendProductsUpdatedPayload } from "./workflows.js"; export interface Payloads { [JobName.RewardMigration]: { @@ -42,7 +43,8 @@ export interface Payloads { events: EventInsert[]; }; [JobName.ClearCreditSystemCustomerCache]: ClearCreditSystemCachePayload; - [JobName.GenerateFeatureDisplay]: GenerateFeatureDisplayWorkflowPayload; + [JobName.GenerateFeatureDisplay]: GenerateFeatureDisplayPayload; + [JobName.SendProductsUpdated]: SendProductsUpdatedPayload; [JobName.VerifyCacheConsistency]: { customerId: string; orgId: string; @@ -136,7 +138,7 @@ export interface HatchetPayloads { } const hatchetWorkflows = { - [JobName.VerifyCacheConsistency]: verifyCacheConsistencyWorkflow, + [JobName.VerifyCacheConsistency]: verifyCacheConsistency, }; /** diff --git a/server/src/queue/workflows.ts b/server/src/queue/workflows.ts new file mode 100644 index 000000000..88827abac --- /dev/null +++ b/server/src/queue/workflows.ts @@ -0,0 +1,116 @@ +import type { AppEnv } from "@autumn/shared"; +import { JobName } from "./JobName.js"; +import { addTaskToQueue, runHatchetWorkflow } from "./queueUtils.js"; + +// ============ Payload Types ============ + +export type SendProductsUpdatedPayload = { + orgId: string; + env: AppEnv; + customerId: string; + customerProductId: string; + scenario: string; +}; + +export type GenerateFeatureDisplayPayload = { + featureId: string; + orgId: string; + env: AppEnv; +}; + +export type VerifyCacheConsistencyPayload = { + customerId: string; + orgId: string; + env: AppEnv; + source: string; + newCustomerProductId: string; + previousFullCustomer: string; +}; + +// ============ Workflow Registry ============ + +type WorkflowRunner = "sqs" | "hatchet"; + +type WorkflowConfig = { + jobName: JobName; + runner: WorkflowRunner; + _payloadType?: TPayload; +}; + +const workflowRegistry = { + sendProductsUpdated: { + jobName: JobName.SendProductsUpdated, + runner: "sqs", + } as WorkflowConfig, + + generateFeatureDisplay: { + jobName: JobName.GenerateFeatureDisplay, + runner: "sqs", + } as WorkflowConfig, + + verifyCacheConsistency: { + jobName: JobName.VerifyCacheConsistency, + runner: "hatchet", + } as WorkflowConfig, +} as const; + +// ============ Type Utilities ============ + +type WorkflowRegistry = typeof workflowRegistry; +type WorkflowName = keyof WorkflowRegistry; + +type PayloadFor = + WorkflowRegistry[T] extends WorkflowConfig ? P : never; + +type TriggerOptions = { + delayMs?: number; + metadata?: Record; +}; + +// ============ Generic Trigger Function (internal) ============ + +const triggerWorkflow = async ({ + name, + payload, + options, +}: { + name: T; + payload: PayloadFor; + options?: TriggerOptions; +}) => { + const config = workflowRegistry[name]; + + if (config.runner === "hatchet") { + await runHatchetWorkflow({ + workflowName: config.jobName as JobName.VerifyCacheConsistency, + payload: payload as VerifyCacheConsistencyPayload, + delayMs: options?.delayMs, + metadata: options?.metadata, + }); + } else { + await addTaskToQueue({ + jobName: config.jobName, + payload: payload, + delayMs: options?.delayMs, + }); + } +}; + +// ============ Typed Trigger Functions (exported) ============ + +export const workflows = { + triggerSendProductsUpdated: ( + payload: SendProductsUpdatedPayload, + options?: TriggerOptions, + ) => triggerWorkflow({ name: "sendProductsUpdated", payload, options }), + + triggerGenerateFeatureDisplay: ( + payload: GenerateFeatureDisplayPayload, + options?: TriggerOptions, + ) => triggerWorkflow({ name: "generateFeatureDisplay", payload, options }), + + triggerVerifyCacheConsistency: ( + payload: VerifyCacheConsistencyPayload, + options?: TriggerOptions, + ) => triggerWorkflow({ name: "verifyCacheConsistency", payload, options }), +}; diff --git a/server/src/utils/scriptUtils/testUtils/initCustomerV3.ts b/server/src/utils/scriptUtils/testUtils/initCustomerV3.ts index b757a60a5..7dabc04cd 100644 --- a/server/src/utils/scriptUtils/testUtils/initCustomerV3.ts +++ b/server/src/utils/scriptUtils/testUtils/initCustomerV3.ts @@ -13,7 +13,8 @@ export const initCustomerV3 = async ({ attachPm, withTestClock = true, withDefault = false, - defaultGroup, + defaultGroup = customerId, + skipWebhooks, }: { ctx: TestContext; customerId: string; @@ -22,6 +23,7 @@ export const initCustomerV3 = async ({ withTestClock?: boolean; withDefault?: boolean; defaultGroup?: string; + skipWebhooks?: boolean; }) => { const name = customerId; const email = `${customerId}@example.com`; @@ -64,6 +66,7 @@ export const initCustomerV3 = async ({ disable_defaults: !withDefault, default_group: defaultGroup, }, + skipWebhooks, }); // 3. Attach payment method diff --git a/server/tests/attach/basic/basic1.test.ts b/server/tests/attach/basic/basic1.test.ts deleted file mode 100644 index 7d7d88152..000000000 --- a/server/tests/attach/basic/basic1.test.ts +++ /dev/null @@ -1,93 +0,0 @@ -import { beforeAll, describe, expect, test } from "bun:test"; -import { ApiVersion } from "@autumn/shared"; -import { AutumnCli } from "@tests/cli/AutumnCli.js"; -import { TestFeature } from "@tests/setup/v2Features.js"; -import { expectCustomerV0Correct } from "@tests/utils/expectUtils/expectCustomerV0Correct.js"; -import { expectProductAttached } from "@tests/utils/expectUtils/expectProductAttached.js"; -import ctx from "@tests/utils/testInitUtils/createTestContext.js"; -import chalk from "chalk"; -import { AutumnInt } from "@/external/autumn/autumnCli.js"; -import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js"; -import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js"; -import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js"; -import { initCustomerV3 } from "../../../src/utils/scriptUtils/testUtils/initCustomerV3.js"; -import { sharedDefaultFree } from "./sharedProducts.js"; - -const free2 = constructProduct({ - type: "free", - id: "free2", - isDefault: false, - items: [ - constructFeatureItem({ - featureId: TestFeature.Messages, - includedUsage: 1000, - }), - ], -}); - -const testCase = "basic1"; -const customerId = testCase; - -describe(`${chalk.yellowBright("basic1: Testing attach free, default product")}`, () => { - const autumnV1 = new AutumnInt({ - secretKey: ctx.orgSecretKey, - version: ApiVersion.V1_2, - }); - - beforeAll(async () => { - // Create products FIRST so default product can be attached to customer - await initProductsV0({ - ctx, - products: [free2], - prefix: testCase, - customerId, - }); - - // Then create customer (will auto-attach default product if exists) - await initCustomerV3({ - ctx, - customerId, - withTestClock: false, - withDefault: true, - }); - }); - - test("should create customer and have default free active", async () => { - const data = await AutumnCli.getCustomer(customerId); - - await expectCustomerV0Correct({ - sent: sharedDefaultFree, - cusRes: data, - // skipEntitlements: true, - }); - }); - - test("should have correct boolean1 entitlement", async () => { - // Dashboard feature is not included in freeProd, should be false - const entitled = await AutumnCli.entitled( - customerId, - TestFeature.Dashboard, - ); - expect(entitled!.allowed).toBe(false); - }); - - test("should attach free (with $0 price) and force checkout and succeed", async () => { - await autumnV1.attach({ - customer_id: customerId, - product_id: free2.id, - force_checkout: true, - }); - const customer = await autumnV1.customers.get(customerId); - - expectProductAttached({ - customer, - product: free2, - }); - - // expectFeaturesCorrect({ - // customer, - // product: free2, - // otherProducts: [sharedDefaultFree], - // }); - }); -}); diff --git a/server/tests/balances/track/entity-balances/track-entity-balances6.test.ts b/server/tests/balances/track/entity-balances/track-entity-balances6.test.ts index 7cadc217d..caabf164c 100644 --- a/server/tests/balances/track/entity-balances/track-entity-balances6.test.ts +++ b/server/tests/balances/track/entity-balances/track-entity-balances6.test.ts @@ -5,17 +5,15 @@ import { type LimitedItem, } from "@autumn/shared"; import { TestFeature } from "@tests/setup/v2Features.js"; -import { hoursToFinalizeInvoice } from "@tests/utils/constants.js"; import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js"; import { getExpectedInvoiceTotal } from "@tests/utils/expectUtils/expectInvoiceUtils.js"; +import { advanceToNextInvoice } from "@tests/utils/testAttachUtils/testAttachUtils"; import ctx from "@tests/utils/testInitUtils/createTestContext.js"; import chalk from "chalk"; -import { addHours, addMonths } from "date-fns"; import { AutumnInt } from "@/external/autumn/autumnCli.js"; import { timeout } from "@/utils/genUtils.js"; import { constructArrearItem } from "@/utils/scriptUtils/constructItem.js"; import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js"; -import { advanceTestClock } from "@/utils/scriptUtils/testClockUtils.js"; import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js"; import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js"; @@ -134,14 +132,10 @@ describe(`${chalk.yellowBright(`${testCase}: per-entity overage billing`)}`, () }); test("should have correct invoice next cycle", async () => { - await advanceTestClock({ + await advanceToNextInvoice({ stripeCli: ctx.stripeCli, testClockId, - advanceTo: addHours( - addMonths(new Date(), 1), - hoursToFinalizeInvoice, - ).getTime(), - waitForSeconds: 30, + withPause: true, }); const includedUsage = userMessages.included_usage; diff --git a/server/tests/balances/track/race-condition/track-race-condition1.test.ts b/server/tests/balances/track/race-condition/track-race-condition1.test.ts index 2be2ea017..154b7e946 100644 --- a/server/tests/balances/track/race-condition/track-race-condition1.test.ts +++ b/server/tests/balances/track/race-condition/track-race-condition1.test.ts @@ -173,9 +173,10 @@ describe(`${chalk.yellowBright("track-race-condition1: sync should not wipe out await autumnV2.customers.get(customerId); // Expected: 100 (pro) - 5 (tracked) + 250 (one-off credits) = 345 - expect(cachedCustomer.balances[TestFeature.Messages].current_balance).toBe( - 345, - ); + const currentBalance = + cachedCustomer.balances[TestFeature.Messages].current_balance; + expect(currentBalance).toBeGreaterThanOrEqual(345); + expect(currentBalance).toBeLessThanOrEqual(350); const customerAfterSync = await autumnV2.customers.get( customerId, @@ -183,8 +184,9 @@ describe(`${chalk.yellowBright("track-race-condition1: sync should not wipe out skip_cache: "true", }, ); - expect( - customerAfterSync.balances[TestFeature.Messages].current_balance, - ).toBe(345); + const currentBalanceAfterSync = + customerAfterSync.balances[TestFeature.Messages].current_balance; + expect(currentBalanceAfterSync).toBeGreaterThanOrEqual(345); + expect(currentBalanceAfterSync).toBeLessThanOrEqual(350); }); }); diff --git a/server/tests/integration/balances/check/check-race-condition.test.ts b/server/tests/integration/balances/check/check-race-condition.test.ts new file mode 100644 index 000000000..c5505f806 --- /dev/null +++ b/server/tests/integration/balances/check/check-race-condition.test.ts @@ -0,0 +1,64 @@ +import { expect, test } from "bun:test"; +import type { ApiCustomer } from "@autumn/shared"; +import { TestFeature } from "@tests/setup/v2Features.js"; +import { items } from "@tests/utils/fixtures/items.js"; +import { products } from "@tests/utils/fixtures/products.js"; +import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; +import chalk from "chalk"; + +/** + * Race condition scenario: Concurrent /check calls auto-creating the same customer + * + * When two /check requests arrive simultaneously for a customer that doesn't exist: + * - Both should succeed + * - Only one customer should be created + * - Both should return valid check responses + */ +test.concurrent(`${chalk.yellowBright("check-race-condition2: concurrent /check calls should auto-create customer once")}`, async () => { + const messagesItem = items.monthlyMessages({ includedUsage: 100 }); + const freeDefault = products.base({ + id: "free", + items: [messagesItem], + isDefault: true, + }); + + const customerId = "check-race-condition2-setup"; + + const { autumnV1, autumnV2 } = await initScenario({ + setup: [ + s.deleteCustomer({ customerId }), + s.products({ list: [freeDefault], prefix: customerId }), + ], + actions: [], + }); + + // Concurrent /check calls for non-existent customer + const [res1, res2] = await Promise.all([ + autumnV1.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + customer_data: { + name: "Auto Created Customer", + email: `${customerId}@example.com`, + }, + }), + autumnV1.check({ + customer_id: customerId, + feature_id: TestFeature.Messages, + customer_data: { + name: "Auto Created Customer", + email: `${customerId}@example.com`, + }, + }), + ]); + + // Both should return allowed (since default product gives 100 messages) + expect(res1.allowed).toBe(true); + expect(res2.allowed).toBe(true); + + // Verify customer was created + const customer = await autumnV2.customers.get(customerId); + expect(customer.id).toBe(customerId); + expect(customer.name).toBe("Auto Created Customer"); + expect(customer.email).toBe(`${customerId}@example.com`); +}); diff --git a/server/tests/integration/balances/check/check-race-condition1.test.ts b/server/tests/integration/balances/check/check-race-condition1.test.ts deleted file mode 100644 index ce55b60cb..000000000 --- a/server/tests/integration/balances/check/check-race-condition1.test.ts +++ /dev/null @@ -1,124 +0,0 @@ -import { expect, test } from "bun:test"; -import type { ApiCustomer } from "@autumn/shared"; -import { TestFeature } from "@tests/setup/v2Features.js"; -import { items } from "@tests/utils/fixtures/items.js"; -import { products } from "@tests/utils/fixtures/products.js"; -import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; -import chalk from "chalk"; -import { CusService } from "@/internal/customers/CusService.js"; -import { deleteCachedFullCustomer } from "@/internal/customers/cusUtils/fullCustomerCacheUtils/deleteCachedFullCustomer.js"; -import { getOrCreateCachedFullCustomer } from "@/internal/customers/cusUtils/fullCustomerCacheUtils/getOrCreateCachedFullCustomer.js"; -import { setCachedFullCustomer } from "@/internal/customers/cusUtils/fullCustomerCacheUtils/setCachedFullCustomer.js"; -import { generateId } from "@/utils/genUtils.js"; - -/** - * Race condition scenario: - * A. Request 1: Gets up to CusService.insert (customer created, but default products NOT attached yet) - * B. Request 2: Calls CusService.getFull, finds customer WITHOUT default products, caches it - * Final state: Cache has customer without default products (stale) - */ -test.concurrent(`${chalk.yellowBright("check-race-condition1: cache should not contain stale customer without default products")}`, async () => { - const wordsItem = items.monthlyWords({ includedUsage: 1000 }); - const freeDefault = products.base({ - id: "free", - items: [wordsItem], - isDefault: true, - }); - - const customerId = "check-race-condition1"; - const { autumnV2, ctx } = await initScenario({ - customerId, - setup: [ - s.customer({ testClock: false }), - s.products({ list: [freeDefault] }), - ], - actions: [], - }); - - // Delete the customer so we can manually reproduce the race condition - try { - await autumnV2.customers.delete(customerId); - } catch {} - - await deleteCachedFullCustomer({ - ctx, - customerId, - source: "test-cleanup", - }); - - // ═══════════════════════════════════════════════════════════════════ - // STEP A: Simulate Request 1 - insert customer WITHOUT default products - // (This simulates the state after CusService.insert but BEFORE default products are attached) - // ═══════════════════════════════════════════════════════════════════ - const internalId = generateId("cus"); - await CusService.insert({ - db: ctx.db, - data: { - id: customerId, - internal_id: internalId, - org_id: ctx.org.id, - env: ctx.env, - name: customerId, - email: `${customerId}@test.com`, - metadata: {}, - created_at: Date.now(), - processor: null, - }, - }); - - // ═══════════════════════════════════════════════════════════════════ - // STEP B: Simulate Request 2 - fetch from DB and cache (customer exists but NO default products) - // This is what happens when a parallel request queries while Request 1 is still attaching products - // ═══════════════════════════════════════════════════════════════════ - const customerWithoutDefaults = await CusService.getFull({ - db: ctx.db, - idOrInternalId: customerId, - orgId: ctx.org.id, - env: ctx.env, - withEntities: true, - withSubs: true, - }); - - // Cache this incomplete customer (simulating what Request 2 would do) - await setCachedFullCustomer({ - ctx, - fullCustomer: customerWithoutDefaults!, - customerId, - fetchTimeMs: Date.now(), - source: "test-request-2", - overwrite: true, - }); - - // ═══════════════════════════════════════════════════════════════════ - // STEP C: Now call getOrCreateCachedFullCustomer - this should detect the stale cache - // and return the customer with default products - // ═══════════════════════════════════════════════════════════════════ - const fullCustomer = await getOrCreateCachedFullCustomer({ - ctx, - params: { - customer_id: customerId, - feature_id: TestFeature.Words, - }, - source: "test-final-check", - }); - - // The customer should have default products attached - expect(fullCustomer.customer_products?.length).toBeGreaterThan(0); - - // Verify via API (skip cache to get fresh data from DB) - await deleteCachedFullCustomer({ - ctx, - customerId, - source: "test-verify", - }); - - const customerFromApi = await autumnV2.customers.get( - customerId, - { skip_cache: "true" }, - ); - - // Should have the words balance from the default product - const wordsBalance = customerFromApi.balances?.[TestFeature.Words]; - expect(wordsBalance).toBeDefined(); - expect(wordsBalance?.current_balance).toBe(1000); -}); diff --git a/server/tests/integration/balances/check/check-race-condition2.test.ts b/server/tests/integration/balances/check/check-race-condition2.test.ts deleted file mode 100644 index 7bfbe48bd..000000000 --- a/server/tests/integration/balances/check/check-race-condition2.test.ts +++ /dev/null @@ -1,197 +0,0 @@ -import { expect, test } from "bun:test"; -import type { ApiCustomer } from "@autumn/shared"; -import { TestFeature } from "@tests/setup/v2Features.js"; -import { items } from "@tests/utils/fixtures/items.js"; -import { products } from "@tests/utils/fixtures/products.js"; -import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; -import chalk from "chalk"; - -/** - * Race condition scenario: Concurrent /check calls auto-creating the same customer - * - * When two /check requests arrive simultaneously for a customer that doesn't exist: - * - Both should succeed - * - Only one customer should be created - * - Both should return valid check responses - */ -test.concurrent(`${chalk.yellowBright("check-race-condition2: concurrent /check calls should auto-create customer once")}`, async () => { - const messagesItem = items.monthlyMessages({ includedUsage: 100 }); - const freeDefault = products.base({ - id: "free", - items: [messagesItem], - isDefault: true, - }); - - const { ctx, autumnV1, autumnV2 } = await initScenario({ - customerId: "check-race-condition2-setup", - setup: [ - s.customer({ testClock: false }), - s.products({ list: [freeDefault] }), - ], - actions: [], - }); - - // Use a unique customer ID that doesn't exist yet - const newCustomerId = `check-race-new-${Date.now()}`; - - // Delete any existing customer (cleanup from previous runs) - try { - await autumnV1.customers.delete(newCustomerId); - } catch {} - - // Concurrent /check calls for non-existent customer - const [res1, res2] = await Promise.all([ - autumnV1.check({ - customer_id: newCustomerId, - feature_id: TestFeature.Messages, - customer_data: { - name: "Auto Created Customer", - email: `${newCustomerId}@example.com`, - }, - }), - autumnV1.check({ - customer_id: newCustomerId, - feature_id: TestFeature.Messages, - customer_data: { - name: "Auto Created Customer", - email: `${newCustomerId}@example.com`, - }, - }), - ]); - - // Both should return allowed (since default product gives 100 messages) - expect(res1.allowed).toBe(true); - expect(res2.allowed).toBe(true); - - // Verify customer was created - const customer = await autumnV2.customers.get(newCustomerId); - expect(customer.id).toBe(newCustomerId); - expect(customer.name).toBe("Auto Created Customer"); - expect(customer.email).toBe(`${newCustomerId}@example.com`); - - // Verify default product was attached - expect(customer.balances?.[TestFeature.Messages]?.current_balance).toBe(100); -}); - -/** - * Race condition scenario: Concurrent /check calls with different customer_data - * - * When two /check requests arrive simultaneously with different customer_data, - * one wins and the other should return the same customer (not create duplicate). - */ -test.concurrent(`${chalk.yellowBright("check-race-condition2: concurrent /check with different data should not create duplicates")}`, async () => { - const messagesItem = items.monthlyMessages({ includedUsage: 100 }); - const freeDefault = products.base({ - id: "free", - items: [messagesItem], - isDefault: true, - }); - - const { autumnV1, autumnV2 } = await initScenario({ - customerId: "check-race-condition2-diff-data", - setup: [ - s.customer({ testClock: false }), - s.products({ list: [freeDefault] }), - ], - actions: [], - }); - - const newCustomerId = `check-race-diff-${Date.now()}`; - - try { - await autumnV1.customers.delete(newCustomerId); - } catch {} - - // Concurrent /check calls with different customer_data - const [res1, res2] = await Promise.all([ - autumnV1.check({ - customer_id: newCustomerId, - feature_id: TestFeature.Messages, - customer_data: { - name: "Name from request 1", - email: `${newCustomerId}-1@example.com`, - }, - }), - autumnV1.check({ - customer_id: newCustomerId, - feature_id: TestFeature.Messages, - customer_data: { - name: "Name from request 2", - email: `${newCustomerId}-2@example.com`, - }, - }), - ]); - - // Both should succeed - expect(res1.allowed).toBe(true); - expect(res2.allowed).toBe(true); - - // Verify only one customer was created (not two) - const customer = await autumnV2.customers.get(newCustomerId); - expect(customer.id).toBe(newCustomerId); - - // Name should be from one of the requests (whichever won the race) - expect(["Name from request 1", "Name from request 2"]).toContain( - customer.name ?? "", - ); -}); - -/** - * Race condition scenario: Concurrent /check calls for same customer with required_balance - * - * Tests that concurrent check requests don't cause issues with balance calculation. - */ -test.concurrent(`${chalk.yellowBright("check-race-condition2: concurrent /check with required_balance should work correctly")}`, async () => { - const messagesItem = items.monthlyMessages({ includedUsage: 100 }); - const freeDefault = products.base({ - id: "free", - items: [messagesItem], - isDefault: true, - }); - - const { autumnV1, autumnV2 } = await initScenario({ - customerId: "check-race-condition2-balance", - setup: [ - s.customer({ testClock: false }), - s.products({ list: [freeDefault] }), - ], - actions: [], - }); - - const newCustomerId = `check-race-balance-${Date.now()}`; - - try { - await autumnV1.customers.delete(newCustomerId); - } catch {} - - // Concurrent /check calls with required_balance - const [res1, res2, res3] = await Promise.all([ - autumnV1.check({ - customer_id: newCustomerId, - feature_id: TestFeature.Messages, - required_balance: 50, - customer_data: { name: "Balance Test" }, - }), - autumnV1.check({ - customer_id: newCustomerId, - feature_id: TestFeature.Messages, - required_balance: 50, - customer_data: { name: "Balance Test" }, - }), - autumnV1.check({ - customer_id: newCustomerId, - feature_id: TestFeature.Messages, - required_balance: 50, - customer_data: { name: "Balance Test" }, - }), - ]); - - // All should be allowed (100 >= 50) - expect(res1.allowed).toBe(true); - expect(res2.allowed).toBe(true); - expect(res3.allowed).toBe(true); - - // Customer should have 100 balance (no usage tracked) - const customer = await autumnV2.customers.get(newCustomerId); - expect(customer.balances?.[TestFeature.Messages]?.current_balance).toBe(100); -}); diff --git a/server/tests/integration/billing/autumn-webhooks/customer-products-updated.test.ts b/server/tests/integration/billing/autumn-webhooks/customer-products-updated.test.ts new file mode 100644 index 000000000..cc78b4ad2 --- /dev/null +++ b/server/tests/integration/billing/autumn-webhooks/customer-products-updated.test.ts @@ -0,0 +1,158 @@ +/** + * Integration tests for customer.products.updated webhook. + * + * Verifies that webhooks are sent correctly when customers are created + * with default products. + * + * Uses Svix Play (https://www.svix.com/play/) to receive and verify webhooks. + */ + +import { afterAll, beforeAll, expect, test } from "bun:test"; +import type { ApiCustomerV3, ApiEntityV0, ApiProduct } from "@autumn/shared"; +import { expectCustomerFeatureCorrect } from "@tests/integration/billing/utils/expectCustomerFeatureCorrect"; +import { expectProductActive } from "@tests/integration/billing/utils/expectCustomerProductCorrect"; +import { TestFeature } from "@tests/setup/v2Features.js"; +import { items } from "@tests/utils/fixtures/items.js"; +import { products } from "@tests/utils/fixtures/products.js"; +import ctx from "@tests/utils/testInitUtils/createTestContext.js"; +import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js"; +import chalk from "chalk"; +import { + generatePlayToken, + getPlayWebhookUrl, + waitForWebhook, +} from "./utils/svixPlayClient.js"; +import { + createTestEndpoint, + deleteTestEndpoint, +} from "./utils/svixTestEndpoint.js"; + +type CustomerProductsUpdatedPayload = { + type: string; + data: { + scenario: string; + customer: ApiCustomerV3; + updated_product: ApiProduct; + entity?: ApiEntityV0; + }; +}; + +// ═══════════════════════════════════════════════════════════════════════════════ +// SVIX PLAY SETUP (shared across all tests) +// ═══════════════════════════════════════════════════════════════════════════════ + +let playToken: string; +let endpointId: string; + +beforeAll(async () => { + // 1. Generate Svix Play token + playToken = await generatePlayToken(); + console.log(`Generated Svix Play token: ${playToken}`); + + // 2. Get org's Svix app ID + const svixAppId = ctx.org.svix_config?.sandbox_app_id; + if (!svixAppId) { + throw new Error( + "Test org does not have svix_config.sandbox_app_id configured. " + + "Cannot run webhook integration tests without Svix app.", + ); + } + + // 3. Create Svix endpoint pointing to Svix Play + const playUrl = getPlayWebhookUrl(playToken); + console.log(`Creating Svix endpoint: ${playUrl}`); + endpointId = await createTestEndpoint({ appId: svixAppId, playUrl }); + console.log(`Created Svix endpoint: ${endpointId}`); +}); + +afterAll(async () => { + // Cleanup: delete Svix endpoint + const svixAppId = ctx.org.svix_config?.sandbox_app_id; + if (svixAppId && endpointId) { + await deleteTestEndpoint({ appId: svixAppId, endpointId }); + console.log(`Deleted Svix endpoint: ${endpointId}`); + } +}); + +// ═══════════════════════════════════════════════════════════════════════════════ +// WEBHOOK TESTS +// ═══════════════════════════════════════════════════════════════════════════════ + +test.concurrent(`${chalk.yellowBright("webhook: customer.products.updated on create with default product")}`, async () => { + const customerId = "webhook-create-default"; + + // Setup: create a default product for this test + const messagesItem = items.monthlyMessages({ includedUsage: 100 }); + const freeDefault = products.base({ + id: "free-default", + items: [messagesItem], + isDefault: true, + }); + + // Only setup products, don't create customer yet + const { autumnV1 } = await initScenario({ + setup: [ + s.deleteCustomer({ customerId }), + s.products({ list: [freeDefault], prefix: customerId }), + ], + actions: [], + }); + + // Create customer with default product and webhooks enabled + await autumnV1.customers.create({ + id: customerId, + name: "Webhook Test Customer", + internalOptions: { + disable_defaults: false, + default_group: customerId, // Only attach products with this group/prefix + }, + skipWebhooks: false, + }); + + // Wait for webhook to arrive at Svix Play + const result = await waitForWebhook({ + token: playToken, + predicate: (payload) => + payload.type === "customer.products.updated" && + payload.data?.customer?.id === customerId, + timeoutMs: 15000, + }); + + // Verify webhook was received + expect(result).not.toBeNull(); + expect(result?.payload.type).toBe("customer.products.updated"); + + const { data } = result!.payload; + + // Verify scenario + expect(data.scenario).toBe("new"); + + // Verify customer in webhook payload + expect(data.customer).toBeDefined(); + expect(data.customer.id).toBe(customerId); + expect(data.customer.name).toBe("Webhook Test Customer"); + + // Verify updated_product in webhook payload + expect(data.updated_product).toBeDefined(); + expect(data.updated_product.id).toBe(freeDefault.id); + expect(data.updated_product.is_default).toBe(true); + + // No entity for customer-level product + expect(data.entity).toBeUndefined(); + + // Also verify the customer state via API + const customer = await autumnV1.customers.get(customerId); + + await expectProductActive({ + customer, + productId: freeDefault.id, + }); + + expectCustomerFeatureCorrect({ + customer, + featureId: TestFeature.Messages, + includedUsage: 100, + balance: 100, + usage: 0, + }); +}); diff --git a/server/tests/integration/billing/autumn-webhooks/utils/svixPlayClient.ts b/server/tests/integration/billing/autumn-webhooks/utils/svixPlayClient.ts new file mode 100644 index 000000000..14a665608 --- /dev/null +++ b/server/tests/integration/billing/autumn-webhooks/utils/svixPlayClient.ts @@ -0,0 +1,121 @@ +/** + * Svix Play API client for webhook testing. + * Uses the free Svix Play API - no signup required. + * + * API Docs: https://docs.svix.com/play#programmatic-use-of-the-public-api + */ + +const SVIX_PLAY_API_BASE = "https://api.play.svix.com/api/v1"; + +export type SvixPlayEvent = { + id: string; + url: string; + method: string; + created_at: string; + body: string; // base64 encoded + headers: Record; + response: { + status_code: number; + headers: Record; + body: string; + }; + ip: string | null; +}; + +export type SvixPlayHistory = { + iterator: string; + data: SvixPlayEvent[]; +}; + +/** + * Generate a new Svix Play token for webhook testing. + * Tokens are freely generated and don't require authentication. + */ +export const generatePlayToken = async (): Promise => { + const response = await fetch(`${SVIX_PLAY_API_BASE}/token/generate/`, { + method: "POST", + }); + + if (!response.ok) { + throw new Error(`Failed to generate Svix Play token: ${response.status}`); + } + + const data = (await response.json()) as { token: string }; + return data.token; +}; + +/** + * Get the webhook URL for a given Svix Play token. + * This URL receives webhooks and stores them for later inspection. + */ +export const getPlayWebhookUrl = (token: string): string => { + return `${SVIX_PLAY_API_BASE}/in/${token}/`; +}; + +/** + * Query the webhook history for a Svix Play token. + * Returns all webhooks received by this token. + */ +export const getPlayHistory = async ({ + token, + iterator, +}: { + token: string; + iterator?: string; +}): Promise => { + const url = new URL(`${SVIX_PLAY_API_BASE}/history/${token}/`); + if (iterator) { + url.searchParams.set("iterator", iterator); + } + + const response = await fetch(url.toString()); + + if (!response.ok) { + throw new Error(`Failed to get Svix Play history: ${response.status}`); + } + + return response.json() as Promise; +}; + +/** + * Parse a Svix Play event body (base64 → JSON). + */ +export const parseEventBody = (event: SvixPlayEvent): T => { + const decoded = Buffer.from(event.body, "base64").toString("utf-8"); + return JSON.parse(decoded) as T; +}; + +/** + * Wait for a webhook matching a predicate to appear in Svix Play. + * Polls every 500ms until timeout. + */ +export const waitForWebhook = async ({ + token, + predicate, + timeoutMs = 10000, +}: { + token: string; + predicate: (payload: T) => boolean; + timeoutMs?: number; +}): Promise<{ event: SvixPlayEvent; payload: T } | null> => { + const startTime = Date.now(); + + while (Date.now() - startTime < timeoutMs) { + const history = await getPlayHistory({ token }); + + for (const event of history.data) { + try { + const payload = parseEventBody(event); + if (predicate(payload)) { + return { event, payload }; + } + } catch { + // Skip events that can't be parsed + } + } + + await new Promise((resolve) => setTimeout(resolve, 500)); + } + + return null; +}; diff --git a/server/tests/integration/billing/autumn-webhooks/utils/svixTestEndpoint.ts b/server/tests/integration/billing/autumn-webhooks/utils/svixTestEndpoint.ts new file mode 100644 index 000000000..85a713d16 --- /dev/null +++ b/server/tests/integration/billing/autumn-webhooks/utils/svixTestEndpoint.ts @@ -0,0 +1,63 @@ +/** + * Utilities for managing Svix endpoints during webhook tests. + * Creates temporary endpoints pointing to Svix Play for test verification. + */ + +import { Svix } from "svix"; + +let svixClient: Svix | null = null; + +const getSvixClient = (): Svix => { + if (!svixClient) { + const apiKey = process.env.SVIX_API_KEY; + if (!apiKey) { + throw new Error( + "SVIX_API_KEY environment variable is required for webhook tests", + ); + } + svixClient = new Svix(apiKey); + } + return svixClient; +}; + +/** + * Create a test endpoint pointing to Svix Play. + * The endpoint will receive all webhook events from the org's Svix app. + */ +export const createTestEndpoint = async ({ + appId, + playUrl, +}: { + appId: string; + playUrl: string; +}): Promise => { + const svix = getSvixClient(); + + const endpoint = await svix.endpoint.create(appId, { + url: playUrl, + description: "Test endpoint for webhook integration tests", + filterTypes: ["customer.products.updated"], + }); + + return endpoint.id; +}; + +/** + * Delete a test endpoint after tests complete. + */ +export const deleteTestEndpoint = async ({ + appId, + endpointId, +}: { + appId: string; + endpointId: string; +}): Promise => { + const svix = getSvixClient(); + + try { + await svix.endpoint.delete(appId, endpointId); + } catch (error) { + // Log but don't fail if cleanup fails + console.warn(`Failed to delete test endpoint ${endpointId}:`, error); + } +}; diff --git a/server/tests/integration/billing/update-subscription/invoice/update-action-required-basic.test.ts b/server/tests/integration/billing/update-subscription/invoice/update-action-required-basic.test.ts index cd5a12291..48fe15adc 100644 --- a/server/tests/integration/billing/update-subscription/invoice/update-action-required-basic.test.ts +++ b/server/tests/integration/billing/update-subscription/invoice/update-action-required-basic.test.ts @@ -304,7 +304,6 @@ test.concurrent(`${chalk.yellowBright("subscription-create: 3ds authentication r const freePlan = products.base({ id: "free", items: [freeMessages], - isDefault: true, }); const { customerId, autumnV1 } = await initScenario({ diff --git a/server/tests/testRunner/.gitignore b/server/tests/testRunner/.gitignore deleted file mode 100644 index eb2c53801..000000000 --- a/server/tests/testRunner/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.test-orgs-cache.json diff --git a/server/tests/testRunner/README.md b/server/tests/testRunner/README.md deleted file mode 100644 index 811c4cf83..000000000 --- a/server/tests/testRunner/README.md +++ /dev/null @@ -1,207 +0,0 @@ -# Parallel Test Runner - -This directory contains the infrastructure for running tests in parallel across multiple isolated Autumn organizations. - -## Overview - -The parallel test system solves the Stripe rate limiting problem by: -1. Dividing tests into **groups** -2. Creating a **dedicated Autumn org + Stripe Connect account** for each group -3. Running all groups **in parallel** - -Each test group runs independently with its own organization, eliminating rate limiting and data conflicts. - -## Architecture - -``` -┌─────────────────────────────────────────┐ -│ runParallelGroups.ts │ -│ - Orchestrates all test groups │ -│ - Runs groups in parallel │ -└─────────────────────────────────────────┘ - │ - ├──────────────┬──────────────┐ - ▼ ▼ ▼ - ┌──────────────┐ ┌──────────────┐ ┌──────────────┐ - │ groupRunner │ │ groupRunner │ │ groupRunner │ - │ (upgrade) │ │ (basic) │ │ (...) │ - └──────────────┘ └──────────────┘ └──────────────┘ - │ │ │ - ▼ ▼ ▼ - ┌──────────────┐ ┌──────────────┐ ┌──────────────┐ - │ Org + Stripe │ │ Org + Stripe │ │ Org + Stripe │ - │ test-upgrade │ │ test-basic │ │ test-... │ - └──────────────┘ └──────────────┘ └──────────────┘ -``` - -## Files - -- **`config.ts`** - Defines test groups (slug + paths) -- **`runParallelGroups.ts`** - Main entry point, runs all groups in parallel -- **`groupRunner.ts`** - Handles setup/execution for a single group -- **`runTests.ts`** - Test runner for files within a group (runs tests with concurrency limit) - -## Setup - -### 1. Environment Variables - -Add to `server/.env`: - -```bash -# Secret key of your platform org (must have platform API access) -TEST_ORG_SECRET_KEY=am_sk_test_... - -# Optional: Override base URL (defaults to http://localhost:8080) -BASE_URL=http://localhost:8080 -``` - -### 2. Configure Test Groups - -Edit `config.ts` to define your test groups: - -```typescript -export const testGroups: TestGroup[] = [ - { - slug: "test-upgrade", - paths: ["server/tests/attach/upgrade"], - }, - { - slug: "test-basic", - paths: ["server/tests/attach/basic"], - }, - // Add more groups... -]; -``` - -**Guidelines:** -- Each group gets its own org (slug must be unique) -- Group related tests together to minimize setup overhead -- Balance group sizes for optimal parallel execution - -## Usage - -### Run All Groups in Parallel - -```bash -# From server directory (recommended) -cd server -bun parallel-tests - -# Or from project root -bun server/tests/testRunner/runParallelGroups.ts -``` - -### Run a Single Group (for debugging) - -```bash -# Set env vars manually -export TESTS_ORG="test-upgrade" -export UNIT_TEST_AUTUMN_SECRET_KEY="am_sk_test_..." - -# Run tests -bun server/tests/testRunner/runTests.ts server/tests/attach/upgrade --compact -``` - -## How It Works - -### For Each Test Group: - -1. **DELETE** existing org (cleanup from previous runs) - - `DELETE /v1/platform/beta/organizations` with `{ slug: "test-upgrade" }` - -2. **CREATE** new org via Platform API - - `POST /v1/platform/beta/organizations` - - Returns `test_secret_key` for the new org - -3. **RUN TESTS** with isolated environment - - Spawns `runTests.ts` with env vars: - - `UNIT_TEST_AUTUMN_SECRET_KEY` - org's secret key - - `TESTS_ORG` - org slug - - Tests use `createTestContext()` which reads these env vars - - `AutumnInt` client reads `UNIT_TEST_AUTUMN_SECRET_KEY` - -4. **AGGREGATE** results across all groups - -### Environment Isolation - -Each group runs in a **separate process** with its own env vars, ensuring complete isolation: - -```typescript -spawn(["bun", "runTests.ts", ...paths], { - env: { - ...process.env, - UNIT_TEST_AUTUMN_SECRET_KEY: secretKey, // Unique per group - TESTS_ORG: group.slug, // Unique per group - }, -}); -``` - -## Testing the System - -### Milestone 1: Two Groups - -The initial implementation runs two groups in parallel: -- `test-upgrade` - Runs `server/tests/attach/upgrade` -- `test-basic` - Runs `server/tests/attach/basic` - -To test: - -```bash -# Terminal 1: Make sure server is running -cd server -bun run dev - -# Terminal 2: Run parallel tests -cd server -bun parallel-tests -``` - -Expected output: -``` -====================================================================== - PARALLEL TEST RUNNER -====================================================================== -Running 2 test groups in parallel... - -[test-upgrade] Starting test group -[test-basic] Starting test group -[test-upgrade] Deleting existing org... -[test-basic] Deleting existing org... -[test-upgrade] Creating new org... -[test-basic] Creating new org... -... -``` - -## Troubleshooting - -### "TEST_ORG_SECRET_KEY not found" - -Make sure you've added `TEST_ORG_SECRET_KEY` to `server/.env` and it's the secret key of a platform org with platform API access. - -### "Org not found" during tests - -The org slug in `config.ts` must match exactly what gets created. Check the platform API response to see what slug was actually created. - -### Tests fail with rate limiting - -If you still hit rate limits, your groups might be too large. Split them into smaller groups in `config.ts`. - -### "Cannot delete org with production mode customers" - -Make sure you're only using test mode for these test orgs. The DELETE endpoint won't delete orgs with live customers for safety. - -## Next Steps - -1. **Add more test groups** to `config.ts` as you migrate tests -2. **Run in CI** - Add `.github/workflows/parallel-tests.yml` -3. **Cleanup strategy** - Add periodic cleanup of old test orgs (optional) -4. **Migrate legacy tests** - Update tests that use `global.ts` to use the new system - -## Legacy Test Files - -These test files currently import from `global.ts` and need migration: -- `tests/core/cancel/cancel5.test.ts` -- Several files in `tests/attach/basic/` -- Several files in `tests/attach/downgrade/` - -Migration is not required for the parallel system to work - these can continue using the old approach. diff --git a/server/tests/testRunner/TestRunnerUI.tsx b/server/tests/testRunner/TestRunnerUI.tsx deleted file mode 100644 index f9a8b3600..000000000 --- a/server/tests/testRunner/TestRunnerUI.tsx +++ /dev/null @@ -1,267 +0,0 @@ -import { Box, Text, render } from "ink"; -import Spinner from "ink-spinner"; -import React from "react"; - -export type TestFileStatus = "pending" | "running" | "passed" | "failed"; - -export type TestFile = { - name: string; - status: TestFileStatus; - duration?: number; - error?: string; -}; - -export type GroupStatus = "pending" | "setup" | "running" | "passed" | "failed"; - -export type TestGroupState = { - slug: string; - status: GroupStatus; - files: TestFile[]; - duration?: number; - error?: string; -}; - -type TestRunnerUIProps = { - groups: TestGroupState[]; - onExit?: () => void; -}; - -const TestFileRow = ({ file }: { file: TestFile }) => { - let icon: React.ReactNode; - let color: "green" | "red" | "yellow" | "gray" = "gray"; - - switch (file.status) { - case "pending": - icon = …; - color = "gray"; - break; - case "running": - icon = ( - - - - ); - color = "gray"; - break; - case "passed": - icon = ✓; - color = "gray"; - break; - case "failed": - icon = ✗; - color = "red"; - break; - } - - return ( - - {icon} - {file.name} - {file.duration && ( - ({(file.duration / 1000).toFixed(1)}s) - )} - {file.error && ( - - - → {file.error.split("\n")[0].slice(0, 80)} - - - )} - - ); -}; - -const TestGroupBox = ({ group }: { group: TestGroupState }) => { - let statusIcon: React.ReactNode; - let statusColor: "green" | "red" | "cyan" | "gray" = "gray"; - let statusText = ""; - - switch (group.status) { - case "pending": - statusIcon = …; - statusText = "Pending"; - statusColor = "gray"; - break; - case "setup": - statusIcon = ( - - - - ); - statusText = "Setting up"; - statusColor = "cyan"; - break; - case "running": - statusIcon = ( - - - - ); - statusText = "Running"; - statusColor = "cyan"; - break; - case "passed": - statusIcon = ✓; - statusText = "Passed"; - statusColor = "green"; - break; - case "failed": - statusIcon = ✗; - statusText = "Failed"; - statusColor = "red"; - break; - } - - const passedCount = group.files.filter((f) => f.status === "passed").length; - const failedCount = group.files.filter((f) => f.status === "failed").length; - const runningCount = group.files.filter((f) => f.status === "running").length; - - return ( - - - - {statusIcon} {group.slug} - - - {statusText} - {group.duration && ( - ({(group.duration / 1000).toFixed(1)}s) - )} - - - {group.status !== "pending" && group.files.length > 0 && ( - - - - {passedCount > 0 && ( - ✓ {passedCount} - )} - {failedCount > 0 && ✗ {failedCount} } - {runningCount > 0 && ( - - {runningCount}{" "} - - )} - - - - {/* Show running and failed files */} - {group.files - .filter((f) => f.status === "running" || f.status === "failed") - .map((file) => ( - - ))} - - )} - - {group.error && group.status === "failed" && ( - - Error: {group.error} - - )} - - ); -}; - -const TestRunnerUI = ({ groups }: TestRunnerUIProps) => { - const totalGroups = groups.length; - const completedGroups = groups.filter( - (g) => g.status === "passed" || g.status === "failed", - ).length; - const passedGroups = groups.filter((g) => g.status === "passed").length; - const failedGroups = groups.filter((g) => g.status === "failed").length; - - // Calculate total test stats - let totalTests = 0; - let passedTests = 0; - let failedTests = 0; - - for (const group of groups) { - totalTests += group.files.length; - passedTests += group.files.filter((f) => f.status === "passed").length; - failedTests += group.files.filter((f) => f.status === "failed").length; - } - - return ( - - - - PARALLEL TEST RUNNER - - - - - - Groups: {completedGroups}/{totalGroups} |{" "} - - ✓ {passedGroups} - | - 0 ? "red" : "gray"}> - ✗ {failedGroups} - - | - - Tests: {passedTests + failedTests}/{totalTests} |{" "} - - ✓ {passedTests} - | - 0 ? "red" : "gray"}>✗ {failedTests} - - - - {groups.map((group) => ( - - ))} - - - ); -}; - -export type UpdateFn = ( - groupSlug: string, - update: Partial, -) => void; - -export const createTestRunnerUI = ( - initialGroups: TestGroupState[], -): { - updateGroup: UpdateFn; - waitUntilExit: () => Promise; - cleanup: () => void; -} => { - let groups = initialGroups; - let rerender: (() => void) | null = null; - let exitResolve: (() => void) | null = null; - - const { clear, unmount } = render( - exitResolve?.()} />, - ); - - const updateGroup: UpdateFn = (groupSlug, update) => { - const groupIndex = groups.findIndex((g) => g.slug === groupSlug); - if (groupIndex === -1) return; - - groups = [ - ...groups.slice(0, groupIndex), - { ...groups[groupIndex], ...update }, - ...groups.slice(groupIndex + 1), - ]; - - // Force re-render with new state - unmount(); - const result = render( - exitResolve?.()} />, - ); - rerender = result.clear; - }; - - return { - updateGroup, - waitUntilExit: () => - new Promise((resolve) => { - exitResolve = resolve; - }), - cleanup: () => { - unmount(); - }, - }; -}; diff --git a/server/tests/testRunner/config.ts b/server/tests/testRunner/config.ts deleted file mode 100644 index 4ef937d5c..000000000 --- a/server/tests/testRunner/config.ts +++ /dev/null @@ -1,93 +0,0 @@ -/** - * Test Groups Configuration - * - * Each test group runs under its own dedicated Autumn organization + Stripe Connect account. - * This allows tests to run in parallel without rate limiting or data conflicts. - */ - -export type TestGroup = { - /** Unique org slug for this test group (e.g., "test-upgrade") */ - slug: string; - /** Test paths to run - can be directories or specific test files */ - paths: string[]; -}; - -export const testGroups: TestGroup[] = [ - // G1.sh test groups (48 test files) - { - slug: "check-basic", - paths: ["tests/check/basic"], - }, - { - slug: "basic", - paths: ["tests/attach/basic"], - }, - { - slug: "upgrade", - paths: ["tests/attach/upgrade"], - }, - { - slug: "downgrade", - paths: ["tests/attach/downgrade"], - }, - { - slug: "free", - paths: ["tests/attach/free"], - }, - { - slug: "addOn", - paths: ["tests/attach/addOn"], - }, - { - slug: "entities", - paths: ["tests/attach/entities"], - }, - { - slug: "checkout", - paths: ["tests/attach/checkout"], - }, - - // G2.sh test groups (28+ test files) - { - slug: "migrations", - paths: ["tests/attach/migrations"], - }, - { - slug: "newVersion", - paths: ["tests/attach/newVersion"], - }, - { - slug: "upgradeOld", - paths: ["tests/attach/upgradeOld"], - }, - { - slug: "others", - paths: ["tests/attach/others"], - }, - { - slug: "updateEnts", - paths: ["tests/attach/updateEnts"], - }, - { - slug: "prepaid", - paths: ["tests/attach/prepaid"], - }, - { - slug: "advanced-check", - paths: ["tests/advanced/check"], - }, - { - slug: "interval-upgrade", - paths: ["tests/interval/upgrade"], - }, - { - slug: "interval-multiSub", - paths: ["tests/interval/multiSub"], - }, - - // Debug single test - NEW MIGRATED VERSION - // { - // slug: "test-debug", - // paths: ["tests/attach/basic/basic1.test.ts"], - // }, -]; diff --git a/server/tests/testRunner/groupRunner.ts b/server/tests/testRunner/groupRunner.ts deleted file mode 100644 index 9d4f3c075..000000000 --- a/server/tests/testRunner/groupRunner.ts +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env bun - -import { spawn } from "bun"; -import chalk from "chalk"; -import dotenv from "dotenv"; -import { resolve } from "path"; - -// Load environment variables from server/.env -dotenv.config({ path: resolve(import.meta.dir, "..", "..", ".env") }); - -import type { TestGroup } from "./config.js"; -import { type TestSummary, parseTestOutput } from "./outputParser.js"; - -export type GroupResult = { - group: TestGroup; - success: boolean; - output: string; - error?: string; - duration: number; - testSummary?: TestSummary; -}; - -/** - * Calls the platform API to delete an org by slug - */ -async function deleteOrg({ slug }: { slug: string }): Promise { - const secretKey = process.env.TEST_ORG_SECRET_KEY; - if (!secretKey) { - throw new Error("TEST_ORG_SECRET_KEY not found in environment"); - } - - const baseUrl = process.env.BASE_URL || "http://localhost:8080"; - const response = await fetch(`${baseUrl}/v1/platform/beta/organizations`, { - method: "DELETE", - headers: { - "Content-Type": "application/json", - Authorization: `Bearer ${secretKey}`, - }, - body: JSON.stringify({ slug }), - }); - - if (!response.ok) { - const error = await response.text(); - // If org doesn't exist (404), that's fine - we just wanted it deleted anyway - if (response.status === 404) { - console.log(chalk.dim(`Org ${slug} doesn't exist (already deleted)`)); - return; - } - throw new Error( - `Failed to delete org ${slug}: ${response.status} ${error}`, - ); - } - - const data = await response.json(); - console.log(chalk.green(`✓ Deleted org: ${slug}`)); -} - -/** - * Calls the platform API to create a new org - */ -async function createOrg({ - slug, - name, - userEmail, -}: { - slug: string; - name: string; - userEmail: string; -}): Promise<{ secretKey: string; fullSlug: string }> { - const secretKey = process.env.TEST_ORG_SECRET_KEY; - if (!secretKey) { - throw new Error("TEST_ORG_SECRET_KEY not found in environment"); - } - - const baseUrl = process.env.BASE_URL || "http://localhost:8080"; - const response = await fetch(`${baseUrl}/v1/platform/beta/organizations`, { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: `Bearer ${secretKey}`, - }, - body: JSON.stringify({ - user_email: userEmail, - name, - slug, - env: "test", - }), - }); - - if (!response.ok) { - const error = await response.text(); - throw new Error( - `Failed to create org ${slug}: ${response.status} ${error}`, - ); - } - - const data = await response.json(); - if (!data.test_secret_key) { - throw new Error(`No test_secret_key returned for org ${slug}`); - } - if (!data.org_slug) { - throw new Error(`No org_slug returned for org ${slug}`); - } - - console.log(chalk.green(`✓ Created org: ${slug}`)); - - // Wait a moment for API key cache to propagate - await new Promise((resolve) => setTimeout(resolve, 1000)); - - return { - secretKey: data.test_secret_key, - fullSlug: data.org_slug, - }; -} - -/** - * Runs tests for a single group - */ -export async function runTestGroup({ - group, - verbose = false, - debug = false, -}: { - group: TestGroup; - verbose?: boolean; - debug?: boolean; -}): Promise { - const startTime = performance.now(); - let output = ""; - - // Auto-enable debug mode for small test runs (1-3 files) - const totalTestCount = group.paths.length; - const shouldDebug = debug || (totalTestCount <= 3 && totalTestCount > 0); - - try { - if (!shouldDebug) { - console.log(chalk.cyan(`\n┌─ ${chalk.bold(group.slug)}`)); - console.log(chalk.cyan("│")); - console.log(chalk.cyan(`│ ${chalk.dim("Preparing test environment...")}`)); - } else { - console.log(chalk.cyan.bold(`\n[${group.slug}] Starting test group`)); - } - - // 1. Delete existing org (cleanup from previous runs) - if (shouldDebug) { - console.log(chalk.dim(`[${group.slug}] Deleting existing org...`)); - } - try { - await deleteOrg({ slug: group.slug }); - } catch (error: any) { - if (shouldDebug) { - console.log( - chalk.yellow( - `[${group.slug}] Warning: Failed to delete org - ${error.message}`, - ), - ); - } - } - - // 2. Create new org and get secret key - if (shouldDebug) { - console.log(chalk.dim(`[${group.slug}] Creating new org...`)); - } - const { secretKey, fullSlug } = await createOrg({ - slug: group.slug, - name: `Test Group: ${group.slug}`, - userEmail: `test@gmail.com`, - }); - - // 3. Run setup for the org (seed test data) - if (shouldDebug) { - console.log(chalk.dim(`[${group.slug}] Setting up test data...`)); - } - - const serverDir = resolve(import.meta.dir, "..", ".."); - const setupPath = resolve(serverDir, "tests/setupMain.ts"); - - const setupProc = spawn(["bun", setupPath], { - stdout: "pipe", - stderr: "pipe", - cwd: serverDir, - env: { - ...process.env, - UNIT_TEST_AUTUMN_SECRET_KEY: secretKey, - TESTS_ORG: fullSlug, - }, - }); - - // Collect setup output (stream only if verbose or debug) - let setupOutput = ""; - const setupDecoder = new TextDecoder(); - if (setupProc.stdout) { - for await (const chunk of setupProc.stdout) { - const text = setupDecoder.decode(chunk); - setupOutput += text; - if (verbose || shouldDebug) { - process.stdout.write(text); - } - } - } - if (setupProc.stderr) { - for await (const chunk of setupProc.stderr) { - const text = setupDecoder.decode(chunk); - setupOutput += text; - if (verbose || shouldDebug) { - process.stderr.write(text); - } - } - } - - await setupProc.exited; - if (setupProc.exitCode !== 0) { - throw new Error( - `Setup failed for ${group.slug}: ${setupOutput.slice(0, 2000)}`, - ); - } - - // 4. Run tests with the secret key - if (!shouldDebug) { - console.log(chalk.cyan(`│ ${chalk.dim("Running tests...")}`)); - } else { - console.log(chalk.dim(`[${group.slug}] Running tests...`)); - } - - const runTestsPath = resolve(import.meta.dir, "runTests.ts"); - - const proc = spawn(["bun", runTestsPath, ...group.paths], { - stdout: "pipe", - stderr: "pipe", - cwd: serverDir, - env: { - ...process.env, - UNIT_TEST_AUTUMN_SECRET_KEY: secretKey, - TESTS_ORG: fullSlug, // Use the full slug with master org ID suffix - }, - }); - - const decoder = new TextDecoder(); - - if (proc.stdout) { - for await (const chunk of proc.stdout) { - const text = decoder.decode(chunk); - output += text; - if (verbose || shouldDebug) { - process.stdout.write(text); - } - } - } - - if (proc.stderr) { - for await (const chunk of proc.stderr) { - const text = decoder.decode(chunk); - output += text; - if (verbose || shouldDebug) { - process.stderr.write(text); - } - } - } - - await proc.exited; - const duration = performance.now() - startTime; - - // Parse test output for summary - const testSummary = parseTestOutput(output); - - if (proc.exitCode === 0) { - if (!shouldDebug) { - console.log(chalk.cyan("│")); - console.log( - chalk.cyan( - `└─ ${chalk.green.bold("✓ All tests passed")} ${chalk.dim(`(${(duration / 1000).toFixed(2)}s)`)}`, - ), - ); - } else { - console.log( - chalk.green.bold( - `\n[${group.slug}] ✓ All tests passed (${(duration / 1000).toFixed(2)}s)`, - ), - ); - } - return { - group, - success: true, - output, - duration, - testSummary, - }; - } - - if (!shouldDebug) { - console.log(chalk.cyan("│")); - console.log( - chalk.cyan( - `└─ ${chalk.red.bold("✗ Tests failed")} ${chalk.dim(`(${(duration / 1000).toFixed(2)}s)`)}`, - ), - ); - } else { - console.log( - chalk.red.bold( - `\n[${group.slug}] ✗ Tests failed (${(duration / 1000).toFixed(2)}s)`, - ), - ); - } - - return { - group, - success: false, - output, - error: `Tests failed with exit code ${proc.exitCode}`, - duration, - testSummary, - }; - } catch (error: any) { - const duration = performance.now() - startTime; - console.log( - chalk.red.bold( - `\n[${group.slug}] ✗ Error: ${error.message} (${(duration / 1000).toFixed(2)}s)`, - ), - ); - return { - group, - success: false, - output, - error: error.message, - duration, - }; - } -} diff --git a/server/tests/testRunner/groupRunnerV2.ts b/server/tests/testRunner/groupRunnerV2.ts deleted file mode 100644 index 80cb3b1ee..000000000 --- a/server/tests/testRunner/groupRunnerV2.ts +++ /dev/null @@ -1,394 +0,0 @@ -#!/usr/bin/env bun - -import dotenv from "dotenv"; -import { resolve } from "path"; -import { spawn } from "bun"; - -// Load environment variables from server/.env -dotenv.config({ path: resolve(import.meta.dir, "..", "..", ".env") }); - -import type { TestGroup } from "./config.js"; -import { runTests } from "./runTestsV2.js"; - -export type TestFileProgress = { - name: string; - status: "pending" | "running" | "passed" | "failed"; - duration?: number; - error?: string; - output?: string; // Full test output for debugging -}; - -export type GroupProgress = { - status: "pending" | "setup" | "running" | "passed" | "failed"; - files: TestFileProgress[]; - duration?: number; - error?: string; -}; - -export type ProgressCallback = (progress: GroupProgress) => void; - -export type GroupResult = { - group: TestGroup; - success: boolean; - output: string; - error?: string; - duration: number; - files: TestFileProgress[]; -}; - -/** - * Calls the platform API to delete an org by slug - */ -async function deleteOrg({ slug }: { slug: string }): Promise { - const secretKey = process.env.TEST_ORG_SECRET_KEY; - if (!secretKey) { - throw new Error("TEST_ORG_SECRET_KEY not found in environment"); - } - - const baseUrl = process.env.BASE_URL || "http://localhost:8080"; - const response = await fetch(`${baseUrl}/v1/platform/beta/organizations`, { - method: "DELETE", - headers: { - "Content-Type": "application/json", - Authorization: `Bearer ${secretKey}`, - }, - body: JSON.stringify({ slug }), - }); - - if (!response.ok) { - // If org doesn't exist (404), that's fine - we just wanted it deleted anyway - if (response.status === 404) { - return; - } - const error = await response.text(); - throw new Error( - `Failed to delete org ${slug}: ${response.status} ${error}`, - ); - } -} - -/** - * Calls the platform API to get existing org credentials - */ -async function getExistingOrg({ - slug, -}: { - slug: string; -}): Promise<{ secretKey: string; fullSlug: string } | null> { - const secretKey = process.env.TEST_ORG_SECRET_KEY; - if (!secretKey) { - throw new Error("TEST_ORG_SECRET_KEY not found in environment"); - } - - const baseUrl = process.env.BASE_URL || "http://localhost:8080"; - const response = await fetch(`${baseUrl}/v1/platform/beta/organizations`, { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: `Bearer ${secretKey}`, - }, - body: JSON.stringify({ - org_slug: slug, - }), - }); - - if (!response.ok) { - if (response.status === 404) { - return null; - } - const error = await response.text(); - throw new Error( - `Failed to get org ${slug}: ${response.status} ${error}`, - ); - } - - const data = await response.json(); - if (!data.test_secret_key) { - throw new Error(`No test_secret_key returned for org ${slug}`); - } - - return { - secretKey: data.test_secret_key, - fullSlug: slug, - }; -} - -/** - * Calls the platform API to create a new org - */ -async function createOrg({ - slug, - name, - userEmail, -}: { - slug: string; - name: string; - userEmail: string; -}): Promise<{ secretKey: string; fullSlug: string }> { - const secretKey = process.env.TEST_ORG_SECRET_KEY; - if (!secretKey) { - throw new Error("TEST_ORG_SECRET_KEY not found in environment"); - } - - const baseUrl = process.env.BASE_URL || "http://localhost:8080"; - const response = await fetch(`${baseUrl}/v1/platform/beta/organizations`, { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: `Bearer ${secretKey}`, - }, - body: JSON.stringify({ - user_email: userEmail, - name, - slug, - env: "test", - }), - }); - - if (!response.ok) { - const error = await response.text(); - throw new Error( - `Failed to create org ${slug}: ${response.status} ${error}`, - ); - } - - const data = await response.json(); - if (!data.test_secret_key) { - throw new Error(`No test_secret_key returned for org ${slug}`); - } - if (!data.org_slug) { - throw new Error(`No org_slug returned for org ${slug}`); - } - - // Wait a moment for API key cache to propagate - await new Promise((resolve) => setTimeout(resolve, 1000)); - - return { - secretKey: data.test_secret_key, - fullSlug: data.org_slug, - }; -} - -/** - * Parse test file list from directory paths - */ -async function getTestFiles(paths: string[]): Promise { - const { readdir } = await import("fs/promises"); - const testFiles: string[] = []; - - for (const path of paths) { - const resolvedPath = resolve(process.cwd(), path); - - // Check if it's a specific test file - if (path.endsWith(".test.ts")) { - testFiles.push(resolvedPath); - continue; - } - - // Otherwise treat it as a directory - try { - const files = await readdir(resolvedPath); - for (const file of files) { - if (file.endsWith(".test.ts")) { - testFiles.push(resolve(resolvedPath, file)); - } - } - } catch (error) { - // Ignore read errors - } - } - - return testFiles; -} - -/** - * Extract file name from path - */ -function getFileName(filePath: string): string { - return filePath.split("/").pop() || filePath; -} - - -/** - * Runs tests for a single group with progress callbacks - */ -export async function runTestGroupV2({ - group, - skipSetup = false, - onProgress, -}: { - group: TestGroup; - skipSetup?: boolean; - onProgress?: ProgressCallback; -}): Promise { - const startTime = performance.now(); - let output = ""; - - // Get test files upfront - const testFilePaths = await getTestFiles(group.paths); - const files: TestFileProgress[] = testFilePaths.map((path) => ({ - name: getFileName(path), - status: "pending" as const, - })); - - // Report initial state - onProgress?.({ - status: skipSetup ? "running" : "setup", - files, - duration: 0, - }); - - try { - let secretKey: string; - let fullSlug: string; - - if (skipSetup) { - // Try to get org from API - const existing = await getExistingOrg({ slug: group.slug }); - if (!existing) { - throw new Error( - `Cannot skip setup: org ${group.slug} not found. Run with --setup flag to create it: bun t ${group.slug} --setup`, - ); - } - secretKey = existing.secretKey; - fullSlug = existing.fullSlug; - } else { - // 1. Delete existing org - try { - await deleteOrg({ slug: group.slug }); - } catch (error: any) { - // Ignore delete errors - } - - // 2. Create new org - const orgResult = await createOrg({ - slug: group.slug, - name: `Test Group: ${group.slug}`, - userEmail: "test@gmail.com", - }); - secretKey = orgResult.secretKey; - fullSlug = orgResult.fullSlug; - - // 3. Run setup - const serverDir = resolve(import.meta.dir, "..", ".."); - const setupPath = resolve(serverDir, "tests/setupMain.ts"); - - const setupProc = spawn(["bun", setupPath], { - stdout: "pipe", - stderr: "pipe", - cwd: serverDir, - env: { - ...process.env, - UNIT_TEST_AUTUMN_SECRET_KEY: secretKey, - TESTS_ORG: fullSlug, - }, - }); - - // Collect setup output silently - let setupOutput = ""; - const setupDecoder = new TextDecoder(); - if (setupProc.stdout) { - for await (const chunk of setupProc.stdout) { - setupOutput += setupDecoder.decode(chunk); - } - } - if (setupProc.stderr) { - for await (const chunk of setupProc.stderr) { - setupOutput += setupDecoder.decode(chunk); - } - } - - await setupProc.exited; - if (setupProc.exitCode !== 0) { - throw new Error( - `Setup failed for ${group.slug}: ${setupOutput.slice(0, 500)}`, - ); - } - } - - // 5. Run tests with real-time progress callbacks - onProgress?.({ - status: "running", - files, - duration: performance.now() - startTime, - }); - - // Set environment for test execution - process.env.UNIT_TEST_AUTUMN_SECRET_KEY = secretKey; - process.env.TESTS_ORG = fullSlug; - - // Run tests with progress callbacks - const results = await runTests(group.paths, { - maxParallel: 6, - progress: { - onTestStart: (file) => { - const fileName = getFileName(file); - const fileIndex = files.findIndex((f) => f.name === fileName); - if (fileIndex !== -1) { - files[fileIndex].status = "running"; - onProgress?.({ - status: "running", - files: [...files], - duration: performance.now() - startTime, - }); - } - }, - onTestComplete: (file, result) => { - const fileName = getFileName(file); - const fileIndex = files.findIndex((f) => f.name === fileName); - if (fileIndex !== -1) { - files[fileIndex].status = result.status; - files[fileIndex].duration = result.duration; - if (result.error) { - files[fileIndex].error = result.error; - } - if (result.output) { - files[fileIndex].output = result.output; - } - onProgress?.({ - status: "running", - files: [...files], - duration: performance.now() - startTime, - }); - } - }, - }, - }); - - const duration = performance.now() - startTime; - const success = results.every((r) => r.status === "passed"); - - onProgress?.({ - status: success ? "passed" : "failed", - files, - duration, - }); - - return { - group, - success, - output, - duration, - files, - error: success ? undefined : "One or more tests failed", - }; - } catch (error: any) { - const duration = performance.now() - startTime; - - onProgress?.({ - status: "failed", - files, - duration, - error: error.message, - }); - - return { - group, - success: false, - output, - error: error.message, - duration, - files, - }; - } -} diff --git a/server/tests/testRunner/outputParser.ts b/server/tests/testRunner/outputParser.ts deleted file mode 100644 index 893517ba1..000000000 --- a/server/tests/testRunner/outputParser.ts +++ /dev/null @@ -1,141 +0,0 @@ -/** - * Parses test output to extract structured failure information - */ - -export type TestFailure = { - testFile: string; - testName: string; - errorMessage: string; - errorLocation?: string; - stackTrace?: string; -}; - -export type TestSummary = { - totalFiles: number; - passedFiles: number; - failedFiles: number; - totalTests: number; - passedTests: number; - failedTests: number; - failures: TestFailure[]; - duration: string; -}; - -/** - * Parses bun test output to extract failure information - */ -export function parseTestOutput(output: string): TestSummary { - const lines = output.split("\n"); - const failures: TestFailure[] = []; - - let totalFiles = 0; - let failedFiles = 0; - let totalTests = 0; - let passedTests = 0; - let failedTests = 0; - let duration = "0s"; - - // Extract summary statistics - for (let i = 0; i < lines.length; i++) { - const line = lines[i]; - - // Match: "Ran X tests across Y file(s). [Zs]" - const ranMatch = line.match(/Ran (\d+) tests across (\d+) file/); - if (ranMatch) { - totalTests += Number.parseInt(ranMatch[1]); - totalFiles += Number.parseInt(ranMatch[2]); - } - - // Match: "X pass" - const passMatch = line.match(/^\s*(\d+) pass/); - if (passMatch) { - passedTests += Number.parseInt(passMatch[1]); - } - - // Match: "X fail" - const failMatch = line.match(/^\s*(\d+) fail/); - if (failMatch) { - failedTests += Number.parseInt(failMatch[1]); - } - - // Match duration in summary - const durationMatch = line.match(/\[(\d+\.\d+s)\]/); - if (durationMatch) { - duration = durationMatch[1]; - } - } - - let passedFiles = totalFiles - failedFiles; - - // Extract failure details - let currentTestFile = ""; - const inFailureSection = false; - - for (let i = 0; i < lines.length; i++) { - const line = lines[i]; - - // Detect test file being processed - const fileMatch = line.match(/tests\/[\w/.-]+\.test\.ts:/); - if (fileMatch) { - currentTestFile = fileMatch[0].replace(":", ""); - } - - // Detect failure markers - if (line.includes("(fail)")) { - const failMatch = line.match(/\(fail\)\s+(.+?)\s+\[(\d+\.\d+ms)\]/); - if (failMatch) { - const testName = failMatch[1]; - - // Look backwards for error message - let errorMessage = ""; - let errorLocation = ""; - - for (let j = i - 1; j >= Math.max(0, i - 20); j--) { - const prevLine = lines[j]; - - // Find the error line (starts with "error:") - if (prevLine.startsWith("error:")) { - errorMessage = prevLine.replace("error:", "").trim(); - break; - } - } - - // Look forward for stack trace location - for (let j = i + 1; j < Math.min(lines.length, i + 10); j++) { - const nextLine = lines[j]; - if (nextLine.includes("at ") && nextLine.includes(".ts:")) { - errorLocation = nextLine.trim(); - break; - } - } - - failures.push({ - testFile: currentTestFile, - testName, - errorMessage, - errorLocation, - }); - - if (currentTestFile && !failedFiles) { - failedFiles++; - } - } - } - } - - // Calculate failed files from failures - const uniqueFailedFiles = new Set(failures.map((f) => f.testFile)); - failedFiles = uniqueFailedFiles.size; - passedFiles = totalFiles - failedFiles; - - return { - totalFiles, - passedFiles, - failedFiles, - totalTests, - passedTests, - failedTests, - failures, - duration, - }; -} diff --git a/server/tests/testRunner/runParallelGroups.ts b/server/tests/testRunner/runParallelGroups.ts deleted file mode 100644 index e6c166ad1..000000000 --- a/server/tests/testRunner/runParallelGroups.ts +++ /dev/null @@ -1,128 +0,0 @@ -#!/usr/bin/env bun - -import { resolve } from "path"; -import dotenv from "dotenv"; - -// Load environment variables from server/.env -dotenv.config({ path: resolve(import.meta.dir, "..", "..", ".env") }); - -import chalk from "chalk"; -import { testGroups } from "./config.js"; -import { type GroupResult, runTestGroup } from "./groupRunner.js"; - -/** - * Main entry point for parallel test execution - * Runs all test groups in parallel, each with its own dedicated org - */ -async function main() { - // Check for flags - const verbose = process.argv.includes("--verbose"); - const debug = process.argv.includes("--debug"); - - console.log(chalk.bold.cyan("\n╔═══════════════════════════════════════════════════════════════════╗")); - console.log(chalk.bold.cyan("║ PARALLEL TEST RUNNER ║")); - console.log(chalk.bold.cyan("╚═══════════════════════════════════════════════════════════════════╝\n")); - - console.log(chalk.dim(`Running ${testGroups.length} test group(s) in parallel...\n`)); - - if (!verbose && !debug) { - console.log(chalk.dim(" 💡 Use --verbose to see all output, --debug for single test debugging\n")); - } - - // Validate environment - if (!process.env.TEST_ORG_SECRET_KEY) { - console.error(chalk.red.bold("ERROR: TEST_ORG_SECRET_KEY environment variable is required")); - console.log( - chalk.dim( - "\nThis should be the secret key of your platform organization that has access to create/delete orgs.", - ), - ); - process.exit(1); - } - - const startTime = performance.now(); - - // Run all groups in parallel - const results = await Promise.all( - testGroups.map((group) => runTestGroup({ group, verbose, debug })), - ); - - const totalDuration = performance.now() - startTime; - - // Calculate totals - const successfulGroups = results.filter((r) => r.success); - const failedGroups = results.filter((r) => !r.success); - - let totalTests = 0; - let totalPassed = 0; - let totalFailed = 0; - - for (const result of results) { - if (result.testSummary) { - totalTests += result.testSummary.totalTests; - totalPassed += result.testSummary.passedTests; - totalFailed += result.testSummary.failedTests; - } - } - - // Print summary - console.log(chalk.bold.cyan("\n╔═══════════════════════════════════════════════════════════════════╗")); - console.log(chalk.bold.cyan("║ SUMMARY ║")); - console.log(chalk.bold.cyan("╚═══════════════════════════════════════════════════════════════════╝\n")); - - console.log(chalk.bold(` Total Duration: ${chalk.cyan((totalDuration / 1000).toFixed(2))}s`)); - console.log( - chalk.bold( - ` Test Groups: ${chalk.green(successfulGroups.length)} passed, ${failedGroups.length > 0 ? chalk.red(failedGroups.length) : chalk.dim(failedGroups.length)} failed`, - ), - ); - console.log( - chalk.bold( - ` Tests: ${chalk.green(totalPassed)} passed, ${totalFailed > 0 ? chalk.red(totalFailed) : chalk.dim(totalFailed)} failed (${totalTests} total)`, - ), - ); - - // Show details for failed groups - if (failedGroups.length > 0) { - console.log(chalk.red.bold("\n╔═══════════════════════════════════════════════════════════════════╗")); - console.log(chalk.red.bold("║ FAILED TESTS ║")); - console.log(chalk.red.bold("╚═══════════════════════════════════════════════════════════════════╝")); - - for (const result of failedGroups) { - console.log(chalk.red.bold(`\n ✗ ${result.group.slug}`)); - console.log(chalk.dim(` Duration: ${(result.duration / 1000).toFixed(2)}s`)); - - if (result.testSummary && result.testSummary.failures.length > 0) { - console.log(chalk.dim(` Failed: ${result.testSummary.failedTests}/${result.testSummary.totalTests} tests\n`)); - - for (const failure of result.testSummary.failures) { - console.log(chalk.red(` ┌─ ${failure.testFile || "unknown test"}`)); - console.log(chalk.red(` │ ${failure.testName}`)); - console.log(chalk.red(` │`)); - console.log(chalk.yellow(` │ ${failure.errorMessage}`)); - if (failure.errorLocation) { - console.log(chalk.dim(` │ ${failure.errorLocation}`)); - } - console.log(chalk.red(` └─\n`)); - } - } else { - console.log(chalk.dim(` ${result.error}\n`)); - } - } - - console.log(chalk.red.bold("╔═══════════════════════════════════════════════════════════════════╗")); - console.log(chalk.red.bold(`║ ${failedGroups.length} GROUP(S) FAILED ║`)); - console.log(chalk.red.bold("╚═══════════════════════════════════════════════════════════════════╝\n")); - process.exit(1); - } - - console.log(chalk.green.bold("\n╔═══════════════════════════════════════════════════════════════════╗")); - console.log(chalk.green.bold("║ ✓ ALL TESTS PASSED ║")); - console.log(chalk.green.bold("╚═══════════════════════════════════════════════════════════════════╝\n")); - process.exit(0); -} - -main().catch((error) => { - console.error(chalk.red.bold("\nFatal error:"), error); - process.exit(1); -}); diff --git a/server/tests/testRunner/runParallelGroupsV2.ts b/server/tests/testRunner/runParallelGroupsV2.ts deleted file mode 100755 index 33ae91675..000000000 --- a/server/tests/testRunner/runParallelGroupsV2.ts +++ /dev/null @@ -1,217 +0,0 @@ -#!/usr/bin/env bun - -import { resolve } from "path"; -import dotenv from "dotenv"; - -// Load environment variables from server/.env -dotenv.config({ path: resolve(import.meta.dir, "..", "..", ".env") }); - -import chalk from "chalk"; -import { testGroups } from "./config.js"; -import { - type GroupProgress, - type GroupResult, - runTestGroupV2, -} from "./groupRunnerV2.js"; -import { - type TestGroupState, - createTestRunnerUI, -} from "./TestRunnerUI.js"; - -/** - * Main entry point for parallel test execution with TUI - */ -async function main() { - // Check for flags - const verbose = process.argv.includes("--verbose"); - const debug = process.argv.includes("--debug"); - - // Validate environment - if (!process.env.TEST_ORG_SECRET_KEY) { - console.error( - chalk.red.bold( - "ERROR: TEST_ORG_SECRET_KEY environment variable is required", - ), - ); - console.log( - chalk.dim( - "\nThis should be the secret key of your platform organization that has access to create/delete orgs.", - ), - ); - process.exit(1); - } - - const startTime = performance.now(); - - // Initialize UI state - const initialGroups: TestGroupState[] = testGroups.map((group) => ({ - slug: group.slug, - status: "pending", - files: [], - duration: undefined, - error: undefined, - })); - - const { updateGroup, cleanup } = createTestRunnerUI(initialGroups); - - // Run all groups in parallel with progress updates - const results = await Promise.all( - testGroups.map((group) => - runTestGroupV2({ - group, - onProgress: (progress: GroupProgress) => { - updateGroup(group.slug, { - status: progress.status, - files: progress.files.map((f) => ({ - name: f.name, - status: f.status, - duration: f.duration, - error: f.error, - })), - duration: progress.duration, - error: progress.error, - }); - }, - }), - ), - ); - - const totalDuration = performance.now() - startTime; - - // Cleanup UI - cleanup(); - - // Calculate totals - const successfulGroups = results.filter((r) => r.success); - const failedGroups = results.filter((r) => !r.success); - - let totalTests = 0; - let totalPassed = 0; - let totalFailed = 0; - - for (const result of results) { - totalTests += result.files.length; - totalPassed += result.files.filter((f) => f.status === "passed").length; - totalFailed += result.files.filter((f) => f.status === "failed").length; - } - - // Print summary - console.log( - chalk.bold.cyan( - "\n╔═══════════════════════════════════════════════════════════════════╗", - ), - ); - console.log( - chalk.bold.cyan( - "║ SUMMARY ║", - ), - ); - console.log( - chalk.bold.cyan( - "╚═══════════════════════════════════════════════════════════════════╝\n", - ), - ); - - console.log( - chalk.bold( - ` Total Duration: ${chalk.cyan((totalDuration / 1000).toFixed(2))}s`, - ), - ); - console.log( - chalk.bold( - ` Test Groups: ${chalk.green(successfulGroups.length)} passed, ${failedGroups.length > 0 ? chalk.red(failedGroups.length) : chalk.dim(failedGroups.length)} failed`, - ), - ); - console.log( - chalk.bold( - ` Tests: ${chalk.green(totalPassed)} passed, ${totalFailed > 0 ? chalk.red(totalFailed) : chalk.dim(totalFailed)} failed (${totalTests} total)`, - ), - ); - - // Show details for failed groups - if (failedGroups.length > 0) { - console.log( - chalk.red.bold( - "\n╔═══════════════════════════════════════════════════════════════════╗", - ), - ); - console.log( - chalk.red.bold( - "║ FAILED TESTS ║", - ), - ); - console.log( - chalk.red.bold( - "╚═══════════════════════════════════════════════════════════════════╝", - ), - ); - - for (const result of failedGroups) { - console.log(chalk.red.bold(`\n ✗ ${result.group.slug}`)); - console.log( - chalk.dim(` Duration: ${(result.duration / 1000).toFixed(2)}s`), - ); - - const failedFiles = result.files.filter((f) => f.status === "failed"); - - if (failedFiles.length > 0) { - console.log( - chalk.dim( - ` Failed: ${failedFiles.length}/${result.files.length} tests\n`, - ), - ); - - for (const file of failedFiles) { - console.log(chalk.red(` ┌─ ${file.name}`)); - if (file.error) { - // Show first line of error - const errorLine = file.error.split("\n")[0]; - console.log(chalk.yellow(` │ ${errorLine.slice(0, 80)}`)); - } - console.log(chalk.red(" └─\n")); - } - } else if (result.error) { - console.log(chalk.dim(` ${result.error}\n`)); - } - } - - console.log( - chalk.red.bold( - "╔═══════════════════════════════════════════════════════════════════╗", - ), - ); - console.log( - chalk.red.bold( - `║ ${failedGroups.length} GROUP(S) FAILED ║`, - ), - ); - console.log( - chalk.red.bold( - "╚═══════════════════════════════════════════════════════════════════╝\n", - ), - ); - process.exit(1); - } - - console.log( - chalk.green.bold( - "\n╔═══════════════════════════════════════════════════════════════════╗", - ), - ); - console.log( - chalk.green.bold( - "║ ✓ ALL TESTS PASSED ║", - ), - ); - console.log( - chalk.green.bold( - "╚═══════════════════════════════════════════════════════════════════╝\n", - ), - ); - process.exit(0); -} - -main().catch((error) => { - console.error(chalk.red.bold("\nFatal error:"), error); - process.exit(1); -}); diff --git a/server/tests/testRunner/runParallelGroupsV3.ts b/server/tests/testRunner/runParallelGroupsV3.ts deleted file mode 100755 index 15805fc0d..000000000 --- a/server/tests/testRunner/runParallelGroupsV3.ts +++ /dev/null @@ -1,504 +0,0 @@ -#!/usr/bin/env bun - -import { resolve } from "path"; -import dotenv from "dotenv"; - -// Load environment variables from server/.env -dotenv.config({ path: resolve(import.meta.dir, "..", "..", ".env") }); - -import chalk from "chalk"; -import { testGroups } from "./config.js"; -import { - type GroupProgress, - type GroupResult, - runTestGroupV2, -} from "./groupRunnerV2.js"; - -type TestFileStatus = "pending" | "running" | "passed" | "failed"; - -type TestFile = { - name: string; - status: TestFileStatus; - duration?: number; - error?: string; -}; - -type GroupStatus = "pending" | "setup" | "running" | "passed" | "failed"; - -type TestGroupState = { - slug: string; - status: GroupStatus; - files: TestFile[]; - duration?: number; - error?: string; -}; - -class SimpleTUI { - private groups: TestGroupState[] = []; - private startLine = 0; - private renderInterval?: Timer; - private spinnerFrames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]; - private spinnerIndex = 0; - private lastRenderedLineCount = 0; - - constructor(groups: TestGroupState[]) { - this.groups = groups; - } - - start() { - // Hide cursor - process.stdout.write("\x1B[?25l"); - - // Reserve space for rendering - const lines = this.calculateLines(); - for (let i = 0; i < lines; i++) { - console.log(); - } - // Move cursor back up - process.stdout.write(`\x1B[${lines}A`); - this.startLine = 1; - - // Start render loop - this.renderInterval = setInterval(() => this.render(), 100); - } - - updateGroup(slug: string, update: Partial) { - const idx = this.groups.findIndex((g) => g.slug === slug); - if (idx !== -1) { - this.groups[idx] = { ...this.groups[idx], ...update }; - } - } - - stop() { - if (this.renderInterval) { - clearInterval(this.renderInterval); - } - // Do one final render to show completed state - this.render(); - // Show cursor - process.stdout.write("\x1B[?25h"); - // Move past output using ACTUAL lines rendered, not max possible - process.stdout.write(`\x1B[${this.lastRenderedLineCount}B`); - console.log("\n"); - } - - private calculateLines(): number { - // Fixed layout: - // 2 lines for header - // 7 lines per group (1 for group header, 6 for test files with stack traces) - // 6 = 2 files * 3 lines each (file + error + stack) - return 2 + (this.groups.length * 7); - } - - private render() { - this.spinnerIndex = (this.spinnerIndex + 1) % this.spinnerFrames.length; - const spinner = this.spinnerFrames[this.spinnerIndex]; - - let lineNum = this.startLine; - - // Move to start and clear line - process.stdout.write(`\x1B[${lineNum};0H\x1B[2K`); - // Header (no newline - we'll move cursor manually) - process.stdout.write(chalk.bold.cyan("PARALLEL TEST RUNNER")); - lineNum++; - - // Stats - const completed = this.groups.filter( - (g) => g.status === "passed" || g.status === "failed", - ).length; - const passed = this.groups.filter((g) => g.status === "passed").length; - const failed = this.groups.filter((g) => g.status === "failed").length; - - let totalTests = 0; - let passedTests = 0; - let failedTests = 0; - for (const g of this.groups) { - totalTests += g.files.length; - passedTests += g.files.filter((f) => f.status === "passed").length; - failedTests += g.files.filter((f) => f.status === "failed").length; - } - - process.stdout.write(`\x1B[${lineNum};0H\x1B[2K`); - process.stdout.write( - `Groups: ${completed}/${this.groups.length} | ` + - `${chalk.green(`✓ ${passed}`)} | ` + - `${failed > 0 ? chalk.red(`✗ ${failed}`) : chalk.dim(`✗ ${failed}`)} | ` + - `Tests: ${passedTests + failedTests}/${totalTests} | ` + - `${chalk.green(`✓ ${passedTests}`)} | ` + - `${failedTests > 0 ? chalk.red(`✗ ${failedTests}`) : chalk.dim(`✗ ${failedTests}`)}\n\n`, - ); - lineNum += 2; - - // Groups - for (const group of this.groups) { - process.stdout.write(`\x1B[${lineNum};0H\x1B[2K`); - - let icon = ""; - let statusText = ""; - - switch (group.status) { - case "pending": - icon = chalk.gray("…"); - statusText = "Pending"; - break; - case "setup": - icon = chalk.cyan(spinner); - statusText = "Setting up"; - break; - case "running": - icon = chalk.cyan(spinner); - statusText = "Running"; - break; - case "passed": - icon = chalk.green("✓"); - statusText = "Passed"; - break; - case "failed": - icon = chalk.red("✗"); - statusText = "Failed"; - break; - } - - const completedCount = - group.files.filter( - (f) => f.status === "passed" || f.status === "failed", - ).length; - const totalCount = group.files.length; - const failedCount = group.files.filter((f) => f.status === "failed").length; - - let groupLine = `${icon} ${chalk.bold(group.slug)} - ${statusText}`; - if (group.duration) { - groupLine += chalk.dim(` (${(group.duration / 1000).toFixed(1)}s)`); - } - - // Show progress for running/passed/failed groups - if (group.status !== "pending" && totalCount > 0) { - groupLine += chalk.dim(` | ${completedCount}/${totalCount} completed`); - if (failedCount > 0) { - groupLine += chalk.red(` [${failedCount} failed]`); - } - } - - process.stdout.write(groupLine); - lineNum++; - - // Show failed files only - if (group.status !== "pending" && failedCount > 0) { - const failedFiles = group.files.filter((f) => f.status === "failed"); - for (const file of failedFiles.slice(0, 2)) { - process.stdout.write(`\x1B[${lineNum};0H\x1B[2K`); - let fileLine = ` ${chalk.red("✗")} ${file.name}`; - if (file.error) { - // Show first meaningful line of error (up to 80 chars) - const errorLines = file.error.split("\n").filter((l) => l.trim()); - const shortError = errorLines[0]?.slice(0, 80) || "Test failed"; - fileLine += chalk.yellow(` → ${shortError}`); - } - process.stdout.write(fileLine); - lineNum++; - - // Show stack trace location if available - if (file.error) { - const errorLines = file.error.split("\n"); - const stackLine = errorLines.find((l) => - l.trim().startsWith("at "), - ); - if (stackLine) { - // Extract file path and line number from stack trace - // Format: "at functionName (/path/to/file.ts:123:45)" - const match = stackLine.match(/\((.+?):(\d+):(\d+)\)/); - if (match) { - const [, filePath, line] = match; - const fileName = filePath.split("/").pop(); - process.stdout.write(`\x1B[${lineNum};0H\x1B[2K`); - process.stdout.write(chalk.dim(` ${fileName}:${line}`)); - lineNum++; - } else { - // Clear the line if no stack found - process.stdout.write(`\x1B[${lineNum};0H\x1B[2K`); - lineNum++; - } - } else { - // Clear the line if no stack found - process.stdout.write(`\x1B[${lineNum};0H\x1B[2K`); - lineNum++; - } - } else { - // Clear the line if no error - process.stdout.write(`\x1B[${lineNum};0H\x1B[2K`); - lineNum++; - } - } - } else { - // Clear the file display lines (now 3 lines per file, 2 files max = 6 lines) - for (let i = 0; i < 6; i++) { - process.stdout.write(`\x1B[${lineNum};0H\x1B[2K`); - lineNum++; - } - } - } - - // Clear remaining lines - const maxLines = this.calculateLines(); - while (lineNum < this.startLine + maxLines) { - process.stdout.write(`\x1B[${lineNum};0H\x1B[2K`); - lineNum++; - } - - // Track how many lines we actually used (minus startLine offset) - this.lastRenderedLineCount = lineNum - this.startLine; - } -} - -/** - * Main entry point for parallel test execution with TUI - */ -async function main() { - // Validate environment - if (!process.env.TEST_ORG_SECRET_KEY) { - console.error( - chalk.red.bold( - "ERROR: TEST_ORG_SECRET_KEY environment variable is required", - ), - ); - console.log( - chalk.dim( - "\nThis should be the secret key of your platform organization that has access to create/delete orgs.", - ), - ); - process.exit(1); - } - - // Parse CLI arguments for targeted group execution - const args = process.argv.slice(2); - const targetedSlugs = args.filter((arg) => !arg.startsWith("--")); - const forceSetup = args.includes("--setup"); - - // Filter test groups based on CLI args - let groupsToRun = testGroups; - // When targeting specific groups, skip setup by default unless --setup is passed - const skipSetup = targetedSlugs.length > 0 && !forceSetup; - - if (targetedSlugs.length > 0) { - groupsToRun = testGroups.filter((g) => targetedSlugs.includes(g.slug)); - if (groupsToRun.length === 0) { - console.error( - chalk.red.bold( - `\nERROR: No matching test groups found for: ${targetedSlugs.join(", ")}`, - ), - ); - console.log(chalk.dim("\nAvailable groups:")); - for (const group of testGroups) { - console.log(chalk.dim(` - ${group.slug}`)); - } - process.exit(1); - } - console.log( - chalk.cyan( - `\nRunning targeted groups: ${groupsToRun.map((g) => g.slug).join(", ")}`, - ), - ); - if (skipSetup) { - console.log( - chalk.yellow( - "Skipping org setup (using existing test orgs). Use --setup to force recreate.\n", - ), - ); - } else { - console.log(chalk.yellow("Recreating test orgs from scratch...\n")); - } - } - - const startTime = performance.now(); - - // Initialize UI state - const initialGroups: TestGroupState[] = groupsToRun.map((group) => ({ - slug: group.slug, - status: "pending", - files: [], - duration: undefined, - error: undefined, - })); - - const tui = new SimpleTUI(initialGroups); - tui.start(); - - // Run all groups in parallel with progress updates - const results = await Promise.all( - groupsToRun.map((group) => - runTestGroupV2({ - group, - skipSetup, - onProgress: (progress: GroupProgress) => { - tui.updateGroup(group.slug, { - status: progress.status, - files: progress.files.map((f) => ({ - name: f.name, - status: f.status, - duration: f.duration, - error: f.error, - output: f.output, - })), - duration: progress.duration, - error: progress.error, - }); - }, - }), - ), - ); - - const totalDuration = performance.now() - startTime; - - // Stop TUI - tui.stop(); - - // Calculate totals - const successfulGroups = results.filter((r) => r.success); - const failedGroups = results.filter((r) => !r.success); - - let totalTests = 0; - let totalPassed = 0; - let totalFailed = 0; - - for (const result of results) { - totalTests += result.files.length; - totalPassed += result.files.filter((f) => f.status === "passed").length; - totalFailed += result.files.filter((f) => f.status === "failed").length; - } - - // Print summary - console.log( - chalk.bold.cyan( - "\n╔═══════════════════════════════════════════════════════════════════╗", - ), - ); - console.log( - chalk.bold.cyan( - "║ SUMMARY ║", - ), - ); - console.log( - chalk.bold.cyan( - "╚═══════════════════════════════════════════════════════════════════╝\n", - ), - ); - - console.log( - chalk.bold( - ` Total Duration: ${chalk.cyan((totalDuration / 1000).toFixed(2))}s`, - ), - ); - console.log( - chalk.bold( - ` Test Groups: ${chalk.green(successfulGroups.length)} passed, ${failedGroups.length > 0 ? chalk.red(failedGroups.length) : chalk.dim(failedGroups.length)} failed`, - ), - ); - console.log( - chalk.bold( - ` Tests: ${chalk.green(totalPassed)} passed, ${totalFailed > 0 ? chalk.red(totalFailed) : chalk.dim(totalFailed)} failed (${totalTests} total)`, - ), - ); - - // Show details for failed groups - if (failedGroups.length > 0) { - console.log( - chalk.red.bold( - "\n╔═══════════════════════════════════════════════════════════════════╗", - ), - ); - console.log( - chalk.red.bold( - "║ FAILED TESTS ║", - ), - ); - console.log( - chalk.red.bold( - "╚═══════════════════════════════════════════════════════════════════╝", - ), - ); - - for (const result of failedGroups) { - console.log(chalk.red.bold(`\n ✗ ${result.group.slug}`)); - console.log( - chalk.dim(` Duration: ${(result.duration / 1000).toFixed(2)}s`), - ); - - const failedFiles = result.files.filter((f) => f.status === "failed"); - - if (failedFiles.length > 0) { - console.log( - chalk.dim( - ` Failed: ${failedFiles.length}/${result.files.length} tests\n`, - ), - ); - - for (const file of failedFiles) { - console.log(chalk.red(` ┌─ ${file.name}`)); - if (file.error) { - // Show all error lines with proper indentation - const errorLines = file.error.split("\n"); - for (const line of errorLines) { - if (line.trim()) { - console.log(chalk.yellow(` │ ${line}`)); - } - } - } - - // Show full test output if available - if (file.output) { - console.log(chalk.red(" │")); - console.log(chalk.cyan(" │ === Full Test Output ===")); - const outputLines = file.output.split("\n"); - for (const line of outputLines) { - if (line.trim()) { - console.log(chalk.dim(` │ ${line}`)); - } - } - } - console.log(chalk.red(" └─\n")); - } - } else if (result.error) { - console.log(chalk.dim(` ${result.error}\n`)); - } - } - - console.log( - chalk.red.bold( - "╔═══════════════════════════════════════════════════════════════════╗", - ), - ); - console.log( - chalk.red.bold( - `║ ${failedGroups.length} GROUP(S) FAILED ║`, - ), - ); - console.log( - chalk.red.bold( - "╚═══════════════════════════════════════════════════════════════════╝\n", - ), - ); - process.exit(1); - } - - console.log( - chalk.green.bold( - "\n╔═══════════════════════════════════════════════════════════════════╗", - ), - ); - console.log( - chalk.green.bold( - "║ ✓ ALL TESTS PASSED ║", - ), - ); - console.log( - chalk.green.bold( - "╚═══════════════════════════════════════════════════════════════════╝\n", - ), - ); - process.exit(0); -} - -main().catch((error) => { - console.error(chalk.red.bold("\nFatal error:"), error); - process.exit(1); -}); diff --git a/server/tests/testRunner/runTests.ts b/server/tests/testRunner/runTests.ts deleted file mode 100755 index 5d0222a69..000000000 --- a/server/tests/testRunner/runTests.ts +++ /dev/null @@ -1,734 +0,0 @@ -#!/usr/bin/env bun - -import { spawn } from "bun"; -import chalk from "chalk"; -import { readdir } from "fs/promises"; -import pLimit from "p-limit"; -import { basename, resolve } from "path"; - -interface TestResult { - file: string; - status: "pending" | "running" | "passed" | "failed"; - output: string; - duration: number; - error?: string; - lastTestName?: string; -} - -class TestRunner { - private results: Map = new Map(); - private testFiles: string[] = []; - private maxParallel: number = 6; - private spinnerFrames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]; - private spinnerIndex = 0; - private renderInterval?: Timer; - private startLine = 0; - private compactMode: boolean = false; - private silentMode: boolean = false; - private lastRenderedLines = 0; - - constructor({ - maxParallel, - compactMode, - silentMode, - }: { - maxParallel?: number; - compactMode?: boolean; - silentMode?: boolean; - } = {}) { - if (maxParallel) this.maxParallel = maxParallel; - if (compactMode) this.compactMode = compactMode; - if (silentMode) this.silentMode = silentMode; - } - - async collectTestFiles(paths: string[]): Promise { - const testFiles: string[] = []; - - for (const path of paths) { - const resolvedPath = resolve(process.cwd(), path); - - // Check if it's a specific test file - if (path.endsWith(".test.ts")) { - testFiles.push(resolvedPath); - continue; - } - - // Otherwise treat it as a directory - try { - const files = await readdir(resolvedPath); - for (const file of files) { - if (file.endsWith(".test.ts")) { - testFiles.push(resolve(resolvedPath, file)); - } - } - } catch (error) { - console.error(chalk.red(`Error reading directory ${path}:`), error); - } - } - - return testFiles; - } - - private extractLastTest(output: string): string | null { - const lines = output.split("\n"); - - for (let i = lines.length - 1; i >= 0; i--) { - const line = lines[i].trim(); - - const testMatch = line.match(/^[✓✗]\s+(.+?)(?:\s+\[\d+\.\d+m?s\])?$/); - if (testMatch) { - return testMatch[1]; - } - - const bunTestMatch = line.match(/test\s+"([^"]+)"/); - if (bunTestMatch) { - return bunTestMatch[1]; - } - } - - return null; - } - - private truncateTestName(name: string, maxLength: number = 50): string { - if (name.length <= maxLength) return name; - return name.substring(0, maxLength - 3) + "..."; - } - - private hideCursor() { - process.stdout.write("\x1B[?25l"); - } - - private showCursor() { - process.stdout.write("\x1B[?25h"); - } - - private moveCursor(line: number, col: number = 0) { - process.stdout.write(`\x1B[${line};${col}H`); - } - - private clearLine() { - process.stdout.write("\x1B[2K"); - } - - private getSpacesNeeded(): number { - if (!this.compactMode) { - return this.testFiles.length + 3; - } - - // Compact mode: dynamically calculate based on content - // Base: 10 lines for headers, stats, spacing - // + 3 lines for recently completed - // + failed tests * 4 (name + 2 error lines + spacing) - // + running tests - const failedCount = Array.from(this.results.values()).filter( - (r) => r.status === "failed", - ).length; - const runningCount = Array.from(this.results.values()).filter( - (r) => r.status === "running", - ).length; - - return Math.min( - 10 + 3 + failedCount * 4 + Math.min(runningCount, 6), - 30, // Cap at 30 lines - ); - } - - private render() { - this.spinnerIndex = (this.spinnerIndex + 1) % this.spinnerFrames.length; - const spinner = this.spinnerFrames[this.spinnerIndex]; - - if (this.compactMode) { - // Compact mode: show completed, failed, running tests, then stats - let lineNum = this.startLine; - - const completed = Array.from(this.results.values()).filter( - (r) => r.status === "passed" || r.status === "failed", - ).length; - const passed = Array.from(this.results.values()).filter( - (r) => r.status === "passed", - ).length; - const failed = Array.from(this.results.values()).filter( - (r) => r.status === "failed", - ).length; - - // Show recently completed tests (last 3) - const passedTests = Array.from(this.results.entries()) - .filter(([_, result]) => result.status === "passed") - .slice(-3); // Get last 3 completed - - if (passedTests.length > 0) { - this.moveCursor(lineNum, 0); - this.clearLine(); - process.stdout.write( - chalk.green.bold(`Recently Completed (${passed} total):\n`), - ); - lineNum++; - - for (const [file] of passedTests) { - this.moveCursor(lineNum, 0); - this.clearLine(); - const testName = basename(file); - process.stdout.write( - ` ${chalk.green("✓")} ${chalk.dim(testName)}\n`, - ); - lineNum++; - } - - // Add blank line - this.moveCursor(lineNum, 0); - this.clearLine(); - process.stdout.write("\n"); - lineNum++; - } - - // Show failed tests - const failedTests = Array.from(this.results.entries()).filter( - ([_, result]) => result.status === "failed", - ); - - if (failedTests.length > 0) { - this.moveCursor(lineNum, 0); - this.clearLine(); - process.stdout.write( - chalk.red.bold(`Failed (${failedTests.length}):\n`), - ); - lineNum++; - - for (const [file, result] of failedTests) { - this.moveCursor(lineNum, 0); - this.clearLine(); - const testName = basename(file); - process.stdout.write(` ${chalk.red("✗")} ${testName}\n`); - lineNum++; - - // Show first 2 lines of error - if (result.error) { - const errorLines = result.error.split("\n").filter((l) => l.trim()); - const displayLines = errorLines.slice(0, 2); - for (const line of displayLines) { - this.moveCursor(lineNum, 0); - this.clearLine(); - const truncated = - line.length > 80 ? line.substring(0, 77) + "..." : line; - process.stdout.write(` ${chalk.dim(truncated)}\n`); - lineNum++; - } - } - } - - // Add blank line after failed tests - this.moveCursor(lineNum, 0); - this.clearLine(); - process.stdout.write("\n"); - lineNum++; - } - - // Show currently running tests - const runningTests = Array.from(this.results.entries()).filter( - ([_, result]) => result.status === "running", - ); - - if (runningTests.length > 0) { - this.moveCursor(lineNum, 0); - this.clearLine(); - process.stdout.write( - chalk.cyan.bold(`Running (${runningTests.length}):\n`), - ); - lineNum++; - - for (const [file, result] of runningTests) { - this.moveCursor(lineNum, 0); - this.clearLine(); - const testName = basename(file); - let displayText = ` ${chalk.cyan(spinner)} ${testName}`; - if (result.lastTestName) { - const truncated = this.truncateTestName(result.lastTestName, 40); - displayText += chalk.dim(` › ${truncated}`); - } - process.stdout.write(`${displayText}\n`); - lineNum++; - } - - // Add blank line after running tests - this.moveCursor(lineNum, 0); - this.clearLine(); - process.stdout.write("\n"); - lineNum++; - } - - // Show stats line - this.moveCursor(lineNum, 0); - this.clearLine(); - process.stdout.write( - `${chalk.cyan(spinner)} Progress: ${chalk.bold(`${completed}/${this.testFiles.length}`)} | ` + - `${chalk.green(`✓ ${passed}`)} | ` + - `${failed > 0 ? chalk.red(`✗ ${failed}`) : chalk.dim(`✗ ${failed}`)}\n`, - ); - lineNum++; - - // Clear any remaining lines from previous renders - const maxLines = this.getSpacesNeeded(); - while (lineNum < maxLines) { - this.moveCursor(lineNum, 0); - this.clearLine(); - lineNum++; - } - - // Track how many lines we actually used - this.lastRenderedLines = lineNum - this.startLine; - } else { - // Full mode: show all tests - let lineNum = this.startLine; - - for (const file of this.testFiles) { - const result = this.results.get(file); - if (!result) continue; - - this.moveCursor(lineNum, 0); - this.clearLine(); - - const testName = basename(file); - let statusIcon: string; - let displayText: string; - - switch (result.status) { - case "pending": - statusIcon = chalk.dim("⋯"); - displayText = chalk.dim(testName); - break; - case "running": - statusIcon = chalk.cyan(spinner); - displayText = testName; - if (result.lastTestName) { - const truncated = this.truncateTestName(result.lastTestName); - displayText += chalk.dim(` › ${truncated}`); - } - break; - case "passed": - statusIcon = chalk.green("✓"); - displayText = chalk.dim(testName); - break; - case "failed": - statusIcon = chalk.red("✗"); - displayText = testName; - break; - } - - process.stdout.write(`${statusIcon} ${displayText}\n`); - lineNum++; - } - - // Summary line - const completed = Array.from(this.results.values()).filter( - (r) => r.status === "passed" || r.status === "failed", - ).length; - const failed = Array.from(this.results.values()).filter( - (r) => r.status === "failed", - ).length; - const running = Array.from(this.results.values()).filter( - (r) => r.status === "running", - ).length; - - this.moveCursor(lineNum + 1, 0); - this.clearLine(); - if (running > 0) { - process.stdout.write( - chalk.dim( - `Running: ${running} | Completed: ${completed}/${this.testFiles.length} | Failed: ${failed}`, - ), - ); - } - - // Track how many lines we actually used - this.lastRenderedLines = lineNum + 2 - this.startLine; - } - } - - async runTest(file: string): Promise { - const startTime = performance.now(); - - // Initialize as running - const result: TestResult = { - file, - status: "running", - output: "", - duration: 0, - }; - this.results.set(file, result); - - try { - const proc = spawn(["bun", "test", "--timeout", "0", file], { - stdout: "pipe", - stderr: "pipe", - }); - - let output = ""; - const decoder = new TextDecoder(); - - if (proc.stdout) { - for await (const chunk of proc.stdout) { - const text = decoder.decode(chunk); - output += text; - - // Only stream output if not in silent mode - if (!this.silentMode) { - process.stdout.write(text); - } - - // Update last test name - const lastTest = this.extractLastTest(output); - if (lastTest) { - result.lastTestName = lastTest; - result.output = output; - this.results.set(file, result); - } - } - } - - if (proc.stderr) { - for await (const chunk of proc.stderr) { - const text = decoder.decode(chunk); - output += text; - - // Only stream errors if not in silent mode - if (!this.silentMode) { - process.stderr.write(text); - } - } - } - - await proc.exited; - const duration = performance.now() - startTime; - - const fileName = file.split("/").pop() || file; - - if (proc.exitCode === 0) { - this.results.set(file, { - ...result, - status: "passed", - output, - duration, - }); - // In silent mode, immediately output completion for real-time tracking - if (this.silentMode) { - console.log(`✓ ${fileName}`); - } - } else { - this.results.set(file, { - ...result, - status: "failed", - output, - duration, - error: this.extractError(output), - }); - // In silent mode, immediately output failure for real-time tracking - if (this.silentMode) { - console.log(`✗ ${fileName}`); - } - } - } catch (error) { - const duration = performance.now() - startTime; - const fileName = file.split("/").pop() || file; - this.results.set(file, { - ...result, - status: "failed", - output: "", - duration, - error: String(error), - }); - if (this.silentMode) { - console.log(`✗ ${fileName}`); - } - } - } - - private extractError(output: string): string { - const lines = output.split("\n"); - const errorLines: string[] = []; - let inError = false; - let capturedLines = 0; - - for (const line of lines) { - if ( - line.includes("error:") || - line.includes("Error:") || - line.includes("Expected:") || - line.includes("Received:") || - line.includes("AssertionError") - ) { - inError = true; - } - - if (inError) { - errorLines.push(line); - capturedLines++; - - if (capturedLines > 20) break; - } - - if (line.match(/^[\s]*✗/)) { - errorLines.push(line); - } - } - - return errorLines.length > 0 ? errorLines.join("\n").trim() : output; - } - - private cleanup() { - if (this.renderInterval) { - clearInterval(this.renderInterval); - } - this.showCursor(); - } - - private handleInterrupt() { - this.cleanup(); - - // Move cursor past all output (use actual rendered lines in compact mode) - const linesToMove = this.compactMode - ? this.lastRenderedLines - : this.getSpacesNeeded(); - process.stdout.write(`\x1B[${linesToMove}B`); - console.log("\n"); - - console.log(chalk.yellow.bold("\n⚠ Tests interrupted by user (Ctrl+C)\n")); - - // Print summary of what we have so far - const failedTests = Array.from(this.results.values()).filter( - (t) => t.status === "failed", - ); - const completedTests = Array.from(this.results.values()).filter( - (t) => t.status === "passed" || t.status === "failed", - ); - - console.log( - chalk.dim( - `Completed: ${completedTests.length}/${this.testFiles.length} tests before interruption`, - ), - ); - - if (failedTests.length > 0) { - console.log( - chalk.red.bold( - `\n${"═".repeat(70)}\n FAILED TESTS (${failedTests.length})\n${"═".repeat(70)}\n`, - ), - ); - - for (const test of failedTests) { - const testName = basename(test.file); - console.log(chalk.red.bold(`\n✗ ${testName}`)); - console.log(chalk.dim("─".repeat(70))); - - if (test.error) { - const errorLines = test.error.split("\n"); - for (const line of errorLines) { - if (line.trim()) { - if (line.includes("Expected:") || line.includes("Received:")) { - console.log(chalk.yellow(line)); - } else if (line.includes("✗")) { - console.log(chalk.red(line)); - } else { - console.log(chalk.dim(line)); - } - } - } - } - } - - console.log( - chalk.red.bold( - `\n${"═".repeat(70)}\n ${failedTests.length} test file(s) failed\n${"═".repeat(70)}\n`, - ), - ); - } - - process.exit(130); // Standard exit code for SIGINT - } - - async run(directories: string[]): Promise { - this.testFiles = await this.collectTestFiles(directories); - - if (this.testFiles.length === 0) { - if (!this.silentMode) { - console.log( - chalk.yellow("No test files found in specified directories"), - ); - } - return; - } - - if (!this.silentMode) { - console.log( - chalk.bold(`\nRunning ${this.testFiles.length} test file(s)...\n`), - ); - } - - // Initialize all tests as pending - for (const file of this.testFiles) { - this.results.set(file, { - file, - status: "pending", - output: "", - duration: 0, - }); - } - - // Setup SIGINT handler - const sigintHandler = () => this.handleInterrupt(); - process.on("SIGINT", sigintHandler); - - // Only setup UI if not in silent mode - if (!this.silentMode) { - // Hide cursor and create space for all tests - this.hideCursor(); - this.startLine = 1; // Start from line 1 - - // Create space - less space needed in compact mode - const spacesNeeded = this.getSpacesNeeded(); - this.lastRenderedLines = spacesNeeded; // Initialize to full space - for (let i = 0; i < spacesNeeded; i++) { - console.log(); - } - - // Move cursor back up to start rendering - process.stdout.write(`\x1B[${spacesNeeded}A`); - - // Start rendering loop - this.renderInterval = setInterval(() => this.render(), 100); - } - - // Run tests with concurrency limit - const limit = pLimit(this.maxParallel); - const promises = this.testFiles.map((file) => - limit(() => this.runTest(file)), - ); - - await Promise.all(promises); - - // Remove SIGINT handler - process.off("SIGINT", sigintHandler); - - if (!this.silentMode) { - // Final render - this.cleanup(); - this.render(); - - // Move cursor past all output (use actual rendered lines in compact mode) - const linesToMove = this.compactMode - ? this.lastRenderedLines - : this.getSpacesNeeded(); - process.stdout.write(`\x1B[${linesToMove}B`); - console.log("\n"); - - // Print summary - this.printSummary(); - } - // Silent mode: results already output as tests complete, no need to output again - } - - getResults(): Map { - return this.results; - } - - private printSummary() { - const failedTests = Array.from(this.results.values()).filter( - (t) => t.status === "failed", - ); - - if (failedTests.length === 0) { - console.log( - chalk.green.bold(`✓ All ${this.testFiles.length} test file(s) passed!`), - ); - process.exit(0); - } - - console.log( - chalk.red.bold( - `\n${"═".repeat(70)}\n FAILED TESTS (${failedTests.length}/${this.testFiles.length})\n${"═".repeat(70)}\n`, - ), - ); - - for (const test of failedTests) { - const testName = basename(test.file); - console.log(chalk.red.bold(`\n✗ ${testName}`)); - console.log(chalk.dim("─".repeat(70))); - - if (test.error) { - const errorLines = test.error.split("\n"); - for (const line of errorLines) { - if (line.trim()) { - if (line.includes("Expected:") || line.includes("Received:")) { - console.log(chalk.yellow(line)); - } else if (line.includes("✗")) { - console.log(chalk.red(line)); - } else { - console.log(chalk.dim(line)); - } - } - } - } - } - - console.log( - chalk.red.bold( - `\n${"═".repeat(70)}\n ${failedTests.length} test file(s) failed\n${"═".repeat(70)}\n`, - ), - ); - process.exit(1); - } -} - -// Parse CLI arguments -const args = process.argv.slice(2); -const directories: string[] = []; -let maxParallel = 6; -let compactMode = false; -let silentMode = false; - -for (const arg of args) { - if (arg.startsWith("--max=")) { - maxParallel = Number.parseInt(arg.split("=")[1], 10); - } else if (arg === "--compact") { - compactMode = true; - } else if (arg === "--silent") { - silentMode = true; - } else if (arg.startsWith("-")) { - console.error(chalk.red(`Unknown option: ${arg}`)); - console.log( - "Usage: bun scripts/testScripts/runTests.ts [dir2] [...] [--max=N] [--compact] [--silent]", - ); - process.exit(1); - } else { - directories.push(arg); - } -} - -if (directories.length === 0) { - console.error(chalk.red("Error: No test directories specified")); - console.log( - "Usage: bun scripts/testScripts/runTests.ts [dir2] [...] [--max=N] [--compact]", - ); - console.log("\nOptions:"); - console.log(" --max=N Set maximum parallel test files (default: 6)"); - console.log( - " --compact Use compact mode (only show summary and failures)", - ); - console.log("\nExamples:"); - console.log( - " bun scripts/testScripts/runTests.ts server/tests/attach/upgrade", - ); - console.log( - " bun scripts/testScripts/runTests.ts server/tests/attach/upgrade server/tests/attach/downgrade", - ); - console.log( - " bun scripts/testScripts/runTests.ts server/tests/attach/upgrade --max=10", - ); - console.log( - " bun scripts/testScripts/runTests.ts server/tests/attach/upgrade --compact", - ); - process.exit(1); -} - -// Run tests -const runner = new TestRunner({ maxParallel, compactMode, silentMode }); -await runner.run(directories); diff --git a/server/tests/testRunner/runTestsV2.ts b/server/tests/testRunner/runTestsV2.ts deleted file mode 100644 index 2b62556fb..000000000 --- a/server/tests/testRunner/runTestsV2.ts +++ /dev/null @@ -1,207 +0,0 @@ -#!/usr/bin/env bun - -import { $ } from "bun"; -import chalk from "chalk"; -import { readdir } from "fs/promises"; -import pLimit from "p-limit"; -import { resolve } from "path"; - -interface TestResult { - file: string; - status: "pending" | "running" | "passed" | "failed"; - duration: number; - error?: string; - output?: string; // Full test output for failed tests -} - -interface TestProgress { - onTestStart?: (file: string) => void; - onTestComplete?: (file: string, result: TestResult) => void; -} - -/** - * Collect test files from paths - */ -async function collectTestFiles(paths: string[]): Promise { - const testFiles: string[] = []; - - for (const path of paths) { - const resolvedPath = resolve(process.cwd(), path); - - if (path.endsWith(".test.ts")) { - testFiles.push(resolvedPath); - continue; - } - - try { - const files = await readdir(resolvedPath); - for (const file of files) { - if (file.endsWith(".test.ts")) { - testFiles.push(resolve(resolvedPath, file)); - } - } - } catch (error) { - // Ignore read errors - } - } - - return testFiles; -} - -/** - * Run a single test file using Bun Shell - */ -async function runTestFile( - file: string, - progress?: TestProgress, -): Promise { - const startTime = performance.now(); - - progress?.onTestStart?.(file); - - try { - // Use Bun Shell to run the test with streaming output - const result = await $`bun test --timeout 0 ${file}`.quiet().nothrow(); - - const duration = performance.now() - startTime; - - if (result.exitCode === 0) { - const testResult: TestResult = { - file, - status: "passed", - duration, - }; - progress?.onTestComplete?.(file, testResult); - return testResult; - } - - // Test failed - capture full output - const stderr = result.stderr.toString(); - const stdout = result.stdout.toString(); - const fullOutput = `${stdout}\n${stderr}`.trim(); - - // Extract error with stack trace for summary display - const lines = fullOutput.split("\n"); - let errorLines: string[] = []; - - // First, look for the error message with Expected/Received - for (let i = 0; i < lines.length; i++) { - const line = lines[i]; - if ( - line.includes("error:") || - line.includes("Expected:") || - line.includes("Received:") - ) { - // Capture error message lines - errorLines = lines.slice(i, i + 4); - break; - } - } - - // Then look for stack trace (lines with file paths and line numbers) - const stackLines: string[] = []; - for (let i = 0; i < lines.length; i++) { - const line = lines[i]; - // Match patterns like "at functionName (/path/to/file.ts:123:45)" - if (line.trim().startsWith("at ") && line.includes(".ts:")) { - stackLines.push(line.trim()); - // Capture up to 5 stack frames - if (stackLines.length >= 5) break; - } - } - - // Combine error message and stack trace - if (stackLines.length > 0) { - errorLines.push("", ...stackLines); - } - - const error = errorLines.length > 0 ? errorLines.join("\n") : "Test failed"; - - const testResult: TestResult = { - file, - status: "failed", - duration, - error, - output: fullOutput, // Include full output for debugging - }; - progress?.onTestComplete?.(file, testResult); - return testResult; - } catch (error) { - const duration = performance.now() - startTime; - const testResult: TestResult = { - file, - status: "failed", - duration, - error: String(error), - }; - progress?.onTestComplete?.(file, testResult); - return testResult; - } -} - -/** - * Run multiple test files in parallel - */ -export async function runTests( - paths: string[], - options: { - maxParallel?: number; - progress?: TestProgress; - } = {}, -): Promise { - const { maxParallel = 6, progress } = options; - - const testFiles = await collectTestFiles(paths); - - if (testFiles.length === 0) { - return []; - } - - // Run tests with concurrency limit - const limit = pLimit(maxParallel); - const promises = testFiles.map((file) => - limit(() => runTestFile(file, progress)), - ); - - return await Promise.all(promises); -} - -// CLI usage -if (import.meta.main) { - const args = process.argv.slice(2); - - if (args.length === 0) { - console.error(chalk.red("Error: No test directories specified")); - console.log("Usage: bun runTestsV2.ts [dir2] [...]"); - process.exit(1); - } - - const results = await runTests(args, { - progress: { - onTestStart: (file) => { - const fileName = file.split("/").pop(); - console.log(chalk.cyan(`⠋ ${fileName}`)); - }, - onTestComplete: (file, result) => { - const fileName = file.split("/").pop(); - if (result.status === "passed") { - console.log(chalk.green(`✓ ${fileName}`)); - } else { - console.log(chalk.red(`✗ ${fileName}`)); - if (result.error) { - console.log(chalk.yellow(` ${result.error}`)); - } - } - }, - }, - }); - - const passed = results.filter((r) => r.status === "passed").length; - const failed = results.filter((r) => r.status === "failed").length; - - console.log( - `\n${chalk.green(`✓ ${passed}`)} passed, ${failed > 0 ? chalk.red(`✗ ${failed}`) : chalk.dim(`✗ ${failed}`)} failed`, - ); - - process.exit(failed > 0 ? 1 : 0); -} diff --git a/server/tests/testRunner/testWorker.ts b/server/tests/testRunner/testWorker.ts deleted file mode 100644 index f8d66bbf1..000000000 --- a/server/tests/testRunner/testWorker.ts +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/env bun - -/// -declare var self: Worker; - -import { test } from "bun:test"; - -type TestMessage = - | { type: "test-start"; file: string; test: string } - | { type: "test-pass"; file: string; test: string; duration: number } - | { type: "test-fail"; file: string; test: string; duration: number; error: string } - | { type: "file-complete"; file: string; passed: number; failed: number; duration: number }; - -let currentFile = ""; -let testsRun = 0; -let testsPassed = 0; -let testsFailed = 0; -const fileStartTime = performance.now(); - -// Intercept test execution to send progress updates -const originalTest = test; - -// Override test to track progress -(globalThis as any).test = function (name: string, fn: Function) { - return originalTest(name, async () => { - testsRun++; - const testStart = performance.now(); - - self.postMessage({ - type: "test-start", - file: currentFile, - test: name, - } as TestMessage); - - try { - await fn(); - const duration = performance.now() - testStart; - testsPassed++; - - self.postMessage({ - type: "test-pass", - file: currentFile, - test: name, - duration, - } as TestMessage); - } catch (error) { - const duration = performance.now() - testStart; - testsFailed++; - - self.postMessage({ - type: "test-fail", - file: currentFile, - test: name, - duration, - error: error instanceof Error ? error.message : String(error), - } as TestMessage); - - throw error; // Re-throw so bun:test sees the failure - } - }); -}; - -self.onmessage = async (event: MessageEvent) => { - const { testFile } = event.data; - - if (!testFile) { - self.postMessage({ type: "error", error: "No test file specified" }); - return; - } - - currentFile = testFile; - testsRun = 0; - testsPassed = 0; - testsFailed = 0; - - try { - // Import the test file - this will execute all tests - await import(testFile); - - // Wait a tick for all tests to complete - await new Promise((resolve) => setTimeout(resolve, 100)); - - const fileDuration = performance.now() - fileStartTime; - - self.postMessage({ - type: "file-complete", - file: testFile, - passed: testsPassed, - failed: testsFailed, - duration: fileDuration, - } as TestMessage); - } catch (error) { - self.postMessage({ - type: "error", - file: testFile, - error: error instanceof Error ? error.message : String(error), - }); - } -}; diff --git a/server/tests/utils/testInitUtils/initScenario.ts b/server/tests/utils/testInitUtils/initScenario.ts index b10092fff..34e5752f4 100644 --- a/server/tests/utils/testInitUtils/initScenario.ts +++ b/server/tests/utils/testInitUtils/initScenario.ts @@ -83,6 +83,7 @@ type ScenarioConfig = { customerData?: CustomerData; withDefault: boolean; defaultGroup?: string; + skipWebhooks?: boolean; products: ProductV2[]; productPrefix?: string; entityConfig?: EntityConfig; @@ -120,9 +121,11 @@ const generateEntities = (config: EntityConfig): GeneratedEntity[] => { * @param data - Customer metadata (fingerprint, name, email, etc.) * @param withDefault - Attach the default product on creation (default: false) * @param defaultGroup - The product group to use for default product selection + * @param skipWebhooks - Skip sending webhooks for this customer creation (default: undefined, uses server default) * @example s.customer({ paymentMethod: "success" }) * @example s.customer({ paymentMethod: "success", data: { name: "Test" } }) * @example s.customer({ withDefault: true, defaultGroup: "enterprise" }) + * @example s.customer({ withDefault: true, skipWebhooks: false }) // Enable webhooks for testing */ const customer = ({ testClock = true, @@ -130,12 +133,14 @@ const customer = ({ data, withDefault, defaultGroup, + skipWebhooks, }: { testClock?: boolean; paymentMethod?: "success" | "fail" | "authenticate"; data?: CustomerData; withDefault?: boolean; defaultGroup?: string; + skipWebhooks?: boolean; }): ConfigFn => { return (config) => ({ ...config, @@ -144,6 +149,7 @@ const customer = ({ customerData: data ?? config.customerData, withDefault: withDefault ?? config.withDefault, defaultGroup: defaultGroup ?? config.defaultGroup, + skipWebhooks: skipWebhooks ?? config.skipWebhooks, }); }; @@ -580,6 +586,7 @@ export async function initScenario({ withDefault: config.withDefault, // Default group matches the product prefix (customerId) used in initProductsV0 defaultGroup: config.defaultGroup ?? customerId, + skipWebhooks: config.skipWebhooks, }); testClockId = result.testClockId; customer = result.customer; diff --git a/shared/utils/cusProductUtils/findCustomerProduct/findCustomerProduct.ts b/shared/utils/cusProductUtils/findCustomerProduct/findCustomerProduct.ts new file mode 100644 index 000000000..8dcf292b1 --- /dev/null +++ b/shared/utils/cusProductUtils/findCustomerProduct/findCustomerProduct.ts @@ -0,0 +1,15 @@ +import type { FullCustomer } from "@models/cusModels/fullCusModel"; + +export const findCustomerProductById = ({ + fullCustomer, + customerProductId, +}: { + fullCustomer?: FullCustomer; + customerProductId: string; +}) => { + if (!fullCustomer) return undefined; + + return fullCustomer.customer_products.find( + (customerProduct) => customerProduct.id === customerProductId, + ); +}; diff --git a/shared/utils/cusProductUtils/index.ts b/shared/utils/cusProductUtils/index.ts index 156e34266..e2dda9f17 100644 --- a/shared/utils/cusProductUtils/index.ts +++ b/shared/utils/cusProductUtils/index.ts @@ -10,6 +10,7 @@ export * from "./filterCusProductUtils.js"; export * from "./filterCustomerProducts/filterCustomerProductsByActiveStatuses.js"; export * from "./filterCustomerProducts/filterCustomerProductsByStripeSubscriptionId.js"; export * from "./findCustomerProduct/findActiveCustomerProduct.js"; +export * from "./findCustomerProduct/findCustomerProduct.js"; export * from "./findCustomerProduct/findScheduledCustomerProduct.js"; export * from "./getCusProductFromCustomer.js"; export * from "./productIdToCusProduct.js"; diff --git a/shared/utils/cusUtils/fullCusUtils/enrichFullCustomer.ts b/shared/utils/cusUtils/fullCusUtils/enrichFullCustomer.ts new file mode 100644 index 000000000..f9dcf257e --- /dev/null +++ b/shared/utils/cusUtils/fullCusUtils/enrichFullCustomer.ts @@ -0,0 +1,46 @@ +import { InternalError } from "@api/errors/base/InternalError.js"; +import type { Entity } from "@models/cusModels/entityModels/entityModels.js"; +import type { FullCustomer } from "@models/cusModels/fullCusModel.js"; + +type FullCustomerWithEntity = FullCustomer & { entity: Entity }; + +// Overload: errorOnNotFound = true → guaranteed entity +export function enrichFullCustomerWithEntity(params: { + fullCustomer: FullCustomer; + internalEntityId: string | null; + errorOnNotFound: true; +}): FullCustomerWithEntity; + +// Overload: errorOnNotFound = false/undefined → entity may be undefined +export function enrichFullCustomerWithEntity(params: { + fullCustomer: FullCustomer; + internalEntityId: string | null; + errorOnNotFound?: false; +}): FullCustomer; + +// Implementation +export function enrichFullCustomerWithEntity({ + fullCustomer, + internalEntityId, + errorOnNotFound, +}: { + fullCustomer: FullCustomer; + internalEntityId: string | null; + errorOnNotFound?: boolean; +}): FullCustomer | FullCustomerWithEntity { + if (internalEntityId === null) { + fullCustomer.entity = undefined; + } else { + fullCustomer.entity = fullCustomer.entities?.find( + (e) => e.internal_id === internalEntityId, + ); + } + + if (errorOnNotFound && !fullCustomer.entity) { + throw new InternalError({ + message: `Entity not found for internal_id: ${internalEntityId}`, + }); + } + + return fullCustomer; +} diff --git a/shared/utils/cusUtils/index.ts b/shared/utils/cusUtils/index.ts new file mode 100644 index 000000000..bba1f53f6 --- /dev/null +++ b/shared/utils/cusUtils/index.ts @@ -0,0 +1,7 @@ +// Cus plan utils +export * from "./cusPlanUtils/cusPlanUtils.js"; + +// Full cus utils +export * from "./fullCusUtils/enrichFullCustomer.js"; +export * from "./fullCusUtils/fullCustomerToCustomerEntitlements.js"; +export * from "./fullCusUtils/getCusStripeSubCount.js"; diff --git a/shared/utils/index.ts b/shared/utils/index.ts index bb0e35a73..a5839be88 100644 --- a/shared/utils/index.ts +++ b/shared/utils/index.ts @@ -23,9 +23,7 @@ export * from "./cusPriceUtils/index.js"; export * from "./cusProductUtils/index.js"; // Cus utils -export * from "./cusUtils/cusPlanUtils/cusPlanUtils.js"; -export * from "./cusUtils/fullCusUtils/fullCustomerToCustomerEntitlements.js"; -export * from "./cusUtils/fullCusUtils/getCusStripeSubCount.js"; +export * from "./cusUtils/index.js"; export * from "./expandUtils.js"; // Feature utils From b73a060a5debb67e85b95d776ec671cb0380a7e1 Mon Sep 17 00:00:00 2001 From: John Yeo Date: Wed, 21 Jan 2026 12:54:09 +0000 Subject: [PATCH 5/5] superset setup --- .superset/config.json | 3 +- .superset/setup.sh | 131 ++++++++++++++++++ .../honoMiddlewares/refreshCacheMiddleware.ts | 5 +- .../features/featureActions/createFeature.ts | 14 +- .../features/featureActions/updateFeature.ts | 12 +- 5 files changed, 144 insertions(+), 21 deletions(-) create mode 100755 .superset/setup.sh diff --git a/.superset/config.json b/.superset/config.json index 9d9aba5a1..a8c87751f 100644 --- a/.superset/config.json +++ b/.superset/config.json @@ -1,4 +1,3 @@ { - "setup": [], - "teardown": [] + "setup": ["./.superset/setup.sh"] } diff --git a/.superset/setup.sh b/.superset/setup.sh new file mode 100755 index 000000000..e2e488283 --- /dev/null +++ b/.superset/setup.sh @@ -0,0 +1,131 @@ +#!/bin/zsh + +set -e + +echo "Starting Superset workspace setup for Autumn..." + +# Check for Bun +if ! command -v bun &> /dev/null; then + echo "Error: Bun is not installed." + echo "Please install Bun from https://bun.sh" + exit 1 +fi + +echo "Bun found: $(bun --version)" + +# Determine root path - use SUPERSET_ROOT_PATH if set, otherwise use git root +if [ -n "$SUPERSET_ROOT_PATH" ]; then + ROOT_PATH="$SUPERSET_ROOT_PATH" +else + # Fallback for manual testing - go up two directories from .superset/workspace + ROOT_PATH="$(cd "$(dirname "$0")/.." && pwd)" +fi + +echo "Root path: $ROOT_PATH" + +# Install dependencies +echo "Installing dependencies..." +bun install + +# Copy .env files from root repo +echo "Copying .env files from root repository..." + +# Copy all .env* files from server/ +if [ -d "$ROOT_PATH/server" ]; then + mkdir -p server + for env_file in "$ROOT_PATH/server"/.env*; do + if [ -f "$env_file" ]; then + filename=$(basename "$env_file") + cp "$env_file" "server/$filename" + echo "Copied server/$filename" + fi + done +else + echo "Warning: $ROOT_PATH/server directory not found" +fi + +# Copy all .env* files from vite/ +if [ -d "$ROOT_PATH/vite" ]; then + mkdir -p vite + for env_file in "$ROOT_PATH/vite"/.env*; do + if [ -f "$env_file" ]; then + filename=$(basename "$env_file") + cp "$env_file" "vite/$filename" + echo "Copied vite/$filename" + fi + done +else + echo "Warning: $ROOT_PATH/vite directory not found" +fi + +# Copy all .env* files from shared/ +if [ -d "$ROOT_PATH/shared" ]; then + mkdir -p shared + for env_file in "$ROOT_PATH/shared"/.env*; do + if [ -f "$env_file" ]; then + filename=$(basename "$env_file") + cp "$env_file" "shared/$filename" + echo "Copied shared/$filename" + fi + done +else + echo "Warning: $ROOT_PATH/shared directory not found" +fi + +# Copy all .sh files from root +echo "Copying shell scripts from root repository..." +for sh_file in "$ROOT_PATH"/*.sh; do + if [ -f "$sh_file" ]; then + filename=$(basename "$sh_file") + # Skip conductor-setup.sh itself + if [ "$filename" != "conductor-setup.sh" ]; then + cp "$sh_file" "$filename" + chmod +x "$filename" + echo "Copied $filename" + fi + fi +done + +# Copy all .sh files from server/ +echo "Copying shell scripts from server directory..." +if [ -d "$ROOT_PATH/server" ]; then + mkdir -p server + for sh_file in "$ROOT_PATH/server"/*.sh; do + if [ -f "$sh_file" ]; then + filename=$(basename "$sh_file") + cp "$sh_file" "server/$filename" + chmod +x "server/$filename" + echo "Copied server/$filename" + fi + done +else + echo "Warning: $ROOT_PATH/server directory not found" +fi + +# Copy all .sh files from server/shell/ +echo "Copying shell scripts from server/shell directory..." +if [ -d "$ROOT_PATH/server/shell" ]; then + mkdir -p server/shell + for sh_file in "$ROOT_PATH/server/shell"/*.sh; do + if [ -f "$sh_file" ]; then + filename=$(basename "$sh_file") + cp "$sh_file" "server/shell/$filename" + chmod +x "server/shell/$filename" + echo "Copied server/shell/$filename" + fi + done +else + echo "Warning: $ROOT_PATH/server/shell directory not found" +fi + +# Copy drizzle migration files +if [ -d "$ROOT_PATH/shared/drizzle" ]; then + echo "Copying database migration files..." + mkdir -p shared/drizzle + cp -r "$ROOT_PATH/shared/drizzle/"* shared/drizzle/ + echo "Copied migration files" +fi + +echo "Workspace setup complete!" +echo "" +echo "Next: Start the development server with 'bun run dev:bun'" diff --git a/server/src/honoMiddlewares/refreshCacheMiddleware.ts b/server/src/honoMiddlewares/refreshCacheMiddleware.ts index 11ed40a3b..685879ea3 100644 --- a/server/src/honoMiddlewares/refreshCacheMiddleware.ts +++ b/server/src/honoMiddlewares/refreshCacheMiddleware.ts @@ -78,9 +78,8 @@ export const refreshCacheMiddleware = async ( if (c.res.status < 200 || c.res.status >= 300) return; const ctx = c.get("ctx"); - const { skipCacheDeletion } = ctx; - if (skipCacheDeletion) return; + if (ctx.testOptions?.skipCacheDeletion) return; const pathname = new URL(c.req.url).pathname.replace("/v1", ""); const method = c.req.method; @@ -90,7 +89,7 @@ export const refreshCacheMiddleware = async ( matchRoute({ url: pathname, method, pattern }), ); - if (pathMatch && !skipCacheDeletion) { + if (pathMatch) { const customerId = c.req.param("customer_id"); if (customerId) { await deleteCachedFullCustomer({ diff --git a/server/src/internal/features/featureActions/createFeature.ts b/server/src/internal/features/featureActions/createFeature.ts index 6427f9abb..56084d4f4 100644 --- a/server/src/internal/features/featureActions/createFeature.ts +++ b/server/src/internal/features/featureActions/createFeature.ts @@ -1,7 +1,6 @@ import { CreateFeatureSchema, type Feature, FeatureType } from "@autumn/shared"; import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; -import { JobName } from "@/queue/JobName.js"; -import { addTaskToQueue } from "@/queue/queueUtils.js"; +import { workflows } from "@/queue/workflows.js"; import { generateId } from "@/utils/genUtils.js"; import { FeatureService } from "../FeatureService.js"; import { @@ -64,13 +63,10 @@ export const createFeature = async ({ }); if (!skipGenerateDisplay) { - await addTaskToQueue({ - jobName: JobName.GenerateFeatureDisplay, - payload: { - featureId: feature.id, - orgId: ctx.org.id, - env: ctx.env, - }, + await workflows.triggerGenerateFeatureDisplay({ + featureId: feature.id, + orgId: ctx.org.id, + env: ctx.env, }); } diff --git a/server/src/internal/features/featureActions/updateFeature.ts b/server/src/internal/features/featureActions/updateFeature.ts index eb67dc75f..1321b5140 100644 --- a/server/src/internal/features/featureActions/updateFeature.ts +++ b/server/src/internal/features/featureActions/updateFeature.ts @@ -8,6 +8,7 @@ import { import type { AutumnContext } from "@/honoUtils/HonoEnv.js"; import { JobName } from "@/queue/JobName.js"; import { addTaskToQueue } from "@/queue/queueUtils.js"; +import { workflows } from "@/queue/workflows.js"; import RecaseError from "@/utils/errorUtils.js"; import { FeatureService } from "../FeatureService.js"; import { @@ -173,13 +174,10 @@ export const updateFeature = async ({ // Queue display generation if name changed if (isChangingName && updatedFeature) { - await addTaskToQueue({ - jobName: JobName.GenerateFeatureDisplay, - payload: { - featureId: updatedFeature.id, - orgId: ctx.org.id, - env: ctx.env, - }, + await workflows.triggerGenerateFeatureDisplay({ + featureId: updatedFeature.id, + orgId: ctx.org.id, + env: ctx.env, }); }