Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

fix get filters bug

Bill Yang8f2891e94fbf
diff --git a/server/src/api/analytics/events/getEventNames.ts b/server/src/api/analytics/events/getEventNames.ts
index 4e4028026..82f80e811 100644
--- a/server/src/api/analytics/events/getEventNames.ts
+++ b/server/src/api/analytics/events/getEventNames.ts
@@ -23,7 +23,7 @@ export async function getEventNames(req: FastifyRequest<GetEventNamesRequest>, r
const timeStatement = getTimeStatement(req.query);
- const filterStatement = filters ? getFilterStatement(filters) : "";
+ const filterStatement = filters ? getFilterStatement(filters, Number(site), timeStatement) : "";
const query = `
SELECT
diff --git a/server/src/api/analytics/events/getEventProperties.ts b/server/src/api/analytics/events/getEventProperties.ts
index c953c3615..b0da96970 100644
--- a/server/src/api/analytics/events/getEventProperties.ts
+++ b/server/src/api/analytics/events/getEventProperties.ts
@@ -28,7 +28,7 @@ export async function getEventProperties(req: FastifyRequest<GetEventPropertiesR
const timeStatement = getTimeStatement(req.query);
- const filterStatement = filters ? getFilterStatement(filters) : "";
+ const filterStatement = filters ? getFilterStatement(filters, Number(site), timeStatement) : "";
const query = `
SELECT
diff --git a/server/src/api/analytics/events/getEvents.ts b/server/src/api/analytics/events/getEvents.ts
index e1f2c1c26..e3647c199 100644
--- a/server/src/api/analytics/events/getEvents.ts
+++ b/server/src/api/analytics/events/getEvents.ts
@@ -43,7 +43,7 @@ export async function getEvents(req: FastifyRequest<GetEventsRequest>, res: Fast
const timeStatement =
startDate || endDate ? getTimeStatement(req.query) : "AND timestamp > now() - INTERVAL 30 MINUTE"; // Default to last 30 minutes if no time range specified
- const filterStatement = filters ? getFilterStatement(filters) : "";
+ const filterStatement = filters ? getFilterStatement(filters, Number(site), timeStatement) : "";
try {
// First, get the total count for pagination metadata
diff --git a/server/src/api/analytics/events/getOutboundLinks.ts b/server/src/api/analytics/events/getOutboundLinks.ts
index 4071e077f..3f503292d 100644
--- a/server/src/api/analytics/events/getOutboundLinks.ts
+++ b/server/src/api/analytics/events/getOutboundLinks.ts
@@ -21,7 +21,7 @@ export async function getOutboundLinks(req: FastifyRequest<GetOutboundLinksReque
const site = req.params.site;
const timeStatement = getTimeStatement(req.query);
- const filterStatement = filters ? getFilterStatement(filters) : "";
+ const filterStatement = filters ? getFilterStatement(filters, Number(site), timeStatement) : "";
const query = `
SELECT
diff --git a/server/src/api/analytics/funnels/getFunnel.ts b/server/src/api/analytics/funnels/getFunnel.ts
index 7b82d2423..8cb5c68d2 100644
--- a/server/src/api/analytics/funnels/getFunnel.ts
+++ b/server/src/api/analytics/funnels/getFunnel.ts
@@ -44,9 +44,8 @@ export async function getFunnel(
}
try {
- const filterStatement = getFilterStatement(request.query.filters);
-
const timeStatement = getTimeStatement(request.query);
+ const filterStatement = getFilterStatement(request.query.filters, Number(site), timeStatement);
// Build conditional statements for each step
const stepConditions = steps.map(step => {
diff --git a/server/src/api/analytics/getErrorBucketed.ts b/server/src/api/analytics/getErrorBucketed.ts
index 4903c5887..3bfbb455b 100644
--- a/server/src/api/analytics/getErrorBucketed.ts
+++ b/server/src/api/analytics/getErrorBucketed.ts
@@ -56,8 +56,8 @@ export async function getErrorBucketed(req: FastifyRequest<GetErrorBucketedReque
}
const numericSiteId = Number(site);
- const filterStatement = getFilterStatement(req.query.filters);
const timeStatement = getTimeStatement(req.query);
+ const filterStatement = getFilterStatement(req.query.filters, numericSiteId, timeStatement);
const timeStatementFill = getTimeStatementFill(req.query, bucket);
try {
diff --git a/server/src/api/analytics/getErrorEvents.ts b/server/src/api/analytics/getErrorEvents.ts
index dc7063918..af424faef 100644
--- a/server/src/api/analytics/getErrorEvents.ts
+++ b/server/src/api/analytics/getErrorEvents.ts
@@ -49,8 +49,8 @@ const getErrorEventsQuery = (request: FastifyRequest<GetErrorEventsRequest>, isC
const { startDate, endDate, timeZone, filters, errorMessage, limit, page, pastMinutesStart, pastMinutesEnd } =
request.query;
- const filterStatement = getFilterStatement(filters);
const timeStatement = getTimeStatement(request.query);
+ const filterStatement = getFilterStatement(filters, Number(request.params.site), timeStatement);
let validatedLimit: number | null = null;
if (!isCountQuery && limit !== undefined) {
diff --git a/server/src/api/analytics/getErrorNames.ts b/server/src/api/analytics/getErrorNames.ts
index ac30cc275..262c920f5 100644
--- a/server/src/api/analytics/getErrorNames.ts
+++ b/server/src/api/analytics/getErrorNames.ts
@@ -31,8 +31,8 @@ type ErrorNamesPaginatedResponse = {
const getErrorNamesQuery = (request: FastifyRequest<GetErrorNamesRequest>, isCountQuery: boolean = false) => {
const { filters, limit, page } = request.query;
- const filterStatement = getFilterStatement(filters);
const timeStatement = getTimeStatement(request.query);
+ const filterStatement = getFilterStatement(filters, Number(request.params.site), timeStatement);
let validatedLimit: number | null = null;
if (!isCountQuery && limit !== undefined) {
diff --git a/server/src/api/analytics/getJourneys.ts b/server/src/api/analytics/getJourneys.ts
index 398d2954d..eae40ee25 100644
--- a/server/src/api/analytics/getJourneys.ts
+++ b/server/src/api/analytics/getJourneys.ts
@@ -36,7 +36,7 @@ export const getJourneys = async (
// Time conditions using getTimeStatement
const timeStatement = getTimeStatement(request.query);
- const filterStatement = getFilterStatement(filters);
+ const filterStatement = getFilterStatement(filters, Number(site), timeStatement);
// Parse step filters
let parsedStepFilters: Record<number, string> = {};
diff --git a/server/src/api/analytics/getOverview.ts b/server/src/api/analytics/getOverview.ts
index c8c25d0c4..13846c067 100644
--- a/server/src/api/analytics/getOverview.ts
+++ b/server/src/api/analytics/getOverview.ts
@@ -13,9 +13,9 @@ type GetOverviewResponse = {
session_duration: number;
};
-const getQuery = (params: FilterParams) => {
- const filterStatement = getFilterStatement(params.filters);
+const getQuery = (params: FilterParams, siteId: number) => {
const timeStatement = getTimeStatement(params);
+ const filterStatement = getFilterStatement(params.filters, siteId, timeStatement);
return `
WITH
@@ -96,14 +96,17 @@ export async function getOverview(req: FastifyRequest<OverviewRequest>, res: Fas
const { startDate, endDate, timeZone, filters, pastMinutesStart, pastMinutesEnd } = req.query;
const site = req.params.site;
- const query = getQuery({
- startDate,
- endDate,
- timeZone,
- filters,
- pastMinutesStart,
- pastMinutesEnd,
- });
+ const query = getQuery(
+ {
+ startDate,
+ endDate,
+ timeZone,
+ filters,
+ pastMinutesStart,
+ pastMinutesEnd,
+ },
+ Number(site)
+ );
try {
const result = await clickhouse.query({
diff --git a/server/src/api/analytics/getOverviewBucketed.ts b/server/src/api/analytics/getOverviewBucketed.ts
index 31c7e63c7..365b4e7e0 100644
--- a/server/src/api/analytics/getOverviewBucketed.ts
+++ b/server/src/api/analytics/getOverviewBucketed.ts
@@ -65,9 +65,10 @@ function getTimeStatementFill(params: FilterParams, bucket: TimeBucket) {
return "";
}
-const getQuery = (params: FilterParams<{ bucket: TimeBucket }>) => {
+const getQuery = (params: FilterParams<{ bucket: TimeBucket }>, siteId: number) => {
const { startDate, endDate, timeZone, bucket, filters, pastMinutesStart, pastMinutesEnd } = params;
- const filterStatement = getFilterStatement(filters);
+ const timeStatement = getTimeStatement(params);
+ const filterStatement = getFilterStatement(filters, siteId, timeStatement);
const pastMinutesRange =
pastMinutesStart !== undefined && pastMinutesEnd !== undefined
@@ -166,15 +167,18 @@ export async function getOverviewBucketed(
const { startDate, endDate, timeZone, bucket, filters, pastMinutesStart, pastMinutesEnd } = req.query;
const site = req.params.site;
- const query = getQuery({
- startDate,
- endDate,
- timeZone,
- bucket,
- filters,
- pastMinutesStart,
- pastMinutesEnd,
- });
+ const query = getQuery(
+ {
+ startDate,
+ endDate,
+ timeZone,
+ bucket,
+ filters,
+ pastMinutesStart,
+ pastMinutesEnd,
+ },
+ Number(site)
+ );
try {
const result = await clickhouse.query({
diff --git a/server/src/api/analytics/getPageTitles.ts b/server/src/api/analytics/getPageTitles.ts
index fc22dc24f..4e957130e 100644
--- a/server/src/api/analytics/getPageTitles.ts
+++ b/server/src/api/analytics/getPageTitles.ts
@@ -31,8 +31,8 @@ type PageTitlesPaginatedResponse = {
const getPageTitlesQuery = (request: FastifyRequest<GetPageTitlesRequest>, isCountQuery: boolean = false) => {
const { startDate, endDate, timeZone, filters, limit, page, pastMinutesStart, pastMinutesEnd } = request.query;
- const filterStatement = getFilterStatement(filters);
const timeStatement = getTimeStatement(request.query);
+ const filterStatement = getFilterStatement(filters, Number(request.params.site), timeStatement);
let validatedLimit: number | null = null;
if (!isCountQuery && limit !== undefined) {
diff --git a/server/src/api/analytics/getSessionLocations.ts b/server/src/api/analytics/getSessionLocations.ts
index 3d35ecd4c..3a4f440ec 100644
--- a/server/src/api/analytics/getSessionLocations.ts
+++ b/server/src/api/analytics/getSessionLocations.ts
@@ -14,8 +14,8 @@ export async function getSessionLocations(
) {
const { site } = req.params;
- const filterStatement = getFilterStatement(req.query.filters);
const timeStatement = getTimeStatement(req.query);
+ const filterStatement = getFilterStatement(req.query.filters, Number(site), timeStatement);
const result = await clickhouse.query({
query: `
diff --git a/server/src/api/analytics/getSessions.ts b/server/src/api/analytics/getSessions.ts
index adaf0b844..1cb46c188 100644
--- a/server/src/api/analytics/getSessions.ts
+++ b/server/src/api/analytics/getSessions.ts
@@ -56,7 +56,8 @@ export async function getSessions(req: FastifyRequest<GetSessionsRequest>, res:
const { filters, page, userId, limit } = req.query;
const site = req.params.site;
- let filterStatement = getFilterStatement(filters);
+ const timeStatement = getTimeStatement(req.query);
+ let filterStatement = getFilterStatement(filters, Number(site), timeStatement);
// Transform filter statement to use extracted UTM columns instead of map access
// since the CTE already extracts utm_source, utm_medium, etc. as separate columns
@@ -67,8 +68,6 @@ export async function getSessions(req: FastifyRequest<GetSessionsRequest>, res:
.replace(/url_parameters\['utm_term'\]/g, "utm_term")
.replace(/url_parameters\['utm_content'\]/g, "utm_content");
- const timeStatement = getTimeStatement(req.query);
-
const query = `
WITH AggregatedSessions AS (
SELECT
diff --git a/server/src/api/analytics/getSingleCol.ts b/server/src/api/analytics/getSingleCol.ts
index bec0221e7..91998d5bf 100644
--- a/server/src/api/analytics/getSingleCol.ts
+++ b/server/src/api/analytics/getSingleCol.ts
@@ -50,9 +50,10 @@ type GetSingleColPaginatedResponse = {
const getQuery = (request: FastifyRequest<GetSingleColRequest>, isCountQuery: boolean = false) => {
const { filters, parameter, limit, page } = request.query;
+ const site = request.params.site;
- const filterStatement = getFilterStatement(filters);
const timeStatement = getTimeStatement(request.query);
+ const filterStatement = getFilterStatement(filters, Number(site), timeStatement);
let validatedLimit: number | null = null;
if (!isCountQuery && limit !== undefined) {
diff --git a/server/src/api/analytics/getUserSessions.ts b/server/src/api/analytics/getUserSessions.ts
index 8bf27eeae..0aef680e3 100644
--- a/server/src/api/analytics/getUserSessions.ts
+++ b/server/src/api/analytics/getUserSessions.ts
@@ -52,8 +52,8 @@ export async function getUserSessions(req: FastifyRequest<GetUserSessionsRequest
const { startDate, endDate, timeZone, site, filters } = req.query;
const userId = req.params.userId;
- const filterStatement = getFilterStatement(filters);
const timeStatement = getTimeStatement(req.query);
+ const filterStatement = getFilterStatement(filters, Number(site), timeStatement);
const query = `
SELECT
diff --git a/server/src/api/analytics/getUsers.ts b/server/src/api/analytics/getUsers.ts
index 605b09407..436c91985 100644
--- a/server/src/api/analytics/getUsers.ts
+++ b/server/src/api/analytics/getUsers.ts
@@ -57,8 +57,8 @@ export async function getUsers(req: FastifyRequest<GetUsersRequest>, res: Fastif
const actualSortOrder = sortOrder === "asc" ? "ASC" : "DESC";
// Generate filter statement and time statement
- const filterStatement = getFilterStatement(filters);
const timeStatement = getTimeStatement(req.query);
+ const filterStatement = getFilterStatement(filters, Number(site), timeStatement);
const query = `
WITH AggregatedUsers AS (
diff --git a/server/src/api/analytics/goals/getGoals.ts b/server/src/api/analytics/goals/getGoals.ts
index 3e83a7763..430789cfd 100644
--- a/server/src/api/analytics/goals/getGoals.ts
+++ b/server/src/api/analytics/goals/getGoals.ts
@@ -122,8 +122,8 @@ export async function getGoals(
}
// Build filter and time clauses for ClickHouse queries
- const filterStatement = filters ? getFilterStatement(filters) : "";
const timeStatement = getTimeStatement(request.query);
+ const filterStatement = filters ? getFilterStatement(filters, Number(site), timeStatement) : "";
// First, get the total number of unique sessions (denominator for conversion rate)
const totalSessionsQuery = `
diff --git a/server/src/api/analytics/performance/getPerformanceByDimension.ts b/server/src/api/analytics/performance/getPerformanceByDimension.ts
index b8dd01d74..64e700f9b 100644
--- a/server/src/api/analytics/performance/getPerformanceByDimension.ts
+++ b/server/src/api/analytics/performance/getPerformanceByDimension.ts
@@ -75,8 +75,8 @@ const getQuery = (request: FastifyRequest<GetPerformanceByDimensionRequest>, isC
throw new Error(`Invalid dimension: ${dimension}`);
}
- const filterStatement = getFilterStatement(filters);
const timeStatement = getTimeStatement(request.query);
+ const filterStatement = getFilterStatement(filters, Number(request.params.site), timeStatement);
let validatedLimit: number | null = null;
if (!isCountQuery && limit !== undefined) {
diff --git a/server/src/api/analytics/performance/getPerformanceOverview.ts b/server/src/api/analytics/performance/getPerformanceOverview.ts
index f1a41a316..0423f2b11 100644
--- a/server/src/api/analytics/performance/getPerformanceOverview.ts
+++ b/server/src/api/analytics/performance/getPerformanceOverview.ts
@@ -4,8 +4,9 @@ import { getFilterStatement, getTimeStatement, processResults } from "../utils.j
import { PerformanceOverviewMetrics } from "../types.js";
import { FilterParams } from "@rybbit/shared";
-const getQuery = (params: FilterParams) => {
- const filterStatement = getFilterStatement(params.filters);
+const getQuery = (params: FilterParams, siteId: number) => {
+ const timeStatement = getTimeStatement(params);
+ const filterStatement = getFilterStatement(params.filters, siteId, timeStatement);
return `SELECT
quantile(0.5)(lcp) AS lcp_p50,
@@ -34,7 +35,7 @@ const getQuery = (params: FilterParams) => {
site_id = {siteId:Int32}
AND type = 'performance'
${filterStatement}
- ${getTimeStatement(params)}`;
+ ${timeStatement}`;
};
export interface PerformanceOverviewRequest {
@@ -47,7 +48,7 @@ export interface PerformanceOverviewRequest {
export async function getPerformanceOverview(req: FastifyRequest<PerformanceOverviewRequest>, res: FastifyReply) {
const site = req.params.site;
- const query = getQuery(req.query);
+ const query = getQuery(req.query, Number(site));
try {
const result = await clickhouse.query({
diff --git a/server/src/api/analytics/performance/getPerformanceTimeSeries.ts b/server/src/api/analytics/performance/getPerformanceTimeSeries.ts
index 9204aee7f..f5f95beb1 100644
--- a/server/src/api/analytics/performance/getPerformanceTimeSeries.ts
+++ b/server/src/api/analytics/performance/getPerformanceTimeSeries.ts
@@ -65,9 +65,10 @@ function getTimeStatementFill(params: FilterParams, bucket: TimeBucket) {
return "";
}
-const getQuery = (params: FilterParams<{ bucket: TimeBucket }>) => {
+const getQuery = (params: FilterParams<{ bucket: TimeBucket }>, siteId: number) => {
const { startDate, endDate, timeZone, bucket, filters, pastMinutesStart, pastMinutesEnd } = params;
- const filterStatement = getFilterStatement(filters);
+ const timeStatement = getTimeStatement(params);
+ const filterStatement = getFilterStatement(filters, siteId, timeStatement);
const isAllTime = !startDate && !endDate && !pastMinutesStart && !pastMinutesEnd;
@@ -100,7 +101,7 @@ WHERE
site_id = {siteId:Int32}
AND type = 'performance'
${filterStatement}
- ${getTimeStatement(params)}
+ ${timeStatement}
GROUP BY time ORDER BY time ${isAllTime ? "" : getTimeStatementFill(params, bucket)}`;
return query;
@@ -119,7 +120,7 @@ export async function getPerformanceTimeSeries(
) {
const site = req.params.site;
- const query = getQuery(req.query);
+ const query = getQuery(req.query, Number(site));
try {
const result = await clickhouse.query({
diff --git a/server/src/api/analytics/utils.ts b/server/src/api/analytics/utils.ts
index b968adda8..b9f43fe5e 100644
--- a/server/src/api/analytics/utils.ts
+++ b/server/src/api/analytics/utils.ts
@@ -138,7 +138,7 @@ export const getSqlParam = (parameter: FilterParameter) => {
return filterParamSchema.parse(parameter);
};
-export function getFilterStatement(filters: string) {
+export function getFilterStatement(filters: string, siteId?: number, timeStatement?: string) {
if (!filters) {
return "";
}
@@ -150,6 +150,10 @@ export function getFilterStatement(filters: string) {
return "";
}
+ const siteIdFilter = siteId ? `site_id = ${siteId}` : "";
+ // Strip leading "AND " from timeStatement since we'll be constructing WHERE clauses
+ const timeFilter = timeStatement ? timeStatement.replace(/^AND\s+/i, "").trim() : "";
+
return (
"AND " +
filtersArray
@@ -160,26 +164,26 @@ export function getFilterStatement(filters: string) {
// Handle event_name as a session-level filter
// This ensures we filter to sessions containing the event, but still count all pageviews in those sessions
if (filter.parameter === "event_name") {
- if (filter.value.length === 1) {
- return `session_id IN (
- SELECT DISTINCT session_id
- FROM events
- WHERE event_name ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + filter.value[0] + x)}
- )`;
- }
+ const whereClause = [siteIdFilter, timeFilter].filter(Boolean).join(" AND ");
+ const eventNameCondition = filter.value.length === 1
+ ? `event_name ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + filter.value[0] + x)}`
+ : `(${filter.value.map(value => `event_name ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + value + x)}`).join(" OR ")})`;
- const valuesWithOperator = filter.value.map(
- value => `event_name ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + value + x)}`
- );
+ const finalWhere = whereClause
+ ? `WHERE ${whereClause} AND ${eventNameCondition}`
+ : `WHERE ${eventNameCondition}`;
return `session_id IN (
SELECT DISTINCT session_id
FROM events
- WHERE (${valuesWithOperator.join(" OR ")})
+ ${finalWhere}
)`;
}
if (filter.parameter === "entry_page") {
+ const whereClause = [siteIdFilter, timeFilter].filter(Boolean).join(" AND ");
+ const whereStatement = whereClause ? `WHERE ${whereClause}` : "";
+
if (filter.value.length === 1) {
return `session_id IN (
SELECT session_id
@@ -188,6 +192,7 @@ export function getFilterStatement(filters: string) {
session_id,
argMin(pathname, timestamp) AS entry_pathname
FROM events
+ ${whereStatement}
GROUP BY session_id
)
WHERE entry_pathname ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + filter.value[0] + x)}
@@ -205,6 +210,7 @@ export function getFilterStatement(filters: string) {
session_id,
argMin(pathname, timestamp) AS entry_pathname
FROM events
+ ${whereStatement}
GROUP BY session_id
)
WHERE (${valuesWithOperator.join(" OR ")})
@@ -212,6 +218,9 @@ export function getFilterStatement(filters: string) {
}
if (filter.parameter === "exit_page") {
+ const whereClause = [siteIdFilter, timeFilter].filter(Boolean).join(" AND ");
+ const whereStatement = whereClause ? `WHERE ${whereClause}` : "";
+
if (filter.value.length === 1) {
return `session_id IN (
SELECT session_id
@@ -220,6 +229,7 @@ export function getFilterStatement(filters: string) {
session_id,
argMax(pathname, timestamp) AS exit_pathname
FROM events
+ ${whereStatement}
GROUP BY session_id
)
WHERE exit_pathname ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + filter.value[0] + x)}
@@ -237,6 +247,7 @@ export function getFilterStatement(filters: string) {
session_id,
argMax(pathname, timestamp) AS exit_pathname
FROM events
+ ${whereStatement}
GROUP BY session_id
)
WHERE (${valuesWithOperator.join(" OR ")})