Refactor attempt

pr-3887-review
Uku Taht 3 years ago
parent e4acdfd7d8
commit 167fb9dabf

@ -209,91 +209,71 @@ defmodule Plausible.Stats.Base do
def apply_entry_prop_filter(sessions_q, _, _), do: sessions_q
def select_event_metrics(q, metrics), do: select_event_metrics(q, metrics, false)
def select_event_metrics(q, []), do: q
def select_event_metrics(q, [], _), do: q
def select_event_metrics(q, [:pageviews | rest], revenue_nils) do
def select_event_metrics(q, [:pageviews | rest]) do
from(e in q,
select_merge: %{
pageviews:
fragment("toUInt64(round(countIf(? = 'pageview') * any(_sample_factor)))", e.name)
}
)
|> select_event_metrics(rest, revenue_nils)
|> select_event_metrics(rest)
end
def select_event_metrics(q, [:events | rest], revenue_nils) do
def select_event_metrics(q, [:events | rest]) do
from(e in q,
select_merge: %{events: fragment("toUInt64(round(count(*) * any(_sample_factor)))")}
)
|> select_event_metrics(rest, revenue_nils)
|> select_event_metrics(rest)
end
def select_event_metrics(q, [:visitors | rest], revenue_nils) do
def select_event_metrics(q, [:visitors | rest]) do
from(e in q,
select_merge: %{
visitors: selected_as(fragment(@uniq_users_expression, e.user_id), :visitors)
}
)
|> select_event_metrics(rest, revenue_nils)
|> select_event_metrics(rest)
end
on_full_build do
def select_event_metrics(q, [:total_revenue | rest], false) do
def select_event_metrics(q, [:total_revenue | rest]) do
q
|> Plausible.Stats.Goal.Revenue.total_revenue_query()
|> select_event_metrics(rest, false)
|> select_event_metrics(rest)
end
def select_event_metrics(q, [:average_revenue | rest], false) do
def select_event_metrics(q, [:average_revenue | rest]) do
q
|> Plausible.Stats.Goal.Revenue.average_revenue_query()
|> 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)
|> select_event_metrics(rest)
end
end
def select_event_metrics(q, [:sample_percent | rest], revenue_nils) do
def select_event_metrics(q, [:sample_percent | rest]) 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, revenue_nils)
|> select_event_metrics(rest)
end
def select_event_metrics(q, [:percentage | rest], revenue_nils) do
q |> select_event_metrics(rest, revenue_nils)
def select_event_metrics(q, [:percentage | rest]) do
q |> select_event_metrics(rest)
end
def select_event_metrics(q, [:conversion_rate | rest], revenue_nils) do
q |> select_event_metrics(rest, revenue_nils)
def select_event_metrics(q, [:conversion_rate | rest]) do
q |> select_event_metrics(rest)
end
def select_event_metrics(q, [:total_visitors | rest], revenue_nils) do
q |> select_event_metrics(rest, revenue_nils)
def select_event_metrics(q, [:total_visitors | rest]) do
q |> select_event_metrics(rest)
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

@ -81,8 +81,8 @@ defmodule Plausible.Stats.Breakdown do
name: fragment("concat('Visit ', ?[?])", ^page_exprs, index)
}
)
# All revenue columns will be set as nils
|> select_event_metrics(metrics_to_select, true)
|> select_event_metrics(metrics_to_select)
|> revenue_is_nil(metrics_to_select)
|> apply_pagination(pagination)
else
nil
@ -780,6 +780,25 @@ defmodule Plausible.Stats.Breakdown do
])
end
# When querying custom event goals and pageviewgoals together, UNION ALL is used
# so the same fields must be present on both sides of the union. This change to the
# query will ensure that we don't unnecessarily read revenue column for pageview goals
defp revenue_is_nil(q, metrics) do
overwrite_fields = %{}
overwrite_fields =
if :total_revenue in metrics,
do: Map.merge(overwrite_fields, %{total_revenue: nil}),
else: overwrite_fields
overwrite_fields =
if :average_revenue in metrics,
do: Map.merge(overwrite_fields, %{average_revenue: nil}),
else: overwrite_fields
from(e in q, select_merge: ^overwrite_fields)
end
on_full_build do
defp cast_revenue_metrics_to_money(results, revenue_goals) do
Plausible.Stats.Goal.Revenue.cast_revenue_metrics_to_money(results, revenue_goals)

Loading…
Cancel
Save