mirror of
https://github.com/yusufipk/OpenFrame.git
synced 2026-09-11 17:46:06 +00:00
fix(admin): show the cardless trial as a trial in the admin panel
The cardless trial writes trialEndsAt and nothing else, because there is no Stripe subscription behind it to report trialing. subscriptionStatus stays FREE, so every admin view reading that column alone showed a live trial as a free account: On Trial sat at zero, Free Users counted the trials, the user table badged them Free with an open-ended Active access, the Trialing filter returned nobody and the growth scoreboard left them out of the paid accounts table. Access has always been resolved from the date (hasBillingAccess), so the display now follows the same date through getEffectiveBillingStatus. Only FREE is overridden: any other status means Stripe has an opinion worth showing.
This commit is contained in:
+17
-6
@@ -4,6 +4,7 @@ import { r2Client, R2_BUCKET_NAME } from '@/lib/r2';
|
||||
import { ListObjectsV2Command, type ListObjectsV2CommandInput } from '@aws-sdk/client-s3';
|
||||
import { isBunnyUploadsEnabled, isStripeBillingEnabled } from '@/lib/feature-flags';
|
||||
import { getStripe, getStripePriceId } from '@/lib/stripe';
|
||||
import { buildCardlessTrialWhereInput } from '@/lib/billing';
|
||||
import { logError } from '@/lib/logger';
|
||||
|
||||
const BUNNY_API_BASE = 'https://video.bunnycdn.com';
|
||||
@@ -551,10 +552,17 @@ export const getCachedStripeStats = unstable_cache(
|
||||
if (!isStripeBillingEnabled()) return null;
|
||||
|
||||
try {
|
||||
const statusCounts = await db.user.groupBy({
|
||||
by: ['subscriptionStatus'],
|
||||
_count: { id: true },
|
||||
});
|
||||
const now = new Date();
|
||||
// The cardless trial leaves `subscriptionStatus` at FREE, so the group-by
|
||||
// alone counted every trial as a free user and reported "On Trial" as zero.
|
||||
// Counted separately and moved across the two buckets below.
|
||||
const [statusCounts, cardlessTrialUsers] = await Promise.all([
|
||||
db.user.groupBy({
|
||||
by: ['subscriptionStatus'],
|
||||
_count: { id: true },
|
||||
}),
|
||||
db.user.count({ where: buildCardlessTrialWhereInput(now) }),
|
||||
]);
|
||||
|
||||
const counts: Record<string, number> = {};
|
||||
for (const row of statusCounts) {
|
||||
@@ -562,10 +570,13 @@ export const getCachedStripeStats = unstable_cache(
|
||||
}
|
||||
|
||||
const activeSubscribers = counts['ACTIVE'] ?? 0;
|
||||
const trialingUsers = counts['TRIALING'] ?? 0;
|
||||
const trialingUsers = (counts['TRIALING'] ?? 0) + cardlessTrialUsers;
|
||||
const pastDueUsers = counts['PAST_DUE'] ?? 0;
|
||||
const canceledUsers = counts['CANCELED'] ?? 0;
|
||||
const freeUsers = counts['FREE'] ?? 0;
|
||||
// Clamped because the two queries above see two different snapshots: a signup
|
||||
// landing between them can be counted as a trial without having been counted
|
||||
// as free, which would otherwise report a negative number of free users.
|
||||
const freeUsers = Math.max(0, (counts['FREE'] ?? 0) - cardlessTrialUsers);
|
||||
// UNPAID, INCOMPLETE and INCOMPLETE_EXPIRED belonged to none of the five buckets
|
||||
// above, so those users were counted nowhere and the totals silently did not add
|
||||
// up to the user table.
|
||||
|
||||
Reference in New Issue
Block a user