Cleanup tier mapping code

Author: jahooma

common/src/constants/subscription-plans.ts

@@ -31,3 +31,19 @@ export const SUBSCRIPTION_TIERS = {
 export type SubscriptionTierPrice = keyof typeof SUBSCRIPTION_TIERS
 
 export const DEFAULT_TIER = SUBSCRIPTION_TIERS[200]
+
+export function createSubscriptionPriceMappings(priceIds: Record<SubscriptionTierPrice, string>) {
+  const priceToTier = Object.fromEntries(
+    Object.entries(priceIds).map(([tier, priceId]) => [priceId, Number(tier) as SubscriptionTierPrice]),
+  ) as Record<string, SubscriptionTierPrice>
+
+  function getTierFromPriceId(priceId: string): SubscriptionTierPrice | null {
+    return priceToTier[priceId] ?? null
+  }
+
+  function getPriceIdFromTier(tier: SubscriptionTierPrice): string | null {
+    return priceIds[tier] ?? null
+  }
+
+  return { getTierFromPriceId, getPriceIdFromTier }
+}

packages/billing/src/subscription-webhooks.ts

@@ -1,5 +1,6 @@
 import { trackEvent } from '@codebuff/common/analytics'
 import { AnalyticsEvent } from '@codebuff/common/constants/analytics-events'
+import { createSubscriptionPriceMappings } 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'
@@ -12,7 +13,6 @@ import { eq } from 'drizzle-orm'
 
 import { expireActiveBlockGrants, handleSubscribe } from './subscription'
 
-import type { SubscriptionTierPrice } from '@codebuff/common/constants/subscription-plans'
 import type { Logger } from '@codebuff/common/types/contracts/logger'
 import type Stripe from 'stripe'
 
@@ -27,23 +27,11 @@ function mapStripeStatus(status: Stripe.Subscription.Status): SubscriptionStatus
   return 'incomplete'
 }
 
-const priceToTier: Record<string, SubscriptionTierPrice> = {
-  ...(env.STRIPE_SUBSCRIPTION_100_PRICE_ID && { [env.STRIPE_SUBSCRIPTION_100_PRICE_ID]: 100 as const }),
-  ...(env.STRIPE_SUBSCRIPTION_200_PRICE_ID && { [env.STRIPE_SUBSCRIPTION_200_PRICE_ID]: 200 as const }),
-  ...(env.STRIPE_SUBSCRIPTION_500_PRICE_ID && { [env.STRIPE_SUBSCRIPTION_500_PRICE_ID]: 500 as const }),
-}
-
-function getTierFromPriceId(priceId: string): SubscriptionTierPrice | null {
-  return priceToTier[priceId] ?? null
-}
-
-const tierToPrice = Object.fromEntries(
-  Object.entries(priceToTier).map(([priceId, tier]) => [tier, priceId]),
-) as Partial<Record<SubscriptionTierPrice, string>>
-
-export function getTierPriceId(tier: SubscriptionTierPrice): string | null {
-  return tierToPrice[tier] ?? null
-}
+export const { getTierFromPriceId, getPriceIdFromTier } = createSubscriptionPriceMappings({
+  100: env.STRIPE_SUBSCRIPTION_100_PRICE_ID,
+  200: env.STRIPE_SUBSCRIPTION_200_PRICE_ID,
+  500: env.STRIPE_SUBSCRIPTION_500_PRICE_ID,
+})
 
 // ---------------------------------------------------------------------------
 // invoice.paid

web/src/app/api/stripe/change-subscription-tier/route.ts

@@ -1,7 +1,7 @@
 import {
   expireActiveBlockGrants,
   getActiveSubscription,
-  getTierPriceId,
+  getPriceIdFromTier,
 } from '@codebuff/billing'
 import { trackEvent } from '@codebuff/common/analytics'
 import { AnalyticsEvent } from '@codebuff/common/constants/analytics-events'
@@ -66,7 +66,7 @@ export async function POST(req: NextRequest) {
     )
   }
 
-  const newPriceId = getTierPriceId(tier)
+  const newPriceId = getPriceIdFromTier(tier)
   if (!newPriceId) {
     return NextResponse.json(
       { error: 'Subscription tier not available' },

web/src/app/api/stripe/create-subscription/route.ts

@@ -1,4 +1,4 @@
-import { getActiveSubscription, getTierPriceId } from '@codebuff/billing'
+import { getActiveSubscription, getPriceIdFromTier } from '@codebuff/billing'
 import { SUBSCRIPTION_TIERS } from '@codebuff/common/constants/subscription-plans'
 import db from '@codebuff/internal/db'
 import * as schema from '@codebuff/internal/db/schema'
@@ -28,7 +28,7 @@ export async function POST(req: NextRequest) {
     ? rawTier
     : 200) as SubscriptionTierPrice
 
-  const priceId = getTierPriceId(tier)
+  const priceId = getPriceIdFromTier(tier)
   if (!priceId) {
     return NextResponse.json(
       { error: 'Subscription tier not available' },