The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
code improvements
Pedro Ladeiraf9df41859d86
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.tsindex 0b17bc3b00..d86d479b99 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@@ -2,7 +2,10 @@ import {exportAnalyticsToZip,PARTNER_PROFILE_SKIP_ENDPOINTS,} from "@/lib/analytics/export-analytics-to-zip";-import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";+import {+ getFirstFilterValue,+ hasExactlyOneLinkIdFilter,+} from "@/lib/analytics/filter-helpers";import { DubApiError } from "@/lib/api/errors";import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";import { withPartnerProfile } from "@/lib/auth/partner";@@ -112,14 +115,13 @@ export const GET = withPartnerProfile(}const dataAvailableFrom = program.startedAt ?? program.createdAt;- const hasSingleLinkFilter = Boolean(parsedParams.linkId);const zipData = await exportAnalyticsToZip({params: parsedParams,workspaceId: program.workspaceId,useComposite: true,skipEndpoints: PARTNER_PROFILE_SKIP_ENDPOINTS,- skipTopLinksForSingleLink: hasSingleLinkFilter,+ skipTopLinksForSingleLink: hasExactlyOneLinkIdFilter(parsedParams.linkId),getAnalyticsParams: () =>parsedParams.linkId? { linkId: parsedParams.linkId }diff --git a/apps/web/app/api/analytics/export/route.ts b/apps/web/app/api/analytics/export/route.tsindex 6771956ec6..600de051c2 100644--- a/apps/web/app/api/analytics/export/route.ts+++ b/apps/web/app/api/analytics/export/route.ts@@ -1,5 +1,8 @@import { exportAnalyticsToZip } from "@/lib/analytics/export-analytics-to-zip";-import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";+import {+ getFirstFilterValue,+ hasExactlyOneLinkIdFilter,+} from "@/lib/analytics/filter-helpers";import { formatProgramAnalyticsForExport } from "@/lib/analytics/utils/format-program-analytics-for-export";import { DubApiError } from "@/lib/api/errors";import { getLinkOrThrow } from "@/lib/api/links/get-link-or-throw";@@ -95,29 +98,27 @@ export const GET = withWorkspace(workspace.plan,).canTrackConversions;- if (useComposite) {- const { success } = await ratelimit(1, "30 s").limit(- `analytics-export:${workspace.id}`,- );+ const { success } = await ratelimit(1, "30 s").limit(+ `analytics-export:${workspace.id}`,+ );- if (!success) {- throw new DubApiError({- code: "rate_limit_exceeded",- message:- "Analytics export is limited to once every 30 seconds. Please try again shortly.",- });- }+ if (!success) {+ throw new DubApiError({+ code: "rate_limit_exceeded",+ message:+ "Analytics export is limited to once every 30 seconds. Please try again shortly.",+ });}const { domain: _domain, key: _key, ...filterParams } = parsedParams;- const hasSingleLinkFilter = Boolean(parsedParams.linkId);- const analyticsParams = hasSingleLinkFilter ? filterParams : parsedParams;+ const hasLinkIdFilter = Boolean(parsedParams.linkId);+ const analyticsParams = hasLinkIdFilter ? filterParams : parsedParams;const zipData = await exportAnalyticsToZip({params: analyticsParams,workspaceId: workspace.id,useComposite,- skipTopLinksForSingleLink: hasSingleLinkFilter,+ skipTopLinksForSingleLink: hasExactlyOneLinkIdFilter(parsedParams.linkId),getDataAvailableFrom: (endpoint) =>endpoint === "timeseries"? programStartedAt ?? workspace.createdAtdiff --git a/apps/web/lib/analytics/filter-helpers.ts b/apps/web/lib/analytics/filter-helpers.tsindex 14aeacc740..9ed23f9610 100644--- a/apps/web/lib/analytics/filter-helpers.ts+++ b/apps/web/lib/analytics/filter-helpers.ts@@ -176,3 +176,16 @@ export function buildAdvancedFilters(return filters;}++/**+ * Returns true when the linkId filter scopes analytics to exactly one link.+ * Used to omit top_links.csv from exports, since that breakdown is redundant+ * for a single-link view.+ */+export function hasExactlyOneLinkIdFilter(+ linkId: string | ParsedFilter | undefined,+): boolean {+ if (!linkId) return false;+ if (typeof linkId === "string") return true;+ return linkId.sqlOperator === "IN" && linkId.values.length === 1;+}diff --git a/apps/web/tests/analytics/advanced-filter-helpers.test.ts b/apps/web/tests/analytics/advanced-filter-helpers.test.tsindex d21c45f7a8..c1d6bf454c 100644--- a/apps/web/tests/analytics/advanced-filter-helpers.test.ts+++ b/apps/web/tests/analytics/advanced-filter-helpers.test.ts@@ -2,6 +2,7 @@ import {buildAdvancedFilters,ensureParsedFilter,extractWorkspaceLinkFilters,+ hasExactlyOneLinkIdFilter,} from "@/lib/analytics/filter-helpers";import { buildFilterValue, parseFilterValue } from "@dub/utils";import { describe, expect, test } from "vitest";@@ -601,4 +602,44 @@ describe("Advanced Filters - Unit Tests", () => {expect(result.folderIdOperator).toBe("NOT IN");});});++ describe("hasExactlyOneLinkIdFilter", () => {+ test("returns false when linkId is undefined", () => {+ expect(hasExactlyOneLinkIdFilter(undefined)).toBe(false);+ });++ test("returns true for a plain string link id", () => {+ expect(hasExactlyOneLinkIdFilter("link_123")).toBe(true);+ });++ test("returns true for a single included link id", () => {+ expect(+ hasExactlyOneLinkIdFilter({+ operator: "IS",+ sqlOperator: "IN",+ values: ["link_123"],+ }),+ ).toBe(true);+ });++ test("returns false for multiple included link ids", () => {+ expect(+ hasExactlyOneLinkIdFilter({+ operator: "IS_ONE_OF",+ sqlOperator: "IN",+ values: ["link_123", "link_456"],+ }),+ ).toBe(false);+ });++ test("returns false for a single excluded link id", () => {+ expect(+ hasExactlyOneLinkIdFilter({+ operator: "IS_NOT",+ sqlOperator: "NOT IN",+ values: ["link_123"],+ }),+ ).toBe(false);+ });+ });});