🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor analytics data fetching and introduce past minutes query
Bill Yang12d4cd3b213c
diff --git a/client/src/api/analytics/useGetOverview.ts b/client/src/api/analytics/useGetOverview.tsindex f6c4c58b6..717407555 100644--- a/client/src/api/analytics/useGetOverview.ts+++ b/client/src/api/analytics/useGetOverview.ts@@ -16,11 +16,9 @@ type PeriodTime = "current" | "previous";export function useGetOverview({periodTime,- past24Hours,site,}: {periodTime?: PeriodTime;- past24Hours?: boolean;site?: number | string;}) {const { time, previousTime, filters } = useStore();@@ -28,7 +26,7 @@ export function useGetOverview({const { startDate, endDate } = getStartAndEndDate(timeToUse);return useQuery({- queryKey: ["overview", timeToUse, site, filters, past24Hours],+ queryKey: ["overview", timeToUse, site, filters],queryFn: () => {const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;return authedFetch(`${BACKEND_URL}/overview`, {@@ -37,7 +35,37 @@ export function useGetOverview({timezone,site,filters,- past24Hours,+ }).then((res) => res.json());+ },+ staleTime: Infinity,+ placeholderData: (_, query: any) => {+ if (!query?.queryKey) return undefined;+ const prevQueryKey = query.queryKey as [string, string, string];+ const [, , prevSite] = prevQueryKey;++ if (prevSite === site) {+ return query.state.data;+ }+ return undefined;+ },+ });+}++export function useGetOverviewPastMinutes({+ pastMinutes,+ site,+}: {+ pastMinutes: number;+ site?: number | string;+}) {+ return useQuery({+ queryKey: ["overview-past-minutes", pastMinutes, site],+ queryFn: () => {+ const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;+ return authedFetch(`${BACKEND_URL}/overview`, {+ pastMinutes,+ timezone,+ site,}).then((res) => res.json());},staleTime: Infinity,diff --git a/client/src/components/SiteCard.tsx b/client/src/components/SiteCard.tsxindex fd785c69e..90c9e0158 100644--- a/client/src/components/SiteCard.tsx+++ b/client/src/components/SiteCard.tsx@@ -1,11 +1,11 @@import { ArrowRight } from "lucide-react";import Link from "next/link";+import { useGetOverviewPastMinutes } from "../api/analytics/useGetOverview";+import { useGetOverviewBucketed } from "../api/analytics/useGetOverviewBucketed";import { SiteSessionChart } from "./SiteSessionChart";import { SiteSettings } from "./SiteSettings/SiteSettings";import { Button } from "./ui/button";import { Skeleton } from "./ui/skeleton";-import { useGetOverviewBucketed } from "../api/analytics/useGetOverviewBucketed";-import { useGetOverview } from "../api/analytics/useGetOverview";interface SiteCardProps {siteId: number;@@ -18,10 +18,11 @@ export function SiteCard({ siteId, domain }: SiteCardProps) {site: siteId,});- const { data: overviewData, isLoading: isOverviewLoading } = useGetOverview({- site: siteId,- past24Hours: true,- });+ const { data: overviewData, isLoading: isOverviewLoading } =+ useGetOverviewPastMinutes({+ site: siteId,+ pastMinutes: 24 * 60,+ });const hasData = (overviewData?.data?.sessions || 0) > 0;diff --git a/server/src/api/getOverview.ts b/server/src/api/getOverview.tsindex 0079967e3..8b1e164a8 100644--- a/server/src/api/getOverview.ts+++ b/server/src/api/getOverview.ts@@ -23,66 +23,17 @@ const getQuery = ({timezone,site,filters,- past24Hours,+ pastMinutes,}: {startDate: string;endDate: string;timezone: string;site: string;filters: string;- past24Hours: boolean;+ pastMinutes: number;}) => {const filterStatement = getFilterStatement(filters);- if (past24Hours) {- return `SELECT- session_stats.sessions,- session_stats.pages_per_session,- session_stats.bounce_rate * 100 AS bounce_rate,- session_stats.session_duration,- page_stats.pageviews,- page_stats.users- FROM- (- -- Session-level metrics- SELECT- COUNT() AS sessions,- AVG(pages_in_session) AS pages_per_session,- sumIf(1, pages_in_session = 1) / COUNT() AS bounce_rate,- AVG(end_time - start_time) AS session_duration- FROM- (- -- One row per session- SELECT- session_id,- MIN(timestamp) AS start_time,- MAX(timestamp) AS end_time,- COUNT(CASE WHEN type = 'pageview' THEN 1 END) AS pages_in_session- FROM pageviews- WHERE- site_id = ${site}- ${filterStatement}- AND timestamp >= toTimeZone(now('${timezone}'), 'UTC') - INTERVAL 1 DAY- AND timestamp < toTimeZone(now('${timezone}'), 'UTC')- GROUP BY session_id- )- ) AS session_stats- CROSS JOIN- (- -- Page-level and user-level metrics- SELECT- COUNT(*) AS pageviews,- COUNT(DISTINCT user_id) AS users- FROM pageviews- WHERE- site_id = ${site}- ${filterStatement}- AND timestamp >= toTimeZone(now('${timezone}'), 'UTC') - INTERVAL 1 DAY- AND timestamp < toTimeZone(now('${timezone}'), 'UTC')- AND type = 'pageview'- ) AS page_stats`;- }-return `SELECTsession_stats.sessions,session_stats.pages_per_session,@@ -110,9 +61,13 @@ const getQuery = ({WHEREsite_id = ${site}${filterStatement}- ${getTimeStatement({- date: { startDate, endDate, timezone },- })}+ ${getTimeStatement(+ pastMinutes+ ? { pastMinutes }+ : {+ date: { startDate, endDate, timezone },+ }+ )}GROUP BY session_id)) AS session_stats@@ -126,9 +81,13 @@ const getQuery = ({WHEREsite_id = ${site}${filterStatement}- ${getTimeStatement({- date: { startDate, endDate, timezone },- })}+ ${getTimeStatement(+ pastMinutes+ ? { pastMinutes }+ : {+ date: { startDate, endDate, timezone },+ }+ )}AND type = 'pageview') AS page_stats`;};@@ -142,6 +101,7 @@ export interface GenericRequest {filters: string;parameter: FilterParameter;past24Hours: boolean;+ pastMinutes: number;limit?: number;};}@@ -150,7 +110,7 @@ export async function getOverview(req: FastifyRequest<GenericRequest>,res: FastifyReply) {- const { startDate, endDate, timezone, site, filters, past24Hours } =+ const { startDate, endDate, timezone, site, filters, pastMinutes } =req.query;const userHasAccessToSite = await getUserHasAccessToSite(req, site);if (!userHasAccessToSite) {@@ -163,7 +123,7 @@ export async function getOverview(timezone,site,filters,- past24Hours,+ pastMinutes: Number(pastMinutes),});try {