cleanup via helper

simstudioai · icecrasher321 · Nov 26, 2025 · Nov 26, 2025 · Nov 26, 2025 · Nov 26, 2025
commit 027d1f984c7e66d539187eee21a1a48ddccc4fd0
diff --git a/apps/sim/lib/auth.ts b/apps/sim/lib/auth.ts
@@ -27,6 +27,7 @@ import { authorizeSubscriptionReference } from '@/lib/billing/authorization'
 import { handleNewUser } from '@/lib/billing/core/usage'
 import { syncSubscriptionUsageLimits } from '@/lib/billing/organization'
 import { getPlans } from '@/lib/billing/plans'
+import { syncSeatsFromStripeQuantity } from '@/lib/billing/validation/seat-management'
 import { handleManualEnterpriseSubscription } from '@/lib/billing/webhooks/enterprise'
 import {
   handleInvoiceFinalized,
@@ -1682,18 +1683,18 @@ export const auth = betterAuth({
                     const stripeSubscription = event.data.object as Stripe.Subscription
                     const quantity = stripeSubscription.items?.data?.[0]?.quantity || 1
 
-                    // Only update if quantity differs from current seats
-                    if (quantity !== subscription.seats) {
-                      await db
-                        .update(schema.subscription)
-                        .set({ seats: quantity })
-                        .where(eq(schema.subscription.id, subscription.id))
+                    const result = await syncSeatsFromStripeQuantity(
+                      subscription.id,
+                      subscription.seats,
+                      quantity
+                    )
 
+                    if (result.synced) {
                       logger.info('[onSubscriptionUpdate] Synced seat count from Stripe', {
                         subscriptionId: subscription.id,
                         referenceId: subscription.referenceId,
-                        previousSeats: subscription.seats,
-                        newSeats: quantity,
+                        previousSeats: result.previousSeats,
+                        newSeats: result.newSeats,
                       })
                     }
                   } catch (error) {

diff --git a/apps/sim/lib/billing/validation/seat-management.ts b/apps/sim/lib/billing/validation/seat-management.ts
@@ -405,3 +405,50 @@ export async function getOrganizationSeatAnalytics(organizationId: string) {
     return null
   }
 }
+
+/**
+ * Sync seat count from Stripe subscription quantity.
+ * Used by webhook handlers to keep local DB in sync with Stripe.
+ */
+export async function syncSeatsFromStripeQuantity(
+  subscriptionId: string,
+  currentSeats: number | null,
+  stripeQuantity: number
+): Promise<{ synced: boolean; previousSeats: number | null; newSeats: number }> {
+  const effectiveCurrentSeats = currentSeats ?? 0
+
+  // Only update if quantity differs
+  if (stripeQuantity === effectiveCurrentSeats) {
+    return {
+      synced: false,
+      previousSeats: effectiveCurrentSeats,
+      newSeats: stripeQuantity,
+    }
+  }
+
+  try {
+    await db
+      .update(subscription)
+      .set({ seats: stripeQuantity })
+      .where(eq(subscription.id, subscriptionId))
+
+    logger.info('Synced seat count from Stripe', {
+      subscriptionId,
+      previousSeats: effectiveCurrentSeats,
+      newSeats: stripeQuantity,
+    })
+
+    return {
+      synced: true,
+      previousSeats: effectiveCurrentSeats,
+      newSeats: stripeQuantity,
+    }
+  } catch (error) {
+    logger.error('Failed to sync seat count from Stripe', {
+      subscriptionId,
+      stripeQuantity,
+      error,
+    })
+    throw error
+  }
+}