From 49496f7aa245ca4cb92ee1e353ad514794381fc5 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Tue, 29 Aug 2023 10:19:57 +0800
Subject: [PATCH] Only return active subscriptions

---
 packages/api/src/resolvers/subscriptions/index.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/api/src/resolvers/subscriptions/index.ts b/packages/api/src/resolvers/subscriptions/index.ts
index 60934dabd..b7890f1dc 100644
--- a/packages/api/src/resolvers/subscriptions/index.ts
+++ b/packages/api/src/resolvers/subscriptions/index.ts
@@ -74,6 +74,7 @@ export const subscriptionsResolver = authorized<
       .leftJoinAndSelect('subscription.newsletterEmail', 'newsletterEmail')
       .where({
         user: { id: uid },
+        status: SubscriptionStatus.Active,
       })
 
     if (type) {
@@ -82,11 +83,6 @@ export const subscriptionsResolver = authorized<
       })
     }
 
-    // only return active subscriptions for newsletter
-    if (type === SubscriptionType.Newsletter) {
-      queryBuilder.andWhere({ status: SubscriptionStatus.Active })
-    }
-
     const subscriptions = await queryBuilder
       .orderBy('subscription.' + sortBy, sortOrder)
       .getMany()