fix: include fieldtype to remove answer for non signature for mrf

Author: kevin9foong

__tests__/unit/backend/helpers/generate-email-data.ts

@@ -16,6 +16,7 @@ export const generateSingleAnswerAutoreply = (
 ): EmailRespondentConfirmationField => ({
   question: response.question,
   answerTemplate: response.answer.split('\n'),
+  fieldType: response.fieldType,
 })
 
 export const generateSingleAnswerFormData = (

src/app/modules/submission/email-submission/email-submission.util.ts

@@ -280,6 +280,7 @@ export const getFormattedResponse = (
     autoReplyData = {
       question, // No prefixes for autoreply
       answerTemplate: answerSplitByNewLine,
+      fieldType,
     }
   }
 
@@ -560,6 +561,7 @@ const maskUidOnLastField = (
         return {
           question: autoReplyField.question,
           answerTemplate: maskedAnswerTemplate,
+          fieldType: autoReplyField.fieldType,
         }
       } else {
         return autoReplyField
@@ -638,6 +640,7 @@ const getAutoReplyFormattedResponse = (
       ...(response.fieldType === BasicField.Signature && {
         answer: response.answer,
       }), // add signature answer for PDF generation
+      fieldType: response.fieldType,
     }
   }
   return undefined

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

@@ -887,14 +887,16 @@ const generatePdfAttachmentIfRequired = ({
     return okAsync(undefined)
   }
 
+  const responsesData = getResponsesDataFromMrfResponses({
+    formFields: form.form_fields,
+    responses,
+  })
+
   const pdfRenderData = generatePdfRenderData({
     refNo: submissionId,
     formTitle: form.title,
     submissionDateTime: submission.created ?? new Date(),
-    responsesData: getResponsesDataFromMrfResponses({
-      formFields: form.form_fields,
-      responses,
-    }),
+    responsesData, 
     formUrl: `${config.app.appUrl}/${form._id}`,
   })
 

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

@@ -282,6 +282,7 @@ export type QuestionAnswerPair = {
   question: string
   answer: string
   signatureDataPngDataUri?: string
+  fieldType: BasicField
 }
 
 /**
@@ -371,6 +372,7 @@ const getQuestionAnswerPairsForOneField = ({
         questionAnswerPairs.push({
           question,
           answer,
+          fieldType: response.fieldType,
         })
       }
       return questionAnswerPairs
@@ -399,6 +401,7 @@ const getQuestionAnswerPairsForOneField = ({
         signatureDataPngDataUri: includeSignatureDataPngDataUri
           ? convertToSignaturePngDataUri(response.answer.value)
           : undefined,
+        fieldType: response.fieldType,
       }
       return [signatureQuestionAnswer]
     }
@@ -412,6 +415,7 @@ const getQuestionAnswerPairsForOneField = ({
           answer: child
             ? child.toString()
             : response.answer.childFields.map(() => '').toString(),
+          fieldType: response.fieldType,
         })
       }
       return questionAnswerPairs
@@ -422,6 +426,7 @@ const getQuestionAnswerPairsForOneField = ({
   questionAnswerPairs.push({
     question: questionTitle,
     answer,
+    fieldType: response.fieldType,
   })
   return questionAnswerPairs
 }
@@ -463,10 +468,11 @@ export const getQuestionAnswerPairsForMultipleFields = ({
   // Add Ndi responses if they exist
   for (const key in responses) {
     if (startsWithSPCPFieldTitle(key)) {
-      const value = responses[key] as NdiResponseV3
+      const { answer, fieldType } = responses[key] as NdiResponseV3
       questionAnswerPairs.push({
         question: key,
-        answer: value.answer,
+        answer,
+        fieldType,
       })
     }
   }
@@ -499,6 +505,7 @@ export const getResponsesDataFromMrfResponses = ({
       question: questionAnswerPair.question,
       answerTemplate: [questionAnswerPair.answer],
       answer: questionAnswerPair.signatureDataPngDataUri,
+      fieldType: questionAnswerPair.fieldType,
     }
   })
 }

src/types/email_mode_data.ts

@@ -3,7 +3,7 @@ import { BasicField } from '../../shared/types'
 export type EmailRespondentConfirmationField = {
   question: string
   answerTemplate: string[]
-  fieldType?: BasicField
+  fieldType: BasicField
   answer?: string
 }