diff --git a/lib/plausible/stats/aggregate.ex b/lib/plausible/stats/aggregate.ex index 56ded33f8..0d243dc10 100644 --- a/lib/plausible/stats/aggregate.ex +++ b/lib/plausible/stats/aggregate.ex @@ -11,7 +11,9 @@ defmodule Plausible.Stats.Aggregate do :visitors, :pageviews, :events, - :sample_percent + :sample_percent, + :conversion_rate, + :total_visitors ] ++ @revenue_metrics @session_metrics [:visits, :bounce_rate, :visit_duration, :views_per_visit, :sample_percent] @@ -45,7 +47,6 @@ defmodule Plausible.Stats.Aggregate do Plausible.ClickhouseRepo.parallel_tasks([session_task, event_task, time_on_page_task]) |> Enum.reduce(%{}, fn aggregate, task_result -> Map.merge(aggregate, task_result) end) - |> maybe_put_cr(site, query, metrics) |> Util.keep_requested_metrics(metrics) |> cast_revenue_metrics_to_money(currency) |> Enum.map(&maybe_round_value/1) @@ -53,36 +54,13 @@ defmodule Plausible.Stats.Aggregate do |> Enum.into(%{}) end - defp maybe_put_cr(aggregate_result, site, query, metrics) do - if :conversion_rate in metrics do - all = - query - |> Query.remove_event_filters([:goal, :props]) - |> then(fn query -> aggregate_events(site, query, [:visitors]) end) - |> Map.fetch!(:visitors) - - converted = aggregate_result.visitors - - cr = Util.calculate_cr(all, converted) - - aggregate_result = Map.put(aggregate_result, :conversion_rate, cr) - - if :total_visitors in metrics do - Map.put(aggregate_result, :total_visitors, all) - else - aggregate_result - end - else - aggregate_result - end - end - defp aggregate_events(_, _, []), do: %{} defp aggregate_events(site, query, metrics) do from(e in base_event_query(site, query), select: %{}) |> select_event_metrics(metrics) |> merge_imported(site, query, :aggregate, metrics) + |> maybe_add_conversion_rate(site, query, metrics) |> ClickhouseRepo.one() end diff --git a/lib/plausible/stats/base.ex b/lib/plausible/stats/base.ex index e92464d32..70b49bad5 100644 --- a/lib/plausible/stats/base.ex +++ b/lib/plausible/stats/base.ex @@ -285,6 +285,14 @@ defmodule Plausible.Stats.Base do q |> select_event_metrics(rest, revenue_nils) end + def select_event_metrics(q, [:conversion_rate | rest], revenue_nils) do + q |> select_event_metrics(rest, revenue_nils) + end + + def select_event_metrics(q, [:total_visitors | rest], revenue_nils) do + q |> select_event_metrics(rest, revenue_nils) + end + def select_event_metrics(_, [unknown | _], _), do: raise("Unknown metric: #{unknown}") def select_session_metrics(q, [], _query), do: q @@ -638,4 +646,28 @@ defmodule Plausible.Stats.Base do q end end + + # Adds conversion_rate metric to query, calculated as + # X / Y where Y is the same breakdown value without goal or props + # filters. + def maybe_add_conversion_rate(q, site, query, metrics) do + if :conversion_rate in metrics do + total_query = query |> Query.remove_event_filters([:goal, :props]) + + # :TRICKY: Subquery is used due to event:goal breakdown above doing an UNION ALL + subquery(q) + |> select_merge(^%{total_visitors: total_visitors_subquery(site, total_query)}) + |> select_merge([e], %{ + conversion_rate: + fragment( + "if(? > 0, round(? / ? * 100, 1), null)", + selected_as(:__total_visitors), + e.visitors, + selected_as(:__total_visitors) + ) + }) + else + q + end + end end diff --git a/lib/plausible/stats/breakdown.ex b/lib/plausible/stats/breakdown.ex index c2acc6e47..56ead942d 100644 --- a/lib/plausible/stats/breakdown.ex +++ b/lib/plausible/stats/breakdown.ex @@ -839,30 +839,6 @@ defmodule Plausible.Stats.Breakdown do end end - # Adds conversion_rate metric to query, calculated as - # X / Y where Y is the same breakdown value without goal or props - # filters. - defp maybe_add_conversion_rate(q, site, query, metrics) do - if :conversion_rate in metrics do - total_query = query |> Query.remove_event_filters([:goal, :props]) - - # :TRICKY: Subquery is used due to event:goal breakdown above doing an UNION ALL - subquery(q) - |> select_merge(^%{total_visitors: total_visitors_subquery(site, total_query)}) - |> select_merge([e], %{ - conversion_rate: - fragment( - "if(? > 0, round(? / ? * 100, 1), null)", - selected_as(:__total_visitors), - e.visitors, - selected_as(:__total_visitors) - ) - }) - else - q - end - end - defp sorting_key(metrics) do if Enum.member?(metrics, :visitors), do: :visitors, else: List.first(metrics) end diff --git a/lib/plausible/stats/util.ex b/lib/plausible/stats/util.ex index a096fe7cc..85c36888f 100644 --- a/lib/plausible/stats/util.ex +++ b/lib/plausible/stats/util.ex @@ -49,12 +49,4 @@ defmodule Plausible.Stats.Util do metrics end end - - def calculate_cr(nil, _converted_visitors), do: nil - - def calculate_cr(unique_visitors, converted_visitors) do - if unique_visitors > 0, - do: Float.round(converted_visitors / unique_visitors * 100, 1), - else: 0.0 - end end