Merge branch 'dev' into jajaja

# Conflicts:
#	pnpm-lock.yaml
#	src/queries/sql/getWebsiteStats.ts
#	src/queries/sql/pageviews/getPageviewMetrics.ts
#	src/queries/sql/sessions/getWebsiteSessionStats.ts
#	src/queries/sql/sessions/getWebsiteSessions.ts
#	src/queries/sql/sessions/getWebsiteSessionsWeekly.ts

src/queries/sql/getWebsiteStats.ts

@@ -113,7 +113,8 @@ async function clickhouseQuery(
             sum(views) c,
             min(min_time) min_time,
             max(max_time) max_time
-        from umami.website_event_stats_hourly "website_event"
+        from website_event_stats_hourly "website_event"
+        ${cohortQuery}
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and event_type = {eventType:UInt32}

src/queries/sql/pageviews/getPageviewMetrics.ts

@@ -146,18 +146,18 @@ async function clickhouseQuery(
     `;
   } else {
     let groupByQuery = '';
-    let columnQuery = `session_id s, arrayJoin(${column})`;
+    let columnQuery = `arrayJoin(${column})`;
 
     if (column === 'referrer_domain') {
       excludeDomain = `and t != ''`;
     }
 
     if (type === 'entry') {
-      columnQuery = `session_id s, argMinMerge(entry_url)`;
+      columnQuery = `argMinMerge(entry_url)`;
     }
 
     if (type === 'exit') {
-      columnQuery = `session_id s, argMaxMerge(exit_url)`;
+      columnQuery = `argMaxMerge(exit_url)`;
     }
 
     if (type === 'entry' || type === 'exit') {
@@ -168,6 +168,9 @@ async function clickhouseQuery(
     select g.t as x,
       uniq(s) as y
     from (
+      select session_id s, 
+        ${columnQuery} as t
+      from website_event_stats_hourly website_event
       select ${columnQuery} as t
       from website_event_stats_hourly as website_event
       ${cohortQuery}

src/queries/sql/reports/getFunnel.ts

@@ -203,7 +203,7 @@ async function clickhouseQuery(
     `
     WITH level0 AS (
       select distinct session_id, url_path, referrer_path, event_name, created_at
-      from umami.website_event
+      from website_event
       where (${stepFilterQuery})
         and website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}

src/queries/sql/reports/getJourney.ts

@@ -220,7 +220,7 @@ async function clickhouseQuery(
           visit_id,
           coalesce(nullIf(event_name, ''), url_path) event,
           row_number() OVER (PARTITION BY visit_id ORDER BY created_at) AS event_number
-      from umami.website_event
+      from website_event
       where website_id = {websiteId:UUID}
         ${filterQuery}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}),

src/queries/sql/sessions/getWebsiteSessionStats.ts

@@ -1,4 +1,5 @@
 import clickhouse from '@/lib/clickhouse';
+import { EVENT_COLUMNS } from '@/lib/constants';
 import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import prisma from '@/lib/prisma';
 import { QueryFilters } from '@/lib/types';
@@ -53,20 +54,37 @@ async function clickhouseQuery(
   const { rawQuery, parseFilters } = clickhouse;
   const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });
 
-  return rawQuery(
-    `
+  let sql = '';
+
+  if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item))) {
+    sql = `
+    select
+      sumIf(1, event_type = 1) as "pageviews",
+      uniq(session_id) as "visitors",
+      uniq(visit_id) as "visits",
+      uniq(country) as "countries",
+      sum(length(event_name)) as "events"
+    from website_event
+    ${cohortQuery}
+    where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        ${filterQuery}
+    `;
+  } else {
+    sql = `
     select
       sum(views) as "pageviews",
       uniq(session_id) as "visitors",
       uniq(visit_id) as "visits",
       uniq(country) as "countries",
       sum(length(event_name)) as "events"
-    from umami.website_event_stats_hourly "website_event"
+    from website_event_stats_hourly website_event
     ${cohortQuery}
     where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         ${filterQuery}
-    `,
-    queryParams,
-  );
+    `;
+  }
+
+  return rawQuery(sql, queryParams);
 }

src/queries/sql/sessions/getWebsiteSessions.ts

@@ -1,5 +1,6 @@
 import clickhouse from '@/lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
+import { EVENT_COLUMNS } from '@/lib/constants';
 import prisma from '@/lib/prisma';
 import { QueryFilters } from '@/lib/types';
 
@@ -75,8 +76,37 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
 
   const searchQuery = search ? `and positionCaseInsensitive(distinct_id, {search:String}) > 0` : '';
 
-  return pagedRawQuery(
-    `
+  let sql = '';
+
+  if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item))) {
+    sql = `
+    select
+      session_id as id,
+      website_id as websiteId,
+      browser,
+      os,
+      device,
+      screen,
+      language,
+      country,
+      region,
+      city,
+      ${getDateStringSQL('min(created_at)')} as firstAt,
+      ${getDateStringSQL('max(created_at)')} as lastAt,
+      uniq(visit_id) as visits,
+      sumIf(views, event_type = 1) as views,
+      lastAt as createdAt
+    from website_event
+    ${cohortQuery}
+    where website_id = {websiteId:UUID}
+    ${dateQuery}
+    ${filterQuery}
+    ${searchQuery}
+    group by session_id, website_id, browser, os, device, screen, language, country, region, city
+    order by lastAt desc
+    `;
+  } else {
+    sql = `
     select
       session_id as id,
       website_id as websiteId,
@@ -102,8 +132,8 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
     ${searchQuery}
     group by session_id, website_id, hostname, browser, os, device, screen, language, country, region, city
     order by lastAt desc
-    `,
-    queryParams,
-    filters,
-  );
+    `;
+  }
+
+  return pagedRawQuery(sql, queryParams, filters);
 }

src/queries/sql/sessions/getWebsiteSessionsWeekly.ts

@@ -2,6 +2,7 @@ import prisma from '@/lib/prisma';
 import clickhouse from '@/lib/clickhouse';
 import { runQuery, PRISMA, CLICKHOUSE } from '@/lib/db';
 import { QueryFilters } from '@/lib/types';
+import { EVENT_COLUMNS } from '@/lib/constants';
 
 export async function getWebsiteSessionsWeekly(
   ...args: [websiteId: string, filters: QueryFilters]
@@ -35,21 +36,39 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
 async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
   const { timezone = 'utc' } = filters;
   const { rawQuery, parseFilters } = clickhouse;
-  const { queryParams } = parseFilters(filters);
+  const { filterQuery, cohortQuery, queryParams } = await parseFilters({ ...filters, websiteId });
 
-  return rawQuery(
-    `
+  let sql = '';
+
+  if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item))) {
+    sql = `
     select
       formatDateTime(toDateTime(created_at, '${timezone}'), '%w:%H') as time,
       count(distinct session_id) as value
-    from website_event_stats_hourly
+    from website_event
+    ${cohortQuery}
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      ${filterQuery}
     group by time
     order by time
-    `,
-    queryParams,
-  ).then(formatResults);
+    `;
+  } else {
+    sql = `
+    select
+      formatDateTime(toDateTime(created_at, '${timezone}'), '%w:%H') as time,
+      count(distinct session_id) as value
+    from website_event_stats_hourly website_event
+    ${cohortQuery}
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      ${filterQuery}
+    group by time
+    order by time
+    `;
+  }
+
+  return rawQuery(sql, queryParams).then(formatResults);
 }
 
 function formatResults(data: any) {