From 13453e7b7f276eb1752a453190f3c2c7ffbc0cfa Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Tue, 17 May 2022 21:26:46 +0800
Subject: [PATCH] Register subscribe resolver

---
 packages/api/src/resolvers/function_resolvers.ts  |  3 +++
 packages/api/src/resolvers/subscriptions/index.ts |  2 +-
 .../api/src/services/save_newsletter_email.ts     | 15 ++++++---------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/api/src/resolvers/function_resolvers.ts b/packages/api/src/resolvers/function_resolvers.ts
index 6bd83fe61..a5b52fe1c 100644
--- a/packages/api/src/resolvers/function_resolvers.ts
+++ b/packages/api/src/resolvers/function_resolvers.ts
@@ -65,6 +65,7 @@ import {
   setShareHighlightResolver,
   setUserPersonalizationResolver,
   signupResolver,
+  subscribeResolver,
   subscriptionsResolver,
   unsubscribeResolver,
   updateHighlightResolver,
@@ -145,6 +146,7 @@ export const functionResolvers = {
     setLabels: setLabelsResolver,
     generateApiKey: generateApiKeyResolver,
     unsubscribe: unsubscribeResolver,
+    subscribe: subscribeResolver,
   },
   Query: {
     me: getMeUserResolver,
@@ -554,4 +556,5 @@ export const functionResolvers = {
   ...resultResolveTypeResolver('Subscriptions'),
   ...resultResolveTypeResolver('Unsubscribe'),
   ...resultResolveTypeResolver('UpdateLabel'),
+  ...resultResolveTypeResolver('Subscribe'),
 }
diff --git a/packages/api/src/resolvers/subscriptions/index.ts b/packages/api/src/resolvers/subscriptions/index.ts
index b59ea7123..6ee982f6d 100644
--- a/packages/api/src/resolvers/subscriptions/index.ts
+++ b/packages/api/src/resolvers/subscriptions/index.ts
@@ -83,7 +83,7 @@ export const unsubscribeResolver = authorized<
     }
 
     const subscription = await getRepository(Subscription).findOneBy({
-      name,
+      name: ILike(name),
       user: { id: uid },
     })
     if (!subscription) {
diff --git a/packages/api/src/services/save_newsletter_email.ts b/packages/api/src/services/save_newsletter_email.ts
index 3fd01b841..ec06d6a9e 100644
--- a/packages/api/src/services/save_newsletter_email.ts
+++ b/packages/api/src/services/save_newsletter_email.ts
@@ -86,20 +86,17 @@ export const saveNewsletterEmail = async (
 
   // sends push notification
   const deviceTokens = await getDeviceTokensByUserId(newsletterEmail.user.id)
-
   if (!deviceTokens) {
     console.log('Device tokens not set:', newsletterEmail.user.id)
     return true
   }
 
-  if (deviceTokens.length) {
-    const multicastMessage = messageForLink(page, deviceTokens)
-    await sendMulticastPushNotifications(
-      newsletterEmail.user.id,
-      multicastMessage,
-      'newsletter'
-    )
-  }
+  const multicastMessage = messageForLink(page, deviceTokens)
+  await sendMulticastPushNotifications(
+    newsletterEmail.user.id,
+    multicastMessage,
+    'newsletter'
+  )
 
   return true
 }