pass in logger to org-billing

Author: charleslien

backend/src/api/usage.ts

@@ -71,10 +71,11 @@ async function usageHandler(
     // If orgId is provided, return organization usage data
     if (orgId) {
       try {
-        const orgUsageResponse = await getOrganizationUsageResponse(
-          orgId,
+        const orgUsageResponse = await getOrganizationUsageResponse({
+          organizationId: orgId,
           userId,
-        )
+          logger,
+        })
         return res.status(200).json(orgUsageResponse)
       } catch (error) {
         logger.error(

backend/src/llm-apis/message-cost-tracker.ts

@@ -517,7 +517,11 @@ async function updateUserCycleUsage(
   if (orgId) {
     // TODO: use `consumeCreditsWithFallback` to handle organization delegation
     // Consume from organization credits
-    const result = await consumeOrganizationCredits(orgId, creditsUsed)
+    const result = await consumeOrganizationCredits({
+      organizationId: orgId,
+      creditsToConsume: creditsUsed,
+      logger,
+    })
 
     if (VERBOSE) {
       logger.debug(

backend/src/websockets/middleware.ts

@@ -225,11 +225,12 @@ protec.use(async (action, clientSessionId, ws, userInfo) => {
       // Using a far past date ensures all grants are considered for current balance.
       const orgQuotaResetDate = new Date(0)
       const { balance: orgBalance } =
-        await calculateOrganizationUsageAndBalance(
-          orgLookup.organizationId,
-          orgQuotaResetDate,
+        await calculateOrganizationUsageAndBalance({
+          organizationId: orgLookup.organizationId,
+          quotaResetDate: orgQuotaResetDate,
           now,
-        )
+          logger,
+        })
 
       if (orgBalance.totalRemaining <= 0) {
         const orgName = orgLookup.organizationName || 'Your organization'

packages/billing/src/__tests__/org-billing.test.ts

@@ -12,6 +12,8 @@ import {
   validateAndNormalizeRepositoryUrl,
 } from '../org-billing'
 
+import type { Logger } from '@codebuff/types/logger'
+
 // Mock the database
 const mockGrants = [
   {
@@ -40,6 +42,13 @@ const mockGrants = [
   },
 ]
 
+const logger: Logger = {
+  debug: () => {},
+  error: () => {},
+  info: () => {},
+  warn: () => {},
+}
+
 describe('Organization Billing', () => {
   beforeAll(() => {
     mockModule('@codebuff/common/db', () => ({
@@ -91,11 +100,12 @@ describe('Organization Billing', () => {
       const quotaResetDate = new Date('2024-01-01')
       const now = new Date('2024-06-01')
 
-      const result = await calculateOrganizationUsageAndBalance(
+      const result = await calculateOrganizationUsageAndBalance({
         organizationId,
         quotaResetDate,
         now,
-      )
+        logger,
+      })
 
       // Total positive balance: 800
       // Total debt: 100
@@ -126,11 +136,12 @@ describe('Organization Billing', () => {
       const quotaResetDate = new Date('2024-01-01')
       const now = new Date('2024-06-01')
 
-      const result = await calculateOrganizationUsageAndBalance(
+      const result = await calculateOrganizationUsageAndBalance({
         organizationId,
         quotaResetDate,
         now,
-      )
+        logger,
+      })
 
       expect(result.balance.totalRemaining).toBe(0)
       expect(result.balance.totalDebt).toBe(0)
@@ -211,10 +222,11 @@ describe('Organization Billing', () => {
       const organizationId = 'org-123'
       const creditsToConsume = 100
 
-      const result = await consumeOrganizationCredits(
+      const result = await consumeOrganizationCredits({
         organizationId,
         creditsToConsume,
-      )
+        logger,
+      })
 
       expect(result.consumed).toBe(100)
       expect(result.fromPurchased).toBe(0) // Organization credits are not "purchased" type
@@ -231,13 +243,14 @@ describe('Organization Billing', () => {
 
       // Should not throw
       await expect(
-        grantOrganizationCredits(
+        grantOrganizationCredits({
           organizationId,
           userId,
           amount,
           operationId,
           description,
-        ),
+          logger,
+        }),
       ).resolves.toBeUndefined()
     })
 
@@ -264,13 +277,14 @@ describe('Organization Billing', () => {
 
       // Should not throw, should handle gracefully
       await expect(
-        grantOrganizationCredits(
+        grantOrganizationCredits({
           organizationId,
           userId,
           amount,
           operationId,
           description,
-        ),
+          logger,
+        }),
       ).resolves.toBeUndefined()
     })
   })

packages/billing/src/auto-topup.ts

@@ -486,14 +486,13 @@ async function processOrgAutoTopupPayment(params: {
     throw new AutoTopupPaymentError('Payment failed or requires action')
   }
 
-  await grantOrganizationCredits(
-    organizationId,
-    userId,
-    amountToTopUp,
+  await grantOrganizationCredits({
+    ...params,
+    amount: amountToTopUp,
     operationId,
-    `Organization auto top-up of ${amountToTopUp.toLocaleString()} credits`,
-    null,
-  )
+    description: `Organization auto top-up of ${amountToTopUp.toLocaleString()} credits`,
+    expiresAt: null,
+  })
 
   logger.info(
     {
@@ -521,10 +520,10 @@ export async function checkAndTriggerOrgAutoTopup(params: {
       return
     }
 
-    const { balance } = await calculateOrganizationUsageAndBalance(
-      organizationId,
-      getNextQuotaReset(null),
-    )
+    const { balance } = await calculateOrganizationUsageAndBalance({
+      ...params,
+      quotaResetDate: getNextQuotaReset(null),
+    })
 
     if (balance.netBalance > (org.auto_topup_threshold || 0)) {
       logger.info(

packages/billing/src/credit-delegation.ts

@@ -172,10 +172,10 @@ export async function consumeCreditsWithDelegation(params: {
 
     // Consume credits from organization
     try {
-      await consumeOrganizationCredits(
-        orgLookup.organizationId,
-        creditsToConsume,
-      )
+      await consumeOrganizationCredits({
+        ...params,
+        organizationId: orgLookup.organizationId,
+      })
 
       logger.info(
         {