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.

fix partner analytics/events + export routes

Steven Teye72c22c87ce9
diff --git a/apps/web/app/(ee)/api/cron/export/events/partner/route.ts b/apps/web/app/(ee)/api/cron/export/events/partner/route.ts
index 02b8235779..b94176f7d7 100644
--- a/apps/web/app/(ee)/api/cron/export/events/partner/route.ts
+++ b/apps/web/app/(ee)/api/cron/export/events/partner/route.ts
@@ -2,6 +2,7 @@ import {
eventsExportColumnAccessors,
eventsExportColumnNames,
} from "@/lib/analytics/events-export-helpers";
+import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";
import { convertToCSV } from "@/lib/analytics/utils/convert-to-csv";
import { createDownloadableExport } from "@/lib/api/create-downloadable-export";
import { handleAndReturnErrorResponse } from "@/lib/api/errors";
@@ -31,10 +32,6 @@ const payloadSchema = partnerProfileEventsQuerySchema.extend({
partnerId: z.string(),
programId: z.string(),
userId: z.string(),
- linkId: z.string().optional(),
- domain: z.string().optional(),
- key: z.string().optional(),
- dataAvailableFrom: z.string().optional(),
});
// POST /api/cron/export/events/partner - QStash worker for processing large partner event exports
@@ -47,7 +44,7 @@ export async function POST(req: Request) {
rawBody,
});
- const { columns, partnerId, programId, userId, ...filters } =
+ const { columns, partnerId, programId, userId, ...parsedParams } =
payloadSchema.parse(JSON.parse(rawBody));
const user = await prisma.user.findUnique({
@@ -77,38 +74,50 @@ export async function POST(req: Request) {
},
});
- const { linkId, domain, key, dataAvailableFrom, ...eventFilters } = filters;
-
// If no links, return early with empty export
if (links.length === 0) {
return logAndRespond("No links found. Skipping the export.");
}
- // Resolve linkId if domain and key are provided
- let resolvedLinkId = linkId;
- if (!resolvedLinkId && domain && key) {
- const foundLink = links.find(
- (link) => link.domain === domain && link.key === key,
+ const { linkId, domain, key } = parsedParams;
+
+ if (linkId) {
+ // check to make sure all of the linkId.values are in the links
+ if (
+ !linkId.values.every((value) => links.some((link) => link.id === value))
+ ) {
+ return logAndRespond(
+ "One or more links are not found. Skipping the export.",
+ );
+ }
+ } else if (domain && key) {
+ const link = links.find(
+ (link) =>
+ link.domain === getFirstFilterValue(domain) && link.key === key,
);
- if (foundLink) {
- resolvedLinkId = foundLink.id;
+ if (!link) {
+ return logAndRespond("Link not found. Skipping the export.");
}
+
+ parsedParams.linkId = {
+ operator: "IS",
+ sqlOperator: "IN",
+ values: [link.id],
+ };
}
// Fetch events in batches and build CSV
const allEvents: Record<string, any>[] = [];
const eventsFilters = {
- ...eventFilters,
+ ...parsedParams,
workspaceId: program.workspaceId,
- ...(resolvedLinkId
- ? { linkId: resolvedLinkId }
+ ...(linkId
+ ? { linkId }
: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING
? { partnerId }
: { linkId: parseFilterValue(links.map((link) => link.id)) }),
- dataAvailableFrom: dataAvailableFrom
- ? new Date(dataAvailableFrom)
- : program.startedAt ?? program.createdAt,
+ dataAvailableFrom: program.startedAt ?? program.createdAt,
};
for await (const { events } of fetchEventsBatch(eventsFilters)) {
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts
index ff41c21c19..dd5c466cad 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts
@@ -1,7 +1,6 @@
import { VALID_ANALYTICS_ENDPOINTS } from "@/lib/analytics/constants";
import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";
import { getAnalytics } from "@/lib/analytics/get-analytics";
-import { parseFilterValue } from "@dub/utils";
import { convertToCSV } from "@/lib/analytics/utils";
import { DubApiError } from "@/lib/api/errors";
import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
@@ -12,6 +11,7 @@ import {
MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING,
} from "@/lib/constants/partner-profile";
import { partnerProfileAnalyticsQuerySchema } from "@/lib/zod/schemas/partner-profile";
+import { parseFilterValue } from "@dub/utils";
import JSZip from "jszip";
// GET /api/partner-profile/programs/[programId]/analytics/export – get export data for partner profile analytics
@@ -37,45 +37,49 @@ export const GET = withPartnerProfile(
});
}
- const parsedParams = partnerProfileAnalyticsQuerySchema.parse(searchParams);
+ // Early return if partner has no links
+ if (links.length === 0) {
+ const zip = new JSZip();
+ const zipData = await zip.generateAsync({ type: "nodebuffer" });
+ return new Response(zipData as unknown as BodyInit, {
+ headers: {
+ "Content-Type": "application/zip",
+ "Content-Disposition": "attachment; filename=analytics_export.zip",
+ },
+ });
+ }
- let { linkId: linkIdFilter, domain: domainFilter, key, ...rest } = parsedParams;
+ const parsedParams = partnerProfileAnalyticsQuerySchema.parse(searchParams);
- // Extract string values for link lookup
- const domain = getFirstFilterValue(domainFilter);
- let linkId = getFirstFilterValue(linkIdFilter);
+ const { linkId, domain, key } = parsedParams;
if (linkId) {
- if (!links.some((link) => link.id === linkId)) {
+ // check to make sure all of the linkId.values are in the links
+ if (
+ !linkId.values.every((value) => links.some((link) => link.id === value))
+ ) {
throw new DubApiError({
code: "not_found",
- message: "Link not found",
+ message: "One or more links are not found",
});
}
} else if (domain && key) {
- const foundLink = links.find(
- (link) => link.domain === domain && link.key === key,
+ const link = links.find(
+ (link) =>
+ link.domain === getFirstFilterValue(domain) && link.key === key,
);
- if (!foundLink) {
+ if (!link) {
throw new DubApiError({
code: "not_found",
message: "Link not found",
});
}
- linkId = foundLink.id;
- }
-
- // Early return if there are no links and no linkId specified
- if (links.length === 0 && !linkId) {
- const zip = new JSZip();
- const zipData = await zip.generateAsync({ type: "nodebuffer" });
- return new Response(zipData as unknown as BodyInit, {
- headers: {
- "Content-Type": "application/zip",
- "Content-Disposition": "attachment; filename=analytics_export.zip",
- },
- });
+ parsedParams.linkId = {
+ operator: "IS",
+ sqlOperator: "IN",
+ values: [link.id],
+ };
}
const zip = new JSZip();
@@ -89,7 +93,7 @@ export const GET = withPartnerProfile(
if (endpoint === "count") return;
const response = await getAnalytics({
- ...rest,
+ ...parsedParams,
workspaceId: program.workspaceId,
...(linkId
? { linkId }
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts
index 4bbca00b75..1f030e0568 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts
@@ -1,6 +1,5 @@
import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";
import { getAnalytics } from "@/lib/analytics/get-analytics";
-import { parseFilterValue } from "@dub/utils";
import { DubApiError } from "@/lib/api/errors";
import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
import { withPartnerProfile } from "@/lib/auth/partner";
@@ -10,6 +9,7 @@ import {
MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING,
} from "@/lib/constants/partner-profile";
import { partnerProfileAnalyticsQuerySchema } from "@/lib/zod/schemas/partner-profile";
+import { parseFilterValue } from "@dub/utils";
import { NextResponse } from "next/server";
// GET /api/partner-profile/programs/[programId]/analytics – get analytics for a program enrollment link
@@ -25,45 +25,52 @@ export const GET = withPartnerProfile(
},
});
- let {
- linkId: linkIdFilter,
- domain: domainFilter,
- key,
- ...rest
- } = partnerProfileAnalyticsQuerySchema.parse(searchParams);
+ // early return if partner has no links
+ if (links.length === 0) {
+ return NextResponse.json([], { status: 200 });
+ }
- const domain = getFirstFilterValue(domainFilter);
- let linkId = getFirstFilterValue(linkIdFilter);
+ const parsedParams = partnerProfileAnalyticsQuerySchema.parse(searchParams);
+
+ const { linkId, domain, key } = parsedParams;
if (linkId) {
- if (!links.some((link) => link.id === linkId)) {
+ // check to make sure all of the linkId.values are in the links
+ if (
+ !linkId.values.every((value) => links.some((link) => link.id === value))
+ ) {
throw new DubApiError({
code: "not_found",
- message: "Link not found",
+ message: "One or more links are not found",
});
}
} else if (domain && key) {
- const foundLink = links.find(
- (link) => link.domain === domain && link.key === key,
+ const link = links.find(
+ (link) =>
+ link.domain === getFirstFilterValue(domain) && link.key === key,
);
- if (!foundLink) {
+ if (!link) {
throw new DubApiError({
code: "not_found",
message: "Link not found",
});
}
- linkId = foundLink.id;
+ parsedParams.linkId = {
+ operator: "IS",
+ sqlOperator: "IN",
+ values: [link.id],
+ };
}
const response = await getAnalytics({
...(LARGE_PROGRAM_IDS.includes(program.id) &&
totalCommissions < LARGE_PROGRAM_MIN_TOTAL_COMMISSIONS_CENTS
- ? { event: rest.event, groupBy: "count", interval: "all" }
- : rest),
+ ? { event: parsedParams.event, groupBy: "count", interval: "all" }
+ : parsedParams),
workspaceId: program.workspaceId,
- ...(linkId
- ? { linkId }
+ ...(parsedParams.linkId
+ ? { linkId: parsedParams.linkId }
: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING
? { partnerId: partner.id }
: { linkId: parseFilterValue(links.map((link) => link.id)) }),
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.ts
index 84d7a3c738..d85ed33447 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.ts
@@ -53,6 +53,16 @@ export const GET = withPartnerProfile(
});
}
+ // early return if partner has no links
+ if (links.length === 0) {
+ return new Response("", {
+ headers: {
+ "Content-Type": "application/csv",
+ "Content-Disposition": `attachment; filename=events_export.csv`,
+ },
+ });
+ }
+
const parsedParams = partnerProfileEventsQuerySchema
.extend({
columns: z
@@ -64,15 +74,6 @@ export const GET = withPartnerProfile(
.parse(searchParams);
const { event, columns: columnsParam } = parsedParams;
- let {
- linkId: linkIdFilter,
- domain: domainFilter,
- key,
- ...rest
- } = parsedParams;
-
- const domain = getFirstFilterValue(domainFilter);
- let linkId = getFirstFilterValue(linkIdFilter);
// Default columns based on event type if not provided
const defaultColumns: Record<string, string[]> = {
@@ -93,44 +94,45 @@ export const GET = withPartnerProfile(
? columnsParam
: defaultColumns[event] || defaultColumns.clicks;
+ const { linkId, domain, key } = parsedParams;
+
if (linkId) {
- if (!links.some((link) => link.id === linkId)) {
+ // check to make sure all of the linkId.values are in the links
+ if (
+ !linkId.values.every((value) => links.some((link) => link.id === value))
+ ) {
throw new DubApiError({
code: "not_found",
- message: "Link not found",
+ message: "One or more links are not found",
});
}
} else if (domain && key) {
- const foundLink = links.find(
- (link) => link.domain === domain && link.key === key,
+ const link = links.find(
+ (link) =>
+ link.domain === getFirstFilterValue(domain) && link.key === key,
);
- if (!foundLink) {
+ if (!link) {
throw new DubApiError({
code: "not_found",
message: "Link not found",
});
}
- linkId = foundLink.id;
- }
-
- if (links.length === 0) {
- return new Response("", {
- headers: {
- "Content-Type": "application/csv",
- "Content-Disposition": `attachment; filename=${event}_export.csv`,
- },
- });
+ parsedParams.linkId = {
+ operator: "IS",
+ sqlOperator: "IN",
+ values: [link.id],
+ };
}
// Count events using getAnalytics with groupBy: "count"
const countResponse = await getAnalytics({
- ...rest,
+ ...parsedParams,
event,
groupBy: "count",
workspaceId: program.workspaceId,
- ...(linkId
- ? { linkId }
+ ...(parsedParams.linkId
+ ? { linkId: parsedParams.linkId }
: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING
? { partnerId: partner.id }
: { linkId: parseFilterValue(links.map((link) => link.id)) }),
@@ -156,9 +158,6 @@ export const GET = withPartnerProfile(
partnerId: partner.id,
programId: params.programId,
userId: session.user.id,
- ...(linkId && { linkId }),
- ...(domain && { domain }),
- ...(key && { key }),
dataAvailableFrom: (
program.startedAt ?? program.createdAt
).toISOString(),
@@ -169,14 +168,13 @@ export const GET = withPartnerProfile(
}
const events = await getEvents({
- ...rest,
+ ...parsedParams,
workspaceId: program.workspaceId,
...(linkId
? { linkId }
: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING
? { partnerId: partner.id }
: { linkId: parseFilterValue(links.map((link) => link.id)) }),
- dataAvailableFrom: program.startedAt ?? program.createdAt,
limit: MAX_EVENTS_TO_EXPORT,
});
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts
index 339092af1e..86bbce9739 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts
@@ -1,6 +1,5 @@
import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";
import { getEvents } from "@/lib/analytics/get-events";
-import { parseFilterValue } from "@dub/utils";
import { DubApiError } from "@/lib/api/errors";
import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
import { withPartnerProfile } from "@/lib/auth/partner";
@@ -14,6 +13,7 @@ import {
PartnerProfileLinkSchema,
partnerProfileEventsQuerySchema,
} from "@/lib/zod/schemas/partner-profile";
+import { parseFilterValue } from "@dub/utils";
import { NextResponse } from "next/server";
import * as z from "zod/v4";
@@ -40,43 +40,45 @@ export const GET = withPartnerProfile(
});
}
- let {
- linkId: linkIdFilter,
- domain: domainFilter,
- key,
- ...rest
- } = partnerProfileEventsQuerySchema.parse(searchParams);
+ // early return if partner has no links
+ if (links.length === 0) {
+ return NextResponse.json([], { status: 200 });
+ }
- const domain = getFirstFilterValue(domainFilter);
- let linkId = getFirstFilterValue(linkIdFilter);
+ const parsedParams = partnerProfileEventsQuerySchema.parse(searchParams);
+ const { linkId, domain, key } = parsedParams;
if (linkId) {
- if (!links.some((link) => link.id === linkId)) {
+ // check to make sure all of the linkId.values are in the links
+ if (
+ !linkId.values.every((value) => links.some((link) => link.id === value))
+ ) {
throw new DubApiError({
code: "not_found",
- message: "Link not found",
+ message: "One or more links are not found",
});
}
} else if (domain && key) {
- const foundLink = links.find(
- (link) => link.domain === domain && link.key === key,
+ const link = links.find(
+ (link) =>
+ link.domain === getFirstFilterValue(domain) && link.key === key,
);
- if (!foundLink) {
+ if (!link) {
throw new DubApiError({
code: "not_found",
message: "Link not found",
});
}
- linkId = foundLink.id;
- }
-
- if (links.length === 0) {
- return NextResponse.json([], { status: 200 });
+ parsedParams.linkId = {
+ operator: "IS",
+ sqlOperator: "IN",
+ values: [link.id],
+ };
}
const events = await getEvents({
- ...rest,
+ ...parsedParams,
workspaceId: program.workspaceId,
...(linkId
? { linkId }