Remove subscription_count. Add more stripe status enums

Author: jahooma

packages/billing/src/subscription-webhooks.ts

@@ -19,8 +19,8 @@ type SubscriptionStatus = (typeof schema.subscriptionStatusEnum.enumValues)[numb
  * Maps a Stripe subscription status to our local enum.
  */
 function mapStripeStatus(status: Stripe.Subscription.Status): SubscriptionStatus {
-  if (status === 'past_due') return 'past_due'
-  if (status === 'canceled') return 'canceled'
+  const validStatuses: readonly string[] = schema.subscriptionStatusEnum.enumValues
+  if (validStatuses.includes(status)) return status as SubscriptionStatus
   return 'active'
 }
 

packages/billing/src/subscription.ts

@@ -510,9 +510,8 @@ export async function isSubscriber(params: {
 /**
  * Handles the first-time-subscribe side-effects:
  * 1. Moves `next_quota_reset` to Stripe's `current_period_end`.
- * 2. Increments `subscription_count`.
- * 3. Migrates unused free/referral credits into a single grant aligned to
- *    the new reset date.
+ * 2. Migrates unused credits into a single grant aligned to the new reset
+ *    date.
  *
  * All operations run inside an advisory-locked transaction.
  */
@@ -542,13 +541,10 @@ export async function handleSubscribe(params: {
         return
       }
 
-      // Move next_quota_reset and bump subscription_count
+      // Move next_quota_reset to align with Stripe billing period
       await tx
         .update(schema.user)
-        .set({
-          next_quota_reset: newResetDate,
-          subscription_count: sql`${schema.user.subscription_count} + 1`,
-        })
+        .set({ next_quota_reset: newResetDate })
         .where(eq(schema.user.id, userId))
 
       // Migrate unused credits so nothing is lost

packages/internal/src/db/schema.ts

@@ -53,9 +53,14 @@ export const agentStepStatus = pgEnum('agent_step_status', [
 ])
 
 export const subscriptionStatusEnum = pgEnum('subscription_status', [
+  'incomplete',
+  'incomplete_expired',
+  'trialing',
   'active',
   'past_due',
   'canceled',
+  'unpaid',
+  'paused',
 ])
 
 export const user = pgTable('user', {
@@ -83,7 +88,6 @@ export const user = pgTable('user', {
   auto_topup_threshold: integer('auto_topup_threshold'),
   auto_topup_amount: integer('auto_topup_amount'),
   banned: boolean('banned').notNull().default(false),
-  subscription_count: integer('subscription_count').notNull().default(0),
 })
 
 export const account = pgTable(