Skip to content

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

Enhance user identification in PDF and weekly report analytics

Bill Yange7a6ba45f560
diff --git a/server/src/services/pdfReports/pdfReportService.ts b/server/src/services/pdfReports/pdfReportService.ts
index c564bfb4c..b95c1d926 100644
--- a/server/src/services/pdfReports/pdfReportService.ts
+++ b/server/src/services/pdfReports/pdfReportService.ts
@@ -6,6 +6,7 @@ import { db } from "../../db/postgres/postgres.js";
import { sites } from "../../db/postgres/schema.js";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
import { getTimeStatement, processResults } from "../../api/analytics/utils/utils.js";
+import { effectiveUserId } from "../../api/analytics/utils/effectiveUserId.js";
import { getFilterStatement } from "../../api/analytics/utils/getFilterStatement.js";
import { createServiceLogger } from "../../lib/logger/logger.js";
import { PdfReportTemplate } from "./templates/PdfReportTemplate.js";
@@ -206,7 +207,7 @@ class PdfReportService {
(
SELECT
COUNT(*) AS pageviews,
- COUNT(DISTINCT user_id) AS users
+ COUNT(DISTINCT ${effectiveUserId()}) AS users
FROM events
WHERE
site_id = {siteId:Int32}
diff --git a/server/src/services/weekyReports/weeklyReportService.ts b/server/src/services/weekyReports/weeklyReportService.ts
index 1b9fd1215..3f61883e8 100644
--- a/server/src/services/weekyReports/weeklyReportService.ts
+++ b/server/src/services/weekyReports/weeklyReportService.ts
@@ -5,6 +5,7 @@ import { db } from "../../db/postgres/postgres.js";
import { organization, member, user, sites } from "../../db/postgres/schema.js";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
import { processResults } from "../../api/analytics/utils/utils.js";
+import { effectiveUserId } from "../../api/analytics/utils/effectiveUserId.js";
import { createServiceLogger } from "../../lib/logger/logger.js";
import { sendWeeklyReportEmail } from "../../lib/email/email.js";
import { filterSitesByMemberAccess } from "../../lib/siteAccess.js";
@@ -57,7 +58,7 @@ class WeeklyReportService {
-- Page-level and user-level metrics
SELECT
COUNT(*) AS pageviews,
- COUNT(DISTINCT user_id) AS users
+ COUNT(DISTINCT ${effectiveUserId()}) AS users
FROM events
WHERE
site_id = {siteId:Int32}