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 force-withdrawals to use partnersToProcess

Steven Tey32ae3bfef2ee
diff --git a/apps/web/app/(ee)/api/cron/payouts/force-withdrawals/route.ts b/apps/web/app/(ee)/api/cron/payouts/force-withdrawals/route.ts
index b0fc45d9ee..4c268f3762 100644
--- a/apps/web/app/(ee)/api/cron/payouts/force-withdrawals/route.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/force-withdrawals/route.ts
@@ -1,10 +1,11 @@
import { forceWithdrawal } from "@/lib/actions/partners/force-withdrawal";
import { handleAndReturnErrorResponse } from "@/lib/api/errors";
+import { MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS } from "@/lib/constants/payouts";
import { qstash } from "@/lib/cron";
import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
import { verifyVercelSignature } from "@/lib/cron/verify-vercel";
import { prisma } from "@dub/prisma";
-import { ACME_PROGRAM_ID, APP_DOMAIN_WITH_NGROK, log } from "@dub/utils";
+import { APP_DOMAIN_WITH_NGROK, log } from "@dub/utils";
import * as z from "zod/v4";
import { logAndRespond } from "../../utils";
@@ -40,30 +41,24 @@ async function handler(req: Request) {
startingAfter = undefined;
}
- // Get batch of partner IDs with processed payouts (cursor-based pagination)
- const processedPayouts = await prisma.payout.findMany({
+ // Get batch of partners with processed payouts (cursor-based pagination)
+ const partnersToProcess = await prisma.partner.findMany({
where: {
- status: "processed",
- method: {
- in: ["stablecoin", "connect"],
- },
- programId: {
- not: ACME_PROGRAM_ID,
+ payoutsEnabledAt: {
+ not: null,
},
- paidAt: {
- lte: new Date(Date.now() - 90 * 24 * 60 * 60 * 1000), // 90 days ago
- },
- partner: {
- payoutsEnabledAt: {
- not: null,
- },
+ defaultPayoutMethod: {
+ in: ["stablecoin", "connect"],
},
- },
- include: {
- partner: {
- select: {
- id: true,
- defaultPayoutMethod: true,
+ payouts: {
+ some: {
+ status: "processed",
+ amount: {
+ gte: MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS,
+ },
+ paidAt: {
+ lte: new Date(Date.now() - 90 * 24 * 60 * 60 * 1000), // 90 days ago
+ },
},
},
},
@@ -77,28 +72,26 @@ async function handler(req: Request) {
id: startingAfter,
},
}),
+ select: {
+ id: true,
+ defaultPayoutMethod: true,
+ },
});
- if (!processedPayouts.length) {
+ if (!partnersToProcess.length) {
return logAndRespond(
- "No processed payouts found. Skipping force withdrawals...",
+ "No partners to process. Skipping force withdrawals...",
);
}
- const hasMoreToProcess = processedPayouts.length === BATCH_SIZE;
+ const hasMoreToProcess = partnersToProcess.length === BATCH_SIZE;
console.log(
- `Found ${processedPayouts.length} partners to process${hasMoreToProcess ? " (more to process)" : ""}`,
+ `Found ${partnersToProcess.length} partners to process${hasMoreToProcess ? " (more to process)" : ""}`,
);
await Promise.allSettled(
- processedPayouts
- .filter(
- // filter out duplicate payouts for the same partner
- (payout, index, self) =>
- index === self.findIndex((t) => t.partnerId === payout.partnerId),
- )
- .map(({ partner }) => forceWithdrawal(partner)),
+ partnersToProcess.map((partner) => forceWithdrawal(partner)),
);
if (hasMoreToProcess) {
@@ -107,7 +100,7 @@ async function handler(req: Request) {
);
const nextStartingAfter =
- processedPayouts[processedPayouts.length - 1].id;
+ partnersToProcess[partnersToProcess.length - 1].id;
const qstashResponse = await qstash.publishJSON({
url: `${APP_DOMAIN_WITH_NGROK}/api/cron/payouts/force-withdrawals`,
diff --git a/apps/web/lib/partners/create-stablecoin-payout.ts b/apps/web/lib/partners/create-stablecoin-payout.ts
index eb4366992a..9a2e2d8cc8 100644
--- a/apps/web/lib/partners/create-stablecoin-payout.ts
+++ b/apps/web/lib/partners/create-stablecoin-payout.ts
@@ -6,6 +6,7 @@ import { PartnerPayoutMethod, Prisma } from "@dub/prisma/client";
import { currencyFormatter, prettyPrint } from "@dub/utils";
import {
BELOW_MIN_WITHDRAWAL_FEE_CENTS,
+ MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS,
MIN_WITHDRAWAL_AMOUNT_CENTS,
STABLECOIN_PAYOUT_FEE_RATE,
} from "../constants/payouts";
@@ -118,6 +119,12 @@ export const createStablecoinPayout = async ({
0,
);
+ if (totalTransferableAmount < MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS) {
+ throw new Error(
+ `Total transferable amount (${currencyFormatter(totalTransferableAmount)}) for partner ${partner.email} is less than the minimum amount required for withdrawal (${currencyFormatter(MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS)}). Skipping...`,
+ );
+ }
+
let withdrawalFee = 0;
// If the total transferable amount is less than the minimum withdrawal amount
diff --git a/apps/web/lib/partners/create-stripe-transfer.ts b/apps/web/lib/partners/create-stripe-transfer.ts
index b168f08daa..1d8d7ecc5c 100644
--- a/apps/web/lib/partners/create-stripe-transfer.ts
+++ b/apps/web/lib/partners/create-stripe-transfer.ts
@@ -97,6 +97,12 @@ export const createStripeTransfer = async ({
0,
);
+ if (totalTransferableAmount < MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS) {
+ throw new Error(
+ `Total transferable amount (${currencyFormatter(totalTransferableAmount)}) for partner ${partner.email} is less than the minimum amount required for withdrawal (${currencyFormatter(MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS)}). Skipping...`,
+ );
+ }
+
let withdrawalFee = 0;
// If the total transferable amount is less than the minimum withdrawal amount
@@ -120,12 +126,6 @@ export const createStripeTransfer = async ({
// Minus the withdrawal fee from the total amount
const finalTransferableAmount = totalTransferableAmount - withdrawalFee;
- if (finalTransferableAmount < MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS) {
- throw new Error(
- `Final transferable amount (${currencyFormatter(finalTransferableAmount)}) is less than the minimum amount required for withdrawal (${currencyFormatter(MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS)})`,
- );
- }
-
const allPayoutsProgramNames = [
...new Set(allPayouts.map((p) => p.program.name)), // deduplicate program names
];