PR comments

lib/db.js

@@ -29,7 +29,7 @@ function logQuery(e) {
   console.log(chalk.yellow(e.params), '->', e.query, chalk.greenBright(`${e.duration}ms`));
 }
 
-function initializePrisma(options) {
+function getPrismaClient(options) {
   const prisma = new PrismaClient(options);
 
   if (process.env.LOG_QUERY) {
@@ -39,7 +39,7 @@ function initializePrisma(options) {
   return prisma;
 }
 
-function initializeClickhouse() {
+function getClickhouseClient() {
   if (!process.env.ANALYTICS_URL) {
     return null;
   }
@@ -63,8 +63,8 @@ function initializeClickhouse() {
   });
 }
 
-const prisma = global.prisma || initializePrisma(options);
+const prisma = global.prisma || getPrismaClient(options);
-const clickhouse = global.clickhouse || initializeClickhouse();
+const clickhouse = global.clickhouse || getClickhouseClient();
 
 if (process.env.NODE_ENV !== 'production') {
   global.prisma = prisma;
@@ -142,15 +142,15 @@ export function getBetweenDatesClickhouse(field, start_at, end_at) {
     and ${getDateFormatClickhouse(end_at)}`;
 }
 
-export function getTimestampInterval(maxColumn, minColumn) {
+export function getTimestampInterval(field) {
   const db = getDatabase();
 
   if (db === POSTGRESQL) {
-    return `floor(extract(epoch from (${maxColumn}) - (${minColumn})))`;
+    return `floor(extract(epoch from max(${field}) - min(${field})))`;
   }
 
   if (db === MYSQL) {
-    return `floor(unix_timestamp(${maxColumn}) - unix_timestamp(${minColumn}))`;
+    return `floor(unix_timestamp(max(${field})) - unix_timestamp(min(${field})))`;
   }
 }
 

queries/analytics/pageview/getPageviewStats.js

@@ -38,7 +38,7 @@ async function relationalQuery(
   return rawQuery(
     `
       select ${getDateQuery('pageview.created_at', unit, timezone)} t,
-        count(${count != '*' ? `${count}${sessionKey}` : count}) y
+        count(${count !== '*' ? `${count}${sessionKey}` : count}) y
       from pageview
         ${joinSession}
       where pageview.website_id=$1
@@ -78,7 +78,7 @@ async function clickhouseQuery(
     from
       (select 
         ${getDateQueryClickhouse('created_at', unit, timezone)} t,
-        count(${count != '*' ? `${count}${sessionKey}` : count}) y
+        count(${count !== '*' ? `${count}${sessionKey}` : count}) y
       from pageview
         ${joinSession}
       where pageview.website_id= $1

queries/analytics/stats/getWebsiteStats.js

@@ -31,24 +31,19 @@ async function relationalQuery(website_id, start_at, end_at, filters = {}) {
       select sum(t.c) as "pageviews",
         count(distinct t.session_id) as "uniques",
         sum(case when t.c = 1 then 1 else 0 end) as "bounces",
-        sum(case when m2 < m1 + interval '1 hour' then ${getTimestampInterval(
+        sum(t.time) as "totaltime"
-          'm2',
-          'm1',
-        )} else 0 end) as "totaltime"
       from (
-        select 
+         select pageview.session_id,
-          pageview.session_id,
+           ${getDateQuery('pageview.created_at', 'hour')},
-          ${getDateQuery('pageview.created_at', 'hour')},
+           count(*) c,
-          count(*) c,
+           ${getTimestampInterval('pageview.created_at')} as "time"
-          min(created_at) m1,
+         from pageview
-          max(created_at) m2
+           ${joinSession}
-        from pageview
+         where pageview.website_id=$1
-            ${joinSession}
+         and pageview.created_at between $2 and $3
-        where pageview.website_id=$1
+         ${pageviewQuery}
-          and pageview.created_at between $2 and $3
+         ${sessionQuery}
-          ${pageviewQuery}
+         group by 1, 2
-          ${sessionQuery}
-        group by 1, 2
      ) t
     `,
     params,