Skip to content

Commit 8352add

Browse files
fix(console): preserve usage reset boundaries (#44729)
Co-authored-by: MrMushrooooom <[email protected]> Co-authored-by: Jack <[email protected]>
1 parent 32f8974 commit 8352add

1 file changed

Lines changed: 26 additions & 6 deletions

File tree

  • packages/console/app/src/routes/zen/util

‎packages/console/app/src/routes/zen/util/handler.ts‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,6 +1109,8 @@ export async function handler(
11091109
authInfo = authInfo!
11101110

11111111
const cost = centsToMicroCents(totalCostInCent)
1112+
// Keep period bounds and persisted timestamps on one snapshot when a queued write crosses a reset boundary.
1113+
const trackedAt = new Date()
11121114

11131115
// For hot workspaces, batch balance/usage updates through Redis to avoid
11141116
// row-level lock contention on BillingTable/UserTable. Returns the amount
@@ -1149,19 +1151,25 @@ export async function handler(
11491151
if (billingSource === "subscription") {
11501152
const plan = authInfo.billing.subscription!.plan
11511153
const black = BlackData.getLimits({ plan })
1152-
const week = getWeekBounds(new Date())
1154+
const week = getWeekBounds(trackedAt)
11531155
const rollingWindowSeconds = black.rollingWindow * 3600
11541156
return [
11551157
db
11561158
.update(SubscriptionTable)
11571159
.set({
11581160
fixedUsage: sql`
11591161
CASE
1162+
WHEN ${SubscriptionTable.timeFixedUpdated} >= ${week.end} THEN ${SubscriptionTable.fixedUsage}
11601163
WHEN ${SubscriptionTable.timeFixedUpdated} >= ${week.start} THEN ${SubscriptionTable.fixedUsage} + ${cost}
11611164
ELSE ${cost}
11621165
END
11631166
`,
1164-
timeFixedUpdated: sql`now()`,
1167+
timeFixedUpdated: sql`
1168+
CASE
1169+
WHEN ${SubscriptionTable.timeFixedUpdated} > ${trackedAt} THEN ${SubscriptionTable.timeFixedUpdated}
1170+
ELSE ${trackedAt}
1171+
END
1172+
`,
11651173
rollingUsage: sql`
11661174
CASE
11671175
WHEN UNIX_TIMESTAMP(${SubscriptionTable.timeRollingUpdated}) >= UNIX_TIMESTAMP(now()) - ${rollingWindowSeconds} THEN ${SubscriptionTable.rollingUsage} + ${cost}
@@ -1185,8 +1193,8 @@ export async function handler(
11851193
}
11861194
if (billingSource === "lite") {
11871195
const lite = LiteData.getLimits()
1188-
const week = getWeekBounds(new Date())
1189-
const month = getMonthlyBounds(new Date(), authInfo.lite!.timeCreated)
1196+
const week = getWeekBounds(trackedAt)
1197+
const month = getMonthlyBounds(trackedAt, authInfo.lite!.timeCreated)
11901198
const rollingWindowSeconds = lite.rollingWindow * 3600
11911199
const quotaCost = Math.round(cost * modelInfo.costMultiplier)
11921200
return [
@@ -1195,18 +1203,30 @@ export async function handler(
11951203
.set({
11961204
monthlyUsage: sql`
11971205
CASE
1206+
WHEN ${LiteTable.timeMonthlyUpdated} >= ${month.end} THEN ${LiteTable.monthlyUsage}
11981207
WHEN ${LiteTable.timeMonthlyUpdated} >= ${month.start} THEN ${LiteTable.monthlyUsage} + ${quotaCost}
11991208
ELSE ${quotaCost}
12001209
END
12011210
`,
1202-
timeMonthlyUpdated: sql`now()`,
1211+
timeMonthlyUpdated: sql`
1212+
CASE
1213+
WHEN ${LiteTable.timeMonthlyUpdated} > ${trackedAt} THEN ${LiteTable.timeMonthlyUpdated}
1214+
ELSE ${trackedAt}
1215+
END
1216+
`,
12031217
weeklyUsage: sql`
12041218
CASE
1219+
WHEN ${LiteTable.timeWeeklyUpdated} >= ${week.end} THEN ${LiteTable.weeklyUsage}
12051220
WHEN ${LiteTable.timeWeeklyUpdated} >= ${week.start} THEN ${LiteTable.weeklyUsage} + ${quotaCost}
12061221
ELSE ${quotaCost}
12071222
END
12081223
`,
1209-
timeWeeklyUpdated: sql`now()`,
1224+
timeWeeklyUpdated: sql`
1225+
CASE
1226+
WHEN ${LiteTable.timeWeeklyUpdated} > ${trackedAt} THEN ${LiteTable.timeWeeklyUpdated}
1227+
ELSE ${trackedAt}
1228+
END
1229+
`,
12101230
rollingUsage: sql`
12111231
CASE
12121232
WHEN UNIX_TIMESTAMP(${LiteTable.timeRollingUpdated}) >= UNIX_TIMESTAMP(now()) - ${rollingWindowSeconds} THEN ${LiteTable.rollingUsage} + ${quotaCost}

0 commit comments

Comments
 (0)