revert: send separate notification emails

Author: kevinkim-ogp

packages/backend/src/apps/postman/__tests__/actions/send-transactional-email.test.ts

@@ -686,7 +686,6 @@ describe('send transactional email', () => {
       userEmail: $.user.email,
       executionId: $.execution.id,
       blacklistedRecipients: [recipients[1]],
-      invalidAttachmentBody: expect.any(String),
     })
   })
 })

packages/backend/src/apps/postman/actions/send-transactional-email/index.ts

@@ -18,10 +18,7 @@ import {
   getDefaultReplyTo,
 } from '../../common/parameters-helper'
 import { sendBlacklistEmail } from '../../common/send-blacklist-email'
-import {
-  createInvalidAttachmentsMessage,
-  sendInvalidAttachmentsEmail,
-} from '../../common/send-invalid-attachments-email'
+import { sendInvalidAttachmentsEmail } from '../../common/send-invalid-attachments-email'
 import { throwPostmanStepError } from '../../common/throw-errors'
 
 const action: IRawAction = {
@@ -182,17 +179,9 @@ const action: IRawAction = {
      */
     if (blacklistedRecipients.length > 0 && !$.execution.testRun) {
       try {
-        let invalidAttachmentBody = null
-        if (hasInvalidAttachments) {
-          invalidAttachmentBody = createInvalidAttachmentsMessage({
-            ...defaultSendEmailParams,
-            ...invalidAttachmentParams,
-          })
-        }
         await sendBlacklistEmail({
           ...defaultSendEmailParams,
           blacklistedRecipients,
-          ...(invalidAttachmentBody && { invalidAttachmentBody }),
         })
       } catch (e) {
         logger.error(e)
@@ -207,15 +196,10 @@ const action: IRawAction = {
     }
 
     /**
-     * Send invalid attachments notification email if no blacklisted recipients
+     * Send invalid attachments notification email
      * Do not send on partial retry as we would have already sent this once with the blacklist email
      */
-    if (
-      hasInvalidAttachments &&
-      !isPartialRetry &&
-      blacklistedRecipients.length === 0 &&
-      !$.execution.testRun
-    ) {
+    if (hasInvalidAttachments && !isPartialRetry && !$.execution.testRun) {
       await sendInvalidAttachmentsEmail({
         ...defaultSendEmailParams,
         ...invalidAttachmentParams,

packages/backend/src/apps/postman/common/send-blacklist-email.ts

@@ -13,15 +13,13 @@ interface SendBlacklistEmailProps {
   userEmail: string
   executionId: string
   blacklistedRecipients: string[]
-  invalidAttachmentBody?: string
 }
 
 interface BlacklistEmailProps {
   flowName: string
   userEmail: string
   executionId: string
   blacklistedRecipients: string[]
-  invalidAttachmentBody?: string
 }
 
 type BlacklistEmailFormProps = Omit<BlacklistEmailProps, 'flowName'>
@@ -49,11 +47,11 @@ export function createRequestBlacklistFormLink({
 }
 
 function createBodyErrorMessage(props: BlacklistEmailProps): string {
-  const { flowName, blacklistedRecipients, invalidAttachmentBody } = props
+  const { flowName, blacklistedRecipients } = props
 
   const formLink = createRequestBlacklistFormLink(props)
 
-  let bodyMessage = `
+  const bodyMessage = `
     Dear fellow plumber,
     <br>
     <br>
@@ -73,13 +71,6 @@ function createBodyErrorMessage(props: BlacklistEmailProps): string {
       <li>Wait for an email confirmation from us (1-2 working days) for further instructions.</li>
     </ol>
     <br>
-    `
-
-  if (invalidAttachmentBody) {
-    bodyMessage += invalidAttachmentBody
-  }
-
-  bodyMessage += `
     Regards,
     <br>
     Plumber team
@@ -127,7 +118,6 @@ export async function sendBlacklistEmail({
   userEmail,
   executionId,
   blacklistedRecipients,
-  invalidAttachmentBody,
 }: SendBlacklistEmailProps) {
   const truncatedFlowName = truncateFlowName(flowName)
   const filteredBlacklist = await filterNotifiedEmails(
@@ -146,7 +136,6 @@ export async function sendBlacklistEmail({
       userEmail,
       executionId,
       blacklistedRecipients: filteredBlacklist,
-      invalidAttachmentBody,
     }),
     recipient: userEmail,
     replyTo: '[email protected]',