Improve subscription ID with multiple subscriptions

BrunoBernardino · Aug 31, 2023 · 8b724d9 · 8b724d9
1 parent e4f9b5c
commit 8b724d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/crons/check-subscriptions.ts b/crons/check-subscriptions.ts
@@ -30,6 +30,9 @@ async function checkSubscriptions() {
             user_id: subscription.customer.id,
             subscription_id: subscription.id,
           };
+        } else if (matchingUser.subscription.external.stripe.subscription_id !== subscription.id) {
+          // Skip previous subscriptions
+          continue;
         }
 
         matchingUser.subscription.isMonthly = subscription.items.data.some((item) => item.price.id.includes('monthly'));

diff --git a/pages/api/subscription.ts b/pages/api/subscription.ts
@@ -15,10 +15,11 @@ export async function pageAction(request: Request) {
 
   const { user } = await validateUserAndSession(user_id, session_id);
 
-  if (provider === 'stripe') {
+  if (provider === 'stripe' && !user.subscription.external.stripe) {
     const subscriptions = await getStripeSubscriptions();
 
     const subscription = subscriptions.find((subscription) =>
+      subscription.status === 'active' &&
       subscription.customer.email === user.email &&
       subscription.items.data.some((item) => item.price.id.startsWith('budget-zen-'))
     );