fix: replace typeof db with BillingDbConnection in all billing dependency interfaces

Addresses Gemini CLI review feedback:
- balance-calculator.ts: CalculateUsageThisCycleDeps now uses BillingDbConnection
- credit-delegation.ts: FindOrganizationForRepositoryDeps now uses BillingDbConnection
- grant-credits.ts: GetPreviousFreeGrantAmountDeps and CalculateTotalReferralBonusDeps now use BillingDbConnection
- org-billing.ts: SyncOrganizationBillingCycleDeps now uses BillingDbConnection

Added type casts to resolve union type incompatibilities between real Drizzle db and mock BillingDbConnection interface.

Author: brandonkachen

packages/billing/src/balance-calculator.ts

@@ -20,6 +20,7 @@ import type { GrantType } from '@codebuff/internal/db/schema'
 import type { withSerializableTransaction as withSerializableTransactionFn } from '@codebuff/internal/db/transaction'
 import type { trackEvent as trackEventFn } from '@codebuff/common/analytics'
 import type { reportPurchasedCreditsToStripe as reportPurchasedCreditsToStripeFn } from './stripe-metering'
+import type { BillingDbConnection } from '@codebuff/common/types/contracts/billing'
 
 export interface CreditBalance {
   totalRemaining: number
@@ -48,7 +49,7 @@ type DbConn = Pick<typeof db, 'select' | 'update'>
  * Dependencies for calculateUsageThisCycle (for testing)
  */
 export interface CalculateUsageThisCycleDeps {
-  db?: typeof db
+  db?: BillingDbConnection
 }
 
 /**
@@ -692,7 +693,8 @@ export async function calculateUsageThisCycle(params: {
   deps?: CalculateUsageThisCycleDeps
 }): Promise<number> {
   const { userId, quotaResetDate, deps = {} } = params
-  const dbClient = deps.db ?? db
+  // Cast to BillingDbConnection to allow either real db or mock to be used
+  const dbClient = (deps.db ?? db) as BillingDbConnection
 
   const usageResult = await dbClient
     .select({
@@ -713,7 +715,7 @@ export async function calculateUsageThisCycle(params: {
           ),
         ),
       ),
-    )
+    ) as unknown as { totalUsed: number }[]
 
   return usageResult[0].totalUsed
 }

packages/billing/src/credit-delegation.ts

@@ -10,7 +10,7 @@ import {
   extractOwnerAndRepo,
 } from './org-billing'
 
-import type { ConsumeCreditsWithFallbackFn } from '@codebuff/common/types/contracts/billing'
+import type { ConsumeCreditsWithFallbackFn, BillingDbConnection } from '@codebuff/common/types/contracts/billing'
 import type { Logger } from '@codebuff/common/types/contracts/logger'
 import type { ParamsOf } from '@codebuff/common/types/function-params'
 
@@ -33,7 +33,7 @@ export interface CreditDelegationResult {
  * Dependencies for findOrganizationForRepository (for testing)
  */
 export interface FindOrganizationForRepositoryDeps {
-  db?: typeof db
+  db?: BillingDbConnection
 }
 
 /**
@@ -47,7 +47,8 @@ export async function findOrganizationForRepository(params: {
   deps?: FindOrganizationForRepositoryDeps
 }): Promise<OrganizationLookupResult> {
   const { userId, repositoryUrl, logger, deps = {} } = params
-  const dbClient = deps.db ?? db
+  // Cast to BillingDbConnection to allow either real db or mock to be used
+  const dbClient = (deps.db ?? db) as BillingDbConnection
 
   try {
     const normalizedUrl = normalizeRepositoryUrl(repositoryUrl)
@@ -70,7 +71,7 @@ export async function findOrganizationForRepository(params: {
       })
       .from(schema.orgMember)
       .innerJoin(schema.org, eq(schema.orgMember.org_id, schema.org.id))
-      .where(eq(schema.orgMember.user_id, userId))
+      .where(eq(schema.orgMember.user_id, userId)) as unknown as { orgId: string; orgName: string; orgSlug: string }[]
 
     if (userOrganizations.length === 0) {
       logger.debug(
@@ -94,7 +95,7 @@ export async function findOrganizationForRepository(params: {
             eq(schema.orgRepo.org_id, userOrg.orgId),
             eq(schema.orgRepo.is_active, true),
           ),
-        )
+        ) as unknown as { repoUrl: string; repoName: string; isActive: boolean }[]
 
       // Check if any repository in this organization matches
       for (const orgRepo of orgRepos) {

packages/billing/src/grant-credits.ts

@@ -15,6 +15,7 @@ import type { Logger } from '@codebuff/common/types/contracts/logger'
 import type {
   TriggerMonthlyResetAndGrantDeps,
   BillingTransactionFn,
+  BillingDbConnection,
 } from '@codebuff/common/types/contracts/billing'
 import type { GrantType } from '@codebuff/internal/db/schema'
 
@@ -24,7 +25,7 @@ import type { CodebuffTransaction } from '@codebuff/internal/db'
  * Dependencies for getPreviousFreeGrantAmount (for testing)
  */
 export interface GetPreviousFreeGrantAmountDeps {
-  db?: typeof db
+  db?: BillingDbConnection
 }
 
 /**
@@ -37,7 +38,8 @@ export async function getPreviousFreeGrantAmount(params: {
   deps?: GetPreviousFreeGrantAmountDeps
 }): Promise<number> {
   const { userId, logger, deps = {} } = params
-  const dbClient = deps.db ?? db
+  // Cast to BillingDbConnection to allow either real db or mock to be used
+  const dbClient = (deps.db ?? db) as BillingDbConnection
 
   const now = new Date()
   const lastExpiredFreeGrant = await dbClient
@@ -53,7 +55,7 @@ export async function getPreviousFreeGrantAmount(params: {
       ),
     )
     .orderBy(desc(schema.creditLedger.expires_at)) // Most recent expiry first
-    .limit(1)
+    .limit(1) as unknown as { principal: number }[]
 
   if (lastExpiredFreeGrant.length > 0) {
     // TODO: remove this once it's past May 22nd, after all users have been migrated over
@@ -76,7 +78,7 @@ export async function getPreviousFreeGrantAmount(params: {
  * Dependencies for calculateTotalReferralBonus (for testing)
  */
 export interface CalculateTotalReferralBonusDeps {
-  db?: typeof db
+  db?: BillingDbConnection
 }
 
 /**
@@ -91,7 +93,8 @@ export async function calculateTotalReferralBonus(params: {
   deps?: CalculateTotalReferralBonusDeps
 }): Promise<number> {
   const { userId, logger, deps = {} } = params
-  const dbClient = deps.db ?? db
+  // Cast to BillingDbConnection to allow either real db or mock to be used
+  const dbClient = (deps.db ?? db) as BillingDbConnection
 
   try {
     const result = await dbClient
@@ -104,7 +107,7 @@ export async function calculateTotalReferralBonus(params: {
           eq(schema.referral.referrer_id, userId),
           eq(schema.referral.referred_id, userId),
         ),
-      )
+      ) as unknown as { totalCredits: string }[]
 
     const totalBonus = parseInt(result[0]?.totalCredits ?? '0')
     logger.debug({ userId, totalBonus }, 'Calculated total referral bonus.')

packages/billing/src/org-billing.ts

@@ -15,7 +15,7 @@ import type {
   CreditConsumptionResult,
 } from './balance-calculator'
 import type { Logger } from '@codebuff/common/types/contracts/logger'
-import type { BillingTransactionFn } from '@codebuff/common/types/contracts/billing'
+import type { BillingTransactionFn, BillingDbConnection } from '@codebuff/common/types/contracts/billing'
 import type { OptionalFields } from '@codebuff/common/types/function-params'
 import type { GrantType } from '@codebuff/internal/db/schema'
 
@@ -28,7 +28,7 @@ type DbConn = Pick<typeof db, 'select' | 'update'>
  * Dependencies for syncOrganizationBillingCycle (for testing)
  */
 export interface SyncOrganizationBillingCycleDeps {
-  db?: typeof db
+  db?: BillingDbConnection
   stripeServer?: typeof stripeServer
 }
 
@@ -42,7 +42,8 @@ export async function syncOrganizationBillingCycle(params: {
   deps?: SyncOrganizationBillingCycleDeps
 }): Promise<Date> {
   const { organizationId, logger, deps = {} } = params
-  const dbClient = deps.db ?? db
+  // Cast to BillingDbConnection to allow either real db or mock to be used
+  const dbClient = (deps.db ?? db) as BillingDbConnection
   const stripe = deps.stripeServer ?? stripeServer
 
   const organization = await dbClient.query.org.findFirst({