Pass comparison_query as argument to top stats functions

jsx-conditional-rendering
Vinicius Brasil 4 years ago
parent 9a4c4f46bb
commit b8e3a469ec

@ -190,12 +190,18 @@ defmodule PlausibleWeb.Api.StatsController do
site = conn.assigns[:site]
with :ok <- validate_params(params) do
query = Query.from(site, params) |> Filters.add_prefix()
comparison_mode = params["comparison"] || "previous_period"
comparison_opts = [from: params["compare_from"], to: params["compare_to"]]
query = Query.from(site, params) |> Filters.add_prefix()
comparison_query =
case Stats.Comparisons.compare(site, query, comparison_mode, comparison_opts) do
{:ok, query} -> query
{:error, _cause} -> nil
end
{top_stats, sample_percent} = fetch_top_stats(site, query, comparison_mode, comparison_opts)
{top_stats, sample_percent} = fetch_top_stats(site, query, comparison_query)
json(conn, %{
top_stats: top_stats,
@ -263,8 +269,7 @@ defmodule PlausibleWeb.Api.StatsController do
defp fetch_top_stats(
site,
%Query{period: "realtime", filters: %{"event:goal" => _goal}} = query,
_comparison_mode,
_comparison_opts
_comparison_query
) do
query_30m = %Query{query | period: "30m"}
@ -291,12 +296,7 @@ defmodule PlausibleWeb.Api.StatsController do
{stats, 100}
end
defp fetch_top_stats(
site,
%Query{period: "realtime"} = query,
_comparison_mode,
_comparison_opts
) do
defp fetch_top_stats(site, %Query{period: "realtime"} = query, _comparison_query) do
query_30m = %Query{query | period: "30m"}
%{
@ -322,35 +322,26 @@ defmodule PlausibleWeb.Api.StatsController do
{stats, 100}
end
defp fetch_top_stats(
site,
%Query{filters: %{"event:goal" => _goal}} = query,
comparison_mode,
comparison_opts
) do
defp fetch_top_stats(site, %Query{filters: %{"event:goal" => _goal}} = query, comparison_query) do
total_q = Query.remove_event_filters(query, [:goal, :props])
{prev_converted_visitors, prev_completions} =
case Stats.Comparisons.compare(site, query, comparison_mode, comparison_opts) do
{:ok, prev_query} ->
%{visitors: %{value: prev_converted_visitors}, events: %{value: prev_completions}} =
Stats.aggregate(site, prev_query, [:visitors, :events])
if comparison_query do
%{visitors: %{value: prev_converted_visitors}, events: %{value: prev_completions}} =
Stats.aggregate(site, comparison_query, [:visitors, :events])
{prev_converted_visitors, prev_completions}
{:error, :not_supported} ->
{nil, nil}
{prev_converted_visitors, prev_completions}
else
{nil, nil}
end
prev_unique_visitors =
case Stats.Comparisons.compare(site, total_q, comparison_mode) do
{:ok, prev_total_query} ->
site
|> Stats.aggregate(prev_total_query, [:visitors])
|> get_in([:visitors, :value])
{:error, :not_supported} ->
nil
if comparison_query do
site
|> Stats.aggregate(comparison_query, [:visitors])
|> get_in([:visitors, :value])
else
nil
end
%{
@ -391,7 +382,7 @@ defmodule PlausibleWeb.Api.StatsController do
{stats, 100}
end
defp fetch_top_stats(site, query, comparison_mode, comparison_opts) do
defp fetch_top_stats(site, query, comparison_query) do
metrics =
if query.filters["event:page"] do
[
@ -416,12 +407,7 @@ defmodule PlausibleWeb.Api.StatsController do
end
current_results = Stats.aggregate(site, query, metrics)
prev_results =
case Stats.Comparisons.compare(site, query, comparison_mode, comparison_opts) do
{:ok, prev_results_query} -> Stats.aggregate(site, prev_results_query, metrics)
{:error, :not_supported} -> nil
end
prev_results = comparison_query && Stats.aggregate(site, comparison_query, metrics)
stats =
[

Loading…
Cancel
Save