Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Fix `charge.failed` race condition in processPayouts cron (#3273)

Steven Teyba9a7860b5a0
diff --git a/apps/web/app/(ee)/api/cron/payouts/process/process-payouts.ts b/apps/web/app/(ee)/api/cron/payouts/process/process-payouts.ts
index de79123857..2925fb720c 100644
--- a/apps/web/app/(ee)/api/cron/payouts/process/process-payouts.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/process/process-payouts.ts
@@ -11,7 +11,12 @@ import { calculatePayoutFeeForMethod } from "@/lib/stripe/payment-methods";
import { sendEmail } from "@dub/email";
import ProgramPayoutThankYou from "@dub/email/templates/program-payout-thank-you";
import { prisma } from "@dub/prisma";
-import { Program, ProgramPayoutMode, Project } from "@dub/prisma/client";
+import {
+ Invoice,
+ Program,
+ ProgramPayoutMode,
+ Project,
+} from "@dub/prisma/client";
import {
APP_DOMAIN_WITH_NGROK,
currencyFormatter,
@@ -44,8 +49,8 @@ interface ProcessPayoutsProps {
> & {
payoutMode: ProgramPayoutMode;
};
+ invoice: Pick<Invoice, "id" | "paymentMethod">;
userId: string;
- invoiceId: string;
paymentMethodId: string;
cutoffPeriod?: CUTOFF_PERIOD_TYPES;
selectedPayoutId?: string;
@@ -55,8 +60,8 @@ interface ProcessPayoutsProps {
export async function processPayouts({
workspace,
program,
+ invoice,
userId,
- invoiceId,
paymentMethodId,
cutoffPeriod,
selectedPayoutId,
@@ -66,12 +71,6 @@ export async function processPayouts({
(c) => c.id === cutoffPeriod,
)?.value;
- const invoice = await prisma.invoice.findUniqueOrThrow({
- where: {
- id: invoiceId,
- },
- });
-
const res = await prisma.payout.updateMany({
where: {
...(selectedPayoutId
diff --git a/apps/web/app/(ee)/api/cron/payouts/process/route.ts b/apps/web/app/(ee)/api/cron/payouts/process/route.ts
index 08d6bb4595..7df8a5b05e 100644
--- a/apps/web/app/(ee)/api/cron/payouts/process/route.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/process/route.ts
@@ -1,5 +1,4 @@
import { handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
import { CUTOFF_PERIOD_ENUM } from "@/lib/partners/cutoff-period";
import { prisma } from "@dub/prisma";
@@ -45,14 +44,41 @@ export async function POST(req: Request) {
where: {
id: workspaceId,
},
- });
-
- const program = await prisma.program.findUniqueOrThrow({
- where: {
- id: getDefaultProgramIdOrThrow(workspace),
+ include: {
+ programs: true,
+ invoices: {
+ where: {
+ id: invoiceId,
+ },
+ },
},
});
+ // should never happen, but just in case
+ if (workspace.programs.length === 0) {
+ return logAndRespond(
+ `Workspace ${workspaceId} has no programs. Skipping...`,
+ );
+ }
+
+ const program = workspace.programs[0];
+
+ // should never happen, but just in case
+ if (workspace.invoices.length === 0) {
+ return logAndRespond(
+ `Invoice ${invoiceId} not found for workspace ${workspaceId}. Skipping...`,
+ );
+ }
+
+ const invoice = workspace.invoices[0];
+
+ // avoid race condition where Stripe's charge.failed webhook is processed before this cron job
+ if (invoice.status === "failed") {
+ return logAndRespond(
+ `Invoice ${invoiceId} has already been marked as failed. Skipping...`,
+ );
+ }
+
if (cutoffPeriod) {
await splitPayouts({
program,
@@ -65,8 +91,8 @@ export async function POST(req: Request) {
await processPayouts({
workspace,
program,
+ invoice,
userId,
- invoiceId,
paymentMethodId,
cutoffPeriod,
selectedPayoutId,