plausible/analytics
1
1
Fork 0
mirror of https://github.com/plausible/analytics.git synced 2024-10-27 02:42:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix realtime dashboard

Browse Source
This commit is contained in:
Uku Taht 2021-08-19 15:41:08 +03:00
parent bea26f0707
commit 0fe053e106
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/plausible/stats/query.ex
View File

@ -41,7 +41,7 @@ defmodule Plausible.Stats.Query do
date = today(tz) date = today(tz)
%__MODULE__{ %__MODULE__{
period: "30m", period: "realtime",
interval: "minute", interval: "minute",
date_range: Date.range(date, date), date_range: Date.range(date, date),
filters: parse_filters(params), filters: parse_filters(params),

23
lib/plausible_web/controllers/api/stats_controller.ex
View File

@ -15,7 +15,14 @@ defmodule PlausibleWeb.Api.StatsController do
_ -> query _ -> query
end end
timeseries = Task.async(fn -> Stats.timeseries(site, query, ["visitors"]) end) timeseries_query =
if query.period == "realtime" do
%Query{query | period: "30m"}
else
query
end
timeseries = Task.async(fn -> Stats.timeseries(site, timeseries_query, ["visitors"]) end)
{top_stats, sample_percent} = fetch_top_stats(site, query) {top_stats, sample_percent} = fetch_top_stats(site, query)
timeseries_result = Task.await(timeseries) timeseries_result = Task.await(timeseries)
@ -62,11 +69,13 @@ defmodule PlausibleWeb.Api.StatsController do
end end
end end
defp fetch_top_stats(site, %Query{period: "30m"} = query) do defp fetch_top_stats(site, %Query{period: "realtime"} = query) do
query_30m = %Query{query | period: "30m"}
%{ %{
"visitors" => %{"value" => visitors}, "visitors" => %{"value" => visitors},
"pageviews" => %{"value" => pageviews} "pageviews" => %{"value" => pageviews}
} = Stats.aggregate(site, query, ["visitors", "pageviews"]) } = Stats.aggregate(site, query_30m, ["visitors", "pageviews"])
stats = [ stats = [
%{ %{
@ -482,6 +491,14 @@ defmodule PlausibleWeb.Api.StatsController do
def conversions(conn, params) do def conversions(conn, params) do
site = conn.assigns[:site] site = conn.assigns[:site]
query = Query.from(site.timezone, params) |> Filters.add_prefix() query = Query.from(site.timezone, params) |> Filters.add_prefix()
query =
if query.period == "realtime" do
%Query{query | period: "30m"}
else
query
end
pagination = parse_pagination(params) pagination = parse_pagination(params)
total_q = Query.remove_goal(query) total_q = Query.remove_goal(query)

2
test/plausible/stats/query_test.exs
View File

@ -25,7 +25,7 @@ defmodule Plausible.Stats.QueryTest do
assert q.date_range.first == Timex.today() assert q.date_range.first == Timex.today()
assert q.date_range.last == Timex.today() assert q.date_range.last == Timex.today()
assert q.period == "30m" assert q.period == "realtime"
end end
test "parses month format" do test "parses month format" do