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.

feat(advanced-filter): analytics pipe helpers

Pedro Ladeirac27ffe556be2
diff --git a/apps/web/lib/analytics/filter-helpers.ts b/apps/web/lib/analytics/filter-helpers.ts
new file mode 100644
index 0000000000..28b39bf2c7
--- /dev/null
+++ b/apps/web/lib/analytics/filter-helpers.ts
@@ -0,0 +1,74 @@
+import { ParsedFilter } from "@dub/utils";
+
+/**
+ * Prepare trigger and region filters for Tinybird pipes.
+ * Handles backward compatibility for qr parameter and region splitting.
+ */
+export function prepareFiltersForPipe(params: {
+ qr?: boolean;
+ trigger?: ParsedFilter;
+ region?: string | ParsedFilter;
+ country?: ParsedFilter;
+}) {
+ // Handle qr backward compatibility
+ let triggerForPipe = params.trigger;
+ if (params.qr && !params.trigger) {
+ triggerForPipe = {
+ operator: "IS" as const,
+ sqlOperator: "IN" as const,
+ values: ["qr"],
+ };
+ }
+
+ // Handle region split (format: "US-CA")
+ let countryForPipe = params.country;
+ let regionForPipe = params.region;
+ if (params.region && typeof params.region === "string") {
+ const split = params.region.split("-");
+ countryForPipe = {
+ operator: "IS" as const,
+ sqlOperator: "IN" as const,
+ values: [split[0]],
+ };
+ regionForPipe = split[1];
+ }
+
+ return { triggerForPipe, countryForPipe, regionForPipe };
+}
+
+/**
+ * Extract workspace link filters (domain, tagIds, folderId, root) into
+ * separate values and operators for Tinybird.
+ *
+ * These filters are applied on the workspace_links node in Tinybird,
+ * so they need to be passed as separate parameters (not in the filters JSON).
+ */
+export function extractWorkspaceLinkFilters(params: {
+ domain?: ParsedFilter;
+ tagIds?: ParsedFilter;
+ folderId?: ParsedFilter;
+ root?: ParsedFilter;
+}) {
+ const extractFilter = (filter?: ParsedFilter) => ({
+ values: filter?.values,
+ operator: (filter?.sqlOperator === "NOT IN" ? "NOT IN" : "IN") as
+ | "IN"
+ | "NOT IN",
+ });
+
+ const domain = extractFilter(params.domain);
+ const tagIds = extractFilter(params.tagIds);
+ const folderId = extractFilter(params.folderId);
+ const root = extractFilter(params.root);
+
+ return {
+ domain: domain.values,
+ domainOperator: domain.operator,
+ tagIds: tagIds.values,
+ tagIdsOperator: tagIds.operator,
+ folderId: folderId.values,
+ folderIdOperator: folderId.operator,
+ root: root.values,
+ rootOperator: root.operator,
+ };
+}
diff --git a/apps/web/lib/analytics/get-analytics.ts b/apps/web/lib/analytics/get-analytics.ts
index 366e100c2c..0a5e33df24 100644
--- a/apps/web/lib/analytics/get-analytics.ts
+++ b/apps/web/lib/analytics/get-analytics.ts
@@ -13,6 +13,10 @@ import {
DIMENSIONAL_ANALYTICS_FILTERS,
SINGULAR_ANALYTICS_ENDPOINTS,
} from "./constants";
+import {
+ extractWorkspaceLinkFilters,
+ prepareFiltersForPipe,
+} from "./filter-helpers";
import { queryParser } from "./query-parser";
import { AnalyticsFilters } from "./types";
import { formatUTCDateTimeClickhouse } from "./utils/format-utc-datetime-clickhouse";
@@ -82,20 +86,13 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
timezone,
});
- // Handle qr backward compatibility
- let triggerForPipe = trigger;
- if (qr && !trigger) {
- triggerForPipe = { operator: "IS" as const, sqlOperator: "IN" as const, values: ["qr"] };
- }
-
- // Handle region split (format: "US-CA")
- let countryForPipe = country;
- let regionForPipe = region;
- if (region && typeof region === 'string') {
- const split = region.split("-");
- countryForPipe = { operator: "IS" as const, sqlOperator: "IN" as const, values: [split[0]] };
- regionForPipe = split[1];
- }
+ const { triggerForPipe, countryForPipe, regionForPipe } =
+ prepareFiltersForPipe({
+ qr,
+ trigger,
+ region,
+ country,
+ });
// Create a Tinybird pipe
const pipe = tb.buildPipe({
@@ -133,17 +130,16 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
const allFilters = [...metadataFilters, ...advancedFilters];
- const domainParam = params.domain?.values;
- const domainOperator = params.domain?.sqlOperator === 'NOT IN' ? 'NOT IN' : 'IN';
-
- const tagIdsParam = params.tagIds?.values;
- const tagIdsOperator = params.tagIds?.sqlOperator === 'NOT IN' ? 'NOT IN' : 'IN';
-
- const folderIdParam = params.folderId?.values;
- const folderIdOperator = params.folderId?.sqlOperator === 'NOT IN' ? 'NOT IN' : 'IN';
-
- const rootParam = params.root?.values;
- const rootOperator = params.root?.sqlOperator === 'NOT IN' ? 'NOT IN' : 'IN';
+ const {
+ domain: domainParam,
+ domainOperator,
+ tagIds: tagIdsParam,
+ tagIdsOperator,
+ folderId: folderIdParam,
+ folderIdOperator,
+ root: rootParam,
+ rootOperator,
+ } = extractWorkspaceLinkFilters(params);
const tinybirdParams: any = {
workspaceId,
@@ -169,7 +165,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
end: formatUTCDateTimeClickhouse(endDate),
granularity,
timezone,
- region: typeof regionForPipe === 'string' ? regionForPipe : undefined,
+ region: typeof regionForPipe === "string" ? regionForPipe : undefined,
filters: allFilters.length > 0 ? JSON.stringify(allFilters) : undefined,
};
diff --git a/apps/web/lib/analytics/get-events.ts b/apps/web/lib/analytics/get-events.ts
index 342e964f88..b52ad605ec 100644
--- a/apps/web/lib/analytics/get-events.ts
+++ b/apps/web/lib/analytics/get-events.ts
@@ -22,6 +22,10 @@ import {
saleEventSchemaTBEndpoint,
} from "../zod/schemas/sales";
import { buildAdvancedFilters } from "./build-advanced-filters";
+import {
+ extractWorkspaceLinkFilters,
+ prepareFiltersForPipe,
+} from "./filter-helpers";
import { queryParser } from "./query-parser";
import { EventsFilters } from "./types";
import { formatUTCDateTimeClickhouse } from "./utils/format-utc-datetime-clickhouse";
@@ -54,20 +58,13 @@ export const getEvents = async (params: EventsFilters) => {
timezone,
});
- // Handle qr backward compatibility
- let triggerForPipe = trigger;
- if (qr && !trigger) {
- triggerForPipe = { operator: "IS" as const, sqlOperator: "IN" as const, values: ["qr"] };
- }
-
- // Handle region split (format: "US-CA")
- let countryForPipe = country;
- let regionForPipe = region;
- if (region && typeof region === 'string') {
- const split = region.split("-");
- countryForPipe = { operator: "IS" as const, sqlOperator: "IN" as const, values: [split[0]] };
- regionForPipe = split[1];
- }
+ const { triggerForPipe, countryForPipe, regionForPipe } =
+ prepareFiltersForPipe({
+ qr,
+ trigger,
+ region,
+ country,
+ });
// support legacy order param
if (order && order !== "desc") {
@@ -109,18 +106,16 @@ export const getEvents = async (params: EventsFilters) => {
const allFilters = [...metadataFilters, ...advancedFilters];
- // Extract workspace_links parameters as direct Tinybird params
- const domainParam = params.domain?.values;
- const domainOperator = params.domain?.sqlOperator === 'NOT IN' ? 'NOT IN' : 'IN';
-
- const tagIdsParam = params.tagIds?.values;
- const tagIdsOperator = params.tagIds?.sqlOperator === 'NOT IN' ? 'NOT IN' : 'IN';
-
- const folderIdParam = params.folderId?.values;
- const folderIdOperator = params.folderId?.sqlOperator === 'NOT IN' ? 'NOT IN' : 'IN';
-
- const rootParam = params.root?.values;
- const rootOperator = params.root?.sqlOperator === 'NOT IN' ? 'NOT IN' : 'IN';
+ const {
+ domain: domainParam,
+ domainOperator,
+ tagIds: tagIdsParam,
+ tagIdsOperator,
+ folderId: folderIdParam,
+ folderIdOperator,
+ root: rootParam,
+ rootOperator,
+ } = extractWorkspaceLinkFilters(params);
const tinybirdParams: any = {
eventType,