Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
fix count query
Francis Cao8d6943bf519f
diff --git a/src/queries/sql/events/getWebsiteEvents.test.ts b/src/queries/sql/events/getWebsiteEvents.test.tsindex 76eeee558..51238327f 100644--- a/src/queries/sql/events/getWebsiteEvents.test.ts+++ b/src/queries/sql/events/getWebsiteEvents.test.ts@@ -79,10 +79,13 @@ describe('getWebsiteEvents', () => {} as any);const [countQuery] = prismaRawQuery.mock.calls[0];+ const [, countParams] = prismaRawQuery.mock.calls[0];const [dataQuery] = prismaRawQuery.mock.calls[1];+ const [, dataParams] = prismaRawQuery.mock.calls[1];expect(countQuery).toContain('select count(*) as num from (select 1 from (');expect(countQuery).not.toContain('exists(');+ expect(countQuery).toContain('event_name ilike {{eventSearch}}');expect(dataQuery).toContain('with paged_events as (');expect(dataQuery).toContain('paged_event_data as (');expect(dataQuery).toContain(@@ -95,6 +98,8 @@ describe('getWebsiteEvents', () => {);expect(dataQuery).toContain('order by paged_events.created_at desc');expect(dataQuery).toContain('(paged_event_data.event_id is not null) as "hasData"');+ expect(countParams).toMatchObject({ eventSearch: '%signup%' });+ expect(dataParams).toMatchObject({ eventSearch: '%signup%' });expect(result).toEqual({data: [{ id: 'event-1' }],count: 25,diff --git a/src/queries/sql/events/getWebsiteEvents.ts b/src/queries/sql/events/getWebsiteEvents.tsindex bf1450e74..e105a0ddf 100644--- a/src/queries/sql/events/getWebsiteEvents.ts+++ b/src/queries/sql/events/getWebsiteEvents.ts@@ -24,10 +24,11 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {websiteId,});const hasDataDateQuery = dateQuery.replaceAll('website_event.', 'event_data.');+ const searchParams = search ? { eventSearch: `%${search}%` } : {};const searchQuery = search- ? `and ((event_name ilike {{search}} and event_type = ${EVENT_TYPE.customEvent})- or (url_path ilike {{search}} and event_type = ${EVENT_TYPE.pageView}))`+ ? `and ((event_name ilike {{eventSearch}} and event_type = ${EVENT_TYPE.customEvent})+ or (url_path ilike {{eventSearch}} and event_type = ${EVENT_TYPE.pageView}))`: '';const eventQuery = `@@ -44,11 +45,24 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {${searchQuery}`;+ const countFromQuery = `+ from website_event+ ${cohortQuery}+ ${joinSessionQuery}+ where website_event.website_id = {{websiteId::uuid}}+ and website_event.event_type != ${EVENT_TYPE.performance}+ ${dateQuery}+ ${filterQuery}+ ${searchQuery}+ `;+const countQuery = maxResults? `select count(*) as num from (select 1 from (${eventQuery}) t limit ${+maxResults}) t2`- : `select count(*) as num from (${eventQuery}) t`;+ : `select count(*) as num ${countFromQuery}`;- const count = await rawQuery(countQuery, queryParams).then(res => Number(res[0].num));+ const count = await rawQuery(countQuery, { ...queryParams, ...searchParams }).then(res =>+ Number(res[0].num),+ );const data = await rawQuery(`@@ -91,7 +105,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {left join paged_event_data on paged_event_data.event_id = website_event.event_idorder by paged_events.created_at desc`,- queryParams,+ { ...queryParams, ...searchParams },FUNCTION_NAME,);@@ -134,9 +148,19 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {${searchQuery}`;+ const countFromQuery = `+ from website_event+ ${cohortQuery}+ where website_id = {websiteId:UUID}+ and event_type != ${EVENT_TYPE.performance}+ ${dateQuery}+ ${filterQuery}+ ${searchQuery}+ `;+const countQuery = maxResults? `select count(*) as num from (select 1 from (${eventQuery}) t limit ${+maxResults}) t2`- : `select count(*) as num from (${eventQuery}) t`;+ : `select count(*) as num ${countFromQuery}`;const count = await rawQuery(countQuery, queryParams).then(res => res[0].num);