pass in logger to grant-credits

charleslien · charleslien · commit 5e0a0286642f · 2025-10-08T12:09:48.000-07:00
diff --git a/backend/src/websockets/middleware.ts b/backend/src/websockets/middleware.ts
@@ -321,7 +321,7 @@ protec.use(async (action, clientSessionId, ws, userInfo) => {
   })
 
   // Check and trigger monthly reset if needed
-  await triggerMonthlyResetAndGrant(userId)
+  await triggerMonthlyResetAndGrant({ userId, logger })
 
   // Check if we need to trigger auto top-up and get the amount added (if any)
   let autoTopupAdded: number | undefined = undefined
diff --git a/packages/billing/src/auto-topup.ts b/packages/billing/src/auto-topup.ts
@@ -183,14 +183,14 @@ async function processAutoTopupPayment(params: {
     throw new AutoTopupPaymentError('Payment failed or requires action')
   }
 
-  await processAndGrantCredit(
-    userId,
-    amountToTopUp,
-    'purchase',
-    `Auto top-up of ${amountToTopUp.toLocaleString()} credits`,
-    null,
+  await processAndGrantCredit({
+    ...params,
+    amount: amountToTopUp,
+    type: 'purchase',
+    description: `Auto top-up of ${amountToTopUp.toLocaleString()} credits`,
+    expiresAt: null,
     operationId,
-  )
+  })
 
   logger.info(
     {
diff --git a/packages/billing/src/grant-credits.ts b/packages/billing/src/grant-credits.ts
@@ -13,6 +13,7 @@ import { and, desc, eq, gt, isNull, lte, or, sql } from 'drizzle-orm'
 import { generateOperationIdTimestamp } from './utils'
 
 import type { GrantType } from '@codebuff/common/db/schema'
+import type { Logger } from '@codebuff/types/logger'
 
 type CreditGrantSelect = typeof schema.creditLedger.$inferSelect
 type DbTransaction = Parameters<typeof db.transaction>[0] extends (
@@ -30,9 +31,12 @@ type DbTransaction = Parameters<typeof db.transaction>[0] extends (
  * @param userId The ID of the user.
  * @returns The amount of the last expired free grant (capped at 2000) or the default.
  */
-export async function getPreviousFreeGrantAmount(
-  userId: string,
-): Promise<number> {
+export async function getPreviousFreeGrantAmount(params: {
+  userId: string
+  logger: Logger
+}): Promise<number> {
+  const { userId, logger } = params
+
   const now = new Date()
   const lastExpiredFreeGrant = await db
     .select({
@@ -72,9 +76,12 @@ export async function getPreviousFreeGrantAmount(
  * @param userId The ID of the user.
  * @returns The total referral bonus credits earned.
  */
-export async function calculateTotalReferralBonus(
-  userId: string,
-): Promise<number> {
+export async function calculateTotalReferralBonus(params: {
+  userId: string
+  logger: Logger
+}): Promise<number> {
+  const { userId, logger } = params
+
   try {
     const result = await db
       .select({
@@ -103,15 +110,27 @@ export async function calculateTotalReferralBonus(
 /**
  * Core grant operation that can be part of a larger transaction.
  */
-export async function grantCreditOperation(
-  userId: string,
-  amount: number,
-  type: GrantType,
-  description: string,
-  expiresAt: Date | null,
-  operationId: string,
-  tx?: DbTransaction,
-) {
+export async function grantCreditOperation(params: {
+  userId: string
+  amount: number
+  type: GrantType
+  description: string
+  expiresAt: Date | null
+  operationId: string
+  tx?: DbTransaction
+  logger: Logger
+}) {
+  const {
+    userId,
+    amount,
+    type,
+    description,
+    expiresAt,
+    operationId,
+    tx,
+    logger,
+  } = params
+
   const dbClient = tx || db
 
   const now = new Date()
@@ -228,36 +247,28 @@ export async function grantCreditOperation(
  * Processes a credit grant request with retries and failure logging.
  * Used for standalone credit grants that need retry logic and failure tracking.
  */
-export async function processAndGrantCredit(
-  userId: string,
-  amount: number,
-  type: GrantType,
-  description: string,
-  expiresAt: Date | null,
-  operationId: string,
-): Promise<void> {
+export async function processAndGrantCredit(params: {
+  userId: string
+  amount: number
+  type: GrantType
+  description: string
+  expiresAt: Date | null
+  operationId: string
+  logger: Logger
+}): Promise<void> {
+  const { operationId, logger } = params
+
   try {
-    await withRetry(
-      () =>
-        grantCreditOperation(
-          userId,
-          amount,
-          type,
-          description,
-          expiresAt,
-          operationId,
-        ),
-      {
-        maxRetries: 3,
-        retryIf: () => true,
-        onRetry: (error, attempt) => {
-          logger.warn(
-            { operationId, attempt, error },
-            `processAndGrantCredit retry ${attempt}`,
-          )
-        },
+    await withRetry(() => grantCreditOperation(params), {
+      maxRetries: 3,
+      retryIf: () => true,
+      onRetry: (error, attempt) => {
+        logger.warn(
+          { operationId, attempt, error },
+          `processAndGrantCredit retry ${attempt}`,
+        )
       },
-    )
+    })
   } catch (error: any) {
     await logSyncFailure({
       id: operationId,
@@ -336,9 +347,12 @@ export async function revokeGrantByOperationId(
  * @param userId The ID of the user
  * @returns The effective quota reset date (either existing or new)
  */
-export async function triggerMonthlyResetAndGrant(
-  userId: string,
-): Promise<Date> {
+export async function triggerMonthlyResetAndGrant(params: {
+  userId: string
+  logger: Logger
+}): Promise<Date> {
+  const { userId, logger } = params
+
   return await db.transaction(async (tx) => {
     const now = new Date()
 
@@ -366,8 +380,8 @@ export async function triggerMonthlyResetAndGrant(
 
     // Calculate grant amounts separately
     const [freeGrantAmount, referralBonus] = await Promise.all([
-      getPreviousFreeGrantAmount(userId),
-      calculateTotalReferralBonus(userId),
+      getPreviousFreeGrantAmount(params),
+      calculateTotalReferralBonus(params),
     ])
 
     // Generate a deterministic operation ID based on userId and reset date to minute precision
@@ -382,25 +396,25 @@ export async function triggerMonthlyResetAndGrant(
       .where(eq(schema.user.id, userId))
 
     // Always grant free credits
-    await processAndGrantCredit(
-      userId,
-      freeGrantAmount,
-      'free',
-      'Monthly free credits',
-      newResetDate, // Free credits expire at next reset
-      freeOperationId,
-    )
+    await processAndGrantCredit({
+      ...params,
+      amount: freeGrantAmount,
+      type: 'free',
+      description: 'Monthly free credits',
+      expiresAt: newResetDate, // Free credits expire at next reset
+      operationId: freeOperationId,
+    })
 
     // Only grant referral credits if there are any
     if (referralBonus > 0) {
-      await processAndGrantCredit(
-        userId,
-        referralBonus,
-        'referral',
-        'Monthly referral bonus',
-        newResetDate, // Referral credits expire at next reset
-        referralOperationId,
-      )
+      await processAndGrantCredit({
+        ...params,
+        amount: referralBonus,
+        type: 'referral',
+        description: 'Monthly referral bonus',
+        expiresAt: newResetDate, // Referral credits expire at next reset
+        operationId: referralOperationId,
+      })
     }
 
     logger.info(
diff --git a/packages/billing/src/usage-service.ts b/packages/billing/src/usage-service.ts
@@ -53,7 +53,7 @@ export async function getUserUsageData(params: {
     const now = new Date()
 
     // Check if we need to reset quota and grant new credits
-    const effectiveQuotaResetDate = await triggerMonthlyResetAndGrant(userId)
+    const effectiveQuotaResetDate = await triggerMonthlyResetAndGrant(params)
 
     // Check if we need to trigger auto top-up
     let autoTopupTriggered = false
diff --git a/web/src/app/api/auth/[...nextauth]/auth-options.ts b/web/src/app/api/auth/[...nextauth]/auth-options.ts
@@ -13,6 +13,7 @@ import { loops, env } from '@codebuff/internal'
 import { eq } from 'drizzle-orm'
 import GitHubProvider from 'next-auth/providers/github'
 
+import type { Logger } from '@codebuff/types/logger'
 import type { NextAuthOptions } from 'next-auth'
 import type { Adapter } from 'next-auth/adapters'
 
@@ -77,22 +78,25 @@ async function createAndLinkStripeCustomer(
   }
 }
 
-async function createInitialCreditGrant(
-  userId: string,
+async function createInitialCreditGrant(params: {
+  userId: string
   expiresAt: Date | null
-): Promise<void> {
+  logger: Logger
+}): Promise<void> {
+  const { userId, expiresAt, logger } = params
+
   try {
     const operationId = `free-${userId}-${generateCompactId()}`
     const nextQuotaReset = getNextQuotaReset(expiresAt)
 
-    await processAndGrantCredit(
-      userId,
-      DEFAULT_FREE_CREDITS_GRANT,
-      'free',
-      'Initial free credits',
-      nextQuotaReset,
-      operationId
-    )
+    await processAndGrantCredit({
+      ...params,
+      amount: DEFAULT_FREE_CREDITS_GRANT,
+      type: 'free',
+      description: 'Initial free credits',
+      expiresAt: nextQuotaReset,
+      operationId,
+    })
 
     logger.info(
       {
@@ -231,7 +235,11 @@ export const authOptions: NextAuthOptions = {
       )
 
       if (customerId) {
-        await createInitialCreditGrant(userData.id, userData.next_quota_reset)
+        await createInitialCreditGrant({
+          userId: userData.id,
+          expiresAt: userData.next_quota_reset,
+          logger,
+        })
       }
 
       // Call the imported function
diff --git a/web/src/app/api/referrals/helpers.ts b/web/src/app/api/referrals/helpers.ts
@@ -1,7 +1,7 @@
 import { grantCreditOperation } from '@codebuff/billing'
-import { CREDITS_REFERRAL_BONUS } from '@codebuff/common/old-constants'
 import db from '@codebuff/common/db'
 import * as schema from '@codebuff/common/db/schema'
+import { CREDITS_REFERRAL_BONUS } from '@codebuff/common/old-constants'
 import { and, eq, sql } from 'drizzle-orm'
 import { NextResponse } from 'next/server'
 
@@ -154,15 +154,16 @@ export async function redeemReferralCode(referralCode: string, userId: string) {
 
       // Process Referrer
       grantPromises.push(
-        grantCreditOperation(
-          referrer.id,
-          CREDITS_REFERRAL_BONUS,
-          'referral',
-          'Referral bonus (referrer)',
-          user.next_quota_reset,
-          `${operationId}-referrer`,
-          tx
-        )
+        grantCreditOperation({
+          userId: referrer.id,
+          amount: CREDITS_REFERRAL_BONUS,
+          type: 'referral',
+          description: 'Referral bonus (referrer)',
+          expiresAt: user.next_quota_reset,
+          operationId: `${operationId}-referrer`,
+          tx,
+          logger,
+        })
           .then(() => true)
           .catch((error: Error) => {
             logger.error(
@@ -180,15 +181,16 @@ export async function redeemReferralCode(referralCode: string, userId: string) {
 
       // Process Referred User
       grantPromises.push(
-        grantCreditOperation(
-          referred.id,
-          CREDITS_REFERRAL_BONUS,
-          'referral',
-          'Referral bonus (referred)',
-          user.next_quota_reset,
-          `${operationId}-referred`,
-          tx
-        )
+        grantCreditOperation({
+          userId: referred.id,
+          amount: CREDITS_REFERRAL_BONUS,
+          type: 'referral',
+          description: 'Referral bonus (referred)',
+          expiresAt: user.next_quota_reset,
+          operationId: `${operationId}-referred`,
+          tx,
+          logger,
+        })
           .then(() => true)
           .catch((error: Error) => {
             logger.error(
diff --git a/web/src/app/api/stripe/buy-credits/route.ts b/web/src/app/api/stripe/buy-credits/route.ts
@@ -127,14 +127,15 @@ export async function POST(req: NextRequest) {
 
           if (paymentIntent.status === 'succeeded') {
             // Grant credits immediately
-            await processAndGrantCredit(
+            await processAndGrantCredit({
               userId,
-              credits,
-              'purchase',
-              `Direct purchase of ${credits.toLocaleString()} credits`,
-              null,
-              operationId
-            )
+              amount: credits,
+              type: 'purchase',
+              description: `Direct purchase of ${credits.toLocaleString()} credits`,
+              expiresAt: null,
+              operationId,
+              logger,
+            })
 
             logger.info(
               {
diff --git a/web/src/app/api/stripe/webhook/route.ts b/web/src/app/api/stripe/webhook/route.ts
