Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Refine pageview tracking in overview queries

Bill Yang3864ca89d480
diff --git a/server/src/api/getOverview.ts b/server/src/api/getOverview.ts
index 06180ee3f..f51c1059e 100644
--- a/server/src/api/getOverview.ts
+++ b/server/src/api/getOverview.ts
@@ -57,7 +57,7 @@ const getQuery = ({
session_id,
MIN(timestamp) AS start_time,
MAX(timestamp) AS end_time,
- COUNT(*) AS pages_in_session
+ COUNT(CASE WHEN type = 'pageview' THEN 1 END) AS pages_in_session
FROM pageviews
WHERE
site_id = ${site}
@@ -79,6 +79,7 @@ const getQuery = ({
${filterStatement}
AND timestamp >= toTimeZone(now('${timezone}'), 'UTC') - INTERVAL 1 DAY
AND timestamp < toTimeZone(now('${timezone}'), 'UTC')
+ AND type = 'pageview'
) AS page_stats`;
}
@@ -104,7 +105,7 @@ const getQuery = ({
session_id,
MIN(timestamp) AS start_time,
MAX(timestamp) AS end_time,
- COUNT(*) AS pages_in_session
+ COUNT(CASE WHEN type = 'pageview' THEN 1 END) AS pages_in_session
FROM pageviews
WHERE
site_id = ${site}
@@ -124,6 +125,7 @@ const getQuery = ({
site_id = ${site}
${filterStatement}
${getTimeStatement(startDate, endDate, timezone)}
+ AND type = 'pageview'
) AS page_stats`;
};
diff --git a/server/src/api/getOverviewBucketed.ts b/server/src/api/getOverviewBucketed.ts
index 6ece2be12..f4f581f7e 100644
--- a/server/src/api/getOverviewBucketed.ts
+++ b/server/src/api/getOverviewBucketed.ts
@@ -102,6 +102,7 @@ FROM
${filterStatement}
AND timestamp >= toTimeZone(now('${timezone}'), 'UTC') - INTERVAL 1 DAY
AND timestamp < toTimeZone(now('${timezone}'), 'UTC')
+ AND type = 'pageview'
GROUP BY session_id
)
GROUP BY time
@@ -122,9 +123,9 @@ FULL JOIN
WHERE
site_id = ${site}
${filterStatement}
- -- Past 24 hours in LA time
AND timestamp >= toTimeZone(now('${timezone}'), 'UTC') - INTERVAL 1 DAY
AND timestamp < toTimeZone(now('${timezone}'), 'UTC')
+ AND type = 'pageview'
GROUP BY time
ORDER BY time WITH FILL
FROM toTimeZone(${TimeBucketToFn[bucket]}(now('${timezone}') - INTERVAL 1 DAY), 'UTC')
@@ -168,6 +169,7 @@ FROM
site_id = ${site}
${filterStatement}
${getTimeStatement(startDate, endDate, timezone)}
+ AND type = 'pageview'
GROUP BY session_id
)
GROUP BY time ORDER BY time ${
@@ -189,6 +191,7 @@ FULL JOIN
site_id = ${site}
${filterStatement}
${getTimeStatement(startDate, endDate, timezone)}
+ AND type = 'pageview'
GROUP BY time ORDER BY time ${
isAllTime
? ""