Skip to content

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

great snake case migration (#682)

Bill Yang3aa4060a4113
diff --git a/client/src/api/admin/useGetAdminServiceEventCount.ts b/client/src/api/admin/useGetAdminServiceEventCount.ts
index 403467a6d..fa361525b 100644
--- a/client/src/api/admin/useGetAdminServiceEventCount.ts
+++ b/client/src/api/admin/useGetAdminServiceEventCount.ts
@@ -23,9 +23,9 @@ async function getAdminServiceEventCount({
timeZone: string;
}): Promise<GetServiceEventCountResponse> {
const params = new URLSearchParams();
- if (startDate) params.append("startDate", startDate);
- if (endDate) params.append("endDate", endDate);
- if (timeZone) params.append("timeZone", timeZone);
+ if (startDate) params.append("start_date", startDate);
+ if (endDate) params.append("end_date", endDate);
+ if (timeZone) params.append("time_zone", timeZone);
return authedFetch("/admin/service-event-count", Object.fromEntries(params));
}
diff --git a/client/src/api/analytics/events/useGetEventProperties.ts b/client/src/api/analytics/events/useGetEventProperties.ts
index 73b046e02..fd8614c72 100644
--- a/client/src/api/analytics/events/useGetEventProperties.ts
+++ b/client/src/api/analytics/events/useGetEventProperties.ts
@@ -21,7 +21,7 @@ export function useGetEventProperties(eventName: string | null) {
queryFn: () => {
const params = {
...timeParams,
- eventName,
+ event_name: eventName,
filters: filteredFilters.length > 0 ? filteredFilters : undefined,
};
diff --git a/client/src/api/analytics/events/useGetEvents.ts b/client/src/api/analytics/events/useGetEvents.ts
index 12a7a540c..b7a4782bc 100644
--- a/client/src/api/analytics/events/useGetEvents.ts
+++ b/client/src/api/analytics/events/useGetEvents.ts
@@ -1,8 +1,7 @@
import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
import { Time } from "../../../components/DateSelector/types";
import { useStore } from "../../../lib/store";
-import { authedFetch, getStartAndEndDate } from "../../utils";
-import { timeZone } from "../../../lib/dateTimeUtils";
+import { authedFetch, getQueryParams } from "../../utils";
export type Event = {
timestamp: string;
@@ -54,30 +53,18 @@ export function useGetEvents(count = 10) {
// New hook with pagination and filtering support
export function useGetEventsInfinite(options: GetEventsOptions = {}) {
const { site, time, filters } = useStore();
- const { startDate, endDate } = options.time ? getStartAndEndDate(options.time) : getStartAndEndDate(time);
const pageSize = options.pageSize || 20;
return useInfiniteQuery<EventsResponse, Error>({
- queryKey: ["events-infinite", site, startDate, endDate, timeZone, filters, pageSize, options.isRealtime],
+ queryKey: ["events-infinite", site, time, filters, pageSize, options.isRealtime],
initialPageParam: 1,
queryFn: async ({ pageParam }) => {
- const params: Record<string, any> = {
- startDate,
- endDate,
- timeZone,
+ const params = getQueryParams(time, {
page: pageParam,
- pageSize,
- };
-
- // Add filters if provided
- if (filters && filters.length > 0) {
- params.filters = JSON.stringify(filters);
- }
-
- // Add count if provided (for backward compatibility)
- if (options.count) {
- params.count = options.count;
- }
+ page_size: pageSize,
+ filters: filters && filters.length > 0 ? JSON.stringify(filters) : undefined,
+ count: options.count,
+ });
const response = await authedFetch<EventsResponse>(`/events/${site}`, params);
return response;
diff --git a/client/src/api/analytics/goals/useGetGoals.ts b/client/src/api/analytics/goals/useGetGoals.ts
index f114d78e4..c6911e051 100644
--- a/client/src/api/analytics/goals/useGetGoals.ts
+++ b/client/src/api/analytics/goals/useGetGoals.ts
@@ -56,7 +56,7 @@ export function useGetGoals({
...timeParams,
filters: filteredFilters,
page,
- pageSize,
+ page_size: pageSize,
sort,
order,
});
diff --git a/client/src/api/analytics/performance/useGetPerformanceByDimension.ts b/client/src/api/analytics/performance/useGetPerformanceByDimension.ts
index 4fd4633e1..b7b9d7173 100644
--- a/client/src/api/analytics/performance/useGetPerformanceByDimension.ts
+++ b/client/src/api/analytics/performance/useGetPerformanceByDimension.ts
@@ -76,8 +76,8 @@ export function useGetPerformanceByDimension({
page,
percentile: selectedPercentile,
filters: useFilters ? [...filters, ...additionalFilters] : undefined,
- sortBy,
- sortOrder,
+ sort_by: sortBy,
+ sort_order: sortOrder,
dimension,
});
diff --git a/client/src/api/analytics/useGetJourneys.ts b/client/src/api/analytics/useGetJourneys.ts
index 6f2717982..186b6d6b5 100644
--- a/client/src/api/analytics/useGetJourneys.ts
+++ b/client/src/api/analytics/useGetJourneys.ts
@@ -1,9 +1,8 @@
import { useQuery } from "@tanstack/react-query";
import { Time } from "../../components/DateSelector/types";
-import { timeZone } from "../../lib/dateTimeUtils";
-import { getFilteredFilters } from "../../lib/store";
import { JOURNEY_PAGE_FILTERS } from "../../lib/filterGroups";
-import { authedFetch, getStartAndEndDate } from "../utils";
+import { getFilteredFilters } from "../../lib/store";
+import { authedFetch, getQueryParams } from "../utils";
export interface JourneyParams {
siteId?: number;
@@ -25,28 +24,20 @@ export interface JourneysResponse {
}
export const useJourneys = ({ siteId, steps = 3, time, limit = 100, stepFilters }: JourneyParams) => {
- const { startDate, endDate } = getStartAndEndDate(time);
-
const filteredFilters = getFilteredFilters(JOURNEY_PAGE_FILTERS);
return useQuery<JourneysResponse>({
- queryKey: ["journeys", siteId, steps, startDate, endDate, timeZone, limit, filteredFilters, stepFilters],
+ queryKey: ["journeys", siteId, steps, time, limit, filteredFilters, stepFilters],
queryFn: async () => {
- const params: Record<string, any> = {};
-
- if (steps) params.steps = steps;
- if (startDate) params.startDate = startDate;
- if (endDate) params.endDate = endDate;
- if (timeZone) params.timeZone = timeZone;
- if (limit) params.limit = limit;
- if (filteredFilters) params.filters = filteredFilters;
- if (stepFilters && Object.keys(stepFilters).length > 0) {
- params.stepFilters = JSON.stringify(stepFilters);
- }
-
+ const params = getQueryParams(time, {
+ steps,
+ limit,
+ filters: filteredFilters,
+ stepFilters: stepFilters && Object.keys(stepFilters).length > 0 ? JSON.stringify(stepFilters) : undefined,
+ });
return authedFetch<JourneysResponse>(`/journeys/${siteId}`, params);
},
enabled: !!siteId,
- placeholderData: (previousData) => previousData,
+ placeholderData: previousData => previousData,
});
};
diff --git a/client/src/api/analytics/useGetMetric.ts b/client/src/api/analytics/useGetMetric.ts
index 1c378b854..cbbfa1c44 100644
--- a/client/src/api/analytics/useGetMetric.ts
+++ b/client/src/api/analytics/useGetMetric.ts
@@ -43,8 +43,8 @@ export function useMetric({
timeToUse.mode === "past-minutes" && periodTime === "previous"
? {
...timeToUse,
- pastMinutesStart: timeToUse.pastMinutesStart * 2,
- pastMinutesEnd: timeToUse.pastMinutesStart,
+ past_minutes_start: timeToUse.pastMinutesStart * 2,
+ past_minutes_end: timeToUse.pastMinutesStart,
}
: timeToUse;
diff --git a/client/src/api/analytics/useGetOrgEventCount.ts b/client/src/api/analytics/useGetOrgEventCount.ts
index 17ea2efcd..b4947d280 100644
--- a/client/src/api/analytics/useGetOrgEventCount.ts
+++ b/client/src/api/analytics/useGetOrgEventCount.ts
@@ -25,9 +25,9 @@ async function getOrgEventCount({
timeZone?: string;
}): Promise<GetOrgEventCountResponse> {
const params = new URLSearchParams();
- if (startDate) params.append("startDate", startDate);
- if (endDate) params.append("endDate", endDate);
- if (timeZone) params.append("timeZone", timeZone);
+ if (startDate) params.append("start_date", startDate);
+ if (endDate) params.append("end_date", endDate);
+ if (timeZone) params.append("time_zone", timeZone);
return authedFetch(`/org-event-count/${organizationId}`, Object.fromEntries(params));
}
diff --git a/client/src/api/analytics/useGetOverviewBucketed.ts b/client/src/api/analytics/useGetOverviewBucketed.ts
index 304ccacc6..3952114b7 100644
--- a/client/src/api/analytics/useGetOverviewBucketed.ts
+++ b/client/src/api/analytics/useGetOverviewBucketed.ts
@@ -1,6 +1,5 @@
import { Filter, TimeBucket } from "@rybbit/shared";
import { UseQueryOptions, UseQueryResult, useQuery } from "@tanstack/react-query";
-import { timeZone } from "../../lib/dateTimeUtils";
import { useStore } from "../../lib/store";
import { APIResponse } from "../types";
import { authedFetch, getQueryParams } from "../utils";
@@ -45,7 +44,6 @@ export function useGetOverviewBucketed({
// Use getQueryParams utility to handle conditional logic
const queryParams = getQueryParams(timeToUse, {
- timeZone,
bucket,
filters: combinedFilters,
});
diff --git a/client/src/api/analytics/useGetUserSessions.ts b/client/src/api/analytics/useGetUserSessions.ts
index 3413e9e81..e7241d09f 100644
--- a/client/src/api/analytics/useGetUserSessions.ts
+++ b/client/src/api/analytics/useGetUserSessions.ts
@@ -56,14 +56,14 @@ export function useGetSessionsInfinite(userId?: string) {
queryFn: ({ pageParam = 1 }) => {
// Use an object for request parameters so we can conditionally add fields
const requestParams: Record<string, any> = {
- timeZone,
+ time_zone: timeZone,
filters: filteredFilters,
page: pageParam,
};
// Add userId if provided
if (userId) {
- requestParams.userId = userId;
+ requestParams.user_id = userId;
}
// Add time parameters
@@ -71,8 +71,8 @@ export function useGetSessionsInfinite(userId?: string) {
Object.assign(requestParams, timeParams);
} else if (!userId) {
// Only add date parameters if not filtering by userId
- requestParams.startDate = timeParams.startDate;
- requestParams.endDate = timeParams.endDate;
+ requestParams.start_date = timeParams.start_date;
+ requestParams.end_date = timeParams.end_date;
}
return authedFetch<APIResponse<GetSessionsResponse>>(`/sessions/${site}`, requestParams);
@@ -198,8 +198,8 @@ export function useGetUserSessionCount(userId: string) {
queryKey: ["user-session-count", userId, site],
queryFn: () => {
return authedFetch<APIResponse<UserSessionCountResponse[]>>(`/user/session-count/${site}`, {
- userId,
- timeZone,
+ user_id: userId,
+ time_zone: timeZone,
});
},
staleTime: Infinity,
diff --git a/client/src/api/analytics/useGetUsers.ts b/client/src/api/analytics/useGetUsers.ts
index 3423f339a..1c5f39bc7 100644
--- a/client/src/api/analytics/useGetUsers.ts
+++ b/client/src/api/analytics/useGetUsers.ts
@@ -51,12 +51,12 @@ export function useGetUsers(options: GetUsersOptions) {
queryFn: async () => {
// Build request parameters
const requestParams: Record<string, any> = {
- timeZone,
+ time_zone: timeZone,
filters: filteredFilters,
page,
- pageSize,
- sortBy,
- sortOrder,
+ page_size: pageSize,
+ sort_by: sortBy,
+ sort_order: sortOrder,
};
// Add time parameters (getQueryParams handles both past-minutes and regular modes)
diff --git a/client/src/api/utils.ts b/client/src/api/utils.ts
index 4ab068742..9a7ef2343 100644
--- a/client/src/api/utils.ts
+++ b/client/src/api/utils.ts
@@ -5,40 +5,40 @@ import { BACKEND_URL } from "../lib/const";
import { timeZone } from "../lib/dateTimeUtils";
import { useStore } from "../lib/store";
-export function getStartAndEndDate(time: Time) {
+function getStartAndEndDate(time: Time) {
if (time.mode === "range") {
- return { startDate: time.startDate, endDate: time.endDate };
+ return { start_date: time.startDate, end_date: time.endDate };
}
if (time.mode === "week") {
return {
- startDate: time.week,
- endDate: DateTime.fromISO(time.week).endOf("week").toISODate(),
+ start_date: time.week,
+ end_date: DateTime.fromISO(time.week).endOf("week").toISODate(),
};
}
if (time.mode === "month") {
return {
- startDate: time.month,
- endDate: DateTime.fromISO(time.month).endOf("month").toISODate(),
+ start_date: time.month,
+ end_date: DateTime.fromISO(time.month).endOf("month").toISODate(),
};
}
if (time.mode === "year") {
return {
- startDate: time.year,
- endDate: DateTime.fromISO(time.year).endOf("year").toISODate(),
+ start_date: time.year,
+ end_date: DateTime.fromISO(time.year).endOf("year").toISODate(),
};
}
if (time.mode === "all-time" || time.mode === "past-minutes") {
- return { startDate: null, endDate: null };
+ return { start_date: null, end_date: null };
}
- return { startDate: time.day, endDate: time.day };
+ return { start_date: time.day, end_date: time.day };
}
export function getQueryParams(time: Time, additionalParams: Record<string, any> = {}): Record<string, any> {
if (time.mode === "past-minutes") {
return {
- timeZone,
- pastMinutesStart: time.pastMinutesStart,
- pastMinutesEnd: time.pastMinutesEnd,
+ time_zone: timeZone,
+ past_minutes_start: time.pastMinutesStart,
+ past_minutes_end: time.pastMinutesEnd,
...additionalParams,
};
}
@@ -46,7 +46,7 @@ export function getQueryParams(time: Time, additionalParams: Record<string, any>
// Regular date-based approach
return {
...getStartAndEndDate(time),
- timeZone,
+ time_zone: timeZone,
...additionalParams,
};
}
diff --git a/client/src/app/[site]/journeys/page.tsx b/client/src/app/[site]/journeys/page.tsx
index 1b91e7d2a..db6319285 100644
--- a/client/src/app/[site]/journeys/page.tsx
+++ b/client/src/app/[site]/journeys/page.tsx
@@ -28,7 +28,7 @@ export default function JourneysPage() {
const { data, isLoading, error } = useJourneys({
siteId: siteMetadata?.siteId,
steps,
- timeZone: timeZone,
+ timeZone,
time,
limit: maxJourneys,
stepFilters,
diff --git a/client/src/app/[site]/main/components/MainSection/PreviousChart.tsx b/client/src/app/[site]/main/components/MainSection/PreviousChart.tsx
index c3800be77..6414a6db3 100644
--- a/client/src/app/[site]/main/components/MainSection/PreviousChart.tsx
+++ b/client/src/app/[site]/main/components/MainSection/PreviousChart.tsx
@@ -26,7 +26,7 @@ const getMin = (time: Time, bucket: TimeBucket) => {
// if (bucket === "hour") {
// return DateTime.now()
// .setZone("UTC")
- // .minus({ minutes: time.pastMinutesStart * 2 })
+ // .minus({ minutes: time.past_minutes_start * 2 })
// .startOf("hour")
// .toJSDate();
// }
diff --git a/client/src/lib/urlParams.ts b/client/src/lib/urlParams.ts
index 30cd8cc71..e442b5db8 100644
--- a/client/src/lib/urlParams.ts
+++ b/client/src/lib/urlParams.ts
@@ -56,10 +56,30 @@ const wellKnownPresets: Record<string, () => Time> = {
wellKnown: "last-month",
}),
"this-year": () => ({ mode: "year", year: DateTime.now().startOf("year").toISODate(), wellKnown: "this-year" }),
- "last-30-minutes": () => ({ mode: "past-minutes", pastMinutesStart: 30, pastMinutesEnd: 0, wellKnown: "last-30-minutes" }),
- "last-1-hour": () => ({ mode: "past-minutes", pastMinutesStart: 60, pastMinutesEnd: 0, wellKnown: "last-1-hour" }),
- "last-6-hours": () => ({ mode: "past-minutes", pastMinutesStart: 360, pastMinutesEnd: 0, wellKnown: "last-6-hours" }),
- "last-24-hours": () => ({ mode: "past-minutes", pastMinutesStart: 1440, pastMinutesEnd: 0, wellKnown: "last-24-hours" }),
+ "last-30-minutes": () => ({
+ mode: "past-minutes",
+ pastMinutesStart: 30,
+ pastMinutesEnd: 0,
+ wellKnown: "last-30-minutes",
+ }),
+ "last-1-hour": () => ({
+ mode: "past-minutes",
+ pastMinutesStart: 60,
+ pastMinutesEnd: 0,
+ wellKnown: "last-1-hour",
+ }),
+ "last-6-hours": () => ({
+ mode: "past-minutes",
+ pastMinutesStart: 360,
+ pastMinutesEnd: 0,
+ wellKnown: "last-6-hours",
+ }),
+ "last-24-hours": () => ({
+ mode: "past-minutes",
+ pastMinutesStart: 1440,
+ pastMinutesEnd: 0,
+ wellKnown: "last-24-hours",
+ }),
"all-time": () => ({ mode: "all-time", wellKnown: "all-time" }),
};
@@ -92,8 +112,8 @@ const serializeStateToUrl = (
} else if (time.mode === "year") {
params.set("year", time.year);
} else if (time.mode === "past-minutes") {
- params.set("pastMinutesStart", time.pastMinutesStart.toString());
- params.set("pastMinutesEnd", time.pastMinutesEnd.toString());
+ params.set("past_minutes_start", time.pastMinutesStart.toString());
+ params.set("past_minutes_end", time.pastMinutesEnd.toString());
}
}
@@ -153,10 +173,14 @@ const deserializeUrlToState = (
const year = searchParams.get("year");
if (year) result.time = { mode: "year", year };
} else if (timeMode === "past-minutes") {
- const pastMinutesStart = searchParams.get("pastMinutesStart");
- const pastMinutesEnd = searchParams.get("pastMinutesEnd");
- if (pastMinutesStart && pastMinutesEnd) {
- result.time = { mode: "past-minutes", pastMinutesStart: Number(pastMinutesStart), pastMinutesEnd: Number(pastMinutesEnd) };
+ const past_minutes_start = searchParams.get("past_minutes_start");
+ const past_minutes_end = searchParams.get("past_minutes_end");
+ if (past_minutes_start && past_minutes_end) {
+ result.time = {
+ mode: "past-minutes",
+ pastMinutesStart: Number(past_minutes_start),
+ pastMinutesEnd: Number(past_minutes_end),
+ };
}
} else if (timeMode === "all-time") {
result.time = { mode: "all-time" };
diff --git a/server/src/api/admin/getAdminServiceEventCount.ts b/server/src/api/admin/getAdminServiceEventCount.ts
index e76181c67..b86ea84c2 100644
--- a/server/src/api/admin/getAdminServiceEventCount.ts
+++ b/server/src/api/admin/getAdminServiceEventCount.ts
@@ -15,9 +15,9 @@ type ServiceEventCountResponse = {
export async function getAdminServiceEventCount(
req: FastifyRequest<{
Querystring: {
- startDate?: string;
- endDate?: string;
- timeZone?: string;
+ start_date?: string;
+ end_date?: string;
+ time_zone?: string;
};
}>,
res: FastifyReply
@@ -28,7 +28,7 @@ export async function getAdminServiceEventCount(
return res.status(401).send({ error: "Unauthorized" });
}
- const { startDate, endDate, timeZone = "UTC" } = req.query;
+ const { start_date, end_date, time_zone = "UTC" } = req.query;
try {
// Build time filter for the query
@@ -36,24 +36,24 @@ export async function getAdminServiceEventCount(
let fillFromDate = "";
let fillToDate = "";
- if (startDate && endDate) {
+ if (start_date && end_date) {
timeFilter = `AND event_hour >= toTimeZone(
- toStartOfDay(toDateTime(${SqlString.escape(startDate)}, ${SqlString.escape(timeZone)})),
+ toStartOfDay(toDateTime(${SqlString.escape(start_date)}, ${SqlString.escape(time_zone)})),
'UTC'
)
AND event_hour < if(
- toDate(${SqlString.escape(endDate)}) = toDate(now(), ${SqlString.escape(timeZone)}),
+ toDate(${SqlString.escape(end_date)}) = toDate(now(), ${SqlString.escape(time_zone)}),
now(),
toTimeZone(
- toStartOfDay(toDateTime(${SqlString.escape(endDate)}, ${SqlString.escape(timeZone)})) + INTERVAL 1 DAY,
+ toStartOfDay(toDateTime(${SqlString.escape(end_date)}, ${SqlString.escape(time_zone)})) + INTERVAL 1 DAY,
'UTC'
)
)`;
// Set up WITH FILL parameters - use UTC midnight boundaries
- fillFromDate = `FROM toStartOfDay(toDateTime(${SqlString.escape(startDate)}))`;
+ fillFromDate = `FROM toStartOfDay(toDateTime(${SqlString.escape(start_date)}))`;
- fillToDate = `TO toStartOfDay(toDateTime(${SqlString.escape(endDate)})) + INTERVAL 1 DAY`;
+ fillToDate = `TO toStartOfDay(toDateTime(${SqlString.escape(end_date)})) + INTERVAL 1 DAY`;
} else {
// Default to last 30 days if no date range provided
timeFilter = "AND event_hour >= toStartOfDay(now()) - INTERVAL 30 DAY";
diff --git a/server/src/api/analytics/events/getEventNames.ts b/server/src/api/analytics/events/getEventNames.ts
index 82f80e811..ab10fb405 100644
--- a/server/src/api/analytics/events/getEventNames.ts
+++ b/server/src/api/analytics/events/getEventNames.ts
@@ -13,12 +13,12 @@ export interface GetEventNamesRequest {
site: string;
};
Querystring: FilterParams<{
- eventName: string;
+ event_name: string;
}>;
}
export async function getEventNames(req: FastifyRequest<GetEventNamesRequest>, res: FastifyReply) {
- const { startDate, endDate, timeZone, filters, pastMinutesStart, pastMinutesEnd } = req.query;
+ const { filters } = req.query;
const site = req.params.site;
const timeStatement = getTimeStatement(req.query);
diff --git a/server/src/api/analytics/events/getEventProperties.ts b/server/src/api/analytics/events/getEventProperties.ts
index b0da96970..5920e5110 100644
--- a/server/src/api/analytics/events/getEventProperties.ts
+++ b/server/src/api/analytics/events/getEventProperties.ts
@@ -14,12 +14,12 @@ export interface GetEventPropertiesRequest {
site: string;
};
Querystring: FilterParams<{
- eventName: string;
+ event_name: string;
}>;
}
export async function getEventProperties(req: FastifyRequest<GetEventPropertiesRequest>, res: FastifyReply) {
- const { startDate, endDate, timeZone, eventName, filters, pastMinutesStart, pastMinutesEnd } = req.query;
+ const { event_name: eventName, filters } = req.query;
const site = req.params.site;
if (!eventName) {
diff --git a/server/src/api/analytics/events/getEvents.ts b/server/src/api/analytics/events/getEvents.ts
index e3647c199..c1db44d64 100644
--- a/server/src/api/analytics/events/getEvents.ts
+++ b/server/src/api/analytics/events/getEvents.ts
@@ -26,22 +26,22 @@ interface GetEventsRequest {
};
Querystring: FilterParams<{
page?: string;
- pageSize?: string;
+ page_size?: string;
count?: string; // Keeping for backward compatibility
}>;
}
export async function getEvents(req: FastifyRequest<GetEventsRequest>, res: FastifyReply) {
const { site } = req.params;
- const { startDate, endDate, timeZone, filters, page = "1", pageSize = "20", count } = req.query;
+ const { start_date, end_date, time_zone, filters, page = "1", page_size: pageSize = "20", count } = req.query;
- // Use count if provided (for backward compatibility), otherwise use pageSize
+ // Use count if provided (for backward compatibility), otherwise use page_size
const limit = count ? parseInt(count, 10) : parseInt(pageSize, 10);
const offset = (parseInt(page, 10) - 1) * limit;
// Get time and filter statements if parameters are provided
const timeStatement =
- startDate || endDate ? getTimeStatement(req.query) : "AND timestamp > now() - INTERVAL 30 MINUTE"; // Default to last 30 minutes if no time range specified
+ start_date || end_date ? getTimeStatement(req.query) : "AND timestamp > now() - INTERVAL 30 MINUTE"; // Default to last 30 minutes if no time range specified
const filterStatement = filters ? getFilterStatement(filters, Number(site), timeStatement) : "";
diff --git a/server/src/api/analytics/getErrorBucketed.ts b/server/src/api/analytics/getErrorBucketed.ts
index 3bfbb455b..e4946ed37 100644
--- a/server/src/api/analytics/getErrorBucketed.ts
+++ b/server/src/api/analytics/getErrorBucketed.ts
@@ -9,23 +9,23 @@ import { TimeBucket } from "./types.js";
function getTimeStatementFill(params: FilterParams, bucket: TimeBucket) {
const { params: validatedParams, bucket: validatedBucket } = validateTimeStatementFillParams(params, bucket);
- if (validatedParams.startDate && validatedParams.endDate && validatedParams.timeZone) {
- const { startDate, endDate, timeZone } = validatedParams;
+ if (validatedParams.start_date && validatedParams.end_date && validatedParams.time_zone) {
+ const { start_date, end_date, time_zone } = validatedParams;
return `WITH FILL FROM ${
TimeBucketToFn[validatedBucket]
- }(toDateTime(${SqlString.escape(startDate)}, ${SqlString.escape(timeZone)}))
+ }(toDateTime(${SqlString.escape(start_date)}, ${SqlString.escape(time_zone)}))
TO if(
- toDate(${SqlString.escape(endDate)}) = toDate(now(), ${SqlString.escape(timeZone)}),
- ${TimeBucketToFn[validatedBucket]}(toTimeZone(now(), ${SqlString.escape(timeZone)})),
- ${TimeBucketToFn[validatedBucket]}(toDateTime(${SqlString.escape(endDate)}, ${SqlString.escape(
- timeZone
+ toDate(${SqlString.escape(end_date)}) = toDate(now(), ${SqlString.escape(time_zone)}),
+ ${TimeBucketToFn[validatedBucket]}(toTimeZone(now(), ${SqlString.escape(time_zone)})),
+ ${TimeBucketToFn[validatedBucket]}(toDateTime(${SqlString.escape(end_date)}, ${SqlString.escape(
+ time_zone
)})) + INTERVAL 1 DAY
) STEP INTERVAL ${bucketIntervalMap[validatedBucket]}`;
}
// For specific past minutes range - convert to exact timestamps for better performance
- if (validatedParams.pastMinutesStart !== undefined && validatedParams.pastMinutesEnd !== undefined) {
- return `WITH FILL FROM now() - INTERVAL ${validatedParams.pastMinutesStart} MINUTE
- TO now() - INTERVAL ${validatedParams.pastMinutesEnd} MINUTE
+ if (validatedParams.past_minutes_start !== undefined && validatedParams.past_minutes_end !== undefined) {
+ return `WITH FILL FROM now() - INTERVAL ${validatedParams.past_minutes_start} MINUTE
+ TO now() - INTERVAL ${validatedParams.past_minutes_end} MINUTE
STEP INTERVAL ${bucketIntervalMap[validatedBucket]}`;
}
@@ -83,7 +83,7 @@ export async function getErrorBucketed(req: FastifyRequest<GetErrorBucketedReque
query_params: {
siteId: numericSiteId,
errorMessage: errorMessage,
- timeZone: req.query.timeZone || "UTC",
+ timeZone: req.query.time_zone || "UTC",
},
});
diff --git a/server/src/api/analytics/getMetric.ts b/server/src/api/analytics/getMetric.ts
index 9e87a6065..316709789 100644
--- a/server/src/api/analytics/getMetric.ts
+++ b/server/src/api/analytics/getMetric.ts
@@ -53,6 +53,7 @@ const getQuery = (request: FastifyRequest<GetMetricRequest>, isCountQuery: boole
const site = request.params.site;
const timeStatement = getTimeStatement(request.query);
+
const filterStatement = getFilterStatement(filters, Number(site), timeStatement);
let validatedLimit: number | null = null;
diff --git a/server/src/api/analytics/getOrgEventCount.ts b/server/src/api/analytics/getOrgEventCount.ts
index c0f9461a6..f44a7868c 100644
--- a/server/src/api/analytics/getOrgEventCount.ts
+++ b/server/src/api/analytics/getOrgEventCount.ts
@@ -18,15 +18,15 @@ export async function getOrgEventCount(
organizationId: string;
};
Querystring: {
- startDate?: string;
- endDate?: string;
- timeZone?: string;
+ start_date?: string;
+ end_date?: string;
+ time_zone?: string;
};
}>,
res: FastifyReply
) {
const { organizationId } = req.params;
- const { startDate, endDate, timeZone = "UTC" } = req.query;
+ const { start_date, end_date, time_zone = "UTC" } = req.query;
try {
// Get all sites the user has access to
@@ -46,31 +46,31 @@ export async function getOrgEventCount(
let fillFromDate = "";
let fillToDate = "";
- if (startDate && endDate) {
+ if (start_date && end_date) {
timeFilter = `AND event_hour >= toTimeZone(
- toStartOfDay(toDateTime(${SqlString.escape(startDate)}, ${SqlString.escape(timeZone)})),
+ toStartOfDay(toDateTime(${SqlString.escape(start_date)}, ${SqlString.escape(time_zone)}),
'UTC'
)
AND event_hour < if(
- toDate(${SqlString.escape(endDate)}) = toDate(now(), ${SqlString.escape(timeZone)}),
+ toDate(${SqlString.escape(end_date)}) = toDate(now(), ${SqlString.escape(time_zone)}),
now(),
toTimeZone(
- toStartOfDay(toDateTime(${SqlString.escape(endDate)}, ${SqlString.escape(timeZone)})) + INTERVAL 1 DAY,
+ toStartOfDay(toDateTime(${SqlString.escape(end_date)}, ${SqlString.escape(time_zone)})) + INTERVAL 1 DAY,
'UTC'
)
)`;
// Set up WITH FILL parameters
fillFromDate = `FROM toTimeZone(
- toStartOfDay(toDateTime(${SqlString.escape(startDate)}, ${SqlString.escape(timeZone)})),
+ toStartOfDay(toDateTime(${SqlString.escape(start_date)}, ${SqlString.escape(time_zone)})),
'UTC'
)`;
fillToDate = `TO if(
- toDate(${SqlString.escape(endDate)}) = toDate(now(), ${SqlString.escape(timeZone)}),
+ toDate(${SqlString.escape(end_date)}) = toDate(now(), ${SqlString.escape(time_zone)}),
toStartOfDay(now()) + INTERVAL 1 DAY,
toTimeZone(
- toStartOfDay(toDateTime(${SqlString.escape(endDate)}, ${SqlString.escape(timeZone)})) + INTERVAL 1 DAY,
+ toStartOfDay(toDateTime(${SqlString.escape(end_date)}, ${SqlString.escape(time_zone)})) + INTERVAL 1 DAY,
'UTC'
)
)`;
diff --git a/server/src/api/analytics/getOverview.ts b/server/src/api/analytics/getOverview.ts
index 13846c067..82503dd3b 100644
--- a/server/src/api/analytics/getOverview.ts
+++ b/server/src/api/analytics/getOverview.ts
@@ -93,17 +93,17 @@ export interface OverviewRequest {
}
export async function getOverview(req: FastifyRequest<OverviewRequest>, res: FastifyReply) {
- const { startDate, endDate, timeZone, filters, pastMinutesStart, pastMinutesEnd } = req.query;
+ const { start_date, end_date, time_zone, filters, past_minutes_start, past_minutes_end } = req.query;
const site = req.params.site;
const query = getQuery(
{
- startDate,
- endDate,
- timeZone,
+ start_date,
+ end_date,
+ time_zone,
filters,
- pastMinutesStart,
- pastMinutesEnd,
+ past_minutes_start,
+ past_minutes_end,
},
Number(site)
);
diff --git a/server/src/api/analytics/getOverviewBucketed.ts b/server/src/api/analytics/getOverviewBucketed.ts
index 365b4e7e0..b4e0003aa 100644
--- a/server/src/api/analytics/getOverviewBucketed.ts
+++ b/server/src/api/analytics/getOverviewBucketed.ts
@@ -9,28 +9,28 @@ import { TimeBucket } from "./types.js";
function getTimeStatementFill(params: FilterParams, bucket: TimeBucket) {
const { params: validatedParams, bucket: validatedBucket } = validateTimeStatementFillParams(params, bucket);
- if (validatedParams.startDate && validatedParams.endDate && validatedParams.timeZone) {
- const { startDate, endDate, timeZone } = validatedParams;
+ if (validatedParams.start_date && validatedParams.end_date && validatedParams.time_zone) {
+ const { start_date, end_date, time_zone } = validatedParams;
return `WITH FILL FROM toTimeZone(
- toDateTime(${TimeBucketToFn[validatedBucket]}(toDateTime(${SqlString.escape(startDate)}, ${SqlString.escape(
- timeZone
+ toDateTime(${TimeBucketToFn[validatedBucket]}(toDateTime(${SqlString.escape(start_date)}, ${SqlString.escape(
+ time_zone
)}))),
'UTC'
)
TO if(
- toDate(${SqlString.escape(endDate)}) = toDate(now(), ${SqlString.escape(timeZone)}),
+ toDate(${SqlString.escape(end_date)}) = toDate(now(), ${SqlString.escape(time_zone)}),
now(),
toTimeZone(
- toDateTime(${TimeBucketToFn[validatedBucket]}(toDateTime(${SqlString.escape(endDate)}, ${SqlString.escape(
- timeZone
+ toDateTime(${TimeBucketToFn[validatedBucket]}(toDateTime(${SqlString.escape(end_date)}, ${SqlString.escape(
+ time_zone
)}))) + INTERVAL 1 DAY,
'UTC'
)
) STEP INTERVAL ${bucketIntervalMap[validatedBucket]}`;
}
// For specific past minutes range - convert to exact timestamps for better performance
- if (validatedParams.pastMinutesStart !== undefined && validatedParams.pastMinutesEnd !== undefined) {
- const { pastMinutesStart: start, pastMinutesEnd: end } = validatedParams;
+ if (validatedParams.past_minutes_start !== undefined && validatedParams.past_minutes_end !== undefined) {
+ const { past_minutes_start: start, past_minutes_end: end } = validatedParams;
// Calculate exact timestamps in JavaScript to avoid runtime ClickHouse calculations
const now = new Date();
@@ -66,16 +66,16 @@ function getTimeStatementFill(params: FilterParams, bucket: TimeBucket) {
}
const getQuery = (params: FilterParams<{ bucket: TimeBucket }>, siteId: number) => {
- const { startDate, endDate, timeZone, bucket, filters, pastMinutesStart, pastMinutesEnd } = params;
+ const { start_date, end_date, time_zone, bucket, filters, past_minutes_start, past_minutes_end } = params;
const timeStatement = getTimeStatement(params);
const filterStatement = getFilterStatement(filters, siteId, timeStatement);
const pastMinutesRange =
- pastMinutesStart !== undefined && pastMinutesEnd !== undefined
- ? { start: Number(pastMinutesStart), end: Number(pastMinutesEnd) }
+ past_minutes_start !== undefined && past_minutes_end !== undefined
+ ? { start: Number(past_minutes_start), end: Number(past_minutes_end) }
: undefined;
- const isAllTime = !startDate && !endDate && !pastMinutesRange;
+ const isAllTime = !start_date && !end_date && !pastMinutesRange;
const query = `
WITH
@@ -124,7 +124,7 @@ SELECT
FROM
(
SELECT
- toDateTime(${TimeBucketToFn[bucket]}(toTimeZone(start_time, ${SqlString.escape(timeZone)}))) AS time,
+ toDateTime(${TimeBucketToFn[bucket]}(toTimeZone(start_time, ${SqlString.escape(time_zone)}))) AS time,
COUNT() AS sessions,
AVG(total_pageviews_in_session) AS pages_per_session,
sumIf(1, total_pageviews_in_session = 1) / COUNT() AS bounce_rate,
@@ -135,7 +135,7 @@ FROM
FULL JOIN
(
SELECT
- toDateTime(${TimeBucketToFn[bucket]}(toTimeZone(timestamp, ${SqlString.escape(timeZone)}))) AS time,
+ toDateTime(${TimeBucketToFn[bucket]}(toTimeZone(timestamp, ${SqlString.escape(time_zone)}))) AS time,
countIf(type = 'pageview') AS pageviews,
COUNT(DISTINCT user_id) AS users
FROM events
@@ -164,18 +164,18 @@ export async function getOverviewBucketed(
}>,
res: FastifyReply
) {
- const { startDate, endDate, timeZone, bucket, filters, pastMinutesStart, pastMinutesEnd } = req.query;
+ const { start_date, end_date, time_zone, bucket, filters, past_minutes_start, past_minutes_end } = req.query;
const site = req.params.site;
const query = getQuery(
{
- startDate,
- endDate,
- timeZone,
+ start_date,
+ end_date,
+ time_zone,
bucket,
filters,
- pastMinutesStart,
- pastMinutesEnd,
+ past_minutes_start,
+ past_minutes_end,
},
Number(site)
);
diff --git a/server/src/api/analytics/getPageTitles.ts b/server/src/api/analytics/getPageTitles.ts
index 4e957130e..b30f17ee9 100644
--- a/server/src/api/analytics/getPageTitles.ts
+++ b/server/src/api/analytics/getPageTitles.ts
@@ -29,7 +29,7 @@ type PageTitlesPaginatedResponse = {
};
const getPageTitlesQuery = (request: FastifyRequest<GetPageTitlesRequest>, isCountQuery: boolean = false) => {
- const { startDate, endDate, timeZone, filters, limit, page, pastMinutesStart, pastMinutesEnd } = request.query;
+ const { filters, limit, page } = request.query;
const timeStatement = getTimeStatement(request.query);
const filterStatement = getFilterStatement(filters, Number(request.params.site), timeStatement);
diff --git a/server/src/api/analytics/getSessions.ts b/server/src/api/analytics/getSessions.ts
index 1cb46c188..5ea8b1283 100644
--- a/server/src/api/analytics/getSessions.ts
+++ b/server/src/api/analytics/getSessions.ts
@@ -48,12 +48,12 @@ export interface GetSessionsRequest {
Querystring: FilterParams<{
limit: number;
page: number;
- userId?: string;
+ user_id?: string;
}>;
}
export async function getSessions(req: FastifyRequest<GetSessionsRequest>, res: FastifyReply) {
- const { filters, page, userId, limit } = req.query;
+ const { filters, page, user_id: userId, limit } = req.query;
const site = req.params.site;
const timeStatement = getTimeStatement(req.query);
@@ -107,7 +107,7 @@ export async function getSessions(req: FastifyRequest<GetSessionsRequest>, res:
FROM events
WHERE
site_id = {siteId:Int32}
- ${userId ? ` AND user_id = {userId:String}` : ""}
+ ${userId ? ` AND user_id = {user_id:String}` : ""}
${timeStatement}
GROUP BY
session_id,
@@ -126,7 +126,7 @@ export async function getSessions(req: FastifyRequest<GetSessionsRequest>, res:
format: "JSONEachRow",
query_params: {
siteId: Number(site),
- userId,
+ user_id: userId,
limit: limit || 100,
offset: (page - 1) * (limit || 100),
},
diff --git a/server/src/api/analytics/getUserSessionCount.ts b/server/src/api/analytics/getUserSessionCount.ts
index c11b16bdd..0bfe043ce 100644
--- a/server/src/api/analytics/getUserSessionCount.ts
+++ b/server/src/api/analytics/getUserSessionCount.ts
@@ -8,8 +8,8 @@ export interface GetUserSessionCountRequest {
site: string;
};
Querystring: {
- userId?: string;
- timeZone?: string;
+ user_id?: string;
+ time_zone?: string;
};
}
@@ -20,10 +20,10 @@ export type GetUserSessionCountResponse = {
export async function getUserSessionCount(req: FastifyRequest<GetUserSessionCountRequest>, res: FastifyReply) {
const { site } = req.params;
- const { userId, timeZone = "UTC" } = req.query;
+ const { user_id: userId, time_zone: timeZone = "UTC" } = req.query;
if (!userId) {
- return res.status(400).send({ error: "userId is required" });
+ return res.status(400).send({ error: "user_id is required" });
}
const query = `
diff --git a/server/src/api/analytics/getUsers.ts b/server/src/api/analytics/getUsers.ts
index 436c91985..a3e7e3b2f 100644
--- a/server/src/api/analytics/getUsers.ts
+++ b/server/src/api/analytics/getUsers.ts
@@ -26,25 +26,14 @@ export interface GetUsersRequest {
};
Querystring: FilterParams<{
page?: string;
- pageSize?: string;
- sortBy?: string;
- sortOrder?: string;
+ page_size?: string;
+ sort_by?: string;
+ sort_order?: string;
}>;
}
export async function getUsers(req: FastifyRequest<GetUsersRequest>, res: FastifyReply) {
- const {
- startDate,
- endDate,
- timeZone,
- filters,
- page = "1",
- pageSize = "20",
- sortBy = "last_seen",
- sortOrder = "desc",
- pastMinutesStart,
- pastMinutesEnd,
- } = req.query;
+ const { filters, page = "1", page_size: pageSize = "20", sort_by: sortBy = "last_seen", sort_order: sortOrder = "desc" } = req.query;
const site = req.params.site;
const pageNum = parseInt(page, 10);
diff --git a/server/src/api/analytics/goals/getGoals.ts b/server/src/api/analytics/goals/getGoals.ts
index 430789cfd..d9986ff79 100644
--- a/server/src/api/analytics/goals/getGoals.ts
+++ b/server/src/api/analytics/goals/getGoals.ts
@@ -36,7 +36,7 @@ export async function getGoals(
};
Querystring: FilterParams<{
page?: string;
- pageSize?: string;
+ page_size?: string;
sort?: string;
order?: "asc" | "desc";
}>;
@@ -44,7 +44,7 @@ export async function getGoals(
reply: FastifyReply
) {
const { site } = request.params;
- const { filters, page = "1", pageSize = "10", sort = "createdAt", order = "desc" } = request.query;
+ const { filters, page = "1", page_size: pageSize = "10", sort = "createdAt", order = "desc" } = request.query;
const pageNumber = parseInt(page, 10);
const pageSizeNumber = parseInt(pageSize, 10);
diff --git a/server/src/api/analytics/performance/getPerformanceByDimension.ts b/server/src/api/analytics/performance/getPerformanceByDimension.ts
index 64e700f9b..8496ce9f1 100644
--- a/server/src/api/analytics/performance/getPerformanceByDimension.ts
+++ b/server/src/api/analytics/performance/getPerformanceByDimension.ts
@@ -10,8 +10,8 @@ interface GetPerformanceByDimensionRequest {
Querystring: FilterParams<{
limit?: number;
page?: number;
- sortBy?: string;
- sortOrder?: "asc" | "desc";
+ sort_by?: string;
+ sort_order?: "asc" | "desc";
dimension: string;
}>;
}
@@ -54,19 +54,7 @@ type GetPerformanceByDimensionPaginatedResponse = {
const getQuery = (request: FastifyRequest<GetPerformanceByDimensionRequest>, isCountQuery: boolean = false) => {
const queryParams = request.query;
- const {
- startDate,
- endDate,
- timeZone,
- filters,
- limit,
- page,
- pastMinutesStart,
- pastMinutesEnd,
- sortBy,
- sortOrder,
- dimension,
- } = queryParams;
+ const { filters, limit, page, sort_by: sortBy, sort_order: sortOrder, dimension } = queryParams;
// Validate dimension
const validDimensions = ["pathname", "country", "device_type", "browser", "operating_system", "region"];
diff --git a/server/src/api/analytics/performance/getPerformanceTimeSeries.ts b/server/src/api/analytics/performance/getPerformanceTimeSeries.ts
index f5f95beb1..c7418aaec 100644
--- a/server/src/api/analytics/performance/getPerformanceTimeSeries.ts
+++ b/server/src/api/analytics/performance/getPerformanceTimeSeries.ts
@@ -9,28 +9,28 @@ import { FilterParams } from "@rybbit/shared";
function getTimeStatementFill(params: FilterParams, bucket: TimeBucket) {
const { params: validatedParams, bucket: validatedBucket } = validateTimeStatementFillParams(params, bucket);
- if (validatedParams.startDate && validatedParams.endDate && validatedParams.timeZone) {
- const { startDate, endDate, timeZone } = validatedParams;
+ if (validatedParams.start_date && validatedParams.end_date && validatedParams.time_zone) {
+ const { start_date, end_date, time_zone } = validatedParams;
return `WITH FILL FROM toTimeZone(
- toDateTime(${TimeBucketToFn[validatedBucket]}(toDateTime(${SqlString.escape(startDate)}, ${SqlString.escape(
- timeZone
+ toDateTime(${TimeBucketToFn[validatedBucket]}(toDateTime(${SqlString.escape(start_date)}, ${SqlString.escape(
+ time_zone
)}))),
'UTC'
)
TO if(
- toDate(${SqlString.escape(endDate)}) = toDate(now(), ${SqlString.escape(timeZone)}),
+ toDate(${SqlString.escape(end_date)}) = toDate(now(), ${SqlString.escape(time_zone)}),
now(),
toTimeZone(
- toDateTime(${TimeBucketToFn[validatedBucket]}(toDateTime(${SqlString.escape(endDate)}, ${SqlString.escape(
- timeZone
+ toDateTime(${TimeBucketToFn[validatedBucket]}(toDateTime(${SqlString.escape(end_date)}, ${SqlString.escape(
+ time_zone
)}))) + INTERVAL 1 DAY,
'UTC'
)
) STEP INTERVAL ${bucketIntervalMap[validatedBucket]}`;
}
// For specific past minutes range - convert to exact timestamps for better performance
- if (validatedParams.pastMinutesStart !== undefined && validatedParams.pastMinutesEnd !== undefined) {
- const { pastMinutesStart: start, pastMinutesEnd: end } = validatedParams;
+ if (validatedParams.past_minutes_start !== undefined && validatedParams.past_minutes_end !== undefined) {
+ const { past_minutes_start: start, past_minutes_end: end } = validatedParams;
// Calculate exact timestamps in JavaScript to avoid runtime ClickHouse calculations
const now = new Date();
@@ -66,15 +66,15 @@ function getTimeStatementFill(params: FilterParams, bucket: TimeBucket) {
}
const getQuery = (params: FilterParams<{ bucket: TimeBucket }>, siteId: number) => {
- const { startDate, endDate, timeZone, bucket, filters, pastMinutesStart, pastMinutesEnd } = params;
+ const { start_date, end_date, time_zone, bucket, filters, past_minutes_start, past_minutes_end } = params;
const timeStatement = getTimeStatement(params);
const filterStatement = getFilterStatement(filters, siteId, timeStatement);
- const isAllTime = !startDate && !endDate && !pastMinutesStart && !pastMinutesEnd;
+ const isAllTime = !start_date && !end_date && !past_minutes_start && !past_minutes_end;
const query = `
SELECT
- toDateTime(${TimeBucketToFn[bucket]}(toTimeZone(timestamp, ${SqlString.escape(timeZone)}))) AS time,
+ toDateTime(${TimeBucketToFn[bucket]}(toTimeZone(timestamp, ${SqlString.escape(time_zone)}))) AS time,
quantile(0.5)(lcp) AS lcp_p50,
quantile(0.75)(lcp) AS lcp_p75,
quantile(0.9)(lcp) AS lcp_p90,
diff --git a/server/src/api/analytics/query-validation.ts b/server/src/api/analytics/query-validation.ts
index 3b5dd9231..59797b1c5 100644
--- a/server/src/api/analytics/query-validation.ts
+++ b/server/src/api/analytics/query-validation.ts
@@ -14,21 +14,21 @@ const dateRegex = /^\d{4}-\d{2}-\d{2}$/;
* Schema for simplified date parameters without table
*/
const fillDateParamsSchema = z.object({
- startDate: z
+ start_date: z
.string()
.regex(dateRegex, { message: "Invalid date format. Use YYYY-MM-DD" })
.optional()
.refine(date => !date || !isNaN(Date.parse(date)), {
message: "Invalid date value",
}),
- endDate: z
+ end_date: z
.string()
.regex(dateRegex, { message: "Invalid date format. Use YYYY-MM-DD" })
.optional()
.refine(date => !date || !isNaN(Date.parse(date)), {
message: "Invalid date value",
}),
- timeZone: z
+ time_zone: z
.string()
.min(1, { message: "Time zone cannot be empty" })
.refine(
@@ -76,21 +76,21 @@ const timeStatementParamsSchema = z
*/
const filterParamsTimeStatementFillSchema = z
.object({
- startDate: z
+ start_date: z
.string()
.regex(dateRegex, { message: "Invalid date format. Use YYYY-MM-DD" })
.optional()
.refine(date => !date || !isNaN(Date.parse(date)), {
message: "Invalid date value",
}),
- endDate: z
+ end_date: z
.string()
.regex(dateRegex, { message: "Invalid date format. Use YYYY-MM-DD" })
.optional()
.refine(date => !date || !isNaN(Date.parse(date)), {
message: "Invalid date value",
}),
- timeZone: z
+ time_zone: z
.string()
.min(1, { message: "Time zone cannot be empty" })
.optional()
@@ -107,7 +107,7 @@ const filterParamsTimeStatementFillSchema = z
},
{ message: "Invalid time zone" }
),
- pastMinutesStart: z
+ past_minutes_start: z
.union([z.string(), z.number()])
.optional()
.transform(val => {
@@ -116,9 +116,9 @@ const filterParamsTimeStatementFillSchema = z
return isNaN(num) ? undefined : num;
})
.refine(val => val === undefined || val >= 0, {
- message: "pastMinutesStart must be non-negative",
+ message: "past_minutes_start must be non-negative",
}),
- pastMinutesEnd: z
+ past_minutes_end: z
.union([z.string(), z.number()])
.optional()
.transform(val => {
@@ -127,29 +127,29 @@ const filterParamsTimeStatementFillSchema = z
return isNaN(num) ? undefined : num;
})
.refine(val => val === undefined || val >= 0, {
- message: "pastMinutesEnd must be non-negative",
+ message: "past_minutes_end must be non-negative",
}),
filters: z.string().optional(),
})
.refine(
data => {
- const hasDateParams = data.startDate && data.endDate && data.timeZone;
- const hasPastMinutesParams = data.pastMinutesStart !== undefined && data.pastMinutesEnd !== undefined;
+ const hasDateParams = data.start_date && data.end_date && data.time_zone;
+ const hasPastMinutesParams = data.past_minutes_start !== undefined && data.past_minutes_end !== undefined;
return hasDateParams || hasPastMinutesParams;
},
{
- message: "Either (startDate, endDate, timeZone) or (pastMinutesStart, pastMinutesEnd) must be provided",
+ message: "Either (start_date, end_date, time_zone) or (past_minutes_start, past_minutes_end) must be provided",
}
)
.refine(
data => {
- if (data.pastMinutesStart !== undefined && data.pastMinutesEnd !== undefined) {
- return data.pastMinutesStart > data.pastMinutesEnd;
+ if (data.past_minutes_start !== undefined && data.past_minutes_end !== undefined) {
+ return data.past_minutes_start > data.past_minutes_end;
}
return true;
},
{
- message: "pastMinutesStart must be greater than pastMinutesEnd (start = older, end = newer)",
+ message: "past_minutes_start must be greater than past_minutes_end (start = older, end = newer)",
}
);
diff --git a/server/src/api/analytics/utils.ts b/server/src/api/analytics/utils.ts
index b9f43fe5e..53f749a83 100644
--- a/server/src/api/analytics/utils.ts
+++ b/server/src/api/analytics/utils.ts
@@ -5,17 +5,17 @@ import { filterParamSchema, validateFilters, validateTimeStatementParams } from
import { FilterParameter, FilterType } from "./types.js";
export function getTimeStatement(
- params: Pick<FilterParams, "startDate" | "endDate" | "timeZone" | "pastMinutesStart" | "pastMinutesEnd">
+ params: Pick<FilterParams, "start_date" | "end_date" | "time_zone" | "past_minutes_start" | "past_minutes_end">
) {
- const { startDate, endDate, timeZone, pastMinutesStart, pastMinutesEnd } = params;
+ const { start_date, end_date, time_zone, past_minutes_start, past_minutes_end } = params;
// Construct the legacy format for validation
const pastMinutesRange =
- pastMinutesStart !== undefined && pastMinutesEnd !== undefined
- ? { start: Number(pastMinutesStart), end: Number(pastMinutesEnd) }
+ past_minutes_start !== undefined && past_minutes_end !== undefined
+ ? { start: Number(past_minutes_start), end: Number(past_minutes_end) }
: undefined;
- const date = startDate && endDate && timeZone ? { startDate, endDate, timeZone } : undefined;
+ const date = start_date && end_date && time_zone ? { start_date, end_date, time_zone } : undefined;
// Sanitize inputs with Zod
const sanitized = validateTimeStatementParams({
@@ -24,21 +24,21 @@ export function getTimeStatement(
});
if (sanitized.date) {
- const { startDate, endDate, timeZone } = sanitized.date;
- if (!startDate && !endDate) {
+ const { start_date, end_date, time_zone } = sanitized.date;
+ if (!start_date && !end_date) {
return "";
}
// Use SqlString.escape for date and timeZone values
return `AND timestamp >= toTimeZone(
- toStartOfDay(toDateTime(${SqlString.escape(startDate)}, ${SqlString.escape(timeZone)})),
+ toStartOfDay(toDateTime(${SqlString.escape(start_date)}, ${SqlString.escape(time_zone)})),
'UTC'
)
AND timestamp < if(
- toDate(${SqlString.escape(endDate)}) = toDate(now(), ${SqlString.escape(timeZone)}),
+ toDate(${SqlString.escape(end_date)}) = toDate(now(), ${SqlString.escape(time_zone)}),
now(),
toTimeZone(
- toStartOfDay(toDateTime(${SqlString.escape(endDate)}, ${SqlString.escape(timeZone)})) + INTERVAL 1 DAY,
+ toStartOfDay(toDateTime(${SqlString.escape(end_date)}, ${SqlString.escape(time_zone)})) + INTERVAL 1 DAY,
'UTC'
)
)`;
@@ -165,9 +165,10 @@ export function getFilterStatement(filters: string, siteId?: number, timeStateme
// This ensures we filter to sessions containing the event, but still count all pageviews in those sessions
if (filter.parameter === "event_name") {
const whereClause = [siteIdFilter, timeFilter].filter(Boolean).join(" AND ");
- const eventNameCondition = filter.value.length === 1
- ? `event_name ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + filter.value[0] + x)}`
- : `(${filter.value.map(value => `event_name ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + value + x)}`).join(" OR ")})`;
+ const eventNameCondition =
+ filter.value.length === 1
+ ? `event_name ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + filter.value[0] + x)}`
+ : `(${filter.value.map(value => `event_name ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + value + x)}`).join(" OR ")})`;
const finalWhere = whereClause
? `WHERE ${whereClause} AND ${eventNameCondition}`
diff --git a/server/src/api/gsc/getData.ts b/server/src/api/gsc/getData.ts
index be877b1fd..9735068d0 100644
--- a/server/src/api/gsc/getData.ts
+++ b/server/src/api/gsc/getData.ts
@@ -14,15 +14,15 @@ import { logger } from "../../lib/logger/logger.js";
export async function getGSCData(req: FastifyRequest<GetGSCDataRequest>, res: FastifyReply) {
try {
const { site } = req.params;
- const { startDate, endDate, dimension } = req.query;
+ const { start_date, end_date, dimension } = req.query;
const siteId = Number(site);
if (isNaN(siteId)) {
return res.status(400).send({ error: "Invalid site ID" });
}
- if (!startDate || !endDate) {
- return res.status(400).send({ error: "Missing startDate or endDate" });
+ if (!start_date || !end_date) {
+ return res.status(400).send({ error: "Missing start_date or end_date" });
}
if (!dimension) {
@@ -58,8 +58,8 @@ export async function getGSCData(req: FastifyRequest<GetGSCDataRequest>, res: Fa
"Content-Type": "application/json",
},
body: JSON.stringify({
- startDate,
- endDate,
+ startDate: start_date,
+ endDate: end_date,
dimensions: [dimension],
rowLimit: 1000,
}),
diff --git a/server/src/api/gsc/types.ts b/server/src/api/gsc/types.ts
index 27a2e2b1a..1d6e31b7e 100644
--- a/server/src/api/gsc/types.ts
+++ b/server/src/api/gsc/types.ts
@@ -17,8 +17,8 @@ export interface GetGSCDataRequest {
site: string;
};
Querystring: {
- startDate: string;
- endDate: string;
+ start_date: string;
+ end_date: string;
dimension: "query" | "page" | "country" | "device";
};
}
diff --git a/server/src/api/sessionReplay/getSessionReplays.ts b/server/src/api/sessionReplay/getSessionReplays.ts
index 72db79634..88e2261eb 100644
--- a/server/src/api/sessionReplay/getSessionReplays.ts
+++ b/server/src/api/sessionReplay/getSessionReplays.ts
@@ -24,11 +24,11 @@ export async function getSessionReplays(
offset: offset ? Number(offset) : 0,
userId: userId || undefined,
minDuration: minDuration ? Number(minDuration) : undefined,
- startDate: request.query.startDate,
- endDate: request.query.endDate,
- timeZone: request.query.timeZone,
- pastMinutesStart: request.query.pastMinutesStart ? Number(request.query.pastMinutesStart) : undefined,
- pastMinutesEnd: request.query.pastMinutesEnd ? Number(request.query.pastMinutesEnd) : undefined,
+ start_date: request.query.start_date,
+ end_date: request.query.end_date,
+ time_zone: request.query.time_zone,
+ past_minutes_start: request.query.past_minutes_start ? Number(request.query.past_minutes_start) : undefined,
+ past_minutes_end: request.query.past_minutes_end ? Number(request.query.past_minutes_end) : undefined,
filters: filters || "",
});
diff --git a/shared/src/params.ts b/shared/src/params.ts
index d8372d370..0d7fee6a1 100644
--- a/shared/src/params.ts
+++ b/shared/src/params.ts
@@ -1,10 +1,10 @@
export interface BaseParams {
- startDate: string;
- endDate: string;
- timeZone: string;
+ start_date: string;
+ end_date: string;
+ time_zone: string;
filters: string;
- pastMinutesStart?: number;
- pastMinutesEnd?: number;
+ past_minutes_start?: number;
+ past_minutes_end?: number;
}
export type FilterParams<T = {}> = BaseParams & T;