WIP

Author: andresgutgon

packages/core/src/events/handlers/sendIssueEscalatingHandler.ts

@@ -17,7 +17,7 @@ const BATCH_SIZE = 100 // Batch size can be up to 1000 in mailgun
 async function findNotificableMembers(workspace: Workspace) {
   return database
     .select({
-      id: users.id,
+      userId: users.id,
       email: users.email,
       name: users.name,
       membershipId: memberships.id,
@@ -33,7 +33,6 @@ async function findNotificableMembers(workspace: Workspace) {
     .orderBy(asc(users.createdAt))
 }
 
-// TODO: Refactor common batching logic with other mailers
 async function sendEmail({
   workspace,
   issue,
@@ -79,21 +78,14 @@ async function sendEmail({
 
   // Send emails in batches using the new sendInBatches method
   await mailer.sendInBatches({
-    addresses: members,
-    sendOptions: async (batch) => {
-      const result = await mailer.send({
+    addressList: members,
+    sendOptions: async (batch) =>
+      mailer.send({
         to: batch.to,
         recipientVariables: batch.recipientVariables,
         currentWorkspace: workspace,
         issue: issueData,
-      })
-
-      if (result.error) {
-        throw result.error
-      }
-
-      return result.value
-    },
+      }),
     context: {
       mailName: 'issue_escalation_email',
       issueId: issue.id,

packages/core/src/mailers/mailers/Mailer.ts

@@ -6,7 +6,11 @@ import SMTPTransport from 'nodemailer/lib/smtp-transport'
 import { Result, TypedResult } from '../../lib/Result'
 import { captureException } from '../../utils/datadogCapture'
 import { createAdapter } from './adapters'
-import { AddressItem, buildBatchRecipients } from './buildBatchRecipients'
+import {
+  AddressItem,
+  buildBatchRecipients,
+  RecipientBatch,
+} from './buildBatchRecipients'
 
 /**
  * Batch sending options for Mailgun.
@@ -126,10 +130,9 @@ export default abstract class Mailer {
     batchSize = 100,
   }: {
     addressList: AddressItem[]
-    sendOptions: (batch: {
-      to: string[]
-      recipientVariables: Record<string, Record<string, unknown>>
-    }) => Promise<TypedResult<SMTPTransport.SentMessageInfo, Error>>
+    sendOptions: (
+      batch: RecipientBatch,
+    ) => Promise<TypedResult<SMTPTransport.SentMessageInfo, Error>>
     context: {
       mailName: string
       [key: string]: unknown

packages/core/src/mailers/mailers/buildBatchRecipients.ts

@@ -35,3 +35,5 @@ export function buildBatchRecipients({
 
   return batches
 }
+
+export type RecipientBatch = ReturnType<typeof buildBatchRecipients>[number]

packages/core/src/mailers/mailers/mailers/issues/IssueEscalatingMailer.ts

@@ -8,10 +8,11 @@ import IssueEscalatingMail, {
   IssueEscalatingMailProps,
 } from '@latitude-data/emails/IssueEscalatingMail'
 import Mailer from '../../Mailer'
+import { RecipientBatch } from '../../buildBatchRecipients'
 
 export type SendIssueEscalatingMailOptions = {
   to: Mail.Options['to']
-  recipientVariables?: Record<string, Record<string, unknown>>
+  recipientVariables: RecipientBatch['recipientVariables']
   currentWorkspace: NotificiationsLayoutProps['currentWorkspace']
   issue: IssueEscalatingMailProps['issue']
 }

packages/core/src/mailers/mailers/mailers/weeklyEmail/WeeklyEmailMailer.ts

@@ -8,10 +8,11 @@ import WeeklyEmailMail, {
   WeeklyEmailMailProps,
 } from '@latitude-data/emails/WeeklyEmailMail'
 import Mailer from '../../Mailer'
+import { RecipientBatch } from '../../buildBatchRecipients'
 
 export type SendWeeklyEmailMailOptions = {
   to: Mail.Options['to']
-  recipientVariables?: Record<string, Record<string, unknown>>
+  recipientVariables: RecipientBatch['recipientVariables']
   currentWorkspace: NotificiationsLayoutProps['currentWorkspace']
   logs: WeeklyEmailMailProps['logs']
   issues: WeeklyEmailMailProps['issues']