From 224001608c3db7ddfa7998d7a237b7688c917440 Mon Sep 17 00:00:00 2001
From: seaerchin <jer005@e.ntu.edu.sg>
Date: Wed, 4 Aug 2021 14:11:15 +0800
Subject: [PATCH] fix(mail.service): updated to cc rather than send individual
 mail

---
 .../mail/__tests__/mail.service.spec.ts       | 36 ++++++++++---------
 src/app/services/mail/mail.service.ts         | 14 ++++----
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/app/services/mail/__tests__/mail.service.spec.ts b/src/app/services/mail/__tests__/mail.service.spec.ts
index ba29ec2153..3e340f578e 100644
--- a/src/app/services/mail/__tests__/mail.service.spec.ts
+++ b/src/app/services/mail/__tests__/mail.service.spec.ts
@@ -1257,11 +1257,11 @@ describe('mail.service', () => {
 
     const MOCK_FORM: IPopulatedForm = {
       permissionList: [
-        { email: MOCK_VALID_EMAIL },
         { email: MOCK_VALID_EMAIL_2 },
+        { email: MOCK_VALID_EMAIL_3 },
       ],
       admin: {
-        email: MOCK_VALID_EMAIL_3,
+        email: MOCK_VALID_EMAIL,
       },
       title: MOCK_FORM_TITLE,
       _id: MOCK_FORM_ID,
@@ -1277,8 +1277,8 @@ describe('mail.service', () => {
     } as unknown as IPopulatedForm
 
     const generateExpectedMailOptions = async (
-      count: number,
-      emailRecipients: string | string[],
+      admin: string,
+      collaborators: string | string[],
     ) => {
       const result = await MailUtils.generateSmsVerificationDisabledHtml({
         formTitle: MOCK_FORM_TITLE,
@@ -1286,7 +1286,8 @@ describe('mail.service', () => {
         smsVerificationLimit: smsConfig.smsVerificationLimit,
       }).map((emailHtml) => {
         return {
-          to: emailRecipients,
+          to: admin,
+          cc: collaborators,
           from: MOCK_SENDER_STRING,
           html: emailHtml,
           subject: '[FormSG] SMS Verification - Free Tier Limit Reached',
@@ -1306,11 +1307,10 @@ describe('mail.service', () => {
       const actualResult = await mailService.sendSmsVerificationDisabledEmail(
         MOCK_FORM,
       )
-      const expectedMailOptions = await generateExpectedMailOptions(1000, [
+      const expectedMailOptions = await generateExpectedMailOptions(
         MOCK_VALID_EMAIL,
-        MOCK_VALID_EMAIL_2,
-        MOCK_VALID_EMAIL_3,
-      ])
+        [MOCK_VALID_EMAIL_2, MOCK_VALID_EMAIL_3],
+      )
 
       // Assert
       expect(actualResult._unsafeUnwrap()).toEqual(true)
@@ -1362,11 +1362,11 @@ describe('mail.service', () => {
 
     const MOCK_FORM: IPopulatedForm = {
       permissionList: [
-        { email: MOCK_VALID_EMAIL },
         { email: MOCK_VALID_EMAIL_2 },
+        { email: MOCK_VALID_EMAIL_3 },
       ],
       admin: {
-        email: MOCK_VALID_EMAIL_3,
+        email: MOCK_VALID_EMAIL,
       },
       title: MOCK_FORM_TITLE,
       _id: MOCK_FORM_ID,
@@ -1383,7 +1383,8 @@ describe('mail.service', () => {
 
     const generateExpectedMailOptions = async (
       count: number,
-      emailRecipients: string | string[],
+      admin: string,
+      collaborators: string | string[],
     ) => {
       const result = await MailUtils.generateSmsVerificationWarningHtml({
         formTitle: MOCK_FORM_TITLE,
@@ -1392,7 +1393,8 @@ describe('mail.service', () => {
         smsVerificationLimit: smsConfig.smsVerificationLimit,
       }).map((emailHtml) => {
         return {
-          to: emailRecipients,
+          to: admin,
+          cc: collaborators,
           from: MOCK_SENDER_STRING,
           html: emailHtml,
           subject: '[FormSG] SMS Verification - Free Tier Limit Alert',
@@ -1413,11 +1415,11 @@ describe('mail.service', () => {
         MOCK_FORM,
         1000,
       )
-      const expectedMailOptions = await generateExpectedMailOptions(1000, [
+      const expectedMailOptions = await generateExpectedMailOptions(
+        1000,
         MOCK_VALID_EMAIL,
-        MOCK_VALID_EMAIL_2,
-        MOCK_VALID_EMAIL_3,
-      ])
+        [MOCK_VALID_EMAIL_2, MOCK_VALID_EMAIL_3],
+      )
 
       // Assert
       expect(actualResult._unsafeUnwrap()).toEqual(true)
diff --git a/src/app/services/mail/mail.service.ts b/src/app/services/mail/mail.service.ts
index 9023d13cc6..cbc92dfd16 100644
--- a/src/app/services/mail/mail.service.ts
+++ b/src/app/services/mail/mail.service.ts
@@ -597,12 +597,11 @@ export class MailService {
     }
 
     return generateSmsVerificationDisabledHtml(htmlData).andThen((mailHtml) => {
-      const emailRecipients = form.permissionList
-        .map(({ email }) => email)
-        .concat(form.admin.email)
+      const formCollaborators = form.permissionList.map(({ email }) => email)
 
       const mailOptions: MailOptions = {
-        to: emailRecipients,
+        to: form.admin.email,
+        cc: formCollaborators,
         from: this.#senderFromString,
         html: mailHtml,
         subject: '[FormSG] SMS Verification - Free Tier Limit Reached',
@@ -634,12 +633,11 @@ export class MailService {
     }
 
     return generateSmsVerificationWarningHtml(htmlData).andThen((mailHtml) => {
-      const emailRecipients = form.permissionList
-        .map(({ email }) => email)
-        .concat(form.admin.email)
+      const formCollaborators = form.permissionList.map(({ email }) => email)
 
       const mailOptions: MailOptions = {
-        to: emailRecipients,
+        to: form.admin.email,
+        cc: formCollaborators,
         from: this.#senderFromString,
         html: mailHtml,
         subject: '[FormSG] SMS Verification - Free Tier Limit Alert',