diff --git a/lib/plausible/stats/base.ex b/lib/plausible/stats/base.ex index 83b4ad6d2..70c0d2fc0 100644 --- a/lib/plausible/stats/base.ex +++ b/lib/plausible/stats/base.ex @@ -209,63 +209,83 @@ defmodule Plausible.Stats.Base do def apply_entry_prop_filter(sessions_q, _, _), do: sessions_q - def select_event_metrics(q, []), do: q + def select_event_metrics(q, metrics), do: select_event_metrics(q, metrics, false) - def select_event_metrics(q, [:pageviews | rest]) do + def select_event_metrics(q, [], _), do: q + + def select_event_metrics(q, [:pageviews | rest], revenue_nils) do from(e in q, select_merge: %{ pageviews: fragment("toUInt64(round(countIf(? = 'pageview') * any(_sample_factor)))", e.name) } ) - |> select_event_metrics(rest) + |> select_event_metrics(rest, revenue_nils) end - def select_event_metrics(q, [:events | rest]) do + def select_event_metrics(q, [:events | rest], revenue_nils) do from(e in q, select_merge: %{events: fragment("toUInt64(round(count(*) * any(_sample_factor)))")} ) - |> select_event_metrics(rest) + |> select_event_metrics(rest, revenue_nils) end - def select_event_metrics(q, [:visitors | rest]) do + def select_event_metrics(q, [:visitors | rest], revenue_nils) do from(e in q, select_merge: %{ visitors: selected_as(fragment(@uniq_users_expression, e.user_id), :visitors) } ) - |> select_event_metrics(rest) + |> select_event_metrics(rest, revenue_nils) end on_full_build do - def select_event_metrics(q, [:total_revenue | rest]) do + def select_event_metrics(q, [:total_revenue | rest], false) do q |> Plausible.Stats.Goal.Revenue.total_revenue_query() - |> select_event_metrics(rest) + |> select_event_metrics(rest, false) end - def select_event_metrics(q, [:average_revenue | rest]) do + def select_event_metrics(q, [:average_revenue | rest], false) do q |> Plausible.Stats.Goal.Revenue.average_revenue_query() - |> select_event_metrics(rest) + |> select_event_metrics(rest, false) + end + + def select_event_metrics(q, [:total_revenue | rest], true) do + from(e in q, + select_merge: %{ + total_revenue: nil + } + ) + |> select_event_metrics(rest, true) + end + + def select_event_metrics(q, [:average_revenue | rest], true) do + from(e in q, + select_merge: %{ + average_revenue: nil + } + ) + |> select_event_metrics(rest, true) end end - def select_event_metrics(q, [:sample_percent | rest]) do + def select_event_metrics(q, [:sample_percent | rest], revenue_nils) do from(e in q, select_merge: %{ sample_percent: fragment("if(any(_sample_factor) > 1, round(100 / any(_sample_factor)), 100)") } ) - |> select_event_metrics(rest) + |> select_event_metrics(rest, revenue_nils) end - def select_event_metrics(q, [:percentage | rest]) do - q |> select_event_metrics(rest) + def select_event_metrics(q, [:percentage | rest], revenue_nils) do + q |> select_event_metrics(rest, revenue_nils) end - def select_event_metrics(_, [unknown | _]), do: raise("Unknown metric: #{unknown}") + def select_event_metrics(_, [unknown | _], _), do: raise("Unknown metric: #{unknown}") def select_session_metrics(q, [], _query), do: q diff --git a/lib/plausible/stats/breakdown.ex b/lib/plausible/stats/breakdown.ex index 7da6cefdf..9fa1a8671 100644 --- a/lib/plausible/stats/breakdown.ex +++ b/lib/plausible/stats/breakdown.ex @@ -80,9 +80,8 @@ defmodule Plausible.Stats.Breakdown do name: fragment("concat('Visit ', ?[?])", ^page_exprs, index) } ) - |> select_event_metrics(metrics_to_select -- @revenue_metrics) - # :TODO: Add test where revenue metric is first / doesn't match the rest. - |> add_revenue_as_nil_selects(metrics_to_select) + # All revenue columns will be set as nils + |> select_event_metrics(metrics_to_select, true) |> apply_pagination(pagination) else nil @@ -816,16 +815,6 @@ defmodule Plausible.Stats.Breakdown do if Enum.member?(metrics, :visitors), do: :visitors, else: List.first(metrics) end - defp add_revenue_as_nil_selects(q, metrics) do - columns_with_nils = - @revenue_metrics - |> Enum.filter(&Enum.member?(metrics, &1)) - |> Enum.map(&{&1, nil}) - |> Enum.into(%{}) - - from(e in q, select_merge: ^columns_with_nils) - end - defp transform_keys(results, keys_to_replace) do Enum.map(results, fn map -> Enum.map(map, fn {key, val} ->