From e82ab49e99a67e02602c2c87ab5921653ae662d2 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 8 Jun 2023 13:48:59 +0300 Subject: [PATCH] WIP --- lib/plausible/stats/base.ex | 25 ++++++++----- lib/plausible/stats/breakdown.ex | 1 + .../breakdown_test.exs | 35 +++++++++++++++++++ 3 files changed, 53 insertions(+), 8 deletions(-) diff --git a/lib/plausible/stats/base.ex b/lib/plausible/stats/base.ex index 3ac344ced..3cc629919 100644 --- a/lib/plausible/stats/base.ex +++ b/lib/plausible/stats/base.ex @@ -322,12 +322,17 @@ defmodule Plausible.Stats.Base do end def select_session_metrics(q, [:pageviews | rest], query) do - from(s in q, - select_merge: %{ - pageviews: - fragment("toUInt64(round(sum(? * ?) * any(_sample_factor)))", s.sign, s.pageviews) - } - ) + if has_named_binding?(q, :events) do + from([s, events: e] in q, select_merge: %{pageviews: field(e, :pageviews)}) + |> select_session_metrics(rest, query) + else + from(s in q, + select_merge: %{ + pageviews: + fragment("toUInt64(round(sum(? * ?) * any(_sample_factor)))", s.sign, s.pageviews) + } + ) + end |> select_session_metrics(rest, query) end @@ -424,14 +429,18 @@ defmodule Plausible.Stats.Base do if Query.has_event_filters?(query) do converted_sessions = from(e in query_events(site, query), + group_by: [e.session_id, field(e, :_sample_factor)], select: %{ - session_id: fragment("DISTINCT ?", e.session_id), - _sample_factor: fragment("_sample_factor") + session_id: e.session_id, + _sample_factor: fragment("_sample_factor"), + events: count(), + pageviews: fragment("countIf(? = ?)", e.name, "pageview") } ) from(s in db_query, join: cs in subquery(converted_sessions), + as: :events, on: s.session_id == cs.session_id ) else diff --git a/lib/plausible/stats/breakdown.ex b/lib/plausible/stats/breakdown.ex index a33823e29..bc7f236f7 100644 --- a/lib/plausible/stats/breakdown.ex +++ b/lib/plausible/stats/breakdown.ex @@ -192,6 +192,7 @@ defmodule Plausible.Stats.Breakdown do |> select_session_metrics(metrics, query) |> merge_imported(site, query, property, metrics) |> apply_pagination(pagination) + |> tap(fn q -> IO.inspect(Ecto.Adapters.SQL.to_sql(:all, ClickhouseRepo, q)) end) |> ClickhouseRepo.all() |> transform_keys(%{operating_system: :os}) |> remove_internal_visits_metric(metrics) diff --git a/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs b/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs index 8d2b052ce..99fd7ae56 100644 --- a/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs +++ b/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs @@ -1942,5 +1942,40 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest do ] } end + + test "page filter, breakdown by visit:source, metric=pageviews", %{conn: conn, site: site} do + populate_stats(site, [ + build(:pageview, + user_id: 1, + pathname: "/page1", + timestamp: ~N[2021-01-01 00:00:00] + ), + build(:pageview, + user_id: 1, + pathname: "/page2", + timestamp: ~N[2021-01-01 00:10:00] + ), + build(:pageview, user_id: 1, pathname: "/page1", timestamp: ~N[2021-01-01 00:25:00]) + ]) + + conn = + get(conn, "/api/v1/stats/breakdown", %{ + "site_id" => site.domain, + "period" => "day", + "date" => "2021-01-01", + "property" => "visit:source", + "metrics" => "pageviews", + "filters" => "event:page==/page1" + }) + + assert json_response(conn, 200) == %{ + "results" => [ + %{ + "source" => "Direct / None", + "pageviews" => 2 + } + ] + } + end end end