fixed event tracking on subs stuff

Author: bmdavis419

apps/web/src/convex/analyticsEvents.ts

@@ -4,6 +4,8 @@ export const AnalyticsEvents = {
 
 	CHECKOUT_STARTED: 'checkout_started',
 	SUBSCRIPTION_CREATED: 'subscription_created',
+	SUBSCRIPTION_UPDATED: 'subscription_updated',
+	SUBSCRIPTION_CANCELED: 'subscription_canceled',
 	BILLING_PORTAL_OPENED: 'billing_portal_opened',
 	USAGE_LIMIT_REACHED: 'usage_limit_reached',
 

apps/web/src/convex/instances/mutations.ts

@@ -194,6 +194,32 @@ export const updateStorageUsed = mutation({
 	}
 });
 
+export const setSubscriptionState = mutation({
+	args: {
+		instanceId: v.id('instances'),
+		plan: v.union(v.literal('pro'), v.literal('free'), v.literal('none')),
+		status: v.union(
+			v.literal('active'),
+			v.literal('trialing'),
+			v.literal('canceled'),
+			v.literal('none')
+		),
+		productId: v.optional(v.string()),
+		currentPeriodEnd: v.optional(v.number()),
+		canceledAt: v.optional(v.number())
+	},
+	handler: async (ctx, args) => {
+		await ctx.db.patch(args.instanceId, {
+			subscriptionPlan: args.plan,
+			subscriptionStatus: args.status,
+			subscriptionProductId: args.productId,
+			subscriptionCurrentPeriodEnd: args.currentPeriodEnd,
+			subscriptionCanceledAt: args.canceledAt,
+			subscriptionUpdatedAt: Date.now()
+		});
+	}
+});
+
 export const upsertCachedResources = mutation({
 	args: {
 		instanceId: v.id('instances'),

apps/web/src/convex/schema.ts

@@ -56,6 +56,19 @@ export default defineSchema({
 		latestBtcaVersion: v.optional(v.string()),
 		latestOpencodeVersion: v.optional(v.string()),
 		lastVersionCheck: v.optional(v.number()),
+		subscriptionPlan: v.optional(v.union(v.literal('pro'), v.literal('free'), v.literal('none'))),
+		subscriptionStatus: v.optional(
+			v.union(
+				v.literal('active'),
+				v.literal('trialing'),
+				v.literal('canceled'),
+				v.literal('none')
+			)
+		),
+		subscriptionProductId: v.optional(v.string()),
+		subscriptionCurrentPeriodEnd: v.optional(v.number()),
+		subscriptionCanceledAt: v.optional(v.number()),
+		subscriptionUpdatedAt: v.optional(v.number()),
 		storageUsedBytes: v.optional(v.number()),
 		lastActiveAt: v.optional(v.number()),
 		provisionedAt: v.optional(v.number()),

apps/web/src/convex/usage.ts

@@ -1,9 +1,11 @@
 import { Autumn } from 'autumn-js';
 import { v } from 'convex/values';
 
+import type { Doc } from './_generated/dataModel.js';
 import { internal } from './_generated/api.js';
-import { action } from './_generated/server.js';
+import { action, type ActionCtx } from './_generated/server.js';
 import { AnalyticsEvents } from './analyticsEvents.js';
+import { instances } from './apiHelpers.js';
 import { requireInstanceOwnershipAction } from './authHelpers.js';
 
 type FeatureMetrics = {
@@ -60,6 +62,16 @@ type BillingSummaryResult = {
 
 type SessionResult = { url: string };
 
+type SubscriptionPlan = 'pro' | 'free' | 'none';
+type SubscriptionStatus = 'active' | 'trialing' | 'canceled' | 'none';
+type SubscriptionSnapshot = {
+	plan: SubscriptionPlan;
+	status: SubscriptionStatus;
+	productId?: string;
+	currentPeriodEnd?: number | null;
+	canceledAt?: number | null;
+};
+
 const SANDBOX_IDLE_MINUTES = 2;
 const CHARS_PER_TOKEN = 4;
 const FEATURE_IDS = {
@@ -209,6 +221,83 @@ function getActiveProduct(
 	return null;
 }
 
+function getSubscriptionSnapshot(
+	activeProduct:
+		| {
+				id: string;
+				status?: string;
+				current_period_end?: number | null;
+				canceled_at?: number | null;
+		  }
+		| null
+): SubscriptionSnapshot {
+	if (!activeProduct) {
+		return { plan: 'none', status: 'none' };
+	}
+
+	const plan: SubscriptionPlan =
+		activeProduct.id === 'btca_pro' ? 'pro' : activeProduct.id === 'free_plan' ? 'free' : 'none';
+	const status: SubscriptionStatus = activeProduct.status
+		? (activeProduct.status as SubscriptionStatus)
+		: 'none';
+
+	return {
+		plan,
+		status,
+		productId: activeProduct.id,
+		currentPeriodEnd: activeProduct.current_period_end ?? undefined,
+		canceledAt: activeProduct.canceled_at ?? undefined
+	};
+}
+
+async function syncSubscriptionState(
+	ctx: ActionCtx,
+	instance: Doc<'instances'>,
+	snapshot: SubscriptionSnapshot
+): Promise<void> {
+	const previousPlan: SubscriptionPlan = instance.subscriptionPlan ?? 'none';
+	const previousStatus: SubscriptionStatus = instance.subscriptionStatus ?? 'none';
+
+	if (previousPlan === snapshot.plan && previousStatus === snapshot.status) {
+		return;
+	}
+
+	await ctx.runMutation(instances.mutations.setSubscriptionState, {
+		instanceId: instance._id,
+		plan: snapshot.plan,
+		status: snapshot.status,
+		productId: snapshot.productId,
+		currentPeriodEnd: snapshot.currentPeriodEnd ?? undefined,
+		canceledAt: snapshot.canceledAt ?? undefined
+	});
+
+	const properties = {
+		instanceId: instance._id,
+		plan: snapshot.plan,
+		status: snapshot.status,
+		previousPlan,
+		previousStatus,
+		productId: snapshot.productId ?? null,
+		currentPeriodEnd: snapshot.currentPeriodEnd ?? null,
+		canceledAt: snapshot.canceledAt ?? null
+	};
+
+	const event =
+		previousPlan !== 'pro' &&
+		snapshot.plan === 'pro' &&
+		(snapshot.status === 'active' || snapshot.status === 'trialing')
+			? AnalyticsEvents.SUBSCRIPTION_CREATED
+			: previousPlan === 'pro' && snapshot.plan !== 'pro'
+				? AnalyticsEvents.SUBSCRIPTION_CANCELED
+				: AnalyticsEvents.SUBSCRIPTION_UPDATED;
+
+	await ctx.scheduler.runAfter(0, internal.analytics.trackEvent, {
+		distinctId: instance.clerkId,
+		event,
+		properties
+	});
+}
+
 async function checkFeature(args: {
 	customerId: string;
 	featureId: string;
@@ -275,6 +364,7 @@ export const ensureUsageAvailable = action({
 					: undefined)
 		});
 		const activeProduct = getActiveProduct(autumnCustomer.products);
+		await syncSubscriptionState(ctx, instance, getSubscriptionSnapshot(activeProduct));
 		if (!activeProduct) {
 			return {
 				ok: false,
@@ -508,6 +598,14 @@ export const getBillingSummary = action({
 			? (activeProduct.status as 'active' | 'trialing' | 'canceled')
 			: 'none';
 
+		await syncSubscriptionState(ctx, instance, {
+			plan,
+			status,
+			productId: activeProduct?.id ?? undefined,
+			currentPeriodEnd: activeProduct?.current_period_end ?? undefined,
+			canceledAt: activeProduct?.canceled_at ?? undefined
+		});
+
 		const [tokensIn, tokensOut, sandboxHours, chatMessages] = await Promise.all([
 			checkFeature({
 				customerId: autumnCustomer.id ?? instance.clerkId,
@@ -607,15 +705,6 @@ export const createCheckoutSession = action({
 			throw new Error(payload.error.message ?? 'Failed to create checkout session');
 		}
 		if (payload.data?.url) {
-			await ctx.scheduler.runAfter(0, internal.analytics.trackEvent, {
-				distinctId: instance.clerkId,
-				event: AnalyticsEvents.SUBSCRIPTION_CREATED,
-				properties: {
-					instanceId: args.instanceId,
-					plan: 'btca_pro',
-					wasExistingCustomer: true
-				}
-			});
 			return { url: payload.data.url };
 		}