The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Combine partner user cleanup and partner delete in deletePartnerAccounts
Rafifa011fa81380
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.tsindex a16f20bddd..170d3a6672 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,8 +1,7 @@import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";-import { deletePartnerUsers } from "@/lib/api/partners/delete-partner-users";+import { deletePartnerAccounts } from "@/lib/api/partners/delete-partner-accounts";import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";import { withAdmin } from "@/lib/auth";-import { conn } from "@/lib/planetscale";import { prisma } from "@/lib/prisma";import { stripe } from "@/lib/stripe";import { prettyPrint } from "@dub/utils";@@ -142,9 +141,7 @@ export const POST = withAdmin(});}- await deletePartnerUsers({ partnerIds: [partner.id] });-- await conn.execute(`DELETE FROM Partner WHERE id = ?`, [partner.id]);+ await deletePartnerAccounts({ partnerIds: [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.tsindex 085f2fc617..475cfaf5b5 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,12 +2,11 @@ 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 { deletePartnerAccounts } from "@/lib/api/partners/delete-partner-accounts";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";import { PRISMA_UPDATEMANY_LIMIT } from "@/lib/cron";-import { conn } from "@/lib/planetscale";import { prisma } from "@/lib/prisma";import { approveLinkedApplication } from "@/lib/program-applications/approve-linked-application";import { storage } from "@/lib/storage";@@ -1123,11 +1122,9 @@ 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]);+ // Also removes the PartnerUser row of a source user that was kept because it+ // still has workspaces.+ await deletePartnerAccounts({ partnerIds: [sourcePartnerId] });if (sourceImage) {try {diff --git a/apps/web/lib/api/partners/bulk-delete-partners.ts b/apps/web/lib/api/partners/bulk-delete-partners.tsindex 160aa0c6be..c36d6a02d4 100644--- a/apps/web/lib/api/partners/bulk-delete-partners.ts+++ b/apps/web/lib/api/partners/bulk-delete-partners.ts@@ -1,8 +1,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 { deletePartnerAccounts } from "./delete-partner-accounts";import { queuePartnerSearchSync } from "./queue-partner-search-sync";const BATCH_SIZE = 250;@@ -194,16 +193,7 @@ 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(",")})`,- partnerIds,- );- console.log(JSON.stringify(res, null, 2));-- console.log(`Deleted ${partnerIds.length} partners`);+ await deletePartnerAccounts({ partnerIds });// Queue an index update because deleting the partners cascades to their// remaining enrollments in other programs.diff --git a/apps/web/lib/api/partners/delete-partner-accounts.ts b/apps/web/lib/api/partners/delete-partner-accounts.tsnew file mode 100644index 0000000000..b488dce320--- /dev/null+++ b/apps/web/lib/api/partners/delete-partner-accounts.ts@@ -0,0 +1,81 @@+import { prisma } from "@/lib/prisma";+import { Prisma } from "@prisma/client";++// Delete partners with a raw query, since Prisma's partner.delete() throws for+// this model. A raw delete skips Prisma's emulated cascades, so this also+// removes the partner users in the same transaction. Without that, the+// PartnerUser rows and each user's defaultPartnerId keep pointing at the+// deleted partner, and every /api/partner-profile request for them fails.+export async function deletePartnerAccounts({+ partnerIds,+}: {+ partnerIds: string[];+}) {+ if (partnerIds.length === 0) {+ return 0;+ }++ const partnerUsers = await prisma.partnerUser.findMany({+ where: {+ partnerId: {+ in: partnerIds,+ },+ },+ select: {+ id: true,+ userId: true,+ },+ });++ const partnerUserIds = partnerUsers.map(({ id }) => id);++ const deletePartnerUsers =+ partnerUsers.length > 0+ ? [+ prisma.partnerNotificationPreferences.deleteMany({+ where: {+ partnerUserId: {+ in: partnerUserIds,+ },+ },+ }),++ prisma.partnerUser.deleteMany({+ where: {+ id: {+ in: partnerUserIds,+ },+ },+ }),++ // User has no index on defaultPartnerId, so narrow the update by user ID.+ // With it cleared, getDefaultPartnerId() falls back to another partner.+ prisma.user.updateMany({+ where: {+ id: {+ in: partnerUsers.map(({ userId }) => userId),+ },+ defaultPartnerId: {+ in: partnerIds,+ },+ },+ data: {+ defaultPartnerId: null,+ },+ }),+ ]+ : [];++ const results = await prisma.$transaction([+ ...deletePartnerUsers,+ prisma.$executeRaw`DELETE FROM Partner WHERE id IN (${Prisma.join(partnerIds)})`,+ ]);++ const deletedPartners = results[results.length - 1] as number;++ console.log(+ `Deleted ${deletedPartners} partners and ${partnerUserIds.length} partner users`,+ );++ return deletedPartners;+}diff --git a/apps/web/lib/api/partners/delete-partner-users.ts b/apps/web/lib/api/partners/delete-partner-users.tsdeleted file mode 100644index 7b266ac4d6..0000000000--- a/apps/web/lib/api/partners/delete-partner-users.ts+++ /dev/null@@ -1,71 +0,0 @@-import { prisma } from "@/lib/prisma";--// Remove the users of partners that are about to be hard-deleted.-// A raw `DELETE FROM Partner` skips Prisma's emulated cascades, so without this-// the PartnerUser rows and each user's defaultPartnerId keep pointing at the-// deleted partner, and every /api/partner-profile request for them fails.-export async function deletePartnerUsers({- partnerIds,-}: {- partnerIds: string[];-}) {- if (partnerIds.length === 0) {- return;- }-- const partnerUsers = await prisma.partnerUser.findMany({- where: {- partnerId: {- in: partnerIds,- },- },- select: {- id: true,- userId: true,- },- });-- if (partnerUsers.length === 0) {- return;- }-- const partnerUserIds = partnerUsers.map(({ id }) => id);-- // User has no index on defaultPartnerId, so narrow the update by user ID.- // With it cleared, getDefaultPartnerId() falls back to another partner.- await prisma.$transaction([- prisma.partnerNotificationPreferences.deleteMany({- where: {- partnerUserId: {- in: partnerUserIds,- },- },- }),-- prisma.partnerUser.deleteMany({- where: {- id: {- in: partnerUserIds,- },- },- }),-- prisma.user.updateMany({- where: {- id: {- in: partnerUsers.map(({ userId }) => userId),- },- defaultPartnerId: {- in: partnerIds,- },- },- data: {- defaultPartnerId: null,- },- }),- ]);-- console.log(- `Deleted ${partnerUserIds.length} partner users for ${partnerIds.length} partners`,- );-}diff --git a/apps/web/scripts/partners/delete-partner-profile.ts b/apps/web/scripts/partners/delete-partner-profile.tsindex a20e071061..2005a8821b 100644--- a/apps/web/scripts/partners/delete-partner-profile.ts+++ b/apps/web/scripts/partners/delete-partner-profile.ts@@ -1,8 +1,7 @@import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";-import { deletePartnerUsers } from "@/lib/api/partners/delete-partner-users";+import { deletePartnerAccounts } from "@/lib/api/partners/delete-partner-accounts";import { prisma } from "@/lib/prisma";import "dotenv-flow/config";-import { conn } from "../../lib/planetscale";import { stripeConnectClient } from "../stripe/connect-client";async function main() {@@ -96,13 +95,7 @@ async function main() {});console.log(`Deleted ${deletedProgramEnrollments.count} program enrollments`);- 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 = ?`, [- partner.id,- ]);- console.log(JSON.stringify(res, null, 2));+ await deletePartnerAccounts({ partnerIds: [partner.id] });if (partner.stripeConnectId) {const res = await stripeConnectClient.accounts.del(partner.stripeConnectId);diff --git a/apps/web/scripts/partners/delete-partners-for-program.ts b/apps/web/scripts/partners/delete-partners-for-program.tsindex f9174f8096..1a8978fced 100644--- a/apps/web/scripts/partners/delete-partners-for-program.ts+++ b/apps/web/scripts/partners/delete-partners-for-program.ts@@ -1,5 +1,5 @@import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";-import { deletePartnerUsers } from "@/lib/api/partners/delete-partner-users";+import { deletePartnerAccounts } from "@/lib/api/partners/delete-partner-accounts";import { prisma } from "@/lib/prisma";import "dotenv-flow/config";@@ -44,19 +44,20 @@ async function main() {await bulkDeleteLinks(finalPartnersToDelete.flatMap((p) => p.links));- await deletePartnerUsers({- partnerIds: finalPartnersToDelete.map((p) => p.partnerId),- });+ const partnerIds = finalPartnersToDelete.map((p) => p.partnerId);- const deletePartners = await prisma.partner.deleteMany({+ const deletedProgramEnrollments = await prisma.programEnrollment.deleteMany({where: {- id: {- in: finalPartnersToDelete.map((p) => p.partnerId),+ programId,+ partnerId: {+ in: partnerIds,},},});- console.log("deletePartners", deletePartners);+ console.log("deletedProgramEnrollments", deletedProgramEnrollments);++ await deletePartnerAccounts({ partnerIds });}main();