The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Add cleanup/unenrolled-partners cron, update click summary cron
Steven Tey626846e7672c
diff --git a/apps/web/app/(ee)/api/cron/cleanup/unenrolled-partners/route.ts b/apps/web/app/(ee)/api/cron/cleanup/unenrolled-partners/route.tsnew file mode 100644index 0000000000..64281bc928--- /dev/null+++ b/apps/web/app/(ee)/api/cron/cleanup/unenrolled-partners/route.ts@@ -0,0 +1,63 @@+import { handleAndReturnErrorResponse } from "@/lib/api/errors";+import { bulkDeletePartners } from "@/lib/api/partners/bulk-delete-partners";+import { verifyQstashSignature } from "@/lib/cron/verify-qstash";+import { prisma } from "@dub/prisma";+import { log } from "@dub/utils";+import { logAndRespond } from "../../utils";++export const dynamic = "force-dynamic";++// This route is used to remove partners that are not enrolled in any program+// Runs once every day at 02:00:00 AM UTC (0 2 * * *)+// POST /api/cron/cleanup/unenrolled-partners+export async function POST(req: Request) {+ try {+ const rawBody = await req.text();++ await verifyQstashSignature({+ req,+ rawBody,+ });++ while (true) {+ const partnersToDelete = await prisma.partner.findMany({+ where: {+ programs: {+ none: {},+ },+ users: {+ none: {},+ },+ },+ take: 250,+ });++ if (partnersToDelete.length === 0) {+ console.log("No more partners to delete, skipping...");+ break;+ }++ console.log(`Found ${partnersToDelete.length} partners to delete.`);++ if (partnersToDelete.length > 0) {+ await bulkDeletePartners({+ partnerIds: partnersToDelete.map((partner) => partner.id),+ deletePartners: true,+ });+ }++ console.log(+ `Deleted ${partnersToDelete.length} partners that are not enrolled in any programs.`,+ );+ }++ return logAndRespond("Completed cleanup of unenrolled partners");+ } catch (error) {+ await log({+ message: `/api/cron/cleanup/unenrolled-partners failed - ${error.message}`,+ type: "errors",+ });++ return handleAndReturnErrorResponse(error);+ }+}diff --git a/apps/web/app/(ee)/api/cron/usage/utils.ts b/apps/web/app/(ee)/api/cron/usage/utils.tsindex 78a01a6033..583db4b78f 100644--- a/apps/web/app/(ee)/api/cron/usage/utils.ts+++ b/apps/web/app/(ee)/api/cron/usage/utils.ts@@ -9,7 +9,6 @@ import {APP_DOMAIN_WITH_NGROK,capitalize,getAdjustedBillingCycleStart,- getPrettyUrl,log,} from "@dub/utils";@@ -125,14 +124,13 @@ export const updateUsage = async () => {root: false,});- const topFive = topLinks.slice(0, 5);- const topFiveLinkIds = topFive.map(({ link }) => link);+ const topLinkIds = topLinks.slice(0, 100).map(({ link }) => link);const linksMetadata = await prisma.link.findMany({where: {projectId: workspace.id,id: {- in: topFiveLinkIds,+ in: topLinkIds,},},select: {@@ -141,13 +139,14 @@ export const updateUsage = async () => {},});- const topFiveLinks = topFive.map((d) => ({- link:- getPrettyUrl(- linksMetadata.find((l) => l.id === d.link)?.shortLink,- ) || d.link,- clicks: d.clicks,- }));+ const topFiveLinks = topLinks+ .filter((d: { link: string; clicks: number }) =>+ linksMetadata.find((l) => l.id === d.link),+ )+ .map((d: { link: string; clicks: number }) => ({+ link: linksMetadata.find((l) => l.id === d.link)!, // coerce here since we're already filtering out links that don't exist+ clicks: d.clicks,+ }));const totalClicks = topLinks.reduce((acc, curr) => acc + curr.clicks,diff --git a/apps/web/lib/api/partners/bulk-delete-partners.ts b/apps/web/lib/api/partners/bulk-delete-partners.tsindex 8bd11e42c6..180ca26d9b 100644--- a/apps/web/lib/api/partners/bulk-delete-partners.ts+++ b/apps/web/lib/api/partners/bulk-delete-partners.ts@@ -65,8 +65,34 @@ export async function bulkDeletePartners({console.log(`Deleted ${deletedLinks.count} links`);}- while (true) {- const commissionsToDelete = await prisma.commission.findMany({+ if (programEnrollmentIds.length > 0) {+ while (true) {+ const commissionsToDelete = await prisma.commission.findMany({+ where: {+ programEnrollment: {+ id: {+ in: programEnrollmentIds,+ },+ },+ },+ take: BATCH_SIZE,+ });++ if (commissionsToDelete.length === 0) {+ break;+ }++ const deletedCommissions = await prisma.commission.deleteMany({+ where: {+ id: {+ in: commissionsToDelete.map((commission) => commission.id),+ },+ },+ });+ console.log(`Deleted ${deletedCommissions.count} commissions`);+ }++ const deletedPayouts = await prisma.payout.deleteMany({where: {programEnrollment: {id: {@@ -74,68 +100,44 @@ export async function bulkDeletePartners({},},},- take: BATCH_SIZE,});+ console.log(`Deleted ${deletedPayouts.count} payouts`);- if (commissionsToDelete.length === 0) {- break;- }-- const deletedCommissions = await prisma.commission.deleteMany({+ // Delete the messages+ const deletedMessages = await prisma.message.deleteMany({where: {- id: {- in: commissionsToDelete.map((commission) => commission.id),+ programEnrollment: {+ id: {+ in: programEnrollmentIds,+ },},},});- console.log(`Deleted ${deletedCommissions.count} commissions`);- }-- const deletedPayouts = await prisma.payout.deleteMany({- where: {- programEnrollment: {- id: {- in: programEnrollmentIds,- },- },- },- });- console.log(`Deleted ${deletedPayouts.count} payouts`);+ console.log(`Deleted ${deletedMessages.count} messages`);- // Delete the messages- const deletedMessages = await prisma.message.deleteMany({- where: {- programEnrollment: {- id: {- in: programEnrollmentIds,+ // Delete the bounty submissions+ const deletedBountySubmissions = await prisma.bountySubmission.deleteMany({+ where: {+ programEnrollment: {+ id: {+ in: programEnrollmentIds,+ },},},- },- });- console.log(`Deleted ${deletedMessages.count} messages`);+ });+ console.log(`Deleted ${deletedBountySubmissions.count} bounty submissions`);- // Delete the bounty submissions- const deletedBountySubmissions = await prisma.bountySubmission.deleteMany({- where: {- programEnrollment: {- id: {- in: programEnrollmentIds,+ // Delete the activity logs+ const deletedActivityLogs = await prisma.activityLog.deleteMany({+ where: {+ resourceType: "partner",+ resourceId: {+ in: partnerIds,},},- },- });- console.log(`Deleted ${deletedBountySubmissions.count} bounty submissions`);-- // Delete the activity logs- const deletedActivityLogs = await prisma.activityLog.deleteMany({- where: {- resourceType: "partner",- resourceId: {- in: partnerIds,- },- },- });- console.log(`Deleted ${deletedActivityLogs.count} activity logs`);+ });+ console.log(`Deleted ${deletedActivityLogs.count} activity logs`);+ }if (deletePartners) {const deletedPartners = await prisma.partner.deleteMany({@@ -146,7 +148,7 @@ export async function bulkDeletePartners({},});console.log(`Deleted ${deletedPartners.count} partners`);- } else {+ } else if (programEnrollmentIds.length > 0) {const deletedProgramEnrollments = await prisma.programEnrollment.deleteMany({where: {diff --git a/packages/email/src/templates/clicks-summary.tsx b/packages/email/src/templates/clicks-summary.tsxindex 1d1a80f865..eae60277b5 100644--- a/packages/email/src/templates/clicks-summary.tsx+++ b/packages/email/src/templates/clicks-summary.tsx@@ -26,23 +26,39 @@ export default function ClicksSummary({createdLinks = 25,topLinks = [{- link: "acmesuperlongdomain.com/insta",+ link: {+ id: "link_1",+ shortLink: "acmesuperlongdomain.com/insta",+ },clicks: 1820,},{- link: "acmesuperlongdomain.com/super-long-path-that-is-way-too-long-and-should-be-truncated",+ link: {+ id: "link_2",+ shortLink:+ "acmesuperlongdomain.com/super-long-path-that-is-way-too-long-and-should-be-truncated",+ },clicks: 2187,},{- link: "acme.com",+ link: {+ id: "link_3",+ shortLink: "acme.com",+ },clicks: 1552,},{- link: "acme.com/twitter",+ link: {+ id: "link_4",+ shortLink: "acme.com/twitter",+ },clicks: 1229,},{- link: "acme.com/linkedin/more/path",+ link: {+ id: "link_5",+ shortLink: "acme.com/linkedin/more/path",+ },clicks: 1055,},],@@ -53,7 +69,10 @@ export default function ClicksSummary({totalClicks: number;createdLinks: number;topLinks: {- link: string;+ link: {+ id: string;+ shortLink: string;+ };clicks: number;}[];}) {@@ -111,33 +130,33 @@ export default function ClicksSummary({Clicks</Column></Row>- {topLinks.map(({ link, clicks }, index) => {- const [domain, ...pathParts] = link.split("/");- const path = pathParts.join("/") || "_root";- return (- <div key={index}>- <Row>- <Column align="left">- <Link- href={`https://app.dub.co/${workspaceSlug}/analytics?domain=${domain}&key=${path}`}- className="text-sm font-medium text-black underline"+ {topLinks.map(+ ({ link: { id: linkId, shortLink }, clicks }, index) => {+ return (+ <div key={linkId}>+ <Row>+ <Column align="left">+ <Link+ href={`https://app.dub.co/${workspaceSlug}/analytics?linkId=${linkId}`}+ className="text-sm font-medium text-black underline"+ >+ {smartTruncate(shortLink, 33)}↗+ </Link>+ </Column>+ <Column+ align="right"+ className="text-sm text-neutral-600">- {smartTruncate(link, 33)}↗- </Link>- </Column>- <Column- align="right"- className="text-sm text-neutral-600"- >- {nFormatter(clicks, { full: clicks < 99999 })}- </Column>- </Row>- {index !== topLinks.length - 1 && (- <Hr className="my-2 w-full border border-neutral-200" />- )}- </div>- );- })}+ {nFormatter(clicks, { full: clicks < 99999 })}+ </Column>+ </Row>+ {index !== topLinks.length - 1 && (+ <Hr className="my-2 w-full border border-neutral-200" />+ )}+ </div>+ );+ },+ )}</Section></>)}