From fe3d3be7f54b43b29196010644056b41adfa6fde Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Tue, 29 Aug 2023 20:17:13 +0800
Subject: [PATCH] Make query more clear

---
 .../api/src/resolvers/subscriptions/index.ts  | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/packages/api/src/resolvers/subscriptions/index.ts b/packages/api/src/resolvers/subscriptions/index.ts
index b28dcb9e6..beb246649 100644
--- a/packages/api/src/resolvers/subscriptions/index.ts
+++ b/packages/api/src/resolvers/subscriptions/index.ts
@@ -77,22 +77,27 @@ export const subscriptionsResolver = authorized<
         user: { id: uid },
       })
 
-    if (type) {
+    if (type && type == SubscriptionType.Newsletter) {
       queryBuilder.andWhere({
         type,
+        status: SubscriptionStatus.Active,
       })
-    }
-
-    queryBuilder.andWhere(
-      new Brackets((qb) => {
-        qb.where({
-          type: SubscriptionType.Newsletter,
-          status: SubscriptionStatus.Active,
-        }).orWhere({
-          type: SubscriptionType.Rss,
+    } else if (type && type == SubscriptionType.Rss) {
+      queryBuilder.where({
+        type,
+      })
+    } else {
+      queryBuilder.andWhere(
+        new Brackets((qb) => {
+          qb.where({
+            type: SubscriptionType.Newsletter,
+            status: SubscriptionStatus.Active,
+          }).orWhere({
+            type: SubscriptionType.Rss,
+          })
         })
-      })
-    )
+      )
+    }
 
     const subscriptions = await queryBuilder
       .orderBy('subscription.' + sortBy, sortOrder)