The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Improve `createStripeTransfer` logic (#3291)
Steven Tey936f7f0d578e
diff --git a/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/queue-stripe-payouts.ts b/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/queue-stripe-payouts.tsindex 96f05af0fc..f84342d96c 100644--- a/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/queue-stripe-payouts.ts+++ b/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/queue-stripe-payouts.ts@@ -70,8 +70,8 @@ export async function queueStripePayouts(deduplicationId: `${invoiceId}-${partnerId}`,method: "POST",body: {- invoiceId,partnerId,+ invoiceId,// only pass chargeId if payment method is card// this is because we're passing chargeId as source_transaction for card payouts since card payouts can take a short time to settle fully// we omit chargeId/source_transaction for other payment methods (ACH, SEPA, etc.) since those settle via charge.succeeded webhook after ~4 daysdiff --git a/apps/web/app/(ee)/api/cron/payouts/send-stripe-payout/route.ts b/apps/web/app/(ee)/api/cron/payouts/send-stripe-payout/route.tsindex 235700c893..0d9cee8e7a 100644--- a/apps/web/app/(ee)/api/cron/payouts/send-stripe-payout/route.ts+++ b/apps/web/app/(ee)/api/cron/payouts/send-stripe-payout/route.ts@@ -1,18 +1,15 @@import { handleAndReturnErrorResponse } from "@/lib/api/errors";import { verifyQstashSignature } from "@/lib/cron/verify-qstash";import { createStripeTransfer } from "@/lib/partners/create-stripe-transfer";-import { sendEmail } from "@dub/email";-import PartnerPayoutProcessed from "@dub/email/templates/partner-payout-processed";-import { prisma } from "@dub/prisma";-import { currencyFormatter, log } from "@dub/utils";+import { log } from "@dub/utils";import { z } from "zod";import { logAndRespond } from "../../utils";export const dynamic = "force-dynamic";const payloadSchema = z.object({- invoiceId: z.string(),partnerId: z.string(),+ invoiceId: z.string().optional(),chargeId: z.string().optional(),});@@ -26,68 +23,16 @@ export async function POST(req: Request) {rawBody,});- const { invoiceId, partnerId, chargeId } = payloadSchema.parse(+ const { partnerId, invoiceId, chargeId } = payloadSchema.parse(JSON.parse(rawBody),);- // there should only be one payout per partner in a given invoice, but just in case there are multiple- const currentInvoicePayouts = await prisma.payout.findMany({- where: {- invoiceId,- partnerId,- status: "processing",- },- include: {- partner: true,- program: true,- },- });-- if (currentInvoicePayouts.length === 0) {- return logAndRespond(- `No "processing" payouts found for partner ${partnerId} and invoice ${invoiceId}`,- );- }-- // get all previously processed payouts for the partners in this invoice- // but haven't been transferred to their Stripe Express account yet- const previouslyProcessedPayouts = await prisma.payout.findMany({- where: {- status: "processed",- stripeTransferId: null,- partnerId,- },- include: {- partner: true,- program: true,- },- });-await createStripeTransfer({- partner: currentInvoicePayouts[0].partner,- previouslyProcessedPayouts,- currentInvoicePayouts,+ partnerId,+ invoiceId,chargeId,});- // again, there should only be one payout per partner in a given invoice- const payout = currentInvoicePayouts[0];- if (payout.partner.email) {- const emailRes = await sendEmail({- variant: "notifications",- to: payout.partner.email!,- subject: `You've received a ${currencyFormatter(payout.amount)} payout from ${payout.program.name}`,- react: PartnerPayoutProcessed({- email: payout.partner.email!,- program: payout.program,- payout,- variant: "stripe",- }),- });-- console.log(`Resend email sent: ${JSON.stringify(emailRes, null, 2)}`);- }-return logAndRespond(`Processed send-stripe-payout job for partner ${partnerId} and invoice ${invoiceId}`,);diff --git a/apps/web/app/(ee)/api/stripe/connect/webhook/account-updated.ts b/apps/web/app/(ee)/api/stripe/connect/webhook/account-updated.tsindex 4bc79dd031..2a64f2c2aa 100644--- a/apps/web/app/(ee)/api/stripe/connect/webhook/account-updated.ts+++ b/apps/web/app/(ee)/api/stripe/connect/webhook/account-updated.ts@@ -8,14 +8,18 @@ import { prisma } from "@dub/prisma";import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";import Stripe from "stripe";-const queue = qstash.queue({+const stripePayoutQueue = qstash.queue({+ queueName: "send-stripe-payout",+});++const balanceAvailableQueue = qstash.queue({queueName: "handle-balance-available",});export async function accountUpdated(event: Stripe.Event) {const account = event.data.object as Stripe.Account;- const { country, payouts_enabled: payoutsEnabled } = account;+ const { country, payouts_enabled: payoutsEnabled, capabilities } = account;const partner = await prisma.partner.findUnique({where: {@@ -34,19 +38,22 @@ export async function accountUpdated(event: Stripe.Event) {return `Partner with stripeConnectId ${account.id} not found, skipping...`;}- if (!payoutsEnabled) {- if (partner.payoutsEnabledAt || partner.payoutMethodHash) {+ if (+ !payoutsEnabled ||+ !capabilities?.transfers ||+ capabilities.transfers === "inactive"+ ) {+ if (partner.payoutsEnabledAt) {await prisma.partner.update({where: {id: partner.id,},data: {payoutsEnabledAt: null,- payoutMethodHash: null,},});// TODO: notify partner about the change- return `Payouts disabled, updated partner ${partner.email} (${partner.stripeConnectId}) with payoutsEnabledAt and payoutMethodHash null`;+ return `Payouts disabled, updated partner ${partner.email} (${partner.stripeConnectId}) with payoutsEnabledAt null`;}return `No change in payout status for ${partner.email} (${partner.stripeConnectId}), skipping...`;}@@ -116,27 +123,65 @@ export async function accountUpdated(event: Stripe.Event) {}}- // Retry payouts that got stuck when the account was restricted (e.g: payout sent but paused- // due to verification requirements). Once payouts are re-enabled, queue them for processing.- const pendingPayouts = await prisma.payout.count({- where: {- partnerId: partner.id,- status: "sent",- mode: "internal",- },- });-- if (pendingPayouts > 0) {- const response = await queue.enqueueJSON({- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/payouts/balance-available`,- deduplicationId: event.id,- method: "POST",- body: {- stripeAccount: partner.stripeConnectId,+ // Retry payouts that got stuck when the account was restricted+ // (e.g: previously processed payouts OR payouts that were sent but paused due to verification requirements).+ // Once payouts are re-enabled, queue them for processing.+ const [previouslyProcessedPayouts, payoutsToWithdraw] = await Promise.all([+ prisma.payout.count({+ where: {+ partnerId: partner.id,+ status: "processed",+ stripeTransferId: null,},- });- return `Enqueued handle-balance-available queue for partner ${partner.stripeConnectId}: ${response.messageId}`;- }+ }),+ prisma.payout.count({+ where: {+ partnerId: partner.id,+ status: "sent",+ mode: "internal",+ },+ }),+ ]);+ console.log({ previouslyProcessedPayouts, payoutsToWithdraw });++ await Promise.allSettled([+ ...(previouslyProcessedPayouts > 0+ ? [+ stripePayoutQueue+ .enqueueJSON({+ url: `${APP_DOMAIN_WITH_NGROK}/api/cron/payouts/send-stripe-payout`,+ method: "POST",+ deduplicationId: `${event.id}-send-stripe-payout`,+ body: {+ partnerId: partner.id,+ },+ })+ .then((res) => {+ console.log(+ `Enqueued send-stripe-payout queue for partner ${partner.id}: ${res.messageId}`,+ );+ }),+ ]+ : []),+ ...(payoutsToWithdraw > 0+ ? [+ balanceAvailableQueue+ .enqueueJSON({+ url: `${APP_DOMAIN_WITH_NGROK}/api/cron/payouts/balance-available`,+ deduplicationId: `${event.id}-balance-available`,+ method: "POST",+ body: {+ stripeAccount: partner.stripeConnectId,+ },+ })+ .then((res) => {+ console.log(+ `Enqueued balance-available queue for partner ${partner.stripeConnectId}: ${res.messageId}`,+ );+ }),+ ]+ : []),+ ]);return `Updated partner ${partner.email} (${partner.stripeConnectId}) with country ${country}, payoutsEnabledAt set, payoutMethodHash ${bankAccount.fingerprint}`;}diff --git a/apps/web/lib/actions/partners/force-withdrawal.ts b/apps/web/lib/actions/partners/force-withdrawal.tsindex ba711a0af7..44363a2557 100644--- a/apps/web/lib/actions/partners/force-withdrawal.ts+++ b/apps/web/lib/actions/partners/force-withdrawal.ts@@ -1,11 +1,8 @@"use server";import { throwIfNoPermission } from "@/lib/auth/partner-users/throw-if-no-permission";-import { MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS } from "@/lib/constants/payouts";import { createStripeTransfer } from "@/lib/partners/create-stripe-transfer";import { ratelimit } from "@/lib/upstash";-import { prisma } from "@dub/prisma";-import { currencyFormatter } from "@dub/utils";import { authPartnerActionClient } from "../safe-action";// Force a withdrawal for a partner (even if the total amount is below the minimum withdrawal amount)@@ -18,13 +15,7 @@ export const forceWithdrawalAction = authPartnerActionClient.action(permission: "payout_settings.update",});- if (!partner.payoutsEnabledAt) {- throw new Error(- "You haven't enabled payouts yet. Please enable payouts in your payout settings.",- );- }-- const { success } = await ratelimit(5, "24 h").limit(+ const { success } = await ratelimit(10, "24 h").limit(`force-withdrawal:${partner.id}`,);@@ -34,47 +25,9 @@ export const forceWithdrawalAction = authPartnerActionClient.action();}- const previouslyProcessedPayouts = await prisma.payout.findMany({- where: {- partnerId: partner.id,- status: "processed",- stripeTransferId: null,- },- include: {- program: {- select: {- name: true,- },- },- },+ await createStripeTransfer({+ partnerId: partner.id,+ forceWithdrawal: true,});-- if (previouslyProcessedPayouts.length === 0) {- throw new Error(- "No previously processed payouts found. Please try again or contact support.",- );- }-- const totalProcessedAmount = previouslyProcessedPayouts.reduce(- (acc, payout) => acc + payout.amount,- 0,- );- if (totalProcessedAmount < MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS) {- throw new Error(- `Your current processed payouts balance (${currencyFormatter(totalProcessedAmount)}) is less than the minimum amount required for withdrawal (${currencyFormatter(MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS)}).`,- );- }-- try {- await createStripeTransfer({- partner,- previouslyProcessedPayouts,- forceWithdrawal: true,- });- } catch (error) {- throw new Error(- "Failed to force withdrawal. Please try again or contact support.",- );- }},);diff --git a/apps/web/lib/partners/create-stripe-transfer.ts b/apps/web/lib/partners/create-stripe-transfer.tsindex 860603151e..8f1c48a834 100644--- a/apps/web/lib/partners/create-stripe-transfer.ts+++ b/apps/web/lib/partners/create-stripe-transfer.ts@@ -1,77 +1,110 @@import {BELOW_MIN_WITHDRAWAL_FEE_CENTS,+ MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS,MIN_WITHDRAWAL_AMOUNT_CENTS,} from "@/lib/constants/payouts";import { stripe } from "@/lib/stripe";+import { sendEmail } from "@dub/email";+import PartnerPayoutProcessed from "@dub/email/templates/partner-payout-processed";import { prisma } from "@dub/prisma";-import { Partner, Payout } from "@dub/prisma/client";+import { Payout, Prisma } from "@dub/prisma/client";import { currencyFormatter, pluralize } from "@dub/utils";-type PayoutWithProgramName = Pick<Payout, "id" | "amount" | "invoiceId"> & {+export type PayoutWithProgramName = Pick<+ Payout,+ "id" | "amount" | "invoiceId"+> & {program: {name: string;};};export const createStripeTransfer = async ({- partner,- previouslyProcessedPayouts,- currentInvoicePayouts,+ partnerId,+ invoiceId,chargeId,forceWithdrawal = false,}: {- partner: Pick<Partner, "id" | "stripeConnectId">;- previouslyProcessedPayouts: PayoutWithProgramName[];- currentInvoicePayouts?: PayoutWithProgramName[];+ partnerId: string;+ invoiceId?: string;chargeId?: string;forceWithdrawal?: boolean;}) => {- // this should never happen since we guard for it outside, but just in case- if (!partner.stripeConnectId) {- console.log(`Partner ${partner.id} has no stripeConnectId, skipping...`);- return;+ const partner = await prisma.partner.findUniqueOrThrow({+ where: {+ id: partnerId,+ },+ select: {+ id: true,+ email: true,+ stripeConnectId: true,+ payoutsEnabledAt: true,+ },+ });++ // should never happen, but just in case+ if (!partner.stripeConnectId || !partner.payoutsEnabledAt) {+ throw new Error(+ `Partner ${partner.email} does not have an active payout account`,+ );}- let withdrawalFee = 0;+ const commonInclude: Prisma.PayoutInclude = {+ program: {+ select: {+ name: true,+ logo: true,+ },+ },+ };- const allPayouts = [- ...previouslyProcessedPayouts,- ...(currentInvoicePayouts ?? []),- ];+ const [previouslyProcessedPayouts, currentInvoicePayouts] = await Promise.all(+ [+ prisma.payout.findMany({+ where: {+ partnerId: partner.id,+ status: "processed",+ stripeTransferId: null,+ },+ include: commonInclude,+ }),+ prisma.payout.findMany({+ where: {+ partnerId: partner.id,+ invoiceId,+ status: "processing",+ },+ include: commonInclude,+ }),+ ],+ );++ const allPayouts = [...previouslyProcessedPayouts, ...currentInvoicePayouts];// this should never happen but just in caseif (allPayouts.length === 0) {- console.log(`No payouts found for partner ${partner.id}, skipping...`);+ console.log(+ `No available payouts found for partner ${partner.email}, skipping...`,+ );return;}- // will be used for transfer_group and idempotencyKey- const finalPayoutInvoiceId = allPayouts[allPayouts.length - 1].invoiceId;-// total transferable amount is the sum of all previously processed payouts (but not sent yet) and the current invoice payoutsconst totalTransferableAmount = allPayouts.reduce((acc, payout) => acc + payout.amount,0,);+ let withdrawalFee = 0;+// If the total transferable amount is less than the minimum withdrawal amountif (totalTransferableAmount < MIN_WITHDRAWAL_AMOUNT_CENTS) {- // if we're not forcing a withdrawal- if (!forceWithdrawal) {- // we need to update current invoice payouts to "processed" status- if (currentInvoicePayouts) {- await prisma.payout.updateMany({- where: {- id: {- in: currentInvoicePayouts.map((p) => p.id),- },- },- data: {- status: "processed",- paidAt: new Date(),- },- });- }+ // if we're forcing a withdrawal, we need to charge a withdrawal fee+ if (forceWithdrawal) {+ withdrawalFee = BELOW_MIN_WITHDRAWAL_FEE_CENTS;+ // else, we will just update current invoice payouts to "processed" status+ } else {+ await updateCurrentInvoicePayoutsToProcessed(currentInvoicePayouts);console.log(`Total processed payouts (${currencyFormatter(totalTransferableAmount)}) for partner ${partner.id} are below ${currencyFormatter(MIN_WITHDRAWAL_AMOUNT_CENTS)}, skipping...`,@@ -80,26 +113,50 @@ export const createStripeTransfer = async ({// skip creating a transferreturn;}-- // else, if we're forcing a withdrawal, we need to charge a withdrawal fee- withdrawalFee = BELOW_MIN_WITHDRAWAL_FEE_CENTS;}// Minus the withdrawal fee from the total amountconst finalTransferableAmount = totalTransferableAmount - withdrawalFee;- if (finalTransferableAmount <= 0) {- console.log(- `Final transferable amount after deducting withdrawal fee (${currencyFormatter(finalTransferableAmount)}) is less than or equal to 0, skipping...`,+ 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)})`,);-- return;}- const allPayoutsPrograms = [+ const allPayoutsProgramNames = [...new Set(allPayouts.map((p) => p.program.name)), // deduplicate program names];+ const stripeConnectAccount = await stripe.accounts.retrieve(+ partner.stripeConnectId,+ );++ if (+ !stripeConnectAccount.payouts_enabled ||+ !stripeConnectAccount.capabilities?.transfers ||+ stripeConnectAccount.capabilities.transfers === "inactive"+ ) {+ await prisma.partner.update({+ where: {+ id: partner.id,+ },+ data: {+ payoutsEnabledAt: null,+ },+ });+ console.log(`Updated partner ${partner.email} with payoutsEnabledAt null`);++ await updateCurrentInvoicePayoutsToProcessed(currentInvoicePayouts);++ throw new Error(+ `Partner's Stripe Express account (${partner.stripeConnectId}) is not configured to receive transfers`,+ );+ }++ // will be used for transfer_group and idempotencyKey+ const finalPayoutInvoiceId = allPayouts[allPayouts.length - 1].invoiceId;+// Create a transfer for the partner combined payouts and update it as sentconst transfer = await stripe.transfers.create({@@ -109,7 +166,7 @@ export const createStripeTransfer = async ({// (even though the transfer could technically include payouts from multiple invoices)transfer_group: finalPayoutInvoiceId!,destination: partner.stripeConnectId,- description: `Dub Partners payout ${pluralize("transfer", allPayoutsPrograms.length)} (${allPayoutsPrograms.join(", ")})`,+ description: `Dub Partners payout transfer (${allPayoutsProgramNames.join(", ")})`,// Omit `source_transaction` if prior processed payouts exist to ensure this transfer// never exceeds the original charge amount....(previouslyProcessedPayouts.length === 0 &&@@ -154,4 +211,44 @@ export const createStripeTransfer = async ({},}),]);++ if (partner.email && currentInvoicePayouts.length > 0) {+ const payout = currentInvoicePayouts[0];+ const emailRes = await sendEmail({+ variant: "notifications",+ to: partner.email,+ subject: `You've received a ${currencyFormatter(payout.amount)} payout from ${payout.program.name}`,+ react: PartnerPayoutProcessed({+ email: partner.email,+ program: payout.program,+ payout,+ variant: "stripe",+ }),+ });++ console.log(`Resend email sent: ${JSON.stringify(emailRes, null, 2)}`);+ }++ return transfer;+};++const updateCurrentInvoicePayoutsToProcessed = async (+ currentInvoicePayouts: Pick<Payout, "id">[],+) => {+ if (currentInvoicePayouts.length > 0) {+ const res = await prisma.payout.updateMany({+ where: {+ id: {+ in: currentInvoicePayouts.map((p) => p.id),+ },+ },+ data: {+ status: "processed",+ paidAt: new Date(),+ },+ });+ console.log(+ `Updated ${res.count} payouts in current invoice to "processed" status`,+ );+ }};diff --git a/apps/web/scripts/stripe/fix-processed-payouts.ts b/apps/web/scripts/stripe/fix-processed-payouts.tsindex 92c168d25a..8f2e4c66e4 100644--- a/apps/web/scripts/stripe/fix-processed-payouts.ts+++ b/apps/web/scripts/stripe/fix-processed-payouts.ts@@ -1,86 +1,47 @@-import { MIN_WITHDRAWAL_AMOUNT_CENTS } from "@/lib/constants/payouts";import { prisma } from "@dub/prisma";-import { currencyFormatter } from "@dub/utils";import "dotenv-flow/config";-import { createStripeTransfer } from "../../lib/partners/create-stripe-transfer";+import { stripeConnectClient } from "./connect-client";async function main() {- const partnersWithProcessedPayouts = await prisma.payout- .groupBy({- by: ["partnerId"],- where: {- status: "processed",- stripeTransferId: null,- },- _sum: {- amount: true,- },- orderBy: {- _sum: {- amount: "desc",+ const partnersWithProcessingPayouts = await prisma.partner.findMany({+ where: {+ payouts: {+ some: {+ status: "processing",+ stripeTransferId: null,+ invoice: {+ status: "completed",+ },},},- // filter out sum amount below 1000- })- .then((result) => {- return result.filter(- (partner) =>- partner._sum.amount &&- partner._sum.amount >= MIN_WITHDRAWAL_AMOUNT_CENTS,- );- });+ },+ });console.log(- `Found ${partnersWithProcessedPayouts.length} partners with processed payouts`,+ `Found ${partnersWithProcessingPayouts.length} partners with processing payouts`,);- console.log(- `Total amount: ${currencyFormatter(partnersWithProcessedPayouts.reduce((acc, partner) => acc + (partner._sum.amount ?? 0), 0))}`,- );- console.table(partnersWithProcessedPayouts.slice(0, 10));- const processedPayouts = await prisma.payout.findMany({- where: {- status: "processed",- stripeTransferId: null,- partnerId: {- in: partnersWithProcessedPayouts.map((partner) => partner.partnerId),- },- },- include: {- partner: {- select: {- id: true,- email: true,- stripeConnectId: true,- },- },- program: {- select: {- name: true,- },- },- },- });+ const results = await Promise.all(+ partnersWithProcessingPayouts.map(async (partner) => {+ try {+ const stripeConnectAccount =+ await stripeConnectClient.accounts.retrieve(partner.stripeConnectId!);+ return {+ partnerId: partner.id,+ email: partner.email,+ stripeConnectId: partner.stripeConnectId,+ payoutsEnabledAt: partner.payoutsEnabledAt,+ actualPayoutsEnabled: stripeConnectAccount.payouts_enabled,+ transfersEnabled: stripeConnectAccount.capabilities?.transfers,+ transfersEnabledStatus: stripeConnectAccount.capabilities?.transfers,+ };+ } catch (error) {+ return null;+ }+ }),+ );- for (const partner of partnersWithProcessedPayouts) {- const previouslyProcessedPayouts = processedPayouts.filter(- (p) => p.partner.id === partner.partnerId,- );- if (previouslyProcessedPayouts.length === 0) {- // shouldn't happen but just in case- console.log(- `No previously processed payouts found for partner ${partner.partnerId}, skipping...`,- );- continue;- }- console.log(- `Creating stripe transfer for partner ${previouslyProcessedPayouts[0].partner.email} with ${previouslyProcessedPayouts.length} payouts (total amount: ${currencyFormatter(previouslyProcessedPayouts.reduce((acc, p) => acc + p.amount, 0))})`,- );- await createStripeTransfer({- partner: previouslyProcessedPayouts[0].partner,- previouslyProcessedPayouts,- });- }+ console.table(results.filter((result) => result !== null));}main();