chore: import upstream snapshot with attribution
CI / Migrate Dev DB (push) Has been skipped
CI / Detect Version (push) Has been cancelled
CI / Migrate DB (push) Has been cancelled
CI / Build Dev ECR (./docker/app.Dockerfile, ECR_APP) (push) Has been cancelled
CI / Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS) (push) Has been cancelled
CI / Build Dev ECR (./docker/pii.Dockerfile, ECR_PII) (push) Has been cancelled
CI / Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME) (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
CI / Build AMD64 (./docker/app.Dockerfile, ECR_APP, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build AMD64 (./docker/db.Dockerfile, ECR_MIGRATIONS, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (./docker/pii.Dockerfile, ECR_PII, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (./docker/realtime.Dockerfile, ECR_REALTIME, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/app.Dockerfile, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/db.Dockerfile, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/pii.Dockerfile, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/realtime.Dockerfile, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Test and Build (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
CI / Migrate Dev DB (push) Has been skipped
CI / Detect Version (push) Has been cancelled
CI / Migrate DB (push) Has been cancelled
CI / Build Dev ECR (./docker/app.Dockerfile, ECR_APP) (push) Has been cancelled
CI / Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS) (push) Has been cancelled
CI / Build Dev ECR (./docker/pii.Dockerfile, ECR_PII) (push) Has been cancelled
CI / Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME) (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
CI / Build AMD64 (./docker/app.Dockerfile, ECR_APP, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build AMD64 (./docker/db.Dockerfile, ECR_MIGRATIONS, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (./docker/pii.Dockerfile, ECR_PII, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (./docker/realtime.Dockerfile, ECR_REALTIME, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/app.Dockerfile, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/db.Dockerfile, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/pii.Dockerfile, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/realtime.Dockerfile, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Test and Build (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
This commit is contained in:
@@ -0,0 +1,92 @@
|
||||
/**
|
||||
* Tests for the billing seat reconciliation cron route.
|
||||
*
|
||||
* @vitest-environment node
|
||||
*/
|
||||
import { createMockRequest } from '@sim/testing'
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
|
||||
const { mockVerifyCronAuth, mockReconcileTeamSeatDrift, mockFindDeadLetteredEvents } = vi.hoisted(
|
||||
() => ({
|
||||
mockVerifyCronAuth: vi.fn().mockReturnValue(null),
|
||||
mockReconcileTeamSeatDrift: vi.fn(),
|
||||
mockFindDeadLetteredEvents: vi.fn(),
|
||||
})
|
||||
)
|
||||
|
||||
vi.mock('@/lib/auth/internal', () => ({ verifyCronAuth: mockVerifyCronAuth }))
|
||||
vi.mock('@/lib/billing/organizations/seat-drift', () => ({
|
||||
reconcileTeamSeatDrift: mockReconcileTeamSeatDrift,
|
||||
}))
|
||||
vi.mock('@/lib/core/outbox/service', () => ({ findDeadLetteredEvents: mockFindDeadLetteredEvents }))
|
||||
vi.mock('@/lib/billing/webhooks/outbox-handlers', () => ({
|
||||
OUTBOX_EVENT_TYPES: {
|
||||
STRIPE_SYNC_SUBSCRIPTION_SEATS: 'stripe.sync-subscription-seats',
|
||||
STRIPE_SYNC_CANCEL_AT_PERIOD_END: 'stripe.sync-cancel-at-period-end',
|
||||
},
|
||||
}))
|
||||
|
||||
import { GET } from './route'
|
||||
|
||||
function createRequest() {
|
||||
return createMockRequest(
|
||||
'GET',
|
||||
undefined,
|
||||
{},
|
||||
'http://localhost:3000/api/cron/reconcile-billing-seats'
|
||||
)
|
||||
}
|
||||
|
||||
describe('reconcile-billing-seats cron route', () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
mockVerifyCronAuth.mockReturnValue(null)
|
||||
mockReconcileTeamSeatDrift.mockResolvedValue({ drifted: 0, reconciled: 0 })
|
||||
mockFindDeadLetteredEvents.mockResolvedValue([])
|
||||
})
|
||||
|
||||
it('returns the auth error when cron auth fails', async () => {
|
||||
mockVerifyCronAuth.mockReturnValueOnce(new Response(null, { status: 401 }) as never)
|
||||
|
||||
const response = await GET(createRequest())
|
||||
|
||||
expect(response.status).toBe(401)
|
||||
expect(mockReconcileTeamSeatDrift).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('runs the drift sweep and reports dead-lettered billing syncs', async () => {
|
||||
mockReconcileTeamSeatDrift.mockResolvedValue({ drifted: 2, reconciled: 1 })
|
||||
mockFindDeadLetteredEvents.mockResolvedValue([
|
||||
{
|
||||
id: 'evt-1',
|
||||
eventType: 'stripe.sync-subscription-seats',
|
||||
payload: { subscriptionId: 'sub-1' },
|
||||
lastError: 'card declined',
|
||||
},
|
||||
])
|
||||
|
||||
const response = await GET(createRequest())
|
||||
|
||||
expect(response.status).toBe(200)
|
||||
const data = await response.json()
|
||||
expect(data).toMatchObject({
|
||||
success: true,
|
||||
drift: { drifted: 2, reconciled: 1 },
|
||||
deadLetteredBillingSyncs: 1,
|
||||
})
|
||||
expect(mockFindDeadLetteredEvents).toHaveBeenCalledWith([
|
||||
'stripe.sync-subscription-seats',
|
||||
'stripe.sync-cancel-at-period-end',
|
||||
])
|
||||
})
|
||||
|
||||
it('returns 500 when the sweep throws', async () => {
|
||||
mockReconcileTeamSeatDrift.mockRejectedValueOnce(new Error('boom'))
|
||||
|
||||
const response = await GET(createRequest())
|
||||
|
||||
expect(response.status).toBe(500)
|
||||
const data = await response.json()
|
||||
expect(data.success).toBe(false)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,79 @@
|
||||
import { createLogger } from '@sim/logger'
|
||||
import { toError } from '@sim/utils/errors'
|
||||
import { type NextRequest, NextResponse } from 'next/server'
|
||||
import { verifyCronAuth } from '@/lib/auth/internal'
|
||||
import { reconcileTeamSeatDrift } from '@/lib/billing/organizations/seat-drift'
|
||||
import { OUTBOX_EVENT_TYPES } from '@/lib/billing/webhooks/outbox-handlers'
|
||||
import { findDeadLetteredEvents } from '@/lib/core/outbox/service'
|
||||
import { generateRequestId } from '@/lib/core/utils/request'
|
||||
import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
|
||||
|
||||
const logger = createLogger('BillingSeatReconcileCron')
|
||||
|
||||
export const dynamic = 'force-dynamic'
|
||||
|
||||
const BILLING_SYNC_EVENT_TYPES = [
|
||||
OUTBOX_EVENT_TYPES.STRIPE_SYNC_SUBSCRIPTION_SEATS,
|
||||
OUTBOX_EVENT_TYPES.STRIPE_SYNC_CANCEL_AT_PERIOD_END,
|
||||
]
|
||||
|
||||
/**
|
||||
* Periodic billing-seat reconciliation. Self-heals Team organizations whose
|
||||
* stored seat count drifted from their member count, and reports any
|
||||
* dead-lettered Stripe seat/cancel sync events so a member who has access but
|
||||
* whose seat charge never synced is surfaced for manual remediation rather than
|
||||
* silently under-billed.
|
||||
*
|
||||
* Scheduled in helm/sim/values.yaml under cronjobs.jobs.reconcileBillingSeats.
|
||||
*/
|
||||
export const GET = withRouteHandler(async (request: NextRequest) => {
|
||||
const requestId = generateRequestId()
|
||||
|
||||
const authError = verifyCronAuth(request, 'Billing seat reconciliation')
|
||||
if (authError) {
|
||||
return authError
|
||||
}
|
||||
|
||||
try {
|
||||
const drift = await reconcileTeamSeatDrift()
|
||||
|
||||
const deadLettered = await findDeadLetteredEvents(BILLING_SYNC_EVENT_TYPES)
|
||||
if (deadLettered.length > 0) {
|
||||
logger.error(
|
||||
'Dead-lettered billing sync events require manual remediation — a billing state change (seat charge or cancellation) never reached Stripe',
|
||||
{
|
||||
requestId,
|
||||
count: deadLettered.length,
|
||||
events: deadLettered.map((event) => ({
|
||||
id: event.id,
|
||||
eventType: event.eventType,
|
||||
subscriptionId: (event.payload as { subscriptionId?: string } | null)?.subscriptionId,
|
||||
lastError: event.lastError,
|
||||
})),
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
logger.info('Billing seat reconciliation completed', {
|
||||
requestId,
|
||||
...drift,
|
||||
deadLetteredBillingSyncs: deadLettered.length,
|
||||
})
|
||||
|
||||
return NextResponse.json({
|
||||
success: true,
|
||||
requestId,
|
||||
drift,
|
||||
deadLetteredBillingSyncs: deadLettered.length,
|
||||
})
|
||||
} catch (error) {
|
||||
logger.error('Billing seat reconciliation failed', {
|
||||
requestId,
|
||||
error: toError(error).message,
|
||||
})
|
||||
return NextResponse.json(
|
||||
{ success: false, requestId, error: toError(error).message },
|
||||
{ status: 500 }
|
||||
)
|
||||
}
|
||||
})
|
||||
Reference in New Issue
Block a user