|
|
|
|
@ -115,7 +115,9 @@ defmodule PlausibleWeb.Api.StatsController do
|
|
|
|
|
full_intervals = build_full_intervals(query, labels)
|
|
|
|
|
|
|
|
|
|
comparison_result =
|
|
|
|
|
case Comparisons.compare(site, query, params["comparison"]) do
|
|
|
|
|
case Comparisons.compare(site, query, params["comparison"],
|
|
|
|
|
from: params["comparison_from"]
|
|
|
|
|
) do
|
|
|
|
|
{:ok, comparison_query} -> Stats.timeseries(site, comparison_query, [selected_metric])
|
|
|
|
|
{:error, :not_supported} -> nil
|
|
|
|
|
end
|
|
|
|
|
@ -175,9 +177,11 @@ defmodule PlausibleWeb.Api.StatsController do
|
|
|
|
|
|
|
|
|
|
with :ok <- validate_params(params) do
|
|
|
|
|
comparison_mode = params["comparison"] || "previous_period"
|
|
|
|
|
comparison_opts = [from: params["comparison_from"]]
|
|
|
|
|
|
|
|
|
|
query = Query.from(site, params) |> Filters.add_prefix()
|
|
|
|
|
|
|
|
|
|
{top_stats, sample_percent} = fetch_top_stats(site, query, comparison_mode)
|
|
|
|
|
{top_stats, sample_percent} = fetch_top_stats(site, query, comparison_mode, comparison_opts)
|
|
|
|
|
|
|
|
|
|
json(conn, %{
|
|
|
|
|
top_stats: top_stats,
|
|
|
|
|
@ -245,7 +249,8 @@ defmodule PlausibleWeb.Api.StatsController do
|
|
|
|
|
defp fetch_top_stats(
|
|
|
|
|
site,
|
|
|
|
|
%Query{period: "realtime", filters: %{"event:goal" => _goal}} = query,
|
|
|
|
|
_comparison_mode
|
|
|
|
|
_comparison_mode,
|
|
|
|
|
_comparison_opts
|
|
|
|
|
) do
|
|
|
|
|
query_30m = %Query{query | period: "30m"}
|
|
|
|
|
|
|
|
|
|
@ -272,7 +277,12 @@ defmodule PlausibleWeb.Api.StatsController do
|
|
|
|
|
{stats, 100}
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
defp fetch_top_stats(site, %Query{period: "realtime"} = query, _comparison_mode) do
|
|
|
|
|
defp fetch_top_stats(
|
|
|
|
|
site,
|
|
|
|
|
%Query{period: "realtime"} = query,
|
|
|
|
|
_comparison_mode,
|
|
|
|
|
_comparison_opts
|
|
|
|
|
) do
|
|
|
|
|
query_30m = %Query{query | period: "30m"}
|
|
|
|
|
|
|
|
|
|
%{
|
|
|
|
|
@ -298,11 +308,16 @@ defmodule PlausibleWeb.Api.StatsController do
|
|
|
|
|
{stats, 100}
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
defp fetch_top_stats(site, %Query{filters: %{"event:goal" => _goal}} = query, comparison_mode) do
|
|
|
|
|
defp fetch_top_stats(
|
|
|
|
|
site,
|
|
|
|
|
%Query{filters: %{"event:goal" => _goal}} = query,
|
|
|
|
|
comparison_mode,
|
|
|
|
|
comparison_opts
|
|
|
|
|
) do
|
|
|
|
|
total_q = Query.remove_event_filters(query, [:goal, :props])
|
|
|
|
|
|
|
|
|
|
{prev_converted_visitors, prev_completions} =
|
|
|
|
|
case Stats.Comparisons.compare(site, query, comparison_mode) do
|
|
|
|
|
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])
|
|
|
|
|
@ -362,7 +377,7 @@ defmodule PlausibleWeb.Api.StatsController do
|
|
|
|
|
{stats, 100}
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
defp fetch_top_stats(site, query, comparison_mode) do
|
|
|
|
|
defp fetch_top_stats(site, query, comparison_mode, comparison_opts) do
|
|
|
|
|
metrics =
|
|
|
|
|
if query.filters["event:page"] do
|
|
|
|
|
[
|
|
|
|
|
@ -389,7 +404,7 @@ defmodule PlausibleWeb.Api.StatsController do
|
|
|
|
|
current_results = Stats.aggregate(site, query, metrics)
|
|
|
|
|
|
|
|
|
|
prev_results =
|
|
|
|
|
case Stats.Comparisons.compare(site, query, comparison_mode) do
|
|
|
|
|
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
|
|
|
|
|
|