Skip to content

Calculate plan allowance availability per current subscription cycle (instead of user-wide) #3922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jurgenwerk wants to merge 1 commit into
base: main
Choose a base branch
from
+68 −8
Open

Calculate plan allowance availability per current subscription cycle (instead of user-wide) #3922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions packages/billing/billing-queries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,14 +562,17 @@ export async function spendCredits(
if (!subscriptionCycle) {
throw new Error('subscription cycle not found');
}
let availablePlanAllowanceCredits = await sumUpCreditsLedger(dbAdapter, {
creditType: [
'plan_allowance',
'plan_allowance_used',
'plan_allowance_expired',
],
userId,
});
let availablePlanAllowanceCredits = Math.max(
0,
await sumUpCreditsLedger(dbAdapter, {
creditType: [
'plan_allowance',
'plan_allowance_used',
'plan_allowance_expired',
],
subscriptionCycleId: subscriptionCycle.id,
}),
);

if (availablePlanAllowanceCredits >= creditsToSpend) {
await addToCreditsLedger(dbAdapter, {
Expand Down
57 changes: 57 additions & 0 deletions packages/realm-server/tests/billing-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,6 +995,63 @@ module(basename(__filename), function () {
);
});

test('does not spend previous cycle plan allowance in current cycle', async function (assert) {
await addToCreditsLedger(dbAdapter, {
userId: user.id,
creditAmount: 100,
creditType: 'plan_allowance',
subscriptionCycleId: subscriptionCycle.id,
});

let nextSubscriptionCycle = await insertSubscriptionCycle(dbAdapter, {
subscriptionId: subscription.id,
periodStart: 2,
periodEnd: 3,
});
await addToCreditsLedger(dbAdapter, {
userId: user.id,
creditAmount: 50,
creditType: 'plan_allowance',
subscriptionCycleId: nextSubscriptionCycle.id,
});

await spendCredits(dbAdapter, user.id, 80);

assert.strictEqual(
await sumUpCreditsLedger(dbAdapter, {
subscriptionCycleId: subscriptionCycle.id,
creditType: [
'plan_allowance',
'plan_allowance_used',
'plan_allowance_expired',
],
}),
100,
);
assert.strictEqual(
await sumUpCreditsLedger(dbAdapter, {
subscriptionCycleId: nextSubscriptionCycle.id,
creditType: [
'plan_allowance',
'plan_allowance_used',
'plan_allowance_expired',
],
}),
0,
);
assert.strictEqual(
await sumUpCreditsLedger(dbAdapter, {
userId: user.id,
creditType: [
'plan_allowance',
'plan_allowance_used',
'plan_allowance_expired',
],
}),
100,
);
});

test('spends ai credits correctly when extra credits are available', async function (assert) {
// User receives 2500 credits for the creator plan and spends 2490 credits
await addToCreditsLedger(dbAdapter, {
Expand Down