feat: propagate isPaymentForm check up and only attach pdf if required

Author: kevin9foong

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

@@ -351,6 +351,7 @@ export const performEncryptPostSubmissionActions = ({
             attachments,
             formData: emailData.formData,
             dataCollationData,
+            pdfAttachment: checkIfAdminPdfIsRequired() ? pdfAttachment : undefined,
           })
 
           return sendEmailConfirmations({
@@ -359,7 +360,11 @@ export const performEncryptPostSubmissionActions = ({
             attachments,
             responsesData: emailData?.autoReplyData,
             recipientData: recipientEmailDatas,
-            pdfAttachment,
+            pdfAttachment: checkIfRespondentFormSummaryIsRequired({
+              isPaymentEnabled,
+              autoReplyMailDatas: recipientEmailDatas,
+            }) ? pdfAttachment : undefined,
+            isPaymentEnabled,
           }).mapErr((error) => {
             logger.error({
               message: 'Error while sending email confirmations',

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

@@ -1214,7 +1214,7 @@ export const performMultiRespondentPostSubmissionUpdateActions = ({
     attachments,
     formFields: snapshottedFormDef.form_fields,
     currentStepActiveFields: snapshottedFormDef.workflow[currentStepNumber]?.edit ?? [],
-    pdfResult,
+    pdfResult: checkIfRespondentFormSummaryIsRequired({ responses, formFields: snapshottedFormDef.form_fields, currentStepActiveFields: snapshottedFormDef.workflow[currentStepNumber]?.edit ?? [] }) ? pdfResult : okAsync(undefined),
   }).mapErr((error) => {
     logger.error({
       message: 'Send multirespondent respondent copy email error',
@@ -1249,7 +1249,7 @@ export const performMultiRespondentPostSubmissionUpdateActions = ({
     submissionId,
     isApproval: checkIsFormApproval(snapshottedFormDef),
     attachments: attachments,
-    pdfResult: pdfResult,
+    pdfResult: checkIsWorkflowCompletionEmailPdfRequired({ currentStepNumber, form: snapshottedFormDef, responses, isRejected: isStepRejected, submissionId }) ? pdfResult : okAsync(undefined),
   })
     .mapErr((error) => {
       logger.error({

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

@@ -594,13 +594,15 @@ export const sendEmailConfirmations = <S extends ISubmissionSchema>({
   attachments,
   recipientData,
   pdfAttachment,
+  isPaymentEnabled,
 }: {
   form: IPopulatedForm
   submission: S
   responsesData?: EmailRespondentConfirmationField[]
   attachments?: Mail.Attachment[]
   recipientData: AutoReplyMailData[]
   pdfAttachment?: Mail.Attachment
+  isPaymentEnabled: boolean
 }): ResultAsync<true, SendEmailConfirmationError> => {
   const logMeta = {
     action: 'sendEmailConfirmations',
@@ -617,6 +619,7 @@ export const sendEmailConfirmations = <S extends ISubmissionSchema>({
     responsesData,
     autoReplyMailDatas: recipientData,
     pdfAttachment,
+    isPaymentEnabled,
   })
   return ResultAsync.fromPromise(sentEmailsPromise, (error) => {
     logger.error({

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

@@ -807,6 +807,7 @@ export class MailService {
     autoReplyMailDatas,
     attachments = [],
     pdfAttachment,
+    isPaymentEnabled,
   }: SendAutoReplyEmailsArgs): Promise<
     PromiseSettledResult<
       Result<
@@ -834,12 +835,6 @@ export class MailService {
 
     // Create a copy of attachments for attaching of autoreply pdf if needed.
     const attachmentsWithAutoreplyPdf = [...attachments, ...(pdfAttachment ? [pdfAttachment] : [])]
-    const isEncryptForm = form?.responseMode === FormResponseMode.Encrypt
-    const encryptFormDef = form as IPopulatedEncryptedForm
-    const isPaymentEnabled =
-      isEncryptForm &&
-      encryptFormDef.payments_channel.channel !== PaymentChannel.Unconnected &&
-      encryptFormDef.payments_field.enabled === true
 
     // Prepare mail sending for each autoreply mail.
     return Promise.allSettled(

src/app/services/mail/mail.types.ts

@@ -34,6 +34,7 @@ export type SendAutoReplyEmailsArgs = {
   })[]
   autoReplyMailDatas: AutoReplyMailData[]
   pdfAttachment?: Mail.Attachment
+  isPaymentEnabled: boolean
 }
 
 export type MailServiceParams = {