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.

improve merge partner account

Steven Tey326b5c71d346
diff --git a/apps/web/app/(ee)/api/cron/merge-partner-accounts/route.ts b/apps/web/app/(ee)/api/cron/merge-partner-accounts/route.ts
index 34ee705f6a..e078e04ced 100644
--- a/apps/web/app/(ee)/api/cron/merge-partner-accounts/route.ts
+++ b/apps/web/app/(ee)/api/cron/merge-partner-accounts/route.ts
@@ -11,7 +11,7 @@ import { redis } from "@/lib/upstash";
import { sendBatchEmail } from "@dub/email";
import PartnerAccountMerged from "@dub/email/templates/partner-account-merged";
import { prisma } from "@dub/prisma";
-import { log, R2_URL } from "@dub/utils";
+import { log, prettyPrint, R2_URL } from "@dub/utils";
import { z } from "zod";
export const dynamic = "force-dynamic";
@@ -71,6 +71,7 @@ export async function POST(req: Request) {
userId: true,
},
},
+ partnerRewinds: true,
},
});
@@ -148,18 +149,29 @@ export async function POST(req: Request) {
// update links, commissions, bounty submissions, and payouts
if (programIdsToTransfer.length > 0) {
- await Promise.all([
- prisma.link.updateMany(updateManyPayload),
- prisma.commission.updateMany(updateManyPayload),
- prisma.payout.updateMany(updateManyPayload),
- ]);
+ const [updatedLinksRes, updatedCommissionsRes, updatedPayoutsRes] =
+ await Promise.all([
+ prisma.link.updateMany(updateManyPayload),
+ prisma.commission.updateMany(updateManyPayload),
+ prisma.payout.updateMany(updateManyPayload),
+ ]);
+ console.log(
+ `Updated ${updatedLinksRes.count} links, ${updatedCommissionsRes.count} commissions, and ${updatedPayoutsRes.count} payouts`,
+ );
// update notification emails, messages, and partner comments
- await Promise.all([
+ const [
+ updatedNotificationEmailsRes,
+ updatedMessagesRes,
+ updatedPartnerCommentsRes,
+ ] = await Promise.all([
prisma.notificationEmail.updateMany(updateManyPayload),
prisma.message.updateMany(updateManyPayload),
prisma.partnerComment.updateMany(updateManyPayload),
]);
+ console.log(
+ `Updated ${updatedNotificationEmailsRes.count} notification emails, ${updatedMessagesRes.count} messages, and ${updatedPartnerCommentsRes.count} partner comments`,
+ );
const updatedLinks = await prisma.link.findMany({
where: {
@@ -201,7 +213,7 @@ export async function POST(req: Request) {
);
}
- await Promise.allSettled([
+ const res = await Promise.allSettled([
// update link metadata in Tinybird
recordLink(updatedLinks),
// expire link cache in Redis
@@ -211,9 +223,58 @@ export async function POST(req: Request) {
syncTotalCommissions({
partnerId: targetPartnerId,
programId,
+ mode: "direct",
}),
),
]);
+ console.log(prettyPrint(res));
+ }
+
+ // If source account has rewind, need to delete and recalculate for the target account
+ if (sourceAccount.partnerRewinds.length > 0) {
+ const deletedRewinds = await prisma.partnerRewind.deleteMany({
+ where: {
+ partnerId: sourcePartnerId,
+ },
+ });
+ console.log(`Deleted ${deletedRewinds.count} partner rewinds`);
+
+ const rewindStats = await prisma.programEnrollment
+ .aggregate({
+ where: {
+ partnerId: targetPartnerId,
+ },
+ _sum: {
+ totalClicks: true,
+ totalLeads: true,
+ totalSaleAmount: true,
+ totalCommissions: true,
+ },
+ })
+ .then((res) => ({
+ totalClicks: res._sum.totalClicks ?? 0,
+ totalLeads: res._sum.totalLeads ?? 0,
+ totalRevenue: res._sum.totalSaleAmount ?? 0,
+ totalEarnings: res._sum.totalCommissions ?? 0,
+ }));
+
+ await prisma.partnerRewind.upsert({
+ where: {
+ partnerId_year: {
+ partnerId: targetPartnerId,
+ year: 2025,
+ },
+ },
+ update: rewindStats,
+ create: {
+ partnerId: targetPartnerId,
+ year: 2025,
+ ...rewindStats,
+ },
+ });
+ console.log(
+ `Upserted partner rewind for ${targetPartnerId} in 2025: ${prettyPrint(rewindStats)}`,
+ );
}
// Remove the user if there are no workspaces left
@@ -234,10 +295,12 @@ export async function POST(req: Request) {
id: sourcePartnerUser.userId,
},
select: {
- image: true,
+ id: true,
email: true,
+ image: true,
},
});
+ console.log(`Deleted user ${deletedUser.email} (${deletedUser.id})`);
if (deletedUser.image) {
await storage.delete({
@@ -259,6 +322,9 @@ export async function POST(req: Request) {
id: sourcePartnerId,
},
});
+ console.log(
+ `Deleted partner ${deletedPartner.email} (${deletedPartner.id})`,
+ );
if (deletedPartner.image) {
await storage.delete({
@@ -296,7 +362,7 @@ export async function POST(req: Request) {
// Make sure the cache is cleared
await redis.del(`${CACHE_KEY_PREFIX}:${userId}`);
- await sendBatchEmail(
+ const resendBatchEmailRes = await sendBatchEmail(
[
{
variant: "notifications",
@@ -323,6 +389,7 @@ export async function POST(req: Request) {
idempotencyKey: `merge-partner-accounts/${userId}`,
},
);
+ console.log(prettyPrint(resendBatchEmailRes));
return new Response(
`Partner account ${sourceEmail} merged into ${targetEmail}.`,
diff --git a/apps/web/lib/api/partners/sync-total-commissions.ts b/apps/web/lib/api/partners/sync-total-commissions.ts
index b1da7719c8..efa08f63cc 100644
--- a/apps/web/lib/api/partners/sync-total-commissions.ts
+++ b/apps/web/lib/api/partners/sync-total-commissions.ts
@@ -1,14 +1,51 @@
import { publishPartnerActivityEvent } from "@/lib/upstash/redis-streams";
import { prisma } from "@dub/prisma";
+async function aggregateAndUpdateTotalCommissions({
+ partnerId,
+ programId,
+}: {
+ partnerId: string;
+ programId: string;
+}) {
+ return await prisma.$transaction(async (tx) => {
+ const totalCommissions = await tx.commission.aggregate({
+ where: {
+ earnings: { not: 0 },
+ programId,
+ partnerId,
+ status: { in: ["pending", "processed", "paid"] },
+ },
+ _sum: { earnings: true },
+ });
+ console.log(
+ `Updating total commissions for partner ${partnerId} in program ${programId} to ${totalCommissions._sum.earnings || 0}`,
+ );
+
+ return await tx.programEnrollment.update({
+ where: {
+ partnerId_programId: { partnerId, programId },
+ },
+ data: {
+ totalCommissions: totalCommissions._sum.earnings || 0,
+ },
+ });
+ });
+}
+
// syncs the total commissions for a partner in a program
export const syncTotalCommissions = async ({
partnerId,
programId,
+ mode = "queue",
}: {
partnerId: string;
programId: string;
+ mode?: "queue" | "direct";
}) => {
+ if (mode === "direct") {
+ return await aggregateAndUpdateTotalCommissions({ partnerId, programId });
+ }
try {
return await publishPartnerActivityEvent({
programId,
@@ -22,29 +59,6 @@ export const syncTotalCommissions = async ({
error,
);
- return await prisma.$transaction(async (tx) => {
- const totalCommissions = await tx.commission.aggregate({
- where: {
- earnings: { not: 0 },
- programId,
- partnerId,
- status: { in: ["pending", "processed", "paid"] },
- },
- _sum: { earnings: true },
- });
-
- console.log(
- `Updating total commissions for partner ${partnerId} in program ${programId} to ${totalCommissions._sum.earnings || 0}`,
- );
-
- return await tx.programEnrollment.update({
- where: {
- partnerId_programId: { partnerId, programId },
- },
- data: {
- totalCommissions: totalCommissions._sum.earnings || 0,
- },
- });
- });
+ return await aggregateAndUpdateTotalCommissions({ partnerId, programId });
}
};