pass in logger to db/transaction.ts

Author: charleslien

common/src/db/transaction.ts

@@ -1,7 +1,8 @@
 import db from './index'
-import { logger } from '../util/logger'
 import { withRetry } from '../util/promise'
 
+import type { Logger } from '@codebuff/types/logger'
+
 type TransactionCallback<T> = Parameters<typeof db.transaction<T>>[0]
 
 /**
@@ -12,10 +13,15 @@ type TransactionCallback<T> = Parameters<typeof db.transaction<T>>[0]
  * @param context Additional context for logging (e.g., userId, operationId)
  * @returns The result of the transaction
  */
-export async function withSerializableTransaction<T>(
-  callback: TransactionCallback<T>,
-  context: Record<string, any> = {},
-): Promise<T> {
+export async function withSerializableTransaction<T>({
+  callback,
+  context = {},
+  logger,
+}: {
+  callback: TransactionCallback<T>
+  context: Record<string, any>
+  logger: Logger
+}): Promise<T> {
   return withRetry(
     async () => {
       return await db.transaction(callback, { isolationLevel: 'serializable' })

packages/billing/src/balance-calculator.ts

@@ -298,8 +298,8 @@ export async function consumeCredits(
   userId: string,
   creditsToConsume: number,
 ): Promise<CreditConsumptionResult> {
-  return await withSerializableTransaction(
-    async (tx) => {
+  return await withSerializableTransaction({
+    callback: async (tx) => {
       const now = new Date()
       const activeGrants = await getOrderedActiveGrants(userId, now, tx)
 
@@ -320,8 +320,9 @@ export async function consumeCredits(
 
       return result
     },
-    { userId, creditsToConsume },
-  )
+    context: { userId, creditsToConsume },
+    logger,
+  })
 }
 
 export async function consumeCreditsAndAddAgentStep(options: {
@@ -374,8 +375,8 @@ export async function consumeCreditsAndAddAgentStep(options: {
 
   try {
     return success(
-      await withSerializableTransaction(
-        async (tx) => {
+      await withSerializableTransaction({
+        callback: async (tx) => {
           const now = new Date()
           const activeGrants = await getOrderedActiveGrants(userId, now, tx)
 
@@ -426,8 +427,9 @@ export async function consumeCreditsAndAddAgentStep(options: {
 
           return { ...result, agentStepId: stepId }
         },
-        { userId, credits },
-      ),
+        context: { userId, credits },
+        logger,
+      }),
     )
   } catch (error) {
     return failure(error)

packages/billing/src/org-billing.ts

@@ -259,8 +259,8 @@ export async function consumeOrganizationCredits(
   organizationId: string,
   creditsToConsume: number,
 ): Promise<CreditConsumptionResult> {
-  return await withSerializableTransaction(
-    async (tx) => {
+  return await withSerializableTransaction({
+    callback: async (tx) => {
       const now = new Date()
       const activeGrants = await getOrderedActiveOrganizationGrants(
         organizationId,
@@ -285,8 +285,9 @@ export async function consumeOrganizationCredits(
 
       return result
     },
-    { organizationId, creditsToConsume },
-  )
+    context: { organizationId, creditsToConsume },
+    logger,
+  })
 }
 
 /**