Skip to content

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

fix(events): filter event names at row level (#1096)

桌子潔806e368af9dc
diff --git a/server/src/api/analytics/events/getEvents.test.ts b/server/src/api/analytics/events/getEvents.test.ts
new file mode 100644
index 000000000..84f3dbac0
--- /dev/null
+++ b/server/src/api/analytics/events/getEvents.test.ts
@@ -0,0 +1,47 @@
+import { describe, expect, it, vi } from "vitest";
+
+vi.mock("../../../db/clickhouse/clickhouse.js", () => ({
+ clickhouse: { query: vi.fn() },
+}));
+vi.mock("../../../db/postgres/postgres.js", () => ({
+ db: {},
+}));
+
+import { buildEventsQuery } from "./getEvents.js";
+
+const SITE_ID = 1;
+
+const baseQuery = (overrides: Partial<Record<string, unknown>> = {}) =>
+ ({
+ start_date: "",
+ end_date: "",
+ time_zone: "UTC",
+ filters: "",
+ page_size: "50",
+ ...overrides,
+ }) as Parameters<typeof buildEventsQuery>[0];
+
+describe("buildEventsQuery filters", () => {
+ it("filters event names at the event-row level", () => {
+ const filters = JSON.stringify([{ parameter: "event_name", type: "equals", value: ["att_prompt_shown"] }]);
+ const { query } = buildEventsQuery(baseQuery({ filters }), SITE_ID);
+
+ expect(query).toContain("AND event_name = 'att_prompt_shown'");
+ expect(query).not.toContain("SELECT DISTINCT session_id");
+ });
+
+ it("keeps channel filters at the session level", () => {
+ const filters = JSON.stringify([{ parameter: "channel", type: "equals", value: ["Direct"] }]);
+ const { query } = buildEventsQuery(baseQuery({ filters }), SITE_ID);
+
+ expect(query).toContain("session_id IN");
+ expect(query).toContain("session_channel = 'Direct'");
+ });
+
+ it("does not add a filter clause when filters are empty", () => {
+ const { query, params } = buildEventsQuery(baseQuery(), SITE_ID);
+
+ expect(query).not.toContain("session_id IN");
+ expect(params).toEqual({ siteId: SITE_ID, limit: 50 });
+ });
+});
diff --git a/server/src/api/analytics/events/getEvents.ts b/server/src/api/analytics/events/getEvents.ts
index 6777c0731..7bcc87a40 100644
--- a/server/src/api/analytics/events/getEvents.ts
+++ b/server/src/api/analytics/events/getEvents.ts
@@ -77,7 +77,10 @@ export const buildEventsQuery = (query: GetEventsRequest["Querystring"], siteId:
const { since_timestamp, before_timestamp, page_size: pageSize = "50", filters } = query;
const limit = parseInt(pageSize, 10);
- const filterStatement = filters ? getFilterStatement(filters, siteId) : "";
+ // The event log filters individual rows; only channel remains session-attributed.
+ const filterStatement = filters
+ ? getFilterStatement(filters, siteId, undefined, { sessionLevelParams: ["channel"] })
+ : "";
// Mode A: Poll for new events since a timestamp (Realtime polling)
if (since_timestamp) {