fix(billing): acknowledge Stripe webhooks whose subscription references a missing organization (#8809)

* fix(billing): acknowledge Stripe webhooks whose subscription references a missing organization instead of retrying for days

* test(billing): prove the not-yet-matching issuance branch by redelivery; drop the logging-only update catch

* test(testing): a swapped price in the Stripe fake no longer reports the previous amount

Author: waleedlatif1

apps/sim/lib/billing/organization.test.ts

@@ -113,6 +113,8 @@ describe('ensureOrganizationForTeamSubscription', () => {
   it('transfers a user-referenced team subscription onto the org the user administers', async () => {
     mockIsSubscriptionOrgScoped.mockResolvedValueOnce(false)
     queueWhereResponses([
+      // referenced user lookup
+      [{ name: 'Owner', email: 'owner@example.com' }],
       // membership lookup: user owns an org
       [{ id: 'member-1', organizationId: 'org-owned', role: 'owner' }],
       // locked membership re-read inside the transfer transaction

apps/sim/lib/billing/organization.ts

@@ -12,6 +12,7 @@ import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/bill
 import { createOrganizationWithOwner } from '@/lib/billing/organizations/create-organization'
 import { acquireOrganizationMutationLock } from '@/lib/billing/organizations/membership'
 import { isEnterprise, isOrgPlan, isPaid } from '@/lib/billing/plan-helpers'
+import { SubscriptionReferenceNotFoundError } from '@/lib/billing/subscriptions/errors'
 import { ENTITLED_SUBSCRIPTION_STATUSES } from '@/lib/billing/subscriptions/utils'
 import { toDecimal } from '@/lib/billing/utils/decimal'
 import type { DbTransaction } from '@/lib/db/types'
@@ -127,8 +128,21 @@ export async function ensureOrganizationForTeamSubscription(
    * checks under the org mutation lock) or creates a new organization. This
    * keeps re-homing deterministic in the webhook flow instead of depending on
    * a client-side transfer call after checkout.
+   *
+   * A reference that is neither an organization nor a user (an organization
+   * deleted under a live subscription) has no one to re-home onto, so it
+   * fails as a dangling reference instead of seeding an organization owned
+   * by a nonexistent user.
    */
   const userId = subscription.referenceId
+  const [userData] = await db
+    .select({ name: user.name, email: user.email })
+    .from(user)
+    .where(eq(user.id, userId))
+    .limit(1)
+  if (!userData) {
+    throw new SubscriptionReferenceNotFoundError(subscription.referenceId)
+  }
 
   logger.info('Creating organization for team subscription', {
     subscriptionId: subscription.id,
@@ -267,16 +281,10 @@ export async function ensureOrganizationForTeamSubscription(
     throw new Error('User is already member of another organization')
   }
 
-  const [userData] = await db
-    .select({ name: user.name, email: user.email })
-    .from(user)
-    .where(eq(user.id, userId))
-    .limit(1)
-
   const orgId = await createOrganizationForTeamPlan(
     userId,
-    userData?.name || undefined,
-    userData?.email || undefined
+    userData.name || undefined,
+    userData.email || undefined
   )
 
   await db.transaction(async (tx) => {
@@ -509,9 +517,7 @@ export async function syncSubscriptionUsageLimits(subscription: SubscriptionData
         .limit(1)
 
       if (users.length === 0) {
-        throw new Error(
-          `Subscription reference ${subscription.referenceId} does not match a user or organization`
-        )
+        throw new SubscriptionReferenceNotFoundError(subscription.referenceId)
       }
 
       await syncUsageLimitsFromSubscription(subscription.referenceId)

apps/sim/lib/billing/subscriptions/errors.ts

@@ -0,0 +1,15 @@
+/**
+ * A subscription whose `referenceId` matches neither an organization nor a user — typically an
+ * organization deleted while its Stripe subscription stayed live. The condition is permanent: no
+ * retry can resolve the reference, so webhook paths acknowledge the event and log it instead of
+ * failing it into Stripe's retry loop.
+ */
+export class SubscriptionReferenceNotFoundError extends Error {
+  readonly referenceId: string
+
+  constructor(referenceId: string) {
+    super(`Subscription reference ${referenceId} does not match a user or organization`)
+    this.name = 'SubscriptionReferenceNotFoundError'
+    this.referenceId = referenceId
+  }
+}