From 0b8a9fb80e6ca807164937ff3b684afd93a8a7a5 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 17 Jun 2020 11:02:20 +0300 Subject: [PATCH] Query referrer data from sessions table instead of events --- lib/plausible/stats/clickhouse.ex | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex index b39f79197..62b9cf8fd 100644 --- a/lib/plausible/stats/clickhouse.ex +++ b/lib/plausible/stats/clickhouse.ex @@ -216,7 +216,7 @@ defmodule Plausible.Stats.Clickhouse do def top_referrers(site, query, limit \\ 5, include \\ []) do referrers = Clickhouse.all( - from e in base_query(site, query), + from e in base_session_query(site, query), select: {fragment("? as name", e.referrer_source), fragment("any(?) as url", e.referrer), fragment("uniq(user_id) as count")}, @@ -565,6 +565,15 @@ defmodule Plausible.Stats.Clickhouse do Enum.sort_by(conversions, fn conversion -> -conversion["count"] end) end + defp base_session_query(site, query) do + {first_datetime, last_datetime} = date_range_utc_boundaries(query.date_range, site.timezone) + + q = from(s in "sessions", + where: s.domain == ^site.domain, + where: s.start >= ^first_datetime and s.start < ^last_datetime + ) + end + defp base_query(site, query, events \\ ["pageview"]) do {first_datetime, last_datetime} = date_range_utc_boundaries(query.date_range, site.timezone) {goal_event, path} = event_name_for_goal(query)