🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor analytics API SQL queries for improved clarity and consistency
Bill Yang36c6205800bf
diff --git a/server/src/api/analytics/getSingleCol.ts b/server/src/api/analytics/getSingleCol.tsindex 5b3bfe8c8..a2f6ee07f 100644--- a/server/src/api/analytics/getSingleCol.ts+++ b/server/src/api/analytics/getSingleCol.ts@@ -48,9 +48,7 @@ const getQuery = (request: FastifyRequest<GenericRequest>) => {});- if (typeof limit !== "number") {- throw new Error("Limit must be a number");- }+ const limitStatement = limit ? `LIMIT ${Number(limit)}` : "";const percentageStatement = `ROUND(COUNT(distinct(session_id)) * 100.0 / SUM(COUNT(distinct(session_id))) OVER (),@@ -72,7 +70,7 @@ const getQuery = (request: FastifyRequest<GenericRequest>) => {${timeStatement}AND type = 'custom_event'GROUP BY event_name ORDER BY count desc- ${limit ? `LIMIT ${limit}` : ""};+ ${limitStatement};`;}@@ -148,7 +146,7 @@ const getQuery = (request: FastifyRequest<GenericRequest>) => {avg_time_on_page_seconds as time_on_page_secondsFROM PathStatsORDER BY unique_sessions DESC- ${limit ? `LIMIT ${limit}` : ""};`;+ ${limitStatement};`;}if (parameter === "pathname") {@@ -193,7 +191,7 @@ const getQuery = (request: FastifyRequest<GenericRequest>) => {avg_time_on_page_seconds as time_on_page_secondsFROM PathStatsORDER BY unique_sessions DESC- ${limit ? `LIMIT ${limit}` : ""};+ ${limitStatement};`;}@@ -221,7 +219,7 @@ const getQuery = (request: FastifyRequest<GenericRequest>) => {round((pageviews / sum(pageviews) OVER ()) * 100, 2) as pageviews_percentageFROM PageStatsORDER BY count desc- ${limit ? `LIMIT ${limit}` : ""};+ ${limitStatement};`;};diff --git a/server/src/api/analytics/getUserSessionCount.ts b/server/src/api/analytics/getUserSessionCount.tsindex 5fa8f2958..fe930c17e 100644--- a/server/src/api/analytics/getUserSessionCount.ts+++ b/server/src/api/analytics/getUserSessionCount.ts@@ -37,7 +37,7 @@ export async function getUserSessionCount(const query = `SELECT- toDate(session_start, '${SqlString.escape(timezone)}') as date,+ toDate(session_start, ${SqlString.escape(timezone)}) as date,count() as sessionsFROM sessionsWHERE