🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance user session count query and filter handling
Bill Yang9afec58b4385
diff --git a/server/src/api/analytics/getUserSessionCount.ts b/server/src/api/analytics/getUserSessionCount.tsindex 0bfe043ce..67055e885 100644--- a/server/src/api/analytics/getUserSessionCount.ts+++ b/server/src/api/analytics/getUserSessionCount.ts@@ -33,7 +33,7 @@ export async function getUserSessionCount(req: FastifyRequest<GetUserSessionCounFROM eventsWHEREsite_id = {siteId:Int32}- AND user_id = {userId:String}+ AND (user_id = {userId:String} OR identified_user_id = {userId:String})GROUP BY dateORDER BY date ASC`;diff --git a/server/src/api/analytics/utils.ts b/server/src/api/analytics/utils.tsindex 6f5cb5f5d..f9214f45a 100644--- a/server/src/api/analytics/utils.ts+++ b/server/src/api/analytics/utils.ts@@ -262,6 +262,35 @@ export function getFilterStatement(filters: string, siteId?: number, timeStateme)`;}+ // Special handling for user_id to also check identified_user_id+ // This is needed because URLs may contain either the device fingerprint (user_id)+ // or the custom identified user ID (identified_user_id)+ if (filter.parameter === "user_id") {+ if (filter.value.length === 1) {+ const escapedValue = SqlString.escape(filter.value[0]);+ if (filter.type === "equals") {+ return `(user_id = ${escapedValue} OR identified_user_id = ${escapedValue})`;+ } else if (filter.type === "not_equals") {+ return `(user_id != ${escapedValue} AND identified_user_id != ${escapedValue})`;+ }+ }++ const conditions = filter.value.map(value => {+ const escapedValue = SqlString.escape(value);+ if (filter.type === "equals") {+ return `(user_id = ${escapedValue} OR identified_user_id = ${escapedValue})`;+ } else {+ return `(user_id != ${escapedValue} AND identified_user_id != ${escapedValue})`;+ }+ });++ if (filter.type === "equals") {+ return `(${conditions.join(" OR ")})`;+ } else {+ return `(${conditions.join(" AND ")})`;+ }+ }+// Special handling for lat/lon with toleranceif (filter.parameter === "lat" || filter.parameter === "lon") {const tolerance = 0.001;