refactor(billing): replace test-oriented db conn types

Author: brandonkachen

common/src/testing/fixtures/billing.ts

@@ -4,7 +4,7 @@
  * Re-exports all test fixtures for cleaner imports:
  * @example
  * ```ts
- * import { testLogger, createMockFetch, createGrantCreditsDbMock } from '@codebuff/common/testing/fixtures'
+ * import { testLogger, createMockFetch, createGrantCreditsStoreMock } from '@codebuff/common/testing/fixtures'
  * ```
  */
 
@@ -22,21 +22,20 @@ export {
 
 // Billing database mock fixtures
 export {
-  createGrantCreditsDbMock,
-  createOrgBillingDbMock,
-  createOrgBillingTransactionMock,
-  createCreditDelegationDbMock,
+  createGrantCreditsStoreMock,
+  createOrgBillingStoreMock,
+  createCreditDelegationStoreMock,
   type GrantCreditsMockOptions,
-  type GrantCreditsDbConn,
-  type GrantCreditsTx,
+  type GrantCreditsStore,
+  type GrantCreditsTxStore,
   type OrgBillingGrant,
   type OrgBillingMockOptions,
-  type OrgBillingDbConn,
-  type OrgBillingWithTransactionFn,
+  type OrgBillingStore,
+  type OrgBillingTxStore,
   type UserOrganization,
   type OrgRepo,
   type CreditDelegationMockOptions,
-  type CreditDelegationDbConn,
+  type CreditDelegationStore,
 } from './billing'
 
 // Database mock fixtures

common/src/testing/fixtures/index.ts

@@ -1,7 +1,7 @@
 import { afterEach, describe, expect, it, mock } from 'bun:test'
 
 import {
-  createCreditDelegationDbMock,
+  createCreditDelegationStoreMock,
   testLogger,
 } from '@codebuff/common/testing/fixtures'
 
@@ -19,7 +19,7 @@ describe('Credit Delegation', () => {
 
   describe('findOrganizationForRepository', () => {
     it('should find organization for matching repository', async () => {
-      const mockDb = createCreditDelegationDbMock({
+      const mockStore = createCreditDelegationStoreMock({
         userOrganizations: [
           {
             orgId: 'org-123',
@@ -43,7 +43,7 @@ describe('Credit Delegation', () => {
         userId,
         repositoryUrl,
         logger,
-        conn: mockDb,
+        store: mockStore,
       })
 
       expect(result.found).toBe(true)
@@ -52,7 +52,7 @@ describe('Credit Delegation', () => {
     })
 
     it('should return not found for non-matching repository', async () => {
-      const mockDb = createCreditDelegationDbMock({
+      const mockStore = createCreditDelegationStoreMock({
         userOrganizations: [
           {
             orgId: 'org-123',
@@ -76,14 +76,14 @@ describe('Credit Delegation', () => {
         userId,
         repositoryUrl,
         logger,
-        conn: mockDb,
+        store: mockStore,
       })
 
       expect(result.found).toBe(false)
     })
 
     it('should return not found when user has no organizations', async () => {
-      const mockDb = createCreditDelegationDbMock({
+      const mockStore = createCreditDelegationStoreMock({
         userOrganizations: [],
         orgRepos: [],
       })
@@ -95,7 +95,7 @@ describe('Credit Delegation', () => {
         userId,
         repositoryUrl,
         logger,
-        conn: mockDb,
+        store: mockStore,
       })
 
       expect(result.found).toBe(false)
@@ -104,7 +104,7 @@ describe('Credit Delegation', () => {
 
   describe('consumeCreditsWithDelegation', () => {
     it('should fail when no repository URL provided', async () => {
-      const mockDb = createCreditDelegationDbMock()
+      const mockStore = createCreditDelegationStoreMock()
 
       const userId = 'user-123'
       const repositoryUrl = null
@@ -115,15 +115,15 @@ describe('Credit Delegation', () => {
         repositoryUrl,
         creditsToConsume,
         logger,
-        conn: mockDb,
+        store: mockStore,
       })
 
       expect(result.success).toBe(false)
       expect(result.error).toBe('No repository URL provided')
     })
 
     it('should fail when no organization found for repository', async () => {
-      const mockDb = createCreditDelegationDbMock({
+      const mockStore = createCreditDelegationStoreMock({
         userOrganizations: [],
         orgRepos: [],
       })
@@ -137,7 +137,7 @@ describe('Credit Delegation', () => {
         repositoryUrl,
         creditsToConsume,
         logger,
-        conn: mockDb,
+        store: mockStore,
       })
 
       expect(result.success).toBe(false)

packages/billing/src/__tests__/credit-delegation.test.ts

@@ -1,7 +1,7 @@
 import { afterEach, describe, expect, it, mock } from 'bun:test'
 
 import {
-  createGrantCreditsDbMock,
+  createGrantCreditsStoreMock,
   testLogger,
 } from '@codebuff/common/testing/fixtures'
 
@@ -20,7 +20,7 @@ describe('grant-credits', () => {
   describe('triggerMonthlyResetAndGrant', () => {
     describe('autoTopupEnabled return value', () => {
       it('should return autoTopupEnabled: true when user has auto_topup_enabled: true', async () => {
-        const mockDb = createGrantCreditsDbMock({
+        const mockStore = createGrantCreditsStoreMock({
           user: {
             next_quota_reset: futureDate,
             auto_topup_enabled: true,
@@ -30,15 +30,15 @@ describe('grant-credits', () => {
         const result = await triggerMonthlyResetAndGrant({
           userId: 'user-123',
           logger,
-          conn: mockDb,
+          store: mockStore,
         })
 
         expect(result.autoTopupEnabled).toBe(true)
         expect(result.quotaResetDate).toEqual(futureDate)
       })
 
       it('should return autoTopupEnabled: false when user has auto_topup_enabled: false', async () => {
-        const mockDb = createGrantCreditsDbMock({
+        const mockStore = createGrantCreditsStoreMock({
           user: {
             next_quota_reset: futureDate,
             auto_topup_enabled: false,
@@ -48,14 +48,14 @@ describe('grant-credits', () => {
         const result = await triggerMonthlyResetAndGrant({
           userId: 'user-123',
           logger,
-          conn: mockDb,
+          store: mockStore,
         })
 
         expect(result.autoTopupEnabled).toBe(false)
       })
 
       it('should default autoTopupEnabled to false when user has auto_topup_enabled: null', async () => {
-        const mockDb = createGrantCreditsDbMock({
+        const mockStore = createGrantCreditsStoreMock({
           user: {
             next_quota_reset: futureDate,
             auto_topup_enabled: null,
@@ -65,30 +65,30 @@ describe('grant-credits', () => {
         const result = await triggerMonthlyResetAndGrant({
           userId: 'user-123',
           logger,
-          conn: mockDb,
+          store: mockStore,
         })
 
         expect(result.autoTopupEnabled).toBe(false)
       })
 
       it('should throw error when user is not found', async () => {
-        const mockDb = createGrantCreditsDbMock({
+        const mockStore = createGrantCreditsStoreMock({
           user: null,
         })
 
         await expect(
           triggerMonthlyResetAndGrant({
             userId: 'nonexistent-user',
             logger,
-            conn: mockDb,
+            store: mockStore,
           }),
         ).rejects.toThrow('User nonexistent-user not found')
       })
     })
 
     describe('quota reset behavior', () => {
       it('should return existing reset date when it is in the future', async () => {
-        const mockDb = createGrantCreditsDbMock({
+        const mockStore = createGrantCreditsStoreMock({
           user: {
             next_quota_reset: futureDate,
             auto_topup_enabled: false,
@@ -98,7 +98,7 @@ describe('grant-credits', () => {
         const result = await triggerMonthlyResetAndGrant({
           userId: 'user-123',
           logger,
-          conn: mockDb,
+          store: mockStore,
         })
 
         expect(result.quotaResetDate).toEqual(futureDate)

packages/billing/src/__tests__/grant-credits.test.ts

@@ -1,8 +1,7 @@
 import { afterEach, describe, expect, it, mock } from 'bun:test'
 
 import {
-  createOrgBillingDbMock,
-  createOrgBillingTransactionMock,
+  createOrgBillingStoreMock,
   testLogger,
   type OrgBillingGrant,
 } from '@codebuff/common/testing/fixtures'
@@ -20,7 +19,7 @@ const mockGrants: OrgBillingGrant[] = [
   {
     operation_id: 'org-grant-1',
     user_id: '',
-    organization_id: 'org-123',
+    org_id: 'org-123',
     principal: 1000,
     balance: 800,
     type: 'organization',
@@ -32,7 +31,7 @@ const mockGrants: OrgBillingGrant[] = [
   {
     operation_id: 'org-grant-2',
     user_id: '',
-    organization_id: 'org-123',
+    org_id: 'org-123',
     principal: 500,
     balance: -100, // Debt
     type: 'organization',
@@ -62,7 +61,7 @@ describe('Organization Billing', () => {
 
   describe('calculateOrganizationUsageAndBalance', () => {
     it('should calculate balance correctly with positive and negative balances', async () => {
-      const mockDb = createOrgBillingDbMock({ grants: mockGrants })
+      const mockStore = createOrgBillingStoreMock({ grants: mockGrants })
       const organizationId = 'org-123'
       const quotaResetDate = new Date('2024-01-01')
       const now = new Date('2024-06-01')
@@ -72,7 +71,7 @@ describe('Organization Billing', () => {
         quotaResetDate,
         now,
         logger,
-        conn: mockDb,
+        store: mockStore,
       })
 
       // Total positive balance: 800
@@ -88,7 +87,7 @@ describe('Organization Billing', () => {
 
     it('should handle organization with no grants', async () => {
       // Mock empty grants
-      const mockDb = createOrgBillingDbMock({ grants: [] })
+      const mockStore = createOrgBillingStoreMock({ grants: [] })
 
       const organizationId = 'org-empty'
       const quotaResetDate = new Date('2024-01-01')
@@ -99,7 +98,7 @@ describe('Organization Billing', () => {
         quotaResetDate,
         now,
         logger,
-        conn: mockDb,
+        store: mockStore,
       })
 
       expect(result.balance.totalRemaining).toBe(0)
@@ -178,8 +177,7 @@ describe('Organization Billing', () => {
 
   describe('consumeOrganizationCredits', () => {
     it('should consume credits from organization grants', async () => {
-      const mockDb = createOrgBillingDbMock({ grants: mockGrants })
-      const mockWithTransaction = createOrgBillingTransactionMock(mockDb)
+      const mockStore = createOrgBillingStoreMock({ grants: mockGrants })
 
       const organizationId = 'org-123'
       const creditsToConsume = 100
@@ -188,7 +186,7 @@ describe('Organization Billing', () => {
         organizationId,
         creditsToConsume,
         logger,
-        withTransaction: mockWithTransaction,
+        store: mockStore,
       })
 
       expect(result.consumed).toBe(100)
@@ -198,7 +196,7 @@ describe('Organization Billing', () => {
 
   describe('grantOrganizationCredits', () => {
     it('should create organization credit grant', async () => {
-      const mockDb = createOrgBillingDbMock({ grants: mockGrants })
+      const mockStore = createOrgBillingStoreMock({ grants: mockGrants })
 
       const organizationId = 'org-123'
       const userId = 'user-123'
@@ -215,23 +213,18 @@ describe('Organization Billing', () => {
           operationId,
           description,
           logger,
-          conn: mockDb,
+          store: mockStore,
         }),
       ).resolves.toBeUndefined()
     })
 
     it('should handle duplicate operation IDs gracefully', async () => {
       // Mock database constraint error
-      const mockDb = createOrgBillingDbMock({
+      const mockStore = createOrgBillingStoreMock({
         grants: mockGrants,
-        insert: () => ({
-          values: () => {
-            throw new PgUniqueViolationError(
-              'Duplicate key',
-              'credit_ledger_pkey',
-            )
-          },
-        }),
+        insertCreditLedgerEntry: async () => {
+          throw new PgUniqueViolationError('Duplicate key', 'credit_ledger_pkey')
+        },
       })
 
       const organizationId = 'org-123'
@@ -249,7 +242,7 @@ describe('Organization Billing', () => {
           operationId,
           description,
           logger,
-          conn: mockDb,
+          store: mockStore,
         }),
       ).resolves.toBeUndefined()
     })