chore: remove growthbook from payment functions

kevin9foong · kevin9foong · commit 3f7ba04fa689 · 2025-12-05T18:12:51.000+08:00
diff --git a/src/app/modules/payments/payments.service.ts b/src/app/modules/payments/payments.service.ts
@@ -1,4 +1,3 @@
-import { GrowthBook } from '@growthbook/growthbook'
 import { isEqual, omit } from 'lodash'
 import moment from 'moment-timezone'
 import mongoose, { Types } from 'mongoose'
@@ -209,7 +208,6 @@ export const confirmPaymentPendingSubmission = (
  */
 export const performPaymentPostSubmissionActions = (
   paymentId: IPaymentSchema['_id'],
-  growthbook: GrowthBook | undefined,
 ): ResultAsync<
   void,
   | PaymentNotFoundError
@@ -244,7 +242,6 @@ export const performPaymentPostSubmissionActions = (
                 performEncryptPostSubmissionActions({
                   submission,
                   responses: payment.responses,
-                  growthbook,
                 })
                   .andThen(() =>
                     // If successfully sent email confirmations, delete response data from payment document.
diff --git a/src/app/modules/payments/stripe.controller.ts b/src/app/modules/payments/stripe.controller.ts
@@ -304,10 +304,7 @@ export const reconcileAccount: ControllerHandler<
         meta: { ...logMeta, event },
       })
 
-      await StripeService.handleStripeEvent(
-        event as Stripe.DiscriminatedEvent,
-        req.growthbook,
-      )
+      await StripeService.handleStripeEvent(event as Stripe.DiscriminatedEvent)
         .andThen(() => {
           logger.warn({
             message:
diff --git a/src/app/modules/payments/stripe.events.controller.ts b/src/app/modules/payments/stripe.events.controller.ts
@@ -89,7 +89,7 @@ const _handleStripeEventUpdates: ControllerHandler<
 
   // Step 3: Process the event
   return (
-    StripeService.handleStripeEvent(event, req.growthbook)
+    StripeService.handleStripeEvent(event)
       // Step 4: Return response to Stripe based on result
       .match(
         () => res.sendStatus(StatusCodes.OK),
diff --git a/src/app/modules/payments/stripe.service.ts b/src/app/modules/payments/stripe.service.ts
@@ -1,6 +1,5 @@
 // Use 'stripe-event-types' for better type discrimination.
 /// <reference types="stripe-event-types" />
-import { GrowthBook } from '@growthbook/growthbook'
 import cuid from 'cuid'
 import mongoose from 'mongoose'
 import { errAsync, ok, okAsync, ResultAsync } from 'neverthrow'
@@ -451,7 +450,6 @@ type HandleStripeEventResultError =
  */
 export const handleStripeEvent = (
   event: Stripe.DiscriminatedEvent,
-  growthbook: GrowthBook | undefined,
 ): ResultAsync<void, HandleStripeEventResultError> => {
   const logMeta = {
     action: 'handleStripeEvent',
@@ -498,7 +496,6 @@ export const handleStripeEvent = (
 
             return PaymentsService.performPaymentPostSubmissionActions(
               paymentId,
-              growthbook,
             )
               .andThen(() => okAsync(undefined))
               .orElse((e) => {
diff --git a/src/app/modules/submission/multirespondent-submission/multirespondent-submission.service.ts b/src/app/modules/submission/multirespondent-submission/multirespondent-submission.service.ts
@@ -43,7 +43,7 @@ import {
   AutoReplyMailData,
   AutoreplySummaryRenderData,
 } from '../../../services/mail/mail.types'
-import { generateAutoreplyPdf } from '../../../services/mail/mail.utils'
+import { AutoReplyData, generateAutoreplyPdf } from '../../../services/mail/mail.utils'
 import { transformMongoError } from '../../../utils/handle-mongo-error'
 import { DatabaseError } from '../../core/core.errors'
 import { isFormMultirespondent } from '../../form/form.utils'
@@ -486,11 +486,6 @@ const sendMrfRespondentCopyEmails = ({
   InvalidWorkflowTypeError | MailSendError | AutoreplyPdfGenerationError
 > => {
   const submissionId: string = submission.id
-  const submissionTime = moment(submission.created)
-    .tz('Asia/Singapore')
-    .format('ddd, DD MMM YYYY hh:mm:ss A')
-  const formUrl: string = `${config.app.appUrl}/${form._id}`
-
   const formQuestionAnswers = getQuestionTitleAnswerString({
     formFields: form.form_fields,
     responses,
@@ -504,20 +499,21 @@ const sendMrfRespondentCopyEmails = ({
   const hasFormSummary = respondentCopyRecipientData.some(
     (autoReplyMailData) => autoReplyMailData.includeFormSummary,
   )
-  const renderData: AutoreplySummaryRenderData = {
+
+  const autoReplyData: AutoReplyData = {
     refNo: submissionId,
     formTitle: form.title,
-    submissionTime: submissionTime,
-    formData: pdfFormData,
-    formUrl: formUrl,
+    submissionDateTime: submission.created || new Date(), 
+    responsesData: pdfFormData,
+    formUrl: `${config.app.appUrl}/${form._id}`
   }
 
   // Step 1: generate PDF if needed
   const pdfResult: ResultAsync<
     Mail.Attachment | undefined,
     AutoreplyPdfGenerationError
   > = hasFormSummary
-    ? generateAutoreplyPdf(renderData, true).map((pdfBuffer) => ({
+    ? generateAutoreplyPdf(autoReplyData, true).map((pdfBuffer) => ({
         filename: 'response.pdf',
         content: Buffer.copyBytesFrom(pdfBuffer),
       }))
diff --git a/src/app/services/mail/__tests__/mail.utils.spec.ts b/src/app/services/mail/__tests__/mail.utils.spec.ts
@@ -0,0 +1,146 @@
+import { ObjectId } from 'bson'
+import { BasicField } from 'shared/types'
+import { SIGNATURE_CAPTURED_STRING } from 'shared/utils/signature'
+
+import * as ConvertHtmlToPdf from '../../../utils/convert-html-to-pdf'
+import { generateAutoreplyPdf, safeRenderFileForTest } from '../mail.utils'
+
+jest.mock('../../../utils/convert-html-to-pdf.ts')
+const MockConvertHtmlToPdf = jest.mocked(ConvertHtmlToPdf)
+
+const MOCK_PDF_BUFFER = Buffer.from('mock pdf buffer')
+const MOCK_SUBMISSION_DATE_TIME = new Date('2025-01-01T00:00:00.000Z')
+
+describe('mail.utils', () => {
+  const AUTOREPLY_PDF_TEMPLATE_FILEPATH = `${__dirname}/../../../views/templates/submit-form-summary-pdf.server.view.html`
+  beforeEach(() => {
+    jest.clearAllMocks()
+    MockConvertHtmlToPdf.generatePdfFromHtml.mockResolvedValue(MOCK_PDF_BUFFER)
+  })
+
+  describe('generateAutoreplyPdf', () => {
+    it('should generate a pdf from html', async () => {
+      // Arrange
+      const mockFormId = new ObjectId().toHexString()
+      const mockSubmissionId = new ObjectId().toHexString()
+      const autoReplyData = {
+        refNo: mockSubmissionId,
+        formTitle: 'Test Form',
+        submissionDateTime: MOCK_SUBMISSION_DATE_TIME,
+        responsesData: [],
+        formUrl: `https://form.gov.sg/${mockFormId}`,
+      }
+
+      // Act
+      const result = await generateAutoreplyPdf(autoReplyData, true)
+
+      // Assert
+      expect(MockConvertHtmlToPdf.generatePdfFromHtml).toHaveBeenCalledOnce()
+      expect(result._unsafeUnwrap()).toEqual(MOCK_PDF_BUFFER)
+    })
+
+    it('should generate pdfRender data correctly for signature field', async () => {
+      // Arrange
+      const mockFormId = new ObjectId().toHexString()
+      const mockSubmissionId = new ObjectId().toHexString()
+      const MOCK_SIGNATURE_PNG_DATAURI = 'datauri://signature.png'
+      const autoReplyData = {
+        refNo: mockSubmissionId,
+        formTitle: 'Test Form',
+        submissionDateTime: MOCK_SUBMISSION_DATE_TIME,
+        responsesData: [
+          {
+            question: 'Signature',
+            answer: MOCK_SIGNATURE_PNG_DATAURI,
+            answerTemplate: [SIGNATURE_CAPTURED_STRING],
+            fieldType: BasicField.Signature,
+          },
+        ],
+        formUrl: `https://form.gov.sg/${mockFormId}`,
+      }
+
+      const formattedSubmissionTimeString = 'Wed, 01 Jan 2025 08:00:00 AM'
+
+      const pdfRenderData = {
+        refNo: mockSubmissionId,
+        formTitle: 'Test Form',
+        submissionTime: formattedSubmissionTimeString,
+        formData: [
+          {
+            question: 'Signature',
+            answer: MOCK_SIGNATURE_PNG_DATAURI, // should be defined for signature fields
+            answerTemplate: [SIGNATURE_CAPTURED_STRING],
+          },
+        ],
+        formUrl: `https://form.gov.sg/${mockFormId}`,
+      }
+
+      const expectedHtml = await safeRenderFileForTest(
+        AUTOREPLY_PDF_TEMPLATE_FILEPATH,
+        pdfRenderData,
+      )
+
+      // Act
+      const result = await generateAutoreplyPdf(autoReplyData, true)
+
+      // Assert
+      expect(MockConvertHtmlToPdf.generatePdfFromHtml).toHaveBeenCalledOnce()
+      expect(MockConvertHtmlToPdf.generatePdfFromHtml).toHaveBeenCalledWith(
+        expectedHtml._unsafeUnwrap(),
+        true,
+      )
+      expect(result._unsafeUnwrap()).toEqual(MOCK_PDF_BUFFER)
+    })
+
+    it('should generate pdfRender data correctly for non-signature fields', async () => {
+      // Arrange
+      const mockFormId = new ObjectId().toHexString()
+      const mockSubmissionId = new ObjectId().toHexString()
+      const autoReplyData = {
+        refNo: mockSubmissionId,
+        formTitle: 'Test Form',
+        submissionDateTime: MOCK_SUBMISSION_DATE_TIME,
+        responsesData: [
+          {
+            question: 'Table field',
+            answer: 'Table answer',
+            answerTemplate: ['Table answer'],
+            fieldType: BasicField.Table,
+          },
+        ],
+        formUrl: `https://form.gov.sg/${mockFormId}`,
+      }
+
+      const formattedSubmissionTimeString = 'Wed, 01 Jan 2025 08:00:00 AM'
+
+      const pdfRenderData = {
+        refNo: mockSubmissionId,
+        formTitle: 'Test Form',
+        submissionTime: formattedSubmissionTimeString,
+        formData: [
+          {
+            question: 'Table field',
+            answer: undefined, // should be undefined for non-signature fields
+            answerTemplate: ['Table answer'],
+          },
+        ],
+        formUrl: `https://form.gov.sg/${mockFormId}`,
+      }
+      const expectedHtml = await safeRenderFileForTest(
+        AUTOREPLY_PDF_TEMPLATE_FILEPATH,
+        pdfRenderData,
+      )
+
+      // Act
+      const result = await generateAutoreplyPdf(autoReplyData, true)
+
+      // Assert
+      expect(MockConvertHtmlToPdf.generatePdfFromHtml).toHaveBeenCalledOnce()
+      expect(MockConvertHtmlToPdf.generatePdfFromHtml).toHaveBeenCalledWith(
+        expectedHtml._unsafeUnwrap(),
+        true,
+      )
+      expect(result._unsafeUnwrap()).toEqual(MOCK_PDF_BUFFER)
+    })
+  })
+})
diff --git a/src/app/services/mail/mail.service.ts b/src/app/services/mail/mail.service.ts
@@ -62,6 +62,7 @@ import {
   SubmissionToAdminHtmlData,
 } from './mail.types'
 import {
+  AutoReplyData,
   generateAutoreplyHtml,
   generateAutoreplyPdf,
   generateIssueReportedNotificationHtml,
@@ -796,18 +797,6 @@ export class MailService {
       >
     >[]
   > => {
-    // Data to render both the submission details mail HTML body and PDF.
-
-    const renderData: AutoreplySummaryRenderData = {
-      refNo: submission.id,
-      formTitle: form.title,
-      submissionTime: moment(submission.created)
-        .tz('Asia/Singapore')
-        .format('ddd, DD MMM YYYY hh:mm:ss A'),
-      formData: responsesData,
-      formUrl: `${this.#appUrl}/${form._id}`,
-    }
-
     // Create a copy of attachments for attaching of autoreply pdf if needed.
     const attachmentsWithAutoreplyPdf = [...attachments]
     const isEncryptForm = form?.responseMode === FormResponseMode.Encrypt
@@ -817,14 +806,21 @@ export class MailService {
       encryptFormDef.payments_channel.channel !== PaymentChannel.Unconnected &&
       encryptFormDef.payments_field.enabled === true
 
+      const autoReplyData: AutoReplyData = {
+        refNo: submission.id,
+        formTitle: form.title,
+        submissionDateTime: submission.created || new Date(), 
+        responsesData,
+        formUrl: `${this.#appUrl}/${form._id}`,
+      }
     // Generate autoreply pdf and append into attachments if any of the mail has
     // to include a form summary.
     if (
       autoReplyMailDatas.some((data) => data.includeFormSummary) &&
       !isPaymentEnabled
     ) {
       const pdfBufferResult = await generateAutoreplyPdf(
-        renderData,
+        autoReplyData,
         isUseLambdaOutput,
       )
       if (pdfBufferResult.isErr()) {
@@ -844,9 +840,14 @@ export class MailService {
       }),
     )
 
-    const strippedRenderData = {
-      ...renderData,
+    const strippedRenderData: AutoreplySummaryRenderData = {
+      refNo: submission.id,
+      formTitle: form.title,
+      submissionTime: moment(submission.created)
+        .tz('Asia/Singapore')
+        .format('ddd, DD MMM YYYY hh:mm:ss A'),
       formData: strippedResponsesData,
+      formUrl: `${this.#appUrl}/${form._id}`,
     }
 
     // Prepare mail sending for each autoreply mail.
diff --git a/src/app/services/mail/mail.utils.ts b/src/app/services/mail/mail.utils.ts
