Check new weekly email notification preferences

functions/src/reset-weekly-emails-flag.ts

@@ -2,20 +2,14 @@ import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
 import { getAllPrivateUsers } from './utils'
 
-export const resetWeeklyEmailsFlag = functions
+export const resetWeeklyEmailsFlag = functions.pubsub // every Monday at 12 am PT (UTC -07:00) ( 12 hours before the emails will be sent)
-  .runWith({ secrets: ['MAILGUN_KEY'] })
+  .schedule('0 7 * * 1')
-  // every Monday at 12 am PT (UTC -07:00) ( 12 hours before the emails will be sent)
-  .pubsub.schedule('0 7 * * 1')
   .timeZone('Etc/UTC')
   .onRun(async () => {
     const privateUsers = await getAllPrivateUsers()
-    // get all users that haven't unsubscribed from weekly emails
-    const privateUsersToSendEmailsTo = privateUsers.filter((user) => {
-      return !user.unsubscribedFromWeeklyTrendingEmails
-    })
     const firestore = admin.firestore()
     await Promise.all(
-      privateUsersToSendEmailsTo.map(async (user) => {
+      privateUsers.map(async (user) => {
         return firestore.collection('private-users').doc(user.id).update({
           weeklyTrendingEmailSent: false,
         })

functions/src/weekly-markets-emails.ts

@@ -48,7 +48,7 @@ async function sendTrendingMarketsEmailsToAllUsers() {
   // get all users that haven't unsubscribed from weekly emails
   const privateUsersToSendEmailsTo = privateUsers.filter((user) => {
     return (
-      !user.unsubscribedFromWeeklyTrendingEmails &&
+      user.notificationPreferences.trending_markets.includes('email') &&
       !user.weeklyTrendingEmailSent
     )
   })