From 67384e2d3580651565e80c11fc05bf48a6af0803 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Tue, 28 Jul 2020 14:10:07 +0300 Subject: [PATCH] Get top stats from the events table --- lib/plausible/stats/clickhouse.ex | 4 ++-- .../controllers/api/stats_controller/main_graph_test.exs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex index bb90d804e..a4c3ab6bf 100644 --- a/lib/plausible/stats/clickhouse.ex +++ b/lib/plausible/stats/clickhouse.ex @@ -177,9 +177,9 @@ defmodule Plausible.Stats.Clickhouse do def pageviews_and_visitors(site, query) do [res] = Clickhouse.all( - from e in base_session_query(site, query), + from e in base_query(site, query), select: - {fragment("sum(sign * pageviews) as pageviews"), + {fragment("count(*) as pageviews"), fragment("uniq(user_id) as visitors")} ) diff --git a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs index 226326a25..72467e0d0 100644 --- a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs @@ -83,14 +83,14 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest do conn = get(conn, "/api/stats/#{site.domain}/main-graph?period=day&date=2019-01-01") res = json_response(conn, 200) - assert %{"name" => "Unique visitors", "count" => 3, "change" => 100} in res["top_stats"] + assert %{"name" => "Unique visitors", "count" => 6, "change" => 100} in res["top_stats"] end test "counts total pageviews", %{conn: conn, site: site} do conn = get(conn, "/api/stats/#{site.domain}/main-graph?period=day&date=2019-01-01") res = json_response(conn, 200) - assert %{"name" => "Total pageviews", "count" => 3, "change" => 100} in res["top_stats"] + assert %{"name" => "Total pageviews", "count" => 6, "change" => 100} in res["top_stats"] end test "calculates bounce rate", %{conn: conn, site: site} do