fix: duplicate pdf due to mutation

Author: kevin9foong

src/app/modules/submission/encrypt-submission/encrypt-submission.service.ts

@@ -3,11 +3,10 @@ import { err, ok, okAsync, Result, ResultAsync } from 'neverthrow'
 import Mail from 'nodemailer/lib/mailer'
 
 import {
-  BasicField,
   DateString,
   FormResponseMode,
   PaymentChannel,
-  SubmissionType,
+  SubmissionType
 } from '../../../../../shared/types'
 import {
   EmailAdminDataField,
@@ -22,8 +21,7 @@ import { getEncryptSubmissionModel } from '../../../models/submission.server.mod
 import { AutoreplyPdfGenerationError } from '../../../services/mail/mail.errors'
 import MailService from '../../../services/mail/mail.service'
 import {
-  AutoReplyMailData,
-  AutoreplySummaryRenderData,
+  AutoReplyMailData
 } from '../../../services/mail/mail.types'
 import { generateAutoreplyPdf, generatePdfRenderData } from '../../../services/mail/mail.utils'
 import { createQueryWithDateParam } from '../../../utils/date'
@@ -173,15 +171,6 @@ const checkIfPdfGenerationIsRequired = ({
   )
 }
 
-const getPdfResponsesData = (responsesData: EmailAdminDataField[]): AutoreplySummaryRenderData['formData'] => {
-  return responsesData.map(({ question, answerTemplate, answer, fieldType }) => ({
-    question,
-    // Only signature field types 
-    answer: fieldType === BasicField.Signature ? answer : undefined,
-    answerTemplate
-  }))
-}
-
 const generatePdfAttachmentIfRequired = ({
   isPaymentEnabled,
   autoReplyMailDatas,

src/app/services/mail/mail.service.ts

@@ -711,10 +711,10 @@ export class MailService {
       return okAsync(true)
     }
 
-    const attachments = submissionAttachments
-    if (pdfAttachment) {
-      attachments.push(pdfAttachment)
-    }
+    const attachmentsToInclude = [
+      ...submissionAttachments,
+      ...(pdfAttachment ? [pdfAttachment] : []),
+    ]
 
     logger.info({
       message: 'Sending admin notification mail',
@@ -755,13 +755,12 @@ export class MailService {
     const adminEmails: string[] = getAdminEmails(form)
 
     return generateSubmissionToAdminHtml(htmlData).andThen((mailHtml) => {
-
       const mail: MailOptions = {
         to: adminEmails,
         from: this.#senderFromString,
         subject: `formsg-auto: ${formTitle} (#${refNo})`,
         html: mailHtml,
-        attachments,
+        attachments: attachmentsToInclude,
         headers: {
           [EMAIL_HEADERS.formId]: String(form._id),
           [EMAIL_HEADERS.submissionId]: refNo,
@@ -836,22 +835,33 @@ export class MailService {
       formUrl: `${this.#appUrl}/${form._id}`,
     }
 
-    // Create a copy of attachments for attaching of autoreply pdf if needed.
-    const attachmentsWithAutoreplyPdf = [
-      ...submissionAttachments,
-      ...(pdfAttachment ? [pdfAttachment] : []),
-    ]
+    const getAttachmentsToInclude = (mailData: AutoReplyMailData) => {
+      const shouldPdfAttachmentBeIncluded =
+        !isPaymentEnabled && mailData.includeFormSummary
+
+      if (shouldPdfAttachmentBeIncluded && !pdfAttachment) {
+        logger.error({ 
+          message: 'Could not find PDF attachment required for autoReply email. Continuing to send without PDF attachment.',
+          meta: {
+            action: 'sendAutoReplyEmails',
+            formId: String(form._id),
+            submissionId: String(submission.id),
+          },
+        })
+      } 
+
+      return pdfAttachment && shouldPdfAttachmentBeIncluded
+        ? [...submissionAttachments, pdfAttachment]
+        : [...submissionAttachments]
+    }
 
     // Prepare mail sending for each autoreply mail.
     return Promise.allSettled(
       autoReplyMailDatas.map((mailData, index) => {
         return this.#sendSingleAutoreplyMail({
           form,
           submission,
-          attachments:
-            mailData.includeFormSummary && !isPaymentEnabled
-              ? attachmentsWithAutoreplyPdf
-              : submissionAttachments,
+          attachments: getAttachmentsToInclude(mailData),
           autoReplyMailData: mailData,
           formSummaryRenderData: strippedRenderData,
           index,