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.

Remove partner users before raw partner deletes

Rafic9b604282c54
diff --git a/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts b/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts
index b3d91aeb85..a16f20bddd 100644
--- a/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts
+++ b/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts
@@ -1,4 +1,5 @@
import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
+import { deletePartnerUsers } from "@/lib/api/partners/delete-partner-users";
import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
import { withAdmin } from "@/lib/auth";
import { conn } from "@/lib/planetscale";
@@ -141,6 +142,8 @@ export const POST = withAdmin(
});
}
+ await deletePartnerUsers({ partnerIds: [partner.id] });
+
await conn.execute(`DELETE FROM Partner WHERE id = ?`, [partner.id]);
console.log(`Deleted partner ${partner.email} (${partner.id})`);
}
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.ts
index db341dd170..085f2fc617 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
@@ -2,6 +2,7 @@ import { resolveFraudGroups } from "@/lib/api/fraud/resolve-fraud-groups";
import { linkCache } from "@/lib/api/links/cache";
import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
import { includeTags } from "@/lib/api/links/include-tags";
+import { deletePartnerUsers } from "@/lib/api/partners/delete-partner-users";
import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
import { syncTotalCommissions } from "@/lib/api/partners/sync-total-commissions";
import { logger } from "@/lib/axiom/server";
@@ -1122,6 +1123,10 @@ async function deleteSourcePartner({
sourceEmail: string;
sourceImage: string | null;
}) {
+ // The source user is kept when it still has workspaces, so its PartnerUser
+ // row has to be removed here.
+ await deletePartnerUsers({ partnerIds: [sourcePartnerId] });
+
await conn.execute(`DELETE FROM Partner WHERE id = ?`, [sourcePartnerId]);
if (sourceImage) {
diff --git a/apps/web/lib/api/partners/bulk-delete-partners.ts b/apps/web/lib/api/partners/bulk-delete-partners.ts
index ed99edf201..160aa0c6be 100644
--- a/apps/web/lib/api/partners/bulk-delete-partners.ts
+++ b/apps/web/lib/api/partners/bulk-delete-partners.ts
@@ -2,6 +2,7 @@ import { conn } from "@/lib/planetscale";
import { prisma } from "@/lib/prisma";
import { ACME_PROGRAM_ID } from "@dub/utils";
import { bulkDeleteLinks } from "../links/bulk-delete-links";
+import { deletePartnerUsers } from "./delete-partner-users";
import { queuePartnerSearchSync } from "./queue-partner-search-sync";
const BATCH_SIZE = 250;
@@ -193,6 +194,8 @@ export async function bulkDeletePartners({
},
});
+ await deletePartnerUsers({ partnerIds });
+
// using conn.execute here since Prisma is throwing a weird error
const res = await conn.execute(
`DELETE FROM Partner WHERE id IN (${partnerIds.map(() => "?").join(",")})`,
diff --git a/apps/web/scripts/partners/delete-partner-profile.ts b/apps/web/scripts/partners/delete-partner-profile.ts
index eeb2fcabb4..a20e071061 100644
--- a/apps/web/scripts/partners/delete-partner-profile.ts
+++ b/apps/web/scripts/partners/delete-partner-profile.ts
@@ -1,4 +1,5 @@
import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
+import { deletePartnerUsers } from "@/lib/api/partners/delete-partner-users";
import { prisma } from "@/lib/prisma";
import "dotenv-flow/config";
import { conn } from "../../lib/planetscale";
@@ -95,12 +96,7 @@ async function main() {
});
console.log(`Deleted ${deletedProgramEnrollments.count} program enrollments`);
- const deletedPartnerUsers = await prisma.partnerUser.deleteMany({
- where: {
- partnerId: partner.id,
- },
- });
- console.log(`Deleted ${deletedPartnerUsers.count} partner users`);
+ await deletePartnerUsers({ partnerIds: [partner.id] });
// using conn.execute here since Prisma is throwing a weird error
const res = await conn.execute(`DELETE FROM Partner WHERE id = ?`, [