🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
fix buckets again
Bill Yang6223929f287b
diff --git a/server/src/api/getPageViews.ts b/server/src/api/getPageViews.tsindex 72be71fd8..8080fbbb2 100644--- a/server/src/api/getPageViews.ts+++ b/server/src/api/getPageViews.ts@@ -16,6 +16,28 @@ const bucketIntervalMap = {month: "1 MONTH",} as const;+function getTimeStatementFill(+ startDate: string,+ endDate: string,+ timezone: string,+ bucket: TimeBucket+) {+ return `+ WITH FILL FROM toTimeZone(+ toStartOfDay(toDateTime('${startDate}', '${timezone}')),+ 'UTC'+ )+ TO if(+ toDate('${endDate}') = toDate(now(), '${timezone}'),+ now(),+ toTimeZone(+ toStartOfDay(toDateTime('${endDate}', '${timezone}')) + INTERVAL 1 DAY,+ 'UTC'+ )+ ) STEP INTERVAL ${bucketIntervalMap[bucket]}+ `;+}+type TimeBucket = "hour" | "day" | "week" | "month";type GetPageViewsResponse = { time: string; pageviews: number }[];@@ -45,12 +67,7 @@ export async function getPageViews(GROUP BYtimeORDER BY- time WITH FILL- FROM ${- TimeBucketToFn[bucket]- }(toDateTime('${startDate}', '${timezone}'))- TO ${TimeBucketToFn[bucket]}(toDateTime('${endDate}', '${timezone}'))- STEP INTERVAL ${bucketIntervalMap[bucket]}+ time ${getTimeStatementFill(startDate, endDate, timezone, bucket)}`;try {