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: remove repetitive code

Pedro Ladeirae2ef1a846360
diff --git a/apps/web/app/(ee)/api/events/route.ts b/apps/web/app/(ee)/api/events/route.ts
index 5406dbb422..452a59d85b 100644
--- a/apps/web/app/(ee)/api/events/route.ts
+++ b/apps/web/app/(ee)/api/events/route.ts
@@ -1,3 +1,4 @@
+import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";
import { getEvents } from "@/lib/analytics/get-events";
import { getFolderIdsToFilter } from "@/lib/analytics/get-folder-ids-to-filter";
import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";
@@ -30,12 +31,8 @@ export const GET = withWorkspace(
} = parsedParams;
// Extract string values for specific link/folder lookup
- const domain = domainFilter && typeof domainFilter === 'object' && 'values' in domainFilter
- ? domainFilter.values[0]
- : undefined;
- const folderId = folderIdFilter && typeof folderIdFilter === 'object' && 'values' in folderIdFilter
- ? folderIdFilter.values[0]
- : undefined;
+ const domain = getFirstFilterValue(domainFilter);
+ const folderId = getFirstFilterValue(folderIdFilter);
let link: Link | null = null;
diff --git a/apps/web/app/api/analytics/dashboard/route.ts b/apps/web/app/api/analytics/dashboard/route.ts
index 6c4d81087c..68a39902e7 100644
--- a/apps/web/app/api/analytics/dashboard/route.ts
+++ b/apps/web/app/api/analytics/dashboard/route.ts
@@ -1,3 +1,4 @@
+import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";
import { getAnalytics } from "@/lib/analytics/get-analytics";
import { DubApiError, handleAndReturnErrorResponse } from "@/lib/api/errors";
import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-range-for-plan";
@@ -21,12 +22,8 @@ export const GET = async (req: Request) => {
const { domain: domainFilter, key, folderId: folderIdFilter, interval, start, end } = parsedParams;
// Extract string values for specific link/folder lookup
- const domain = domainFilter && typeof domainFilter === 'object' && 'values' in domainFilter
- ? domainFilter.values[0]
- : undefined;
- const folderId = folderIdFilter && typeof folderIdFilter === 'object' && 'values' in folderIdFilter
- ? folderIdFilter.values[0]
- : undefined;
+ const domain = getFirstFilterValue(domainFilter);
+ const folderId = getFirstFilterValue(folderIdFilter);
if ((!domain || !key) && !folderId) {
throw new DubApiError({
diff --git a/apps/web/app/api/analytics/export/route.ts b/apps/web/app/api/analytics/export/route.ts
index a5c375ae3e..c0780fb50f 100644
--- a/apps/web/app/api/analytics/export/route.ts
+++ b/apps/web/app/api/analytics/export/route.ts
@@ -1,4 +1,5 @@
import { VALID_ANALYTICS_ENDPOINTS } from "@/lib/analytics/constants";
+import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";
import { getAnalytics } from "@/lib/analytics/get-analytics";
import { getFolderIdsToFilter } from "@/lib/analytics/get-folder-ids-to-filter";
import { convertToCSV } from "@/lib/analytics/utils";
@@ -23,12 +24,8 @@ export const GET = withWorkspace(
parsedParams;
// Extract string values for specific link/folder lookup
- const domain = domainFilter && typeof domainFilter === 'object' && 'values' in domainFilter
- ? domainFilter.values[0]
- : undefined;
- const folderId = folderIdFilter && typeof folderIdFilter === 'object' && 'values' in folderIdFilter
- ? folderIdFilter.values[0]
- : undefined;
+ const domain = getFirstFilterValue(domainFilter);
+ const folderId = getFirstFilterValue(folderIdFilter);
let link: Link | null = null;
diff --git a/apps/web/app/api/analytics/route.ts b/apps/web/app/api/analytics/route.ts
index e706c03f6b..36d2d92957 100644
--- a/apps/web/app/api/analytics/route.ts
+++ b/apps/web/app/api/analytics/route.ts
@@ -1,4 +1,5 @@
import { VALID_ANALYTICS_ENDPOINTS } from "@/lib/analytics/constants";
+import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";
import { getAnalytics } from "@/lib/analytics/get-analytics";
import { getFolderIdsToFilter } from "@/lib/analytics/get-folder-ids-to-filter";
import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";
@@ -50,12 +51,8 @@ export const GET = withWorkspace(
// Extract string values for specific link/folder lookup
// When domain+key is provided, it's for getting a specific link (not filtering)
- const domain = domainFilter && typeof domainFilter === 'object' && 'values' in domainFilter
- ? domainFilter.values[0]
- : undefined;
- const folderId = folderIdFilter && typeof folderIdFilter === 'object' && 'values' in folderIdFilter
- ? folderIdFilter.values[0]
- : undefined;
+ const domain = getFirstFilterValue(domainFilter);
+ const folderId = getFirstFilterValue(folderIdFilter);
let link: Link | null = null;
diff --git a/apps/web/lib/analytics/build-advanced-filters.ts b/apps/web/lib/analytics/build-advanced-filters.ts
deleted file mode 100644
index e3909201b7..0000000000
--- a/apps/web/lib/analytics/build-advanced-filters.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { ParsedFilter, type SQLOperator } from "@dub/utils";
-
-export interface AdvancedFilter {
- field: string;
- operator: SQLOperator;
- values: string[];
-}
-
-const SUPPORTED_FIELDS = [
- "country",
- "city",
- "continent",
- "device",
- "browser",
- "os",
- "referer",
- "refererUrl",
- "url",
- "trigger",
- "utm_source",
- "utm_medium",
- "utm_campaign",
- "utm_term",
- "utm_content",
- "saleType",
-] as const;
-
-type SupportedField = (typeof SUPPORTED_FIELDS)[number];
-
-export function buildAdvancedFilters(
- params: Partial<Record<SupportedField, ParsedFilter | undefined>>,
-): AdvancedFilter[] {
- const filters: AdvancedFilter[] = [];
-
- for (const field of SUPPORTED_FIELDS) {
- const parsed = params[field];
- if (!parsed) continue;
-
- filters.push({
- field,
- operator: parsed.sqlOperator,
- values: parsed.values,
- });
- }
-
- return filters;
-}
diff --git a/apps/web/lib/analytics/filter-helpers.ts b/apps/web/lib/analytics/filter-helpers.ts
index 28b39bf2c7..245de60dfb 100644
--- a/apps/web/lib/analytics/filter-helpers.ts
+++ b/apps/web/lib/analytics/filter-helpers.ts
@@ -1,4 +1,27 @@
-import { ParsedFilter } from "@dub/utils";
+import { ParsedFilter, type SQLOperator } from "@dub/utils";
+
+/**
+ * Advanced filter structure for Tinybird's filters JSON parameter.
+ * Used for event-level dimensional filters.
+ */
+export interface AdvancedFilter {
+ field: string;
+ operator: SQLOperator;
+ values: string[];
+}
+
+/**
+ * Extract the first string value from a ParsedFilter.
+ * Useful for API routes that need a single value (e.g., domain, folderId)
+ * for lookups, even when the filter supports multiple values.
+ */
+export function getFirstFilterValue(
+ filter: ParsedFilter | string | undefined,
+): string | undefined {
+ if (!filter) return undefined;
+ if (typeof filter === "string") return filter;
+ return filter.values?.[0];
+}
/**
* Prepare trigger and region filters for Tinybird pipes.
@@ -72,3 +95,48 @@ export function extractWorkspaceLinkFilters(params: {
rootOperator: root.operator,
};
}
+
+/**
+ * Build advanced filters array for Tinybird's filters JSON parameter.
+ * Extracts event-level dimensional filters from params and formats them
+ * for the filters JSON that gets passed to Tinybird pipes.
+ */
+const SUPPORTED_FIELDS = [
+ "country",
+ "city",
+ "continent",
+ "device",
+ "browser",
+ "os",
+ "referer",
+ "refererUrl",
+ "url",
+ "trigger",
+ "utm_source",
+ "utm_medium",
+ "utm_campaign",
+ "utm_term",
+ "utm_content",
+ "saleType",
+] as const;
+
+type SupportedField = (typeof SUPPORTED_FIELDS)[number];
+
+export function buildAdvancedFilters(
+ params: Partial<Record<SupportedField, ParsedFilter | undefined>>,
+): AdvancedFilter[] {
+ const filters: AdvancedFilter[] = [];
+
+ for (const field of SUPPORTED_FIELDS) {
+ const parsed = params[field];
+ if (!parsed) continue;
+
+ filters.push({
+ field,
+ operator: parsed.sqlOperator,
+ values: parsed.values,
+ });
+ }
+
+ return filters;
+}
diff --git a/apps/web/lib/analytics/get-analytics.ts b/apps/web/lib/analytics/get-analytics.ts
index 0a5e33df24..15083bad1b 100644
--- a/apps/web/lib/analytics/get-analytics.ts
+++ b/apps/web/lib/analytics/get-analytics.ts
@@ -8,12 +8,12 @@ import { decodeKeyIfCaseSensitive } from "../api/links/case-sensitivity";
import { conn } from "../planetscale";
import { analyticsFilterTB } from "../zod/schemas/analytics";
import { analyticsResponse } from "../zod/schemas/analytics-response";
-import { buildAdvancedFilters } from "./build-advanced-filters";
import {
DIMENSIONAL_ANALYTICS_FILTERS,
SINGULAR_ANALYTICS_ENDPOINTS,
} from "./constants";
import {
+ buildAdvancedFilters,
extractWorkspaceLinkFilters,
prepareFiltersForPipe,
} from "./filter-helpers";
diff --git a/apps/web/lib/analytics/get-events.ts b/apps/web/lib/analytics/get-events.ts
index b52ad605ec..54ae07818d 100644
--- a/apps/web/lib/analytics/get-events.ts
+++ b/apps/web/lib/analytics/get-events.ts
@@ -21,8 +21,8 @@ import {
saleEventResponseSchema,
saleEventSchemaTBEndpoint,
} from "../zod/schemas/sales";
-import { buildAdvancedFilters } from "./build-advanced-filters";
import {
+ buildAdvancedFilters,
extractWorkspaceLinkFilters,
prepareFiltersForPipe,
} from "./filter-helpers";
diff --git a/apps/web/tests/analytics/advanced-filters.test.ts b/apps/web/tests/analytics/advanced-filters.test.ts
index ee959111f2..a6d28a1edc 100644
--- a/apps/web/tests/analytics/advanced-filters.test.ts
+++ b/apps/web/tests/analytics/advanced-filters.test.ts
@@ -1,5 +1,5 @@
import { parseFilterValue, buildFilterValue } from "@dub/utils";
-import { buildAdvancedFilters } from "@/lib/analytics/build-advanced-filters";
+import { buildAdvancedFilters } from "@/lib/analytics/filter-helpers";
import { describe, expect, test } from "vitest";
describe("Advanced Filters - Unit Tests", () => {