Skip to content

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

Refactor user session count API and hook to remove date parameters

Bill Yang067aa4b1aca1
diff --git a/client/src/api/analytics/userSessions.ts b/client/src/api/analytics/userSessions.ts
index c29560b6a..c579aec18 100644
--- a/client/src/api/analytics/userSessions.ts
+++ b/client/src/api/analytics/userSessions.ts
@@ -196,17 +196,14 @@ export interface UserSessionCountResponse {
}
export function useGetUserSessionCount(userId: string) {
- const { time, site } = useStore();
- const { startDate, endDate } = getStartAndEndDate(time);
+ const { site } = useStore();
return useQuery<APIResponse<UserSessionCountResponse[]>>({
- queryKey: ["user-session-count", userId, time, site],
+ queryKey: ["user-session-count", userId, site],
queryFn: () => {
const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
return authedFetch(`${BACKEND_URL}/user/session-count/${site}`, {
userId,
- startDate,
- endDate,
timezone,
}).then((res) => res.json());
},
diff --git a/server/src/api/analytics/getUserSessionCount.ts b/server/src/api/analytics/getUserSessionCount.ts
index f24a8495c..ffcc45484 100644
--- a/server/src/api/analytics/getUserSessionCount.ts
+++ b/server/src/api/analytics/getUserSessionCount.ts
@@ -1,6 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import clickhouse from "../../db/clickhouse/clickhouse.js";
-import { getTimeStatement, processResults } from "./utils.js";
+import { processResults } from "./utils.js";
import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
export interface GetUserSessionCountRequest {
@@ -9,8 +9,6 @@ export interface GetUserSessionCountRequest {
};
Querystring: {
userId?: string;
- startDate?: string;
- endDate?: string;
timezone?: string;
};
}
@@ -25,7 +23,7 @@ export async function getUserSessionCount(
res: FastifyReply
) {
const { site } = req.params;
- const { userId, startDate, endDate, timezone } = req.query;
+ const { userId, timezone = "UTC" } = req.query;
const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
if (!userHasAccessToSite) {
@@ -36,25 +34,14 @@ export async function getUserSessionCount(
return res.status(400).send({ error: "userId is required" });
}
- // Generate time statement
- const timeStatement = getTimeStatement({
- date: {
- startDate: startDate || "",
- endDate: endDate || "",
- timezone: timezone || "UTC",
- table: "sessions",
- },
- });
-
const query = `
SELECT
- toDate(session_start, '${timezone || "UTC"}') as date,
+ toDate(session_start, '${timezone}') as date,
count() as sessions
FROM sessions
WHERE
site_id = ${site}
AND user_id = '${userId}'
- ${timeStatement}
GROUP BY date
ORDER BY date ASC
`;