fix(mailer): batch degrades isUnsubscribed errors to per-entry failures

waleedlatif1 · waleedlatif1 · commit 7705d3196ec9 · 2026-05-21T19:15:25.000-07:00
A transient DB error in isUnsubscribed used to abort the whole batch
because the call sat outside the per-email try/catch in prepareBatch.
Wrap the unsubscribe check inside the same catch so a rejection becomes
a per-recipient failure, matching sendEmail's behavior. Lock it in
with a regression test.
diff --git a/apps/sim/lib/messaging/email/mailer.test.ts b/apps/sim/lib/messaging/email/mailer.test.ts
@@ -251,5 +251,19 @@ describe('mailer', () => {
 
       expect(isUnsubscribed).not.toHaveBeenCalled()
     })
+
+    it('should degrade isUnsubscribed rejections to per-entry failures', async () => {
+      ;(isUnsubscribed as Mock).mockRejectedValue(new Error('Database connection failed'))
+
+      const result = await sendBatchEmails({
+        emails: [
+          { ...testEmailOptions, to: 'user1@example.com', emailType: 'marketing' as EmailType },
+          { ...testEmailOptions, to: 'user2@example.com', emailType: 'marketing' as EmailType },
+        ],
+      })
+
+      expect(result.results).toHaveLength(2)
+      expect(result.results.every((r) => r.success === false)).toBe(true)
+    })
   })
 })
diff --git a/apps/sim/lib/messaging/email/mailer.ts b/apps/sim/lib/messaging/email/mailer.ts
@@ -94,11 +94,11 @@ interface PreparedBatchEntry {
 
 async function prepareBatch(emails: EmailOptions[]): Promise<PreparedBatchEntry[]> {
   return Promise.all(
-    emails.map(async (email, index) => {
-      if (await shouldSkipForUnsubscribe(email)) {
-        return { index, data: null, skippedResult: SKIPPED_UNSUBSCRIBED_RESULT }
-      }
+    emails.map(async (email, index): Promise<PreparedBatchEntry> => {
       try {
+        if (await shouldSkipForUnsubscribe(email)) {
+          return { index, data: null, skippedResult: SKIPPED_UNSUBSCRIBED_RESULT }
+        }
         return { index, data: processEmailData(email), skippedResult: null }
       } catch (error) {
         return {
