Merge pull request #1833 from Mephistic/move-email-templates

Fix Email Notification Bugs

Author: Mephistic

functions/src/notifications/deliverNotifications.ts

@@ -3,7 +3,11 @@ import * as handlebars from "handlebars"
 import * as fs from "fs"
 import { db, Timestamp } from "../firebase"
 //import { auth, db, Timestamp } from "../firebase" // Temporarily using email from the profile to test the non-auth issues
-import { getNextDigestAt, getNotificationStartDate } from "./helpers"
+import {
+  convertHtmlToText,
+  getNextDigestAt,
+  getNotificationStartDate
+} from "./helpers"
 import { startOfDay } from "date-fns"
 import { TestimonySubmissionNotificationFields, Profile } from "./types"
 import {
@@ -87,13 +91,16 @@ const deliverEmailNotifications = async () => {
         `No new notifications for ${profileDoc.id} - not sending email`
       )
     } else {
+      console.log(
+        `Sending email to user ${profileDoc.id} with data: ${digestData}`
+      )
       const htmlString = renderToHtmlString(digestData)
 
       const email = {
         to: [verifiedEmail],
         message: {
           subject: "Your Notifications Digest",
-          text: "", // blank because we're sending HTML
+          text: convertHtmlToText(htmlString), // TODO: Just make a text template for this
           html: htmlString
         },
         createdAt: Timestamp.now()

functions/src/notifications/helpers.ts

@@ -9,6 +9,8 @@ import {
   subMonths
 } from "date-fns"
 
+import { JSDOM } from "jsdom"
+
 export const getNextDigestAt = (notificationFrequency: Frequency) => {
   const now = startOfDay(new Date())
   let nextDigestAt = null
@@ -49,3 +51,8 @@ export const getNotificationStartDate = (
       return now
   }
 }
+
+export const convertHtmlToText = (html: string) => {
+  const dom = new JSDOM(html)
+  return dom.window.document.body.textContent || "No content"
+}

package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "build:dev": "MAPLE_ENV=dev next build",
     "build:prod": "MAPLE_ENV=prod next build",
-    "build:functions": "next lint -d functions/src && yarn --cwd functions build",
+    "build:functions": "next lint -d functions/src && yarn --cwd functions build && yarn copy-handlebars",
     "check-formatting": "prettier --check .",
     "check-types": "tsc --noEmit",
     "deploy:backend:dev": "firebase --project=default deploy --only firestore,functions,storage",