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.

Revert "Replace deletePartnerUsers with hardDeletePartners"

Rafi468801e0b2d3
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 8452ce22b3..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,7 +1,8 @@
import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
-import { hardDeletePartners } from "@/lib/api/partners/hard-delete-partners";
+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";
import { prisma } from "@/lib/prisma";
import { stripe } from "@/lib/stripe";
import { prettyPrint } from "@dub/utils";
@@ -141,7 +142,9 @@ export const POST = withAdmin(
});
}
- await hardDeletePartners({ partnerIds: [partner.id] });
+ 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 9e5ed52a1e..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,11 +2,12 @@ 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 { hardDeletePartners } from "@/lib/api/partners/hard-delete-partners";
+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";
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";
@@ -1122,9 +1123,11 @@ async function deleteSourcePartner({
sourceEmail: string;
sourceImage: string | null;
}) {
- // Also removes the PartnerUser row of a source user that was kept because it
- // still has workspaces.
- await hardDeletePartners({ partnerIds: [sourcePartnerId] });
+ // 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) {
try {
diff --git a/apps/web/lib/api/partners/bulk-delete-partners.ts b/apps/web/lib/api/partners/bulk-delete-partners.ts
index fca83cb827..160aa0c6be 100644
--- a/apps/web/lib/api/partners/bulk-delete-partners.ts
+++ b/apps/web/lib/api/partners/bulk-delete-partners.ts
@@ -1,7 +1,8 @@
+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 { hardDeletePartners } from "./hard-delete-partners";
+import { deletePartnerUsers } from "./delete-partner-users";
import { queuePartnerSearchSync } from "./queue-partner-search-sync";
const BATCH_SIZE = 250;
@@ -193,7 +194,16 @@ export async function bulkDeletePartners({
},
});
- await hardDeletePartners({ partnerIds });
+ 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`);
// 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-users.ts b/apps/web/lib/api/partners/delete-partner-users.ts
new file mode 100644
index 0000000000..7b266ac4d6
--- /dev/null
+++ b/apps/web/lib/api/partners/delete-partner-users.ts
@@ -0,0 +1,71 @@
+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/lib/api/partners/hard-delete-partners.ts b/apps/web/lib/api/partners/hard-delete-partners.ts
deleted file mode 100644
index 05c9401621..0000000000
--- a/apps/web/lib/api/partners/hard-delete-partners.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import { prisma } from "@/lib/prisma";
-import { Prisma } from "@prisma/client";
-
-// Permanently delete partners and every row that cascades from them.
-// Prisma's partner.delete() throws for this model, and a raw
-// `DELETE FROM Partner` skips the emulated cascades, so this deletes the
-// children itself and runs the raw delete in the same transaction.
-//
-// Callers must remove program data first (enrollments, links, customers,
-// commissions and payouts), since those need side effects such as cache,
-// Tinybird and search index updates.
-export async function hardDeletePartners({
- partnerIds,
-}: {
- partnerIds: string[];
-}) {
- if (partnerIds.length === 0) {
- return 0;
- }
-
- const where = {
- partnerId: {
- in: partnerIds,
- },
- };
-
- const partnerUsers = await prisma.partnerUser.findMany({
- where,
- select: {
- id: true,
- userId: true,
- },
- });
-
- const results = await prisma.$transaction([
- // Partner users
- prisma.partnerNotificationPreferences.deleteMany({
- where: {
- partnerUserId: {
- in: partnerUsers.map(({ id }) => id),
- },
- },
- }),
- prisma.partnerUser.deleteMany({ where }),
- // 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,
- },
- }),
- prisma.partnerInvite.deleteMany({ where }),
-
- // Partner profile
- prisma.partnerIndustryInterest.deleteMany({ where }),
- prisma.partnerPreferredEarningStructure.deleteMany({ where }),
- prisma.partnerSalesChannel.deleteMany({ where }),
- prisma.partnerPlatform.deleteMany({ where }),
- prisma.postback.deleteMany({ where }),
-
- // Program activity
- prisma.message.deleteMany({ where }),
- prisma.message.deleteMany({
- where: {
- senderPartnerId: {
- in: partnerIds,
- },
- },
- }),
- prisma.partnerComment.deleteMany({ where }),
- prisma.submittedLeadComment.deleteMany({ where }),
- prisma.bountySubmission.deleteMany({ where }),
- prisma.programPartnerTag.deleteMany({ where }),
- prisma.discoveredPartner.deleteMany({ where }),
- prisma.fraudAlert.deleteMany({ where }),
- prisma.fraudEvent.deleteMany({ where }),
- prisma.fraudEventGroup.deleteMany({ where }),
-
- // Relations that are set to null on delete
- prisma.programApplication.updateMany({
- where,
- data: {
- partnerId: null,
- },
- }),
- prisma.programApplicationEvent.updateMany({
- where: {
- referredByPartnerId: {
- in: partnerIds,
- },
- },
- data: {
- referredByPartnerId: null,
- },
- }),
-
- 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 ${partnerUsers.length} partner users`,
- );
-
- return deletedPartners;
-}
diff --git a/apps/web/scripts/partners/delete-partner-profile.ts b/apps/web/scripts/partners/delete-partner-profile.ts
index 764a5af4ce..a20e071061 100644
--- a/apps/web/scripts/partners/delete-partner-profile.ts
+++ b/apps/web/scripts/partners/delete-partner-profile.ts
@@ -1,7 +1,8 @@
import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
-import { hardDeletePartners } from "@/lib/api/partners/hard-delete-partners";
+import { deletePartnerUsers } from "@/lib/api/partners/delete-partner-users";
import { prisma } from "@/lib/prisma";
import "dotenv-flow/config";
+import { conn } from "../../lib/planetscale";
import { stripeConnectClient } from "../stripe/connect-client";
async function main() {
@@ -65,6 +66,29 @@ async function main() {
}
}
+ // delete messages for partnerId
+ const deletedMessages = await prisma.message.deleteMany({
+ where: {
+ partnerId: partner.id,
+ },
+ });
+ console.log(`Deleted ${deletedMessages.count} messages`);
+
+ // delete fraud event groups and alerts for partnerId
+ const deletedFraudEventGroups = await prisma.fraudEventGroup.deleteMany({
+ where: {
+ partnerId: partner.id,
+ },
+ });
+ console.log(`Deleted ${deletedFraudEventGroups.count} fraud event groups`);
+
+ const deletedFraudAlerts = await prisma.fraudAlert.deleteMany({
+ where: {
+ partnerId: partner.id,
+ },
+ });
+ console.log(`Deleted ${deletedFraudAlerts.count} fraud alerts`);
+
const deletedProgramEnrollments = await prisma.programEnrollment.deleteMany({
where: {
partnerId: partner.id,
@@ -72,7 +96,13 @@ async function main() {
});
console.log(`Deleted ${deletedProgramEnrollments.count} program enrollments`);
- await hardDeletePartners({ partnerIds: [partner.id] });
+ 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));
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.ts
index c24e8bf043..f9174f8096 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 { hardDeletePartners } from "@/lib/api/partners/hard-delete-partners";
+import { deletePartnerUsers } from "@/lib/api/partners/delete-partner-users";
import { prisma } from "@/lib/prisma";
import "dotenv-flow/config";
@@ -44,20 +44,19 @@ async function main() {
await bulkDeleteLinks(finalPartnersToDelete.flatMap((p) => p.links));
- const partnerIds = finalPartnersToDelete.map((p) => p.partnerId);
+ await deletePartnerUsers({
+ partnerIds: finalPartnersToDelete.map((p) => p.partnerId),
+ });
- const deletedProgramEnrollments = await prisma.programEnrollment.deleteMany({
+ const deletePartners = await prisma.partner.deleteMany({
where: {
- programId,
- partnerId: {
- in: partnerIds,
+ id: {
+ in: finalPartnersToDelete.map((p) => p.partnerId),
},
},
});
- console.log("deletedProgramEnrollments", deletedProgramEnrollments);
-
- await hardDeletePartners({ partnerIds });
+ console.log("deletePartners", deletePartners);
}
main();