From e3142e93f0654fd53e9eb6264881f335000f0d5d Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Thu, 17 Nov 2022 18:09:03 -0800 Subject: [PATCH 1/2] get distinct sessions for session metrics --- queries/analytics/session/getSessionMetrics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/queries/analytics/session/getSessionMetrics.js b/queries/analytics/session/getSessionMetrics.js index 6e74e9b6..7db0f9b5 100644 --- a/queries/analytics/session/getSessionMetrics.js +++ b/queries/analytics/session/getSessionMetrics.js @@ -42,7 +42,7 @@ async function clickhouseQuery(websiteId, { startDate, endDate, field, filters = const { pageviewQuery, sessionQuery } = parseFilters(null, filters, params); return rawQuery( - `select ${field} x, count(*) y + `select ${field} x, count(distinct session_id) y from event as x where website_id = $1 and rev_id = $2 From bba8876522cdb3ee7c42947df51052d82fa90fe0 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Fri, 18 Nov 2022 03:20:45 -0800 Subject: [PATCH 2/2] Fix destructure error. --- hooks/useRequireLogin.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hooks/useRequireLogin.js b/hooks/useRequireLogin.js index b2edc347..1e73f38b 100644 --- a/hooks/useRequireLogin.js +++ b/hooks/useRequireLogin.js @@ -12,17 +12,14 @@ export default function useRequireLogin() { async function loadUser() { setLoading(true); - const { - ok, - data: { user }, - } = await get('/auth/verify'); + const { ok, data } = await get('/auth/verify'); if (!ok) { await router.push('/login'); return null; } - setUser(user); + setUser(data.user); setLoading(false); }