The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Release hold commissions when duplicate partner accounts are merged
Cursor Agent2054cb9d29d4
diff --git a/apps/web/app/(ee)/api/workflows/merge-partner-accounts/route.ts b/apps/web/app/(ee)/api/workflows/merge-partner-accounts/route.tsindex 18c523c59e..6c76809fc2 100644--- a/apps/web/app/(ee)/api/workflows/merge-partner-accounts/route.ts+++ b/apps/web/app/(ee)/api/workflows/merge-partner-accounts/route.ts@@ -44,7 +44,8 @@ const CACHE_KEY_PREFIX = "merge-partner-accounts";* 3. finalize-transfers: transfer bounty submissions + sync transferred links* (Tinybird/cache) and total commissions.* 4. cleanup-source-account: delete the source partner's rewinds, source user,- * duplicate-account fraud events, and finally the source partner itself.+ * duplicate-account fraud events (resolving groups + releasing any hold+ * commissions), and finally the source partner itself.* 5. send-merged-emails: clear the verification cache + notify both accounts.*/@@ -139,9 +140,11 @@ export const { POST } = serve<Input>(logs.push(outputLog);}- // Clean up duplicate-account fraud events + resolve their groups+ // Clean up duplicate-account fraud events + resolve their groups,+ // releasing any commissions that were held for that risk.const { outputLog: fraudLog } = await cleanupFraudEvents({sourcePartnerId,+ targetPartnerId,});logs.push(fraudLog);@@ -932,8 +935,10 @@ async function deleteSourceUser({ sourceUserId }: { sourceUserId: string }) {async function cleanupFraudEvents({sourcePartnerId,+ targetPartnerId,}: {sourcePartnerId: string;+ targetPartnerId: string;}) {const fraudEventsToDelete = await prisma.fraudEvent.findMany({where: {@@ -991,7 +996,13 @@ async function cleanupFraudEvents({type: FraudRuleType.partnerDuplicateAccount,},resolutionReason:- "Automatically resolved because partners with duplicate payout methods were merged. No other partners share this payout method.",+ "Automatically resolved because the duplicate partner accounts were merged.",+ // Commissions may have been held for the duplicate-account risk; release+ // them now that the merge resolved those fraud groups. By this point+ // commissions have already been transferred to the target partner, so+ // release against the surviving account.+ releaseHoldCommissions: true,+ releasePartnerId: targetPartnerId,});return logAndReturn({diff --git a/apps/web/lib/api/fraud/release-hold-commissions.ts b/apps/web/lib/api/fraud/release-hold-commissions.tsindex 163a884a65..b9dda77c83 100644--- a/apps/web/lib/api/fraud/release-hold-commissions.ts+++ b/apps/web/lib/api/fraud/release-hold-commissions.ts@@ -249,7 +249,16 @@ export async function releaseHoldCommissions({// Groups resolved/expired fraud groups by program+partner and enqueues a cron// job per pair so releaseHoldCommissions runs asynchronously via QStash.-export async function queueReleaseHoldCommissions(riskGroupIds: string[]) {+export async function queueReleaseHoldCommissions(+ riskGroupIds: string[],+ {+ releasePartnerId,+ }: {+ // Override the partner whose hold commissions should be released. Used when+ // commissions have already moved to a different partner (e.g. account merge).+ releasePartnerId?: string;+ } = {},+) {if (riskGroupIds.length === 0) {return 0;}@@ -280,7 +289,8 @@ export async function queueReleaseHoldCommissions(riskGroupIds: string[]) {>();for (const riskGroup of riskGroups) {- const key = `${riskGroup.programId}:${riskGroup.partnerId}`;+ const partnerId = releasePartnerId ?? riskGroup.partnerId;+ const key = `${riskGroup.programId}:${partnerId}`;const existing = pairs.get(key);if (existing) {@@ -288,7 +298,7 @@ export async function queueReleaseHoldCommissions(riskGroupIds: string[]) {} else {pairs.set(key, {programId: riskGroup.programId,- partnerId: riskGroup.partnerId,+ partnerId,resolvedGroupIds: [riskGroup.id],});}diff --git a/apps/web/lib/api/fraud/resolve-fraud-groups.ts b/apps/web/lib/api/fraud/resolve-fraud-groups.tsindex f3014d4387..b532aea027 100644--- a/apps/web/lib/api/fraud/resolve-fraud-groups.ts+++ b/apps/web/lib/api/fraud/resolve-fraud-groups.ts@@ -8,11 +8,16 @@ export async function resolveFraudGroups({userId,resolutionReason,releaseHoldCommissions = false,+ // When set, hold-commission release jobs run against this partner instead of+ // each group's partnerId. Used by account merges where commissions have+ // already been transferred to the surviving partner.+ releasePartnerId,}: {where: Prisma.FraudEventGroupWhereInput;userId?: string;resolutionReason?: string;releaseHoldCommissions?: boolean;+ releasePartnerId?: string;}) {const riskGroups = await prisma.fraudEventGroup.findMany({where: {@@ -48,7 +53,7 @@ export async function resolveFraudGroups({console.info(`Resolved ${count} fraud event groups ${prettyPrint(where)}`);if (releaseHoldCommissions && count > 0) {- await queueReleaseHoldCommissions(riskGroupIds);+ await queueReleaseHoldCommissions(riskGroupIds, { releasePartnerId });}return count;