From 32c94118ce38f0258da96bcfae60e25731a144ba Mon Sep 17 00:00:00 2001 From: Mythie Date: Sun, 20 Jul 2025 11:18:02 +1000 Subject: [PATCH] fix: subscription update handler logic --- .../stripe/webhook/on-subscription-updated.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/ee/server-only/stripe/webhook/on-subscription-updated.ts b/packages/ee/server-only/stripe/webhook/on-subscription-updated.ts index feb759ef0..15c76fae7 100644 --- a/packages/ee/server-only/stripe/webhook/on-subscription-updated.ts +++ b/packages/ee/server-only/stripe/webhook/on-subscription-updated.ts @@ -56,8 +56,12 @@ export const onSubscriptionUpdated = async ({ ); } - if (organisation.subscription?.planId !== subscription.id) { - console.error('[WARNING]: Organisation has two subscriptions'); + if ( + organisation.subscription && + organisation.subscription.status !== SubscriptionStatus.INACTIVE && + organisation.subscription.planId !== subscription.id + ) { + console.error('[WARNING]: Organisation might have two subscriptions'); } const previousItem = previousAttributes?.items?.data[0]; @@ -112,10 +116,9 @@ export const onSubscriptionUpdated = async ({ await prisma.$transaction(async (tx) => { await tx.subscription.update({ where: { - planId: subscription.id, + organisationId: organisation.id, }, data: { - organisationId: organisation.id, status: status, planId: subscription.id, priceId: subscription.items.data[0].price.id,