🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
show correct subs
Bill Yanga7bdb013e5c0
diff --git a/client/src/app/admin/components/organizations/Organizations.tsx b/client/src/app/admin/components/organizations/Organizations.tsxindex f0eee196f..04dd0cd63 100644--- a/client/src/app/admin/components/organizations/Organizations.tsx+++ b/client/src/app/admin/components/organizations/Organizations.tsx@@ -169,7 +169,6 @@ export function Organizations() {return filtered;}, [organizations, searchQuery, showZeroEvents, showFreeUsers, showOnlyOverLimit]);- // Impersonation handlerconst handleImpersonate = useCallback(async (userId: string) => {try {@@ -188,12 +187,7 @@ export function Organizations() {[router]);- // Format subscription statusconst formatSubscriptionStatus = (subscription: AdminOrganizationData["subscription"]) => {- if (!subscription.id) {- return <Badge variant="secondary">Free</Badge>;- }-const statusColor =subscription.status === "active" ? "default" : subscription.status === "canceled" ? "destructive" : "secondary";@@ -515,15 +509,21 @@ export function Organizations() {</div><div className="grid grid-cols-1 md:grid-cols-4 gap-4 p-4 border border-neutral-100 dark:border-neutral-800 rounded"><div>- <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">Plan</div>+ <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">+ Plan+ </div><div className="font-medium">{row.original.subscription.planName}</div></div><div>- <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">Status</div>+ <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">+ Status+ </div><div className="font-medium">{row.original.subscription.status}</div></div><div>- <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">Event Limit</div>+ <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">+ Event Limit+ </div><div className="font-medium">{row.original.subscription.eventLimit? formatter(row.original.subscription.eventLimit)@@ -532,7 +532,9 @@ export function Organizations() {</div>{row.original.subscription.currentPeriodEnd && (<div>- <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">Period End</div>+ <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">+ Period End+ </div><div className="font-medium">{formatDistanceToNow(new Date(row.original.subscription.currentPeriodEnd), {addSuffix: true,@@ -542,7 +544,9 @@ export function Organizations() {)}{row.original.subscription.cancelAtPeriodEnd && (<div>- <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">Cancellation</div>+ <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">+ Cancellation+ </div><div className="font-medium text-orange-400">Cancels at period end</div></div>)}@@ -576,7 +580,9 @@ export function Organizations() {))}</div>) : (- <div className="text-neutral-500 dark:text-neutral-400 p-4 border border-neutral-100 dark:border-neutral-800 rounded">No sites</div>+ <div className="text-neutral-500 dark:text-neutral-400 p-4 border border-neutral-100 dark:border-neutral-800 rounded">+ No sites+ </div>)}</div>@@ -600,7 +606,9 @@ export function Organizations() {{member.role}</Badge></div>- <div className="text-sm text-neutral-700 dark:text-neutral-200">{member.email}</div>+ <div className="text-sm text-neutral-700 dark:text-neutral-200">+ {member.email}+ </div><div className="text-xs text-neutral-500 dark:text-neutral-400"><CopyText text={member.userId} className="text-xs"></CopyText></div>@@ -619,7 +627,9 @@ export function Organizations() {))}</div>) : (- <div className="text-neutral-500 dark:text-neutral-400 p-4 border border-neutral-100 dark:border-neutral-800 rounded">No members</div>+ <div className="text-neutral-500 dark:text-neutral-400 p-4 border border-neutral-100 dark:border-neutral-800 rounded">+ No members+ </div>)}</div></div>diff --git a/server/src/services/admin/subscriptionService.ts b/server/src/services/admin/subscriptionService.tsindex 402f0b0dc..6069bc9b4 100644--- a/server/src/services/admin/subscriptionService.ts+++ b/server/src/services/admin/subscriptionService.ts@@ -1,5 +1,7 @@+import { sql } from "drizzle-orm";import { DateTime } from "luxon";-import { DEFAULT_EVENT_LIMIT, getStripePrices } from "../../lib/const.js";+import { db } from "../../db/postgres/postgres.js";+import { APPSUMO_TIER_LIMITS, DEFAULT_EVENT_LIMIT, getStripePrices } from "../../lib/const.js";import { stripe } from "../../lib/stripe.js";export interface SubscriptionData {@@ -87,6 +89,57 @@ async function fetchSubscriptionsForCustomers(return subscriptionMap;}+interface AppSumoLicenseData {+ tier: string;+ eventLimit: number;+}++/**+ * Fetches AppSumo license data for multiple organization IDs+ * @param organizationIds Set of organization IDs to fetch AppSumo licenses for+ * @returns Map of organization ID to AppSumo license data+ */+async function fetchAppSumoLicensesForOrganizations(+ organizationIds: Set<string>+): Promise<Map<string, AppSumoLicenseData>> {+ const licenseMap = new Map<string, AppSumoLicenseData>();++ if (organizationIds.size === 0) {+ return licenseMap;+ }++ try {+ const orgIdsArray = Array.from(organizationIds);+ const BATCH_SIZE = 1000;++ // Batch queries to avoid PostgreSQL's row expression limit+ for (let i = 0; i < orgIdsArray.length; i += BATCH_SIZE) {+ const batch = orgIdsArray.slice(i, i + BATCH_SIZE);+ const placeholders = sql.join(+ batch.map(id => sql`${id}`),+ sql`, `+ );+ const licenses = await db.execute(+ sql`SELECT organization_id, tier FROM appsumo.licenses WHERE organization_id IN (${placeholders}) AND status = 'active'`+ );++ if (Array.isArray(licenses)) {+ for (const license of licenses) {+ const orgId = (license as any).organization_id as string;+ const tier = (license as any).tier as keyof typeof APPSUMO_TIER_LIMITS;+ const eventLimit = APPSUMO_TIER_LIMITS[tier] || APPSUMO_TIER_LIMITS["1"];++ licenseMap.set(orgId, { tier, eventLimit });+ }+ }+ }+ } catch (error) {+ console.error("Error fetching AppSumo licenses:", error);+ }++ return licenseMap;+}+/*** Creates a map of organization IDs to their subscription data* @param organizations Array of organization objects with id and stripeCustomerId@@ -101,8 +154,13 @@ export async function getOrganizationSubscriptions(> {const orgsWithStripe = organizations.filter(org => org.stripeCustomerId);const stripeCustomerIds = new Set(orgsWithStripe.map(org => org.stripeCustomerId!));+ const allOrgIds = new Set(organizations.map(org => org.id));- const subscriptionMap = await fetchSubscriptionsForCustomers(stripeCustomerIds, includeFullDetails);+ // Fetch both Stripe subscriptions and AppSumo licenses in parallel+ const [stripeSubscriptionMap, appsumoLicenseMap] = await Promise.all([+ fetchSubscriptionsForCustomers(stripeCustomerIds, includeFullDetails),+ fetchAppSumoLicensesForOrganizations(allOrgIds),+ ]);// Create organization map with subscription dataconst orgSubscriptionMap = new Map<@@ -110,18 +168,47 @@ export async function getOrganizationSubscriptions(SubscriptionData & { planName: string; status: string; eventLimit: number; currentPeriodEnd: Date }>();+ const nextMonthStart = DateTime.now().startOf("month").plus({ months: 1 }).toJSDate();+for (const org of organizations) {- const subscriptionData = org.stripeCustomerId ? subscriptionMap.get(org.stripeCustomerId) : null;+ const stripeData = org.stripeCustomerId ? stripeSubscriptionMap.get(org.stripeCustomerId) : null;+ const appsumoData = appsumoLicenseMap.get(org.id);- if (subscriptionData) {- // Ensure all required fields are present for paid subscriptions+ // Determine which subscription to use (highest event limit wins)+ const stripeEventLimit = stripeData?.eventLimit ?? 0;+ const appsumoEventLimit = appsumoData?.eventLimit ?? 0;++ if (stripeData && (!appsumoData || stripeEventLimit >= appsumoEventLimit)) {+ // Use Stripe subscriptionorgSubscriptionMap.set(org.id, {- ...subscriptionData,- planName: subscriptionData.planName || "free",- status: subscriptionData.status || "free",- eventLimit: subscriptionData.eventLimit ?? 0,- currentPeriodEnd: subscriptionData.currentPeriodEnd ?? new Date(),+ ...stripeData,+ planName: stripeData.planName || "free",+ status: stripeData.status || "free",+ eventLimit: stripeData.eventLimit ?? 0,+ currentPeriodEnd: stripeData.currentPeriodEnd ?? new Date(),});+ } else if (appsumoData) {+ // Use AppSumo subscription+ const subscriptionData: SubscriptionData & {+ planName: string;+ status: string;+ eventLimit: number;+ currentPeriodEnd: Date;+ } = {+ id: "",+ planName: `appsumo-${appsumoData.tier}`,+ status: "active",+ eventLimit: appsumoData.eventLimit,+ currentPeriodEnd: nextMonthStart,+ };++ if (includeFullDetails) {+ subscriptionData.currentPeriodStart = DateTime.now().startOf("month").toJSDate();+ subscriptionData.cancelAtPeriodEnd = false;+ subscriptionData.interval = "lifetime";+ }++ orgSubscriptionMap.set(org.id, subscriptionData);} else {// Free plan with all required fieldsorgSubscriptionMap.set(org.id, {@@ -129,7 +216,7 @@ export async function getOrganizationSubscriptions(planName: "free",status: "free",eventLimit: DEFAULT_EVENT_LIMIT,- currentPeriodEnd: DateTime.now().startOf("month").plus({ months: 1 }).toJSDate(),+ currentPeriodEnd: nextMonthStart,});}}