fix(quickbooks): continue webhook batches after target failures

Author: Bill Leoutsakos

apps/sim/background/quickbooks-webhook-ingress.test.ts

@@ -59,6 +59,7 @@ describe('QuickBooks webhook ingress job', () => {
       return { outcome: 'queued' }
     })
     await expect(executeQuickBooksWebhookIngress(payload)).resolves.toEqual({
+      failed: 0,
       ignored: 0,
       processed: 2,
       targetCount: 2,
@@ -98,4 +99,23 @@ describe('QuickBooks webhook ingress job', () => {
       expect.objectContaining({ jobId: 'quickbooks-webhook-ingress:request-1:1:root' })
     )
   })
+
+  it('durably continues the batch before retrying a failed target page', async () => {
+    mockFindPage.mockResolvedValue({
+      hasMore: false,
+      nextCursor: null,
+      targets: [{ webhook: { id: 'w1' }, workflow: { id: 'wf1' } }],
+    })
+    mockDispatch.mockResolvedValue({ outcome: 'failed' })
+
+    await enqueueQuickBooksWebhookIngress(payload)
+    const options = mockEnqueue.mock.calls[0][2] as { runner: () => Promise<void> }
+    await expect(options.runner()).rejects.toThrow('Failed to dispatch 1 of 1 QuickBooks targets')
+    expect(mockEnqueue).toHaveBeenNthCalledWith(
+      2,
+      'quickbooks-webhook-ingress',
+      expect.objectContaining({ eventIndex: 1, afterWebhookId: undefined }),
+      expect.objectContaining({ jobId: 'quickbooks-webhook-ingress:request-1:1:root' })
+    )
+  })
 })

apps/sim/background/quickbooks-webhook-ingress.ts

@@ -21,6 +21,7 @@ export interface QuickBooksWebhookIngressPayload {
 }
 
 export interface QuickBooksWebhookIngressResult {
+  failed: number
   ignored: number
   nextCursor?: string
   processed: number
@@ -33,7 +34,7 @@ export async function executeQuickBooksWebhookIngress(
 ): Promise<QuickBooksWebhookIngressResult> {
   const eventIndex = payload.eventIndex ?? 0
   const event = payload.events[eventIndex]
-  if (!event) return { ignored: 0, processed: 0, targetCount: 0 }
+  if (!event) return { failed: 0, ignored: 0, processed: 0, targetCount: 0 }
 
   const request = new NextRequest('http://internal/api/webhooks/quickbooks', {
     method: 'POST',
@@ -65,10 +66,6 @@ export async function executeQuickBooksWebhookIngress(
     else failed += 1
   }
 
-  if (failed > 0) {
-    throw new Error(`Failed to dispatch ${failed} of ${page.targets.length} QuickBooks targets`)
-  }
-
   logger.info(`[${payload.requestId}] QuickBooks webhook page completed`, {
     eventId: event.id,
     eventIndex,
@@ -77,23 +74,22 @@ export async function executeQuickBooksWebhookIngress(
     targetCount: page.targets.length,
   })
   return {
+    failed,
     ignored,
     processed,
     targetCount: page.targets.length,
     ...(nextCursor ? { nextCursor } : {}),
   }
 }
 
-async function runQuickBooksWebhookIngressJob(
-  payload: QuickBooksWebhookIngressPayload
+async function enqueueQuickBooksWebhookContinuation(
+  payload: QuickBooksWebhookIngressPayload,
+  result: QuickBooksWebhookIngressResult
 ): Promise<void> {
   const eventIndex = payload.eventIndex ?? 0
-  const result = await executeQuickBooksWebhookIngress(payload)
   if (result.nextCursor) {
     await enqueueQuickBooksWebhookIngress({ ...payload, afterWebhookId: result.nextCursor })
-    return
-  }
-  if (eventIndex + 1 < payload.events.length) {
+  } else if (eventIndex + 1 < payload.events.length) {
     await enqueueQuickBooksWebhookIngress({
       ...payload,
       eventIndex: eventIndex + 1,
@@ -102,6 +98,20 @@ async function runQuickBooksWebhookIngressJob(
   }
 }
 
+async function runQuickBooksWebhookIngressJob(
+  payload: QuickBooksWebhookIngressPayload
+): Promise<void> {
+  const result = await executeQuickBooksWebhookIngress(payload)
+  // The continuation has a deterministic job id, so retries cannot duplicate it. Enqueue it
+  // before retrying this page to avoid stranding later events in an already-acknowledged batch.
+  await enqueueQuickBooksWebhookContinuation(payload, result)
+  if (result.failed > 0) {
+    throw new Error(
+      `Failed to dispatch ${result.failed} of ${result.targetCount} QuickBooks targets`
+    )
+  }
+}
+
 export async function enqueueQuickBooksWebhookIngress(
   payload: QuickBooksWebhookIngressPayload
 ): Promise<string> {