Skip to content

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

Enhance session data structure and analytics by adding session duration and event count

Bill Yang77ebac016f7d
diff --git a/client/src/api/analytics/userSessions.ts b/client/src/api/analytics/userSessions.ts
index 1b40b6a6e..cc1215e02 100644
--- a/client/src/api/analytics/userSessions.ts
+++ b/client/src/api/analytics/userSessions.ts
@@ -54,7 +54,9 @@ export type GetSessionsResponse = {
referrer: string;
session_end: string;
session_start: string;
+ session_duration: number;
pageviews: number;
+ events: number;
entry_page: string;
exit_page: string;
}[];
diff --git a/client/src/app/[site]/sessions/components/SessionDetails.tsx b/client/src/app/[site]/sessions/components/SessionDetails.tsx
index 111489e5d..559424a17 100644
--- a/client/src/app/[site]/sessions/components/SessionDetails.tsx
+++ b/client/src/app/[site]/sessions/components/SessionDetails.tsx
@@ -167,7 +167,12 @@ export function SessionDetails({ sessionId }: SessionDetailsProps) {
>
<FileText className="w-3 h-3" />
<span>
- Pageviews: {sessionDetails.data.session.pageviews}
+ Pageviews:{" "}
+ {
+ sessionDetails.data.pageviews.filter(
+ (p) => p.type === "pageview"
+ ).length
+ }
</span>
</Badge>
<Badge
@@ -232,7 +237,7 @@ export function SessionDetails({ sessionId }: SessionDetailsProps) {
size={24}
/>
<div className="text-sm font-mono">
- {sessionDetails.data.session.user_id}
+ {sessionDetails.data.session.session_id}
</div>
</div>
{sessionDetails.data.session.language && (
diff --git a/server/src/api/getSession.ts b/server/src/api/getSession.ts
index c5fa11b06..ee8f3ea2c 100644
--- a/server/src/api/getSession.ts
+++ b/server/src/api/getSession.ts
@@ -23,7 +23,9 @@ export interface SessionDetails {
referrer: string;
session_end: string;
session_start: string;
+ session_duration: number;
pageviews: number;
+ events: number;
entry_page: string;
exit_page: string;
}
diff --git a/server/src/api/getSessions.ts b/server/src/api/getSessions.ts
index c64120934..9ecac7beb 100644
--- a/server/src/api/getSessions.ts
+++ b/server/src/api/getSessions.ts
@@ -19,9 +19,11 @@ export type GetSessionsResponse = {
referrer: string;
session_end: string;
session_start: string;
+ session_duration: number;
entry_page: string;
exit_page: string;
pageviews: number;
+ events: number;
}[];
export interface GetSessionsRequest {
@@ -59,12 +61,14 @@ SELECT
device_type,
browser,
operating_system,
- referrer,
+ argMin(referrer, timestamp),
MAX(timestamp) AS session_end,
MIN(timestamp) AS session_start,
+ dateDiff('second', MIN(timestamp), MAX(timestamp)) AS session_duration,
argMinIf(pathname, timestamp, type = 'pageview') AS entry_page,
argMaxIf(pathname, timestamp, type = 'pageview') AS exit_page,
- countIf(type = 'pageview') AS pageviews
+ countIf(type = 'pageview') AS pageviews,
+ countIf(type = 'custom_event') AS events
FROM pageviews
WHERE
site_id = ${site}
@@ -79,12 +83,14 @@ GROUP BY
iso_3166_2,
language,
device_type,
- operating_system,
- referrer
+ operating_system
+
ORDER BY session_start DESC
LIMIT 100 OFFSET ${(page - 1) * 100}
`;
+ console.log(query);
+
try {
const result = await clickhouse.query({
query,