improvement(billing): accurate per-member usage via shared ledger helper

Per-member/per-user usage in the org-member routes now adds the usage_log
ledger to the currentPeriodCost baseline (which is no longer incremented),
via a shared getOrgMemberLedgerByUser helper to avoid repeating the
subscription→period→ledger lookup across the admin and member-facing routes.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: icecrasher321

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

@@ -11,8 +11,8 @@ import {
 import { parseRequest } from '@/lib/api/server'
 import { getSession } from '@/lib/auth'
 import { setActiveOrganizationForCurrentSession } from '@/lib/auth/active-organization'
+import { getOrgMemberLedgerByUser } from '@/lib/billing/core/organization'
 import { getUserUsageData } from '@/lib/billing/core/usage'
-import { getBillingPeriodUsageCostByUser } from '@/lib/billing/core/usage-log'
 import {
   removeExternalUserFromOrganizationWorkspaces,
   removeUserFromOrganization,
@@ -106,14 +106,14 @@ export const GET = withRouteHandler(
           // usage_log for the period. (getUserUsageData returns the org POOL for
           // org-scoped members, so it can't supply the per-member figure.)
           const memberLedger =
-            computed.billingPeriodStart && computed.billingPeriodEnd
-              ? ((
-                  await getBillingPeriodUsageCostByUser(
-                    { type: 'organization', id: organizationId },
-                    { start: computed.billingPeriodStart, end: computed.billingPeriodEnd }
-                  )
-                ).get(memberId) ?? 0)
-              : 0
+            (
+              await getOrgMemberLedgerByUser(
+                organizationId,
+                computed.billingPeriodStart && computed.billingPeriodEnd
+                  ? { start: computed.billingPeriodStart, end: computed.billingPeriodEnd }
+                  : null
+              )
+            ).get(memberId) ?? 0
           memberData = {
             ...memberData,
             usage: {

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

@@ -17,7 +17,7 @@ import {
 } from '@/lib/api/contracts/organization'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { getSession } from '@/lib/auth'
-import { getBillingPeriodUsageCostByUser } from '@/lib/billing/core/usage-log'
+import { getOrgMemberLedgerByUser } from '@/lib/billing/core/organization'
 import { ENTITLED_SUBSCRIPTION_STATUSES } from '@/lib/billing/subscriptions/utils'
 import { validateSeatAvailability } from '@/lib/billing/validation/seat-management'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
@@ -143,13 +143,12 @@ export const GET = withRouteHandler(
         // currentPeriodCost is only a baseline; add each member's attributed
         // usage_log for the period (batched, one query) so the roster shows real
         // usage rather than the frozen baseline.
-        const usageByUser =
+        const usageByUser = await getOrgMemberLedgerByUser(
+          organizationId,
           billingPeriodStart && billingPeriodEnd
-            ? await getBillingPeriodUsageCostByUser(
-                { type: 'organization', id: organizationId },
-                { start: billingPeriodStart, end: billingPeriodEnd }
-              )
-            : new Map<string, number>()
+            ? { start: billingPeriodStart, end: billingPeriodEnd }
+            : null
+        )
 
         const membersWithUsage = base.map((row) => ({
           ...row,

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

@@ -35,8 +35,7 @@ import {
   adminV1UpdateOrganizationMemberContract,
 } from '@/lib/api/contracts/v1/admin'
 import { parseRequest } from '@/lib/api/server'
-import { getOrganizationSubscription } from '@/lib/billing/core/billing'
-import { getBillingPeriodUsageCostByUser } from '@/lib/billing/core/usage-log'
+import { getOrgMemberLedgerByUser } from '@/lib/billing/core/organization'
 import { removeUserFromOrganization } from '@/lib/billing/organizations/membership'
 import { isBillingEnabled } from '@/lib/core/config/feature-flags'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
@@ -102,17 +101,7 @@ export const GET = withRouteHandler(
 
       // currentPeriodCost is only a baseline; add this member's attributed
       // usage_log for the org's period so admin shows real current usage.
-      const subscription = await getOrganizationSubscription(organizationId)
-      const billingPeriod =
-        subscription?.periodStart && subscription?.periodEnd
-          ? { start: subscription.periodStart, end: subscription.periodEnd }
-          : null
-      const ledgerByUser = billingPeriod
-        ? await getBillingPeriodUsageCostByUser(
-            { type: 'organization', id: organizationId },
-            billingPeriod
-          )
-        : new Map<string, number>()
+      const ledgerByUser = await getOrgMemberLedgerByUser(organizationId)
 
       const data: AdminMemberDetail = {
         id: memberData.id,

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

@@ -37,8 +37,7 @@ import {
   adminV1ListOrganizationMembersContract,
 } from '@/lib/api/contracts/v1/admin'
 import { parseRequest } from '@/lib/api/server'
-import { getOrganizationSubscription } from '@/lib/billing/core/billing'
-import { getBillingPeriodUsageCostByUser } from '@/lib/billing/core/usage-log'
+import { getOrgMemberLedgerByUser } from '@/lib/billing/core/organization'
 import { addUserToOrganization } from '@/lib/billing/organizations/membership'
 import { isBillingEnabled } from '@/lib/core/config/feature-flags'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
@@ -113,17 +112,7 @@ export const GET = withRouteHandler(
 
       // currentPeriodCost is only a baseline; add each member's attributed
       // usage_log for the org's period so admin shows real current usage.
-      const subscription = await getOrganizationSubscription(organizationId)
-      const billingPeriod =
-        subscription?.periodStart && subscription?.periodEnd
-          ? { start: subscription.periodStart, end: subscription.periodEnd }
-          : null
-      const usageByUser = billingPeriod
-        ? await getBillingPeriodUsageCostByUser(
-            { type: 'organization', id: organizationId },
-            billingPeriod
-          )
-        : new Map<string, number>()
+      const usageByUser = await getOrgMemberLedgerByUser(organizationId)
 
       const data: AdminMemberDetail[] = membersData.map((m) => ({
         id: m.id,

apps/sim/lib/billing/core/organization.ts

@@ -55,6 +55,32 @@ interface MemberUsageData {
   joinedAt: Date
 }
 
+/**
+ * Per-member usage_log cost for an org's current billing period, keyed by userId.
+ * `currentPeriodCost` is only a baseline (no longer incremented on the hot path),
+ * so callers add this ledger component to it for each member's real current-period
+ * usage. Pass `period` to reuse an already-fetched subscription window; omit it to
+ * look up the org's subscription here. Returns an empty map when there's no period.
+ */
+export async function getOrgMemberLedgerByUser(
+  organizationId: string,
+  period?: { start: Date; end: Date } | null
+): Promise<Map<string, number>> {
+  let billingPeriod = period ?? null
+  if (period === undefined) {
+    const subscription = await getOrganizationSubscription(organizationId)
+    billingPeriod =
+      subscription?.periodStart && subscription?.periodEnd
+        ? { start: subscription.periodStart, end: subscription.periodEnd }
+        : null
+  }
+  if (!billingPeriod) return new Map<string, number>()
+  return getBillingPeriodUsageCostByUser(
+    { type: 'organization', id: organizationId },
+    billingPeriod
+  )
+}
+
 /**
  * Get comprehensive organization billing and usage data
  */
@@ -108,12 +134,7 @@ export async function getOrganizationBillingData(
       subscription.periodStart && subscription.periodEnd
         ? { start: subscription.periodStart, end: subscription.periodEnd }
         : null
-    const usageByUser = billingPeriod
-      ? await getBillingPeriodUsageCostByUser(
-          { type: 'organization', id: subscription.referenceId },
-          billingPeriod
-        )
-      : new Map<string, number>()
+    const usageByUser = await getOrgMemberLedgerByUser(organizationId, billingPeriod)
 
     // Process member data
     const members: MemberUsageData[] = membersWithUsage.map((memberRecord) => {