🐛 (billing) Only fetch active subscriptions

baptisteArno · May 5, 2023 · 98a21f3 · 98a21f3 · vercel · May 5, 2023
1 parent 8b3a690
commit 98a21f3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/apps/builder/src/features/billing/api/getSubscription.ts b/apps/builder/src/features/billing/api/getSubscription.ts
@@ -49,6 +49,7 @@ export const getSubscription = authenticatedProcedure
     const subscriptions = await stripe.subscriptions.list({
       customer: workspace.stripeId,
       limit: 1,
+      status: 'active',
     })
 
     const subscription = subscriptions?.data.shift()

diff --git a/apps/builder/src/features/billing/api/updateSubscription.ts b/apps/builder/src/features/billing/api/updateSubscription.ts
@@ -72,6 +72,8 @@ export const updateSubscription = authenticatedProcedure
       })
       const { data } = await stripe.subscriptions.list({
         customer: workspace.stripeId,
+        limit: 1,
+        status: 'active',
       })
       const subscription = data[0] as Stripe.Subscription | undefined
       const currentPlanItemId = subscription?.items.data.find((item) =>

diff --git a/apps/builder/src/test/utils/databaseActions.ts b/apps/builder/src/test/utils/databaseActions.ts
@@ -59,6 +59,8 @@ export const cancelSubscription = async (stripeId: string) => {
   const currentSubscriptionId = (
     await stripe.subscriptions.list({
       customer: stripeId,
+      limit: 1,
+      status: 'active',
     })
   ).data.shift()?.id
   if (currentSubscriptionId)