Extract getUserByStripeCustomerId helper

Author: jahooma

packages/billing/src/subscription-webhooks.ts

@@ -2,7 +2,10 @@ import { trackEvent } from '@codebuff/common/analytics'
 import { AnalyticsEvent } from '@codebuff/common/constants/analytics-events'
 import db from '@codebuff/internal/db'
 import * as schema from '@codebuff/internal/db/schema'
-import { stripeServer } from '@codebuff/internal/util/stripe'
+import {
+  getUserByStripeCustomerId,
+  stripeServer,
+} from '@codebuff/internal/util/stripe'
 import { eq } from 'drizzle-orm'
 
 import { handleSubscribe } from './subscription'
@@ -21,20 +24,6 @@ function mapStripeStatus(status: Stripe.Subscription.Status): SubscriptionStatus
   return 'active'
 }
 
-/**
- * Looks up a user ID by Stripe customer ID.
- */
-async function getUserIdByCustomerId(
-  customerId: string,
-): Promise<string | null> {
-  const userRecord = await db
-    .select({ id: schema.user.id })
-    .from(schema.user)
-    .where(eq(schema.user.stripe_customer_id, customerId))
-    .limit(1)
-  return userRecord[0]?.id ?? null
-}
-
 // ---------------------------------------------------------------------------
 // invoice.paid
 // ---------------------------------------------------------------------------
@@ -82,7 +71,7 @@ export async function handleSubscriptionInvoicePaid(params: {
   }
 
   // Look up the user for this customer
-  const userId = await getUserIdByCustomerId(customerId)
+  const userId = (await getUserByStripeCustomerId(customerId))?.id ?? null
 
   // On first invoice, migrate renewal date & credits (Option B)
   if (invoice.billing_reason === 'subscription_create') {
@@ -163,7 +152,7 @@ export async function handleSubscriptionInvoicePaymentFailed(params: {
       ? invoice.customer
       : invoice.customer?.id
   const userId = customerId
-    ? await getUserIdByCustomerId(customerId)
+    ? (await getUserByStripeCustomerId(customerId))?.id ?? null
     : null
 
   await db
@@ -214,7 +203,7 @@ export async function handleSubscriptionUpdated(params: {
     typeof stripeSubscription.customer === 'string'
       ? stripeSubscription.customer
       : stripeSubscription.customer.id
-  const userId = await getUserIdByCustomerId(customerId)
+  const userId = (await getUserByStripeCustomerId(customerId))?.id ?? null
 
   const status = mapStripeStatus(stripeSubscription.status)
 
@@ -280,7 +269,7 @@ export async function handleSubscriptionDeleted(params: {
     typeof stripeSubscription.customer === 'string'
       ? stripeSubscription.customer
       : stripeSubscription.customer.id
-  const userId = await getUserIdByCustomerId(customerId)
+  const userId = (await getUserByStripeCustomerId(customerId))?.id ?? null
 
   await db
     .update(schema.subscription)

packages/internal/src/util/stripe.ts

@@ -1,6 +1,8 @@
-import Stripe from 'stripe'
-
+import db from '@codebuff/internal/db'
+import * as schema from '@codebuff/internal/db/schema'
 import { env } from '@codebuff/internal/env'
+import { eq } from 'drizzle-orm'
+import Stripe from 'stripe'
 
 export const stripeServer = new Stripe(env.STRIPE_SECRET_KEY, {
   apiVersion: '2024-06-20',
@@ -15,3 +17,28 @@ export async function getCurrentSubscription(customerId: string) {
   })
   return subscriptions.data[0]
 }
+
+/**
+ * Look up a user by their Stripe customer ID.
+ */
+export async function getUserByStripeCustomerId(
+  stripeCustomerId: string,
+): Promise<{
+  id: string
+  banned: boolean
+  email: string
+  name: string | null
+} | null> {
+  const users = await db
+    .select({
+      id: schema.user.id,
+      banned: schema.user.banned,
+      email: schema.user.email,
+      name: schema.user.name,
+    })
+    .from(schema.user)
+    .where(eq(schema.user.stripe_customer_id, stripeCustomerId))
+    .limit(1)
+
+  return users[0] ?? null
+}

web/src/lib/ban-conditions.ts

@@ -5,6 +5,8 @@ import { eq } from 'drizzle-orm'
 
 import type { Logger } from '@codebuff/common/types/contracts/logger'
 
+export { getUserByStripeCustomerId } from '@codebuff/internal/util/stripe'
+
 // =============================================================================
 // CONFIGURATION - Edit these values to adjust ban thresholds
 // =============================================================================
@@ -102,31 +104,6 @@ const BAN_CONDITIONS: BanCondition[] = [
 // PUBLIC API
 // =============================================================================
 
-/**
- * Look up a user by their Stripe customer ID
- */
-export async function getUserByStripeCustomerId(
-  stripeCustomerId: string,
-): Promise<{
-  id: string
-  banned: boolean
-  email: string
-  name: string | null
-} | null> {
-  const users = await db
-    .select({
-      id: schema.user.id,
-      banned: schema.user.banned,
-      email: schema.user.email,
-      name: schema.user.name,
-    })
-    .from(schema.user)
-    .where(eq(schema.user.stripe_customer_id, stripeCustomerId))
-    .limit(1)
-
-  return users[0] ?? null
-}
-
 /**
  * Ban a user and log the action
  */