Improve merge-partners flow (dubinc#3584)

Author: steven-tey

apps/web/app/(ee)/api/admin/delete-partner-account/route.ts

@@ -1,4 +1,5 @@
 import { withAdmin } from "@/lib/auth";
+import { conn } from "@/lib/planetscale";
 import { stripe } from "@/lib/stripe";
 import { recordLink } from "@/lib/tinybird";
 import { prisma } from "@dub/prisma";
@@ -115,14 +116,22 @@ export const POST = withAdmin(async ({ req }) => {
           );
         }
       }
+
+      await prisma.programEnrollment.deleteMany({
+        where: {
+          partnerId: partner.id,
+          programId: {
+            in: partner.programs.map(({ program }) => program.id),
+          },
+        },
+      });
+      console.log(
+        `Deleted ${partner.programs.length} program enrollments for partner ${partner.email} (${partner.id})`,
+      );
     }
 
-    const deletedPartner = await prisma.partner.delete({
-      where: {
-        id: partner.id,
-      },
-    });
-    console.log("Deleted partner", deletedPartner);
+    await conn.execute(`DELETE FROM Partner WHERE id = ?`, [partner.id]);
+    console.log(`Deleted partner ${partner.email} (${partner.id})`);
   }
 
   return NextResponse.json({ success: true });

apps/web/app/(ee)/api/cron/partners/merge-accounts/route.ts

@@ -5,13 +5,14 @@ import { includeProgramEnrollment } from "@/lib/api/links/include-program-enroll
 import { includeTags } from "@/lib/api/links/include-tags";
 import { syncTotalCommissions } from "@/lib/api/partners/sync-total-commissions";
 import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
+import { conn } from "@/lib/planetscale";
 import { storage } from "@/lib/storage";
 import { recordLink } from "@/lib/tinybird";
 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, prettyPrint, R2_URL, toCentsNumber } from "@dub/utils";
+import { log, prettyPrint, R2_URL } from "@dub/utils";
 import * as z from "zod/v4";
 
 export const dynamic = "force-dynamic";
@@ -60,10 +61,12 @@ export async function POST(req: Request) {
       select: {
         id: true,
         email: true,
+        image: true,
         payoutMethodHash: true,
         programs: {
           select: {
             programId: true,
+            tenantId: true,
           },
         },
         users: {
@@ -99,6 +102,12 @@ export async function POST(req: Request) {
       );
     }
 
+    if (sourceAccount.id === targetAccount.id) {
+      return new Response(
+        `Source and target partner accounts must be different. Source account: ${sourceAccount.email} (${sourceAccount.id}), Target account: ${targetAccount.email} (${targetAccount.id})`,
+      );
+    }
+
     const {
       id: sourcePartnerId,
       users: sourcePartnerUsers,
@@ -164,18 +173,20 @@ export async function POST(req: Request) {
         `Updated ${updatedLinksRes.count} links, ${updatedCustomersRes.count} customers, ${updatedCommissionsRes.count} commissions, and ${updatedPayoutsRes.count} payouts`,
       );
 
-      // update notification emails, messages, and partner comments
+      // update discount codes, notification emails, messages, and partner comments
       const [
+        updatedDiscountCodesRes,
         updatedNotificationEmailsRes,
         updatedMessagesRes,
         updatedPartnerCommentsRes,
       ] = await Promise.all([
+        prisma.discountCode.updateMany(updateManyPayload),
         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`,
+        `Updated ${updatedDiscountCodesRes.count} discount codes, ${updatedNotificationEmailsRes.count} notification emails, ${updatedMessagesRes.count} messages, and ${updatedPartnerCommentsRes.count} partner comments`,
       );
 
       const updatedLinks = await prisma.link.findMany({
@@ -240,6 +251,50 @@ export async function POST(req: Request) {
       console.log(prettyPrint(res));
     }
 
+    const existingEnrollments = sourcePartnerEnrollments.filter(
+      ({ programId }) =>
+        targetPartnerEnrollments.some(
+          ({ programId: targetProgramId }) => programId === targetProgramId,
+        ),
+    );
+
+    if (existingEnrollments.length > 0) {
+      for (const sourceEnrollment of existingEnrollments) {
+        const targetEnrollment = targetPartnerEnrollments.find(
+          ({ programId }) => programId === sourceEnrollment.programId,
+        );
+        await prisma.$transaction(async (tx) => {
+          // delete old source enrollment
+          await tx.programEnrollment.delete({
+            where: {
+              partnerId_programId: {
+                partnerId: sourcePartnerId,
+                programId: sourceEnrollment.programId,
+              },
+            },
+          });
+
+          // update target enrollment with source enrollment's tenantId if target enrollment does not have a tenantId
+          if (sourceEnrollment.tenantId && !targetEnrollment?.tenantId) {
+            await tx.programEnrollment.update({
+              where: {
+                partnerId_programId: {
+                  partnerId: targetPartnerId,
+                  programId: sourceEnrollment.programId,
+                },
+              },
+              data: {
+                tenantId: sourceEnrollment.tenantId,
+              },
+            });
+          }
+        });
+        console.log(
+          `Deleted old source enrollment for program ${sourceEnrollment.programId}.${sourceEnrollment.tenantId ? ` Since there was a tenantId, we updated the target enrollment with the same tenantId: ${sourceEnrollment.tenantId}` : ""}`,
+        );
+      }
+    }
+
     // 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({
@@ -248,43 +303,6 @@ export async function POST(req: Request) {
         },
       });
       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: toCentsNumber(res._sum.totalSaleAmount ?? 0),
-          totalEarnings: toCentsNumber(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
@@ -327,18 +345,14 @@ export async function POST(req: Request) {
 
     try {
       // Finally, delete the partner account
-      const deletedPartner = await prisma.partner.delete({
-        where: {
-          id: sourcePartnerId,
-        },
-      });
+      await conn.execute(`DELETE FROM Partner WHERE id = ?`, [sourcePartnerId]);
       console.log(
-        `Deleted partner ${deletedPartner.email} (${deletedPartner.id})`,
+        `Deleted partner ${sourceAccount.email} (${sourceAccount.id})`,
       );
 
-      if (deletedPartner.image) {
+      if (sourceAccount.image) {
         await storage.delete({
-          key: deletedPartner.image.replace(`${R2_URL}/`, ""),
+          key: sourceAccount.image.replace(`${R2_URL}/`, ""),
         });
       }
     } catch (error) {