Plans to tiered subscription. Don't store plan name/tier in db

Author: jahooma

common/src/constants/subscription-plans.ts

@@ -1,26 +1,19 @@
-export const PLAN_NAMES = ['pro'] as const
-export type PlanName = (typeof PLAN_NAMES)[number]
+export const SUBSCRIPTION_DISPLAY_NAME = 'Flex' as const
 
-export interface PlanConfig {
-  name: PlanName
-  displayName: string
+export interface TierConfig {
   monthlyPrice: number
   creditsPerBlock: number
   blockDurationHours: number
   weeklyCreditsLimit: number
 }
 
-export const PLANS = {
-  pro: {
-    name: 'pro',
-    displayName: 'Pro',
+export const SUBSCRIPTION_TIERS = {
+  200: {
     monthlyPrice: 200,
     creditsPerBlock: 1250,
     blockDurationHours: 5,
-    weeklyCreditsLimit: 15000,
+    weeklyCreditsLimit: 12500,
   },
-} as const satisfies Record<PlanName, PlanConfig>
+} as const satisfies Record<number, TierConfig>
 
-export function isPlanName(name: string): name is PlanName {
-  return (PLAN_NAMES as readonly string[]).includes(name)
-}
+export const DEFAULT_TIER = SUBSCRIPTION_TIERS[200]

packages/billing/src/subscription-webhooks.ts

@@ -1,16 +1,13 @@
 import { trackEvent } from '@codebuff/common/analytics'
 import { AnalyticsEvent } from '@codebuff/common/constants/analytics-events'
-import { PLANS } from '@codebuff/common/constants/subscription-plans'
 import db from '@codebuff/internal/db'
 import * as schema from '@codebuff/internal/db/schema'
-import { env } from '@codebuff/internal/env'
 import { stripeServer } from '@codebuff/internal/util/stripe'
 import { eq } from 'drizzle-orm'
 
 import { handleSubscribe } from './subscription'
 
 import type { Logger } from '@codebuff/common/types/contracts/logger'
-import type { PlanConfig } from '@codebuff/common/constants/subscription-plans'
 import type Stripe from 'stripe'
 
 type SubscriptionStatus = (typeof schema.subscriptionStatusEnum.enumValues)[number]
@@ -38,22 +35,6 @@ async function getUserIdByCustomerId(
   return userRecord[0]?.id ?? null
 }
 
-/**
- * Resolves a PlanConfig from a Stripe price ID.
- * Compares against the configured env var for each plan.
- */
-function getPlanFromPriceId(priceId: string): PlanConfig {
-  if (!env.STRIPE_SUBSCRIPTION_200_PRICE_ID) {
-    throw new Error(
-      'STRIPE_SUBSCRIPTION_200_PRICE_ID env var is not configured',
-    )
-  }
-  if (env.STRIPE_SUBSCRIPTION_200_PRICE_ID === priceId) {
-    return PLANS.pro
-  }
-  throw new Error(`Unknown subscription price ID: ${priceId}`)
-}
-
 // ---------------------------------------------------------------------------
 // invoice.paid
 // ---------------------------------------------------------------------------
@@ -100,17 +81,6 @@ export async function handleSubscriptionInvoicePaid(params: {
     return
   }
 
-  let plan: PlanConfig
-  try {
-    plan = getPlanFromPriceId(priceId)
-  } catch {
-    logger.warn(
-      { subscriptionId, priceId },
-      'Subscription invoice for unrecognised price — skipping',
-    )
-    return
-  }
-
   // Look up the user for this customer
   const userId = await getUserIdByCustomerId(customerId)
 
@@ -138,7 +108,6 @@ export async function handleSubscriptionInvoicePaid(params: {
       stripe_customer_id: customerId,
       user_id: userId,
       stripe_price_id: priceId,
-      plan_name: plan.name,
       status: 'active',
       billing_period_start: new Date(stripeSub.current_period_start * 1000),
       billing_period_end: new Date(stripeSub.current_period_end * 1000),
@@ -150,7 +119,6 @@ export async function handleSubscriptionInvoicePaid(params: {
         status: 'active',
         ...(userId ? { user_id: userId } : {}),
         stripe_price_id: priceId,
-        plan_name: plan.name,
         billing_period_start: new Date(
           stripeSub.current_period_start * 1000,
         ),
@@ -164,7 +132,6 @@ export async function handleSubscriptionInvoicePaid(params: {
     {
       subscriptionId,
       customerId,
-      planName: plan.name,
       billingReason: invoice.billing_reason,
     },
     'Processed subscription invoice.paid',
@@ -243,18 +210,6 @@ export async function handleSubscriptionUpdated(params: {
     return
   }
 
-  let planName: string
-  try {
-    const plan = getPlanFromPriceId(priceId)
-    planName = plan.name
-  } catch {
-    logger.warn(
-      { subscriptionId, priceId },
-      'Subscription updated with unrecognised price — skipping',
-    )
-    return
-  }
-
   const customerId =
     typeof stripeSubscription.customer === 'string'
       ? stripeSubscription.customer
@@ -272,7 +227,6 @@ export async function handleSubscriptionUpdated(params: {
       stripe_customer_id: customerId,
       user_id: userId,
       stripe_price_id: priceId,
-      plan_name: planName,
       status,
       cancel_at_period_end: stripeSubscription.cancel_at_period_end,
       billing_period_start: new Date(
@@ -287,7 +241,6 @@ export async function handleSubscriptionUpdated(params: {
       set: {
         ...(userId ? { user_id: userId } : {}),
         stripe_price_id: priceId,
-        plan_name: planName,
         status,
         cancel_at_period_end: stripeSubscription.cancel_at_period_end,
         billing_period_start: new Date(
@@ -303,7 +256,6 @@ export async function handleSubscriptionUpdated(params: {
   logger.info(
     {
       subscriptionId,
-      planName,
       cancelAtPeriodEnd: stripeSubscription.cancel_at_period_end,
     },
     'Processed subscription update',

packages/billing/src/subscription.ts

@@ -2,8 +2,8 @@ import { trackEvent } from '@codebuff/common/analytics'
 import { AnalyticsEvent } from '@codebuff/common/constants/analytics-events'
 import { GRANT_PRIORITIES } from '@codebuff/common/constants/grant-priorities'
 import {
-  PLANS,
-  isPlanName,
+  DEFAULT_TIER,
+  SUBSCRIPTION_DISPLAY_NAME,
 } from '@codebuff/common/constants/subscription-plans'
 import db from '@codebuff/internal/db'
 import * as schema from '@codebuff/internal/db/schema'
@@ -131,15 +131,14 @@ export function getWeekEnd(
 
 /**
  * Resolves the effective subscription limits for a user.
- * Checks `limit_override` first, then falls back to the plan constants.
+ * Checks `limit_override` first, then falls back to the default tier constants.
  */
 export async function getSubscriptionLimits(params: {
   userId: string
-  planName: string
   logger: Logger
   conn?: DbConn
 }): Promise<SubscriptionLimits> {
-  const { userId, planName, logger, conn = db } = params
+  const { userId, logger, conn = db } = params
 
   const overrides = await conn
     .select()
@@ -160,15 +159,10 @@ export async function getSubscriptionLimits(params: {
     }
   }
 
-  if (!isPlanName(planName)) {
-    throw new Error(`Unknown plan name: ${planName}`)
-  }
-
-  const plan = PLANS[planName]
   return {
-    creditsPerBlock: plan.creditsPerBlock,
-    blockDurationHours: plan.blockDurationHours,
-    weeklyCreditsLimit: plan.weeklyCreditsLimit,
+    creditsPerBlock: DEFAULT_TIER.creditsPerBlock,
+    blockDurationHours: DEFAULT_TIER.blockDurationHours,
+    weeklyCreditsLimit: DEFAULT_TIER.weeklyCreditsLimit,
   }
 }
 
@@ -282,7 +276,6 @@ export async function ensureActiveBlockGrant(params: {
       // 2. Resolve limits
       const limits = await getSubscriptionLimits({
         userId,
-        planName: subscription.plan_name,
         logger,
         conn: tx,
       })
@@ -331,7 +324,7 @@ export async function ensureActiveBlockGrant(params: {
           balance: limits.creditsPerBlock,
           priority: GRANT_PRIORITIES.subscription,
           expires_at: expiresAt,
-          description: `${subscription.plan_name} block (${limits.blockDurationHours}h)`,
+          description: `${SUBSCRIPTION_DISPLAY_NAME} block (${limits.blockDurationHours}h)`,
         })
         .onConflictDoNothing({ target: schema.creditLedger.operation_id })
         .returning()
@@ -404,7 +397,6 @@ export async function checkRateLimit(params: {
 
   const limits = await getSubscriptionLimits({
     userId,
-    planName: subscription.plan_name,
     logger,
   })
 

packages/internal/src/db/schema.ts

@@ -463,7 +463,6 @@ export const subscription = pgTable(
     stripe_customer_id: text('stripe_customer_id').notNull(),
     user_id: text('user_id').references(() => user.id, { onDelete: 'cascade' }),
     stripe_price_id: text('stripe_price_id').notNull(),
-    plan_name: text('plan_name').notNull(),
     status: subscriptionStatusEnum('status').notNull().default('active'),
     billing_period_start: timestamp('billing_period_start', {
       mode: 'date',

web/src/app/profile/components/usage-display.tsx

@@ -58,8 +58,8 @@ const grantTypeInfo: Record<
     text: 'text-indigo-600 dark:text-indigo-400',
     gradient: 'from-indigo-500/70 to-indigo-600/70',
     icon: <Star className="h-4 w-4" />,
-    label: 'Pro Subscription',
-    description: 'Credits from your Pro plan',
+    label: 'Flex',
+    description: 'Credits from your Flex subscription',
   },
   referral: {
     bg: 'bg-green-500',