🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor time statement handling in API queries
Bill Yang1a806b51fbad
diff --git a/server/src/api/getOverview.ts b/server/src/api/getOverview.tsindex 009c522d3..0079967e3 100644--- a/server/src/api/getOverview.ts+++ b/server/src/api/getOverview.ts@@ -110,7 +110,9 @@ const getQuery = ({WHEREsite_id = ${site}${filterStatement}- ${getTimeStatement(startDate, endDate, timezone)}+ ${getTimeStatement({+ date: { startDate, endDate, timezone },+ })}GROUP BY session_id)) AS session_stats@@ -124,7 +126,9 @@ const getQuery = ({WHEREsite_id = ${site}${filterStatement}- ${getTimeStatement(startDate, endDate, timezone)}+ ${getTimeStatement({+ date: { startDate, endDate, timezone },+ })}AND type = 'pageview') AS page_stats`;};diff --git a/server/src/api/getOverviewBucketed.ts b/server/src/api/getOverviewBucketed.tsindex f4f581f7e..30d3b065b 100644--- a/server/src/api/getOverviewBucketed.ts+++ b/server/src/api/getOverviewBucketed.ts@@ -168,7 +168,9 @@ FROMWHEREsite_id = ${site}${filterStatement}- ${getTimeStatement(startDate, endDate, timezone)}+ ${getTimeStatement({+ date: { startDate, endDate, timezone },+ })}AND type = 'pageview'GROUP BY session_id)@@ -190,7 +192,9 @@ FULL JOINWHEREsite_id = ${site}${filterStatement}- ${getTimeStatement(startDate, endDate, timezone)}+ ${getTimeStatement({+ date: { startDate, endDate, timezone },+ })}AND type = 'pageview'GROUP BY time ORDER BY time ${isAllTimediff --git a/server/src/api/getSession.ts b/server/src/api/getSession.tsindex ee8f3ea2c..c358147e9 100644--- a/server/src/api/getSession.ts+++ b/server/src/api/getSession.ts@@ -1,11 +1,7 @@import { FastifyReply, FastifyRequest } from "fastify";import clickhouse from "../db/clickhouse/clickhouse.js";-import {- getFilterStatement,- getTimeStatement,- processResults,-} from "./utils.js";import { getUserHasAccessToSite } from "../lib/auth-utils.js";+import { processResults } from "./utils.js";export interface SessionDetails {session_id: string;diff --git a/server/src/api/getSessions.ts b/server/src/api/getSessions.tsindex ff06608bb..047b93be4 100644--- a/server/src/api/getSessions.ts+++ b/server/src/api/getSessions.ts@@ -74,7 +74,9 @@ WHEREsite_id = ${site}${userId ? ` AND user_id = '${userId}'` : ""}${filterStatement}- ${getTimeStatement(startDate, endDate, timezone)}+ ${getTimeStatement({+ date: { startDate, endDate, timezone },+ })}GROUP BYsession_id,user_iddiff --git a/server/src/api/getSingleCol.ts b/server/src/api/getSingleCol.tsindex 8ed90036e..c41148c67 100644--- a/server/src/api/getSingleCol.ts+++ b/server/src/api/getSingleCol.ts@@ -4,7 +4,6 @@ import {geSqlParam,getFilterStatement,getTimeStatement,- getTimeStatementRealtime,processResults,} from "./utils.js";import { getUserHasAccessToSite } from "../lib/auth-utils.js";@@ -60,11 +59,13 @@ const getQuery = (request: GenericRequest["Querystring"]) => {WHEREsite_id = ${site}${filterStatement}- ${+ ${getTimeStatement(minutes- ? getTimeStatementRealtime(minutes)- : getTimeStatement(startDate, endDate, timezone)- }+ ? { pastMinutes: minutes }+ : {+ date: { startDate, endDate, timezone },+ }+ )}AND type = 'custom_event'GROUP BY event_name ORDER BY count desc${limit ? `LIMIT ${limit}` : ""};@@ -88,11 +89,13 @@ const getQuery = (request: GenericRequest["Querystring"]) => {WHEREsite_id = ${site}${filterStatement}- ${+ ${getTimeStatement(minutes- ? getTimeStatementRealtime(minutes)- : getTimeStatement(startDate, endDate, timezone)- }+ ? { pastMinutes: minutes }+ : {+ date: { startDate, endDate, timezone },+ }+ )}// AND type = 'pageview'GROUP BY session_id) AS query@@ -109,11 +112,13 @@ const getQuery = (request: GenericRequest["Querystring"]) => {WHEREsite_id = ${site}${filterStatement}- ${+ ${getTimeStatement(minutes- ? getTimeStatementRealtime(minutes)- : getTimeStatement(startDate, endDate, timezone)- }+ ? { pastMinutes: minutes }+ : {+ date: { startDate, endDate, timezone },+ }+ )}// AND type = 'pageview'GROUP BY value ORDER BY count desc${limit ? `LIMIT ${limit}` : ""};diff --git a/server/src/api/getUserSessions.ts b/server/src/api/getUserSessions.tsindex 6fcb95eb9..59541721c 100644--- a/server/src/api/getUserSessions.ts+++ b/server/src/api/getUserSessions.ts@@ -85,7 +85,9 @@ WHEREsite_id = ${site}AND user_id = '${userId}'${filterStatement}- ${getTimeStatement(startDate, endDate, timezone)}+ ${getTimeStatement({+ date: { startDate, endDate, timezone },+ })}ORDER BY timestamp ASC`;diff --git a/server/src/api/utils.ts b/server/src/api/utils.tsindex 99499357f..0dc9ce3bd 100644--- a/server/src/api/utils.ts+++ b/server/src/api/utils.ts@@ -1,34 +1,42 @@import { ResultSet } from "@clickhouse/client";import { Filter, FilterParameter, FilterType } from "./types.js";-export function getTimeStatement(- startDate: string,- endDate: string,- timezone: string,- table: "events" | "sessions" = "events"-) {- if (!startDate && !endDate) {- return "";- }+export function getTimeStatement({+ date,+ pastMinutes,+}: {+ date?: {+ startDate: string;+ endDate: string;+ timezone: string;+ table?: "events" | "sessions";+ };+ pastMinutes?: number;+}) {+ if (date) {+ const { startDate, endDate, timezone, table } = date;+ if (!startDate && !endDate) {+ return "";+ }- const col = table === "events" ? "timestamp" : "session_end";+ const col = (table ?? "events") === "events" ? "timestamp" : "session_end";- return `AND ${col} >= toTimeZone(+ return `AND ${col} >= toTimeZone(toStartOfDay(toDateTime('${startDate}', '${timezone}')),'UTC'- )- AND ${col} < if(- toDate('${endDate}') = toDate(now(), '${timezone}'),- now(),- toTimeZone(- toStartOfDay(toDateTime('${endDate}', '${timezone}')) + INTERVAL 1 DAY,- 'UTC')- )`;-}--export function getTimeStatementRealtime(minutes: number) {- return `AND timestamp > now() - interval '${minutes} minute'`;+ AND ${col} < if(+ toDate('${endDate}') = toDate(now(), '${timezone}'),+ now(),+ toTimeZone(+ toStartOfDay(toDateTime('${endDate}', '${timezone}')) + INTERVAL 1 DAY,+ 'UTC'+ )+ )`;+ }+ if (pastMinutes) {+ return `AND timestamp > now() - interval '${pastMinutes} minute'`;+ }}export async function processResults<T>(