Insights report filtering.

queries/analytics/getActiveVisitors.ts

@@ -17,10 +17,8 @@ async function relationalQuery(websiteId: string) {
     `
     select count(distinct session_id) x
     from website_event
-    join website 
-        on website_event.website_id = website.website_id
-    where website.website_id = {{websiteId::uuid}}
-    and website_event.created_at >= {{startAt}}
+    where website_id = {{websiteId::uuid}}
+    and created_at >= {{startAt}}
     `,
     { websiteId, startAt: subMinutes(new Date(), 5) },
   );

queries/analytics/getRealtimeData.ts

@@ -1,5 +1,5 @@
 import { md5 } from 'next-basics';
-import { getSessions, getEvents } from 'queries';
+import { getSessions, getEvents } from 'queries/index';
 import { EVENT_TYPE } from 'lib/constants';
 
 export async function getRealtimeData(websiteId, time) {

queries/analytics/getValues.ts

@@ -0,0 +1,38 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
+
+export async function getValues(...args: [websiteId: string, column: string]) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, column: string) {
+  const { rawQuery } = prisma;
+
+  return rawQuery(
+    `
+    select distinct ${column} as "value"
+    from website_event
+    inner join session
+      on session.session_id = website_event.session_id
+    where website_event.website_id = {{websiteId::uuid}}
+    `,
+    { websiteId },
+  );
+}
+
+async function clickhouseQuery(websiteId: string, column: string) {
+  const { rawQuery } = clickhouse;
+
+  return rawQuery(
+    `
+    select distinct ${column} as value
+    from website_event
+    where website_id = {websiteId:UUID}
+    `,
+    { websiteId },
+  );
+}

queries/analytics/reports/getInsights.ts

@@ -1,7 +1,7 @@
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
-import { EVENT_TYPE } from 'lib/constants';
+import { EVENT_TYPE, SESSION_COLUMNS } from 'lib/constants';
 import { QueryFilters } from 'lib/types';
 
 export async function getInsights(
@@ -24,23 +24,29 @@ async function relationalQuery(
   }[]
 > {
   const { parseFilters, rawQuery } = prisma;
-  const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
-    ...filters,
-    eventType: EVENT_TYPE.pageView,
-  });
+  const { filterQuery, joinSession, params } = await parseFilters(
+    websiteId,
+    {
+      ...filters,
+      eventType: EVENT_TYPE.pageView,
+    },
+    {
+      joinSession: !!fields.find(({ name }) => SESSION_COLUMNS.includes(name)),
+    },
+  );
 
   return rawQuery(
     `
-    select
-      url_path,
-      count(*) y
+    select 
+      ${parseFields(fields)}
     from website_event
       ${joinSession}
     where website_event.website_id = {{websiteId::uuid}}
       and website_event.created_at between {{startDate}} and {{endDate}}
       and website_event.event_type = {{eventType}}
       ${filterQuery}
-    group by 1
+    group by ${fields.map(({ name }) => name).join(',')}
+    order by 1 desc, 2 desc
     limit 500
     `,
     params,
@@ -87,7 +93,7 @@ function parseFields(fields) {
 
       return arr.concat(name);
     },
-    ['count(*) as views', 'count(distinct session_id) as visitors'],
+    ['count(*) as views', 'count(distinct website_event.session_id) as visitors'],
   );
 
   return query.join(',\n');