Skip to content

Commit ecf64b3

Browse files
author
Vikhyath Mondreti
committed
feat(billing): align enterprise reporting periods
1 parent 0758df3 commit ecf64b3

50 files changed

Lines changed: 23226 additions & 617 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/sim/app/api/billing/update-cost/route.test.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ const ACCOUNT_BILLING_DECISION = {
8888
billingPeriod: {
8989
start: '2026-07-01T00:00:00.000Z',
9090
end: '2026-08-01T00:00:00.000Z',
91+
source: 'reporting' as const,
9192
},
9293
}
9394

@@ -418,6 +419,7 @@ describe('POST /api/billing/update-cost — workspaceId attribution', () => {
418419
billingPeriod: {
419420
start: new Date('2026-07-01T00:00:00.000Z'),
420421
end: new Date('2026-08-01T00:00:00.000Z'),
422+
source: 'reporting',
421423
},
422424
})
423425
)
@@ -431,6 +433,7 @@ describe('POST /api/billing/update-cost — workspaceId attribution', () => {
431433
expectedBillingPeriod: {
432434
start: new Date('2026-07-01T00:00:00.000Z'),
433435
end: new Date('2026-08-01T00:00:00.000Z'),
436+
source: 'reporting',
434437
},
435438
}
436439
)
@@ -660,6 +663,7 @@ describe('POST /api/billing/update-cost — workspaceId attribution', () => {
660663
expectedBillingPeriod: {
661664
start: new Date('2026-07-01T00:00:00.000Z'),
662665
end: new Date('2026-08-01T00:00:00.000Z'),
666+
source: 'reporting',
663667
},
664668
}
665669
)

‎apps/sim/app/api/billing/update-cost/route.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,9 @@ async function updateCostInner(req: NextRequest, span: Span): Promise<NextRespon
280280
billingPeriod: {
281281
start: new Date(accountDecision.billingPeriod.start),
282282
end: new Date(accountDecision.billingPeriod.end),
283+
...(accountDecision.billingPeriod.source
284+
? { source: accountDecision.billingPeriod.source }
285+
: {}),
283286
},
284287
}
285288
: undefined

‎apps/sim/app/api/copilot/api-keys/validate/route.test.ts‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const ATTRIBUTION = {
5252
billingPeriod: {
5353
start: '2026-07-01T00:00:00.000Z',
5454
end: '2026-08-01T00:00:00.000Z',
55+
source: 'reporting' as const,
5556
},
5657
payerSubscription: null,
5758
}
@@ -63,6 +64,7 @@ const ACCOUNT_BILLING_DECISION = {
6364
billingPeriod: {
6465
start: '2026-07-01T00:00:00.000Z',
6566
end: '2026-08-01T00:00:00.000Z',
67+
source: 'reporting' as const,
6668
},
6769
}
6870

@@ -174,6 +176,7 @@ describe('POST /api/copilot/api-keys/validate billing protocols', () => {
174176
billingPeriod: {
175177
start: new Date(ACCOUNT_BILLING_DECISION.billingPeriod.start),
176178
end: new Date(ACCOUNT_BILLING_DECISION.billingPeriod.end),
179+
source: ACCOUNT_BILLING_DECISION.billingPeriod.source,
177180
},
178181
})
179182
mockGetUserEntityPermissions.mockResolvedValue('read')
@@ -387,11 +390,16 @@ describe('POST /api/copilot/api-keys/validate billing protocols', () => {
387390
)
388391

389392
expect(res.status).toBe(200)
390-
expect(mockCheckServerSideUsageLimits).toHaveBeenCalledWith('user-1', ACCOUNT_SUBSCRIPTION)
393+
expect(mockCheckServerSideUsageLimits).toHaveBeenCalledWith(
394+
'user-1',
395+
ACCOUNT_SUBSCRIPTION,
396+
expect.objectContaining({ billingEntity: ACCOUNT_BILLING_DECISION.billingEntity })
397+
)
391398
expect(mockCheckAttributedUsageLimits).not.toHaveBeenCalled()
392399
expect(mockResolveBillingAttribution).not.toHaveBeenCalled()
393400
expect(mockGetUserEntityPermissions).not.toHaveBeenCalled()
394401
expect(mockGetWorkspaceBillingSettings).not.toHaveBeenCalled()
402+
expect(mockSerializeAccountBillingDecisionHeader).toHaveBeenCalledWith(ACCOUNT_BILLING_DECISION)
395403
expect(res.headers.get('x-sim-billing-account-decision')).toBe('serialized-account-decision')
396404
})
397405

@@ -407,7 +415,11 @@ describe('POST /api/copilot/api-keys/validate billing protocols', () => {
407415
)
408416

409417
expect(res.status).toBe(200)
410-
expect(mockCheckServerSideUsageLimits).toHaveBeenCalledWith('user-1', ACCOUNT_SUBSCRIPTION)
418+
expect(mockCheckServerSideUsageLimits).toHaveBeenCalledWith(
419+
'user-1',
420+
ACCOUNT_SUBSCRIPTION,
421+
expect.objectContaining({ billingEntity: ACCOUNT_BILLING_DECISION.billingEntity })
422+
)
411423
})
412424

413425
it('fails direct-v1 admission closed when its payer cannot be resolved', async () => {

‎apps/sim/app/api/copilot/api-keys/validate/route.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ async function checkAdmissionUsage(admission: AdmissionBillingDecision): Promise
169169
onError: 'throw',
170170
})
171171
const billingContext = deriveBillingContext(admission.userId, subscription)
172-
const usage = await checkServerSideUsageLimits(admission.userId, subscription)
172+
const usage = await checkServerSideUsageLimits(admission.userId, subscription, billingContext)
173173
return {
174174
isExceeded: usage.isExceeded,
175175
currentUsage: usage.currentUsage,
@@ -181,6 +181,9 @@ async function checkAdmissionUsage(admission: AdmissionBillingDecision): Promise
181181
billingPeriod: {
182182
start: billingContext.billingPeriod.start.toISOString(),
183183
end: billingContext.billingPeriod.end.toISOString(),
184+
...(billingContext.billingPeriod.source
185+
? { source: billingContext.billingPeriod.source }
186+
: {}),
184187
},
185188
},
186189
}

‎apps/sim/app/api/organizations/[id]/members/[memberId]/route.ts‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import { updateOrganizationMemberRoleContract } from '@/lib/api/contracts/organi
99
import { parseRequest } from '@/lib/api/server'
1010
import { getSession } from '@/lib/auth'
1111
import { setActiveOrganizationForCurrentSession } from '@/lib/auth/active-organization'
12-
import { getOrgMemberLedgerByUser } from '@/lib/billing/core/organization'
13-
import { getUserUsageData } from '@/lib/billing/core/usage'
12+
import { getOrganizationMemberUsageSnapshot } from '@/lib/billing/core/organization'
1413
import {
1514
removeExternalUserFromOrganizationWorkspaces,
1615
removeUserFromOrganization,
@@ -99,31 +98,23 @@ export const GET = withRouteHandler(
9998
.where(eq(userStats.userId, memberId))
10099
.limit(1)
101100

102-
const computed = await getUserUsageData(memberId, dbReplica)
103-
104101
if (usageData.length > 0) {
105-
// currentPeriodCost is only a baseline; add this member's attributed
106-
// usage_log for the period. (getUserUsageData returns the org POOL for
107-
// org-scoped members, so it can't supply the per-member figure.)
108-
const memberLedger =
109-
(
110-
await getOrgMemberLedgerByUser(
111-
organizationId,
112-
computed.billingPeriodStart && computed.billingPeriodEnd
113-
? { start: computed.billingPeriodStart, end: computed.billingPeriodEnd }
114-
: null,
115-
dbReplica
116-
)
117-
).get(memberId) ?? 0
102+
const { billingPeriod, includeLegacyBaseline, usageByUser } =
103+
await getOrganizationMemberUsageSnapshot(organizationId, {
104+
executor: dbReplica,
105+
userIds: [memberId],
106+
})
107+
const memberLedger = usageByUser.get(memberId) ?? 0
118108
memberData = {
119109
...memberData,
120110
usage: {
121111
...usageData[0],
122112
currentPeriodCost: (
123-
Number(usageData[0].currentPeriodCost ?? 0) + memberLedger
113+
(includeLegacyBaseline ? Number(usageData[0].currentPeriodCost ?? 0) : 0) +
114+
memberLedger
124115
).toString(),
125-
billingPeriodStart: computed.billingPeriodStart,
126-
billingPeriodEnd: computed.billingPeriodEnd,
116+
billingPeriodStart: billingPeriod?.start ?? null,
117+
billingPeriodEnd: billingPeriod?.end ?? null,
127118
},
128119
} as typeof memberData & {
129120
usage: (typeof usageData)[0] & {

‎apps/sim/app/api/organizations/[id]/members/route.ts‎

Lines changed: 10 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import { db } from '@sim/db'
2-
import { member, subscription as subscriptionTable, user, userStats } from '@sim/db/schema'
2+
import { member, user, userStats } from '@sim/db/schema'
33
import { createLogger } from '@sim/logger'
44
import { isOrgAdminRole } from '@sim/platform-authz/workspace'
5-
import { and, eq, inArray } from 'drizzle-orm'
5+
import { and, eq } from 'drizzle-orm'
66
import { type NextRequest, NextResponse } from 'next/server'
77
import {
88
organizationMemberQuerySchema,
99
organizationParamsSchema,
1010
} from '@/lib/api/contracts/organization'
1111
import { getValidationErrorMessage } from '@/lib/api/server'
1212
import { getSession } from '@/lib/auth'
13-
import { getOrgMemberLedgerByUser } from '@/lib/billing/core/organization'
14-
import { ENTITLED_SUBSCRIPTION_STATUSES } from '@/lib/billing/subscriptions/utils'
13+
import { getOrganizationMemberUsageSnapshot } from '@/lib/billing/core/organization'
1514
import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
1615

1716
const logger = createLogger('OrganizationMembersAPI')
@@ -101,41 +100,18 @@ export const GET = withRouteHandler(
101100
.leftJoin(userStats, eq(user.id, userStats.userId))
102101
.where(eq(member.organizationId, organizationId))
103102

104-
// The billing period is the same for every member — it comes from
105-
// whichever subscription covers them. Fetch once and attach to
106-
// every row instead of calling `getUserUsageData` per-member,
107-
// which would run an O(N) pooled query for each of N rows.
108-
const [orgSub] = await db
109-
.select({
110-
periodStart: subscriptionTable.periodStart,
111-
periodEnd: subscriptionTable.periodEnd,
103+
const { billingPeriod, includeLegacyBaseline, usageByUser } =
104+
await getOrganizationMemberUsageSnapshot(organizationId, {
105+
userIds: base.length <= 1_000 ? base.map((row) => row.userId) : undefined,
112106
})
113-
.from(subscriptionTable)
114-
.where(
115-
and(
116-
eq(subscriptionTable.referenceId, organizationId),
117-
inArray(subscriptionTable.status, ENTITLED_SUBSCRIPTION_STATUSES)
118-
)
119-
)
120-
.limit(1)
121-
122-
const billingPeriodStart = orgSub?.periodStart ?? null
123-
const billingPeriodEnd = orgSub?.periodEnd ?? null
124-
125-
// currentPeriodCost is only a baseline; add each member's attributed
126-
// usage_log for the period (batched, one query) so the roster shows real
127-
// usage rather than the frozen baseline.
128-
const usageByUser = await getOrgMemberLedgerByUser(
129-
organizationId,
130-
billingPeriodStart && billingPeriodEnd
131-
? { start: billingPeriodStart, end: billingPeriodEnd }
132-
: null
133-
)
107+
const billingPeriodStart = billingPeriod?.start ?? null
108+
const billingPeriodEnd = billingPeriod?.end ?? null
134109

135110
const membersWithUsage = base.map((row) => ({
136111
...row,
137112
currentPeriodCost: (
138-
Number(row.currentPeriodCost ?? 0) + (usageByUser.get(row.userId) ?? 0)
113+
(includeLegacyBaseline ? Number(row.currentPeriodCost ?? 0) : 0) +
114+
(usageByUser.get(row.userId) ?? 0)
139115
).toString(),
140116
billingPeriodStart,
141117
billingPeriodEnd,

‎apps/sim/app/api/v1/admin/dashboard/enterprise-provisioning/[id]/workspace-moves/[moveId]/retry/route.ts‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
import { getErrorMessage } from '@sim/utils/errors'
2+
import { toDashboardProvisioning } from '@/lib/admin/dashboard'
3+
import { adminDashboardRetryEnterpriseWorkspaceMoveContract } from '@/lib/api/contracts/v1/admin/dashboard'
4+
import { parseRequest } from '@/lib/api/server'
5+
import {
6+
EnterpriseProvisioningError,
7+
retryEnterpriseWorkspaceMove,
8+
} from '@/lib/billing/enterprise-provisioning'
9+
import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
10+
import { getAdminAuditActor } from '@/app/api/v1/admin/dashboard/actor'
11+
import { withAdminAuthParams } from '@/app/api/v1/admin/middleware'
12+
import {
13+
adminValidationErrorResponse,
14+
badRequestResponse,
15+
singleResponse,
16+
} from '@/app/api/v1/admin/responses'
17+
18+
interface RouteParams {
19+
id: string
20+
moveId: string
21+
}
22+
23+
export const POST = withRouteHandler(
24+
withAdminAuthParams<RouteParams>(async (request, context) => {
25+
const parsed = await parseRequest(
26+
adminDashboardRetryEnterpriseWorkspaceMoveContract,
27+
request,
28+
context,
29+
{ validationErrorResponse: adminValidationErrorResponse }
30+
)
31+
if (!parsed.success) return parsed.response
32+
try {
33+
return singleResponse(
34+
toDashboardProvisioning(
35+
await retryEnterpriseWorkspaceMove(
36+
parsed.data.params.id,
37+
parsed.data.params.moveId,
38+
await getAdminAuditActor(request)
39+
)
40+
)
41+
)
42+
} catch (error) {
43+
return badRequestResponse(
44+
error instanceof EnterpriseProvisioningError
45+
? error.message
46+
: getErrorMessage(error, 'Failed to retry Enterprise workspace move')
47+
)
48+
}
49+
})
50+
)

‎apps/sim/app/api/v1/admin/dashboard/enterprise-provisioning/preflight/route.ts‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
import { getErrorMessage } from '@sim/utils/errors'
2+
import { adminDashboardEnterprisePreflightContract } from '@/lib/api/contracts/v1/admin/dashboard'
3+
import { parseRequest } from '@/lib/api/server'
4+
import {
5+
EnterpriseProvisioningError,
6+
getEnterpriseIssuancePreflight,
7+
} from '@/lib/billing/enterprise-provisioning'
8+
import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
9+
import { withAdminAuth } from '@/app/api/v1/admin/middleware'
10+
import {
11+
adminValidationErrorResponse,
12+
badRequestResponse,
13+
singleResponse,
14+
} from '@/app/api/v1/admin/responses'
15+
16+
export const GET = withRouteHandler(
17+
withAdminAuth(async (request) => {
18+
const parsed = await parseRequest(
19+
adminDashboardEnterprisePreflightContract,
20+
request,
21+
{},
22+
{ validationErrorResponse: adminValidationErrorResponse }
23+
)
24+
if (!parsed.success) return parsed.response
25+
try {
26+
return singleResponse(await getEnterpriseIssuancePreflight(parsed.data.query))
27+
} catch (error) {
28+
return badRequestResponse(
29+
error instanceof EnterpriseProvisioningError
30+
? error.message
31+
: getErrorMessage(error, 'Failed to prepare Enterprise issuance')
32+
)
33+
}
34+
})
35+
)

‎apps/sim/app/api/v1/admin/dashboard/organizations/[id]/billing-terms/preview/route.ts‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import { getErrorMessage } from '@sim/utils/errors'
2+
import { previewDashboardEnterpriseBillingTerms } from '@/lib/admin/dashboard'
3+
import { adminDashboardPreviewBillingTermsContract } from '@/lib/api/contracts/v1/admin/dashboard'
4+
import { parseRequest } from '@/lib/api/server'
5+
import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
6+
import { withAdminAuthParams } from '@/app/api/v1/admin/middleware'
7+
import {
8+
adminInvalidJsonResponse,
9+
adminValidationErrorResponse,
10+
badRequestResponse,
11+
singleResponse,
12+
} from '@/app/api/v1/admin/responses'
13+
14+
export const POST = withRouteHandler(
15+
withAdminAuthParams<{ id: string }>(async (request, context) => {
16+
const parsed = await parseRequest(adminDashboardPreviewBillingTermsContract, request, context, {
17+
validationErrorResponse: adminValidationErrorResponse,
18+
invalidJsonResponse: adminInvalidJsonResponse,
19+
})
20+
if (!parsed.success) return parsed.response
21+
try {
22+
return singleResponse(
23+
await previewDashboardEnterpriseBillingTerms(parsed.data.params.id, parsed.data.body)
24+
)
25+
} catch (error) {
26+
return badRequestResponse(
27+
getErrorMessage(error, 'Failed to preview Enterprise billing terms')
28+
)
29+
}
30+
})
31+
)

‎apps/sim/app/api/v1/admin/dashboard/organizations/[id]/billing-terms/route.ts‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import { getErrorMessage } from '@sim/utils/errors'
2+
import { updateDashboardEnterpriseBillingTerms } from '@/lib/admin/dashboard'
3+
import { adminDashboardUpdateBillingTermsContract } from '@/lib/api/contracts/v1/admin/dashboard'
4+
import { parseRequest } from '@/lib/api/server'
5+
import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
6+
import { getAdminAuditActor } from '@/app/api/v1/admin/dashboard/actor'
7+
import { withAdminAuthParams } from '@/app/api/v1/admin/middleware'
8+
import {
9+
adminInvalidJsonResponse,
10+
adminValidationErrorResponse,
11+
badRequestResponse,
12+
singleResponse,
13+
} from '@/app/api/v1/admin/responses'
14+
15+
export const PATCH = withRouteHandler(
16+
withAdminAuthParams<{ id: string }>(async (request, context) => {
17+
const parsed = await parseRequest(adminDashboardUpdateBillingTermsContract, request, context, {
18+
validationErrorResponse: adminValidationErrorResponse,
19+
invalidJsonResponse: adminInvalidJsonResponse,
20+
})
21+
if (!parsed.success) return parsed.response
22+
try {
23+
await updateDashboardEnterpriseBillingTerms(
24+
parsed.data.params.id,
25+
parsed.data.body,
26+
await getAdminAuditActor(request)
27+
)
28+
return singleResponse({ success: true as const })
29+
} catch (error) {
30+
return badRequestResponse(getErrorMessage(error, 'Failed to update Enterprise billing terms'))
31+
}
32+
})
33+
)

0 commit comments

Comments
 (0)