diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx index 2dcb2b81..c488464d 100644 --- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx +++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx @@ -21,11 +21,12 @@ export function WebsiteMetricsBar({ const { ref, isSticky } = useSticky({ enabled: sticky }); const { data, isLoading, isFetched, error } = useWebsiteStats(websiteId); - const { pageviews, uniques, bounces, totaltime } = data || {}; - const num = Math.min(data && uniques.value, data && bounces.value); + const { views, visitors, visits, bounces, totaltime } = data || {}; + const num = Math.min(data && visitors.value, data && bounces.value); const diffs = data && { - pageviews: pageviews.value - pageviews.change, - uniques: uniques.value - uniques.change, + views: views.value - views.change, + visitors: visitors.value - visitors.change, + visits: visits.value - visits.change, bounces: bounces.value - bounces.change, totaltime: totaltime.value - totaltime.change, }; @@ -39,25 +40,39 @@ export function WebsiteMetricsBar({ })} > - {pageviews && uniques && ( + {views && visitors && ( <> + + Number(n).toFixed(0) + '%'} @@ -66,14 +81,12 @@ export function WebsiteMetricsBar({ { // expire visitId after 30 minutes session.visitId = !!session.iat && Math.floor(new Date().getTime() / 1000) - session.iat > 1800 - ? uuid(session.id, sessionSalt()) + ? uuid(session.id, visitSalt()) : session.visitId; session.iat = Math.floor(new Date().getTime() / 1000); diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts index 51716b30..34ba84d2 100644 --- a/src/queries/analytics/getWebsiteStats.ts +++ b/src/queries/analytics/getWebsiteStats.ts @@ -1,19 +1,27 @@ -import prisma from 'lib/prisma'; import clickhouse from 'lib/clickhouse'; -import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db'; import { EVENT_TYPE } from 'lib/constants'; +import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db'; +import prisma from 'lib/prisma'; import { QueryFilters } from 'lib/types'; -export async function getWebsiteStats(...args: [websiteId: string, filters: QueryFilters]) { +export async function getWebsiteStats( + ...args: [websiteId: string, filters: QueryFilters] +): Promise< + { views: number; visitors: number; visits: number; bounces: number; totaltime: number }[] +> { return runQuery({ [PRISMA]: () => relationalQuery(...args), [CLICKHOUSE]: () => clickhouseQuery(...args), }); } -async function relationalQuery(websiteId: string, filters: QueryFilters) { - const { getDateQuery, getAddIntervalQuery, getTimestampDiffQuery, parseFilters, rawQuery } = - prisma; +async function relationalQuery( + websiteId: string, + filters: QueryFilters, +): Promise< + { views: number; visitors: number; visits: number; bounces: number; totaltime: number }[] +> { + const { getTimestampDiffQuery, parseFilters, rawQuery } = prisma; const { filterQuery, joinSession, params } = await parseFilters(websiteId, { ...filters, eventType: EVENT_TYPE.pageView, @@ -22,16 +30,15 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) { return rawQuery( ` select - sum(t.c) as "pageviews", - count(distinct t.session_id) as "uniques", + sum(t.c) as "views", + count(distinct t.session_id) as "visitors", + count(distinct t.visit_id) as "visits", sum(case when t.c = 1 then 1 else 0 end) as "bounces", - sum(case when t.max_time < ${getAddIntervalQuery('t.min_time', '1 hour')} - then ${getTimestampDiffQuery('t.min_time', 't.max_time')} - else 0 end) as "totaltime" + sum(${getTimestampDiffQuery('t.min_time', 't.max_time')}) as "totaltime" from ( select website_event.session_id, - ${getDateQuery('website_event.created_at', 'hour')}, + website_event.visit_id, count(*) as "c", min(website_event.created_at) as "min_time", max(website_event.created_at) as "max_time" @@ -53,8 +60,10 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) { async function clickhouseQuery( websiteId: string, filters: QueryFilters, -): Promise<{ pageviews: number; uniques: number; bounces: number; totaltime: number }[]> { - const { rawQuery, getDateQuery, parseFilters } = clickhouse; +): Promise< + { views: number; visitors: number; visits: number; bounces: number; totaltime: number }[] +> { + const { rawQuery, parseFilters } = clickhouse; const { filterQuery, params } = await parseFilters(websiteId, { ...filters, eventType: EVENT_TYPE.pageView, @@ -63,14 +72,15 @@ async function clickhouseQuery( return rawQuery( ` select - sum(t.c) as "pageviews", - count(distinct t.session_id) as "uniques", + sum(t.c) as "views", + count(distinct t.session_id) as "visitors", + count(distinct t.visit_id) as "visits", sum(if(t.c = 1, 1, 0)) as "bounces", - sum(if(max_time < min_time + interval 1 hour, max_time-min_time, 0)) as "totaltime" + sum(max_time-min_time) as "totaltime" from ( select session_id, - ${getDateQuery('created_at', 'hour')} time_series, + visit_id, count(*) c, min(created_at) min_time, max(created_at) max_time @@ -79,15 +89,16 @@ async function clickhouseQuery( and created_at between {startDate:DateTime64} and {endDate:DateTime64} and event_type = {eventType:UInt32} ${filterQuery} - group by session_id, time_series + group by session_id, visit_id ) as t; `, params, ).then(a => { return Object.values(a).map(a => { return { - pageviews: Number(a.pageviews), - uniques: Number(a.uniques), + views: Number(a.views), + visitors: Number(a.visitors), + visits: Number(a.visits), bounces: Number(a.bounces), totaltime: Number(a.totaltime), };