Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Fix realtime periods returning wrong date range for non-UTC timezone sites (#4508)

RobertJoonas5e26e2c97d94
diff --git a/lib/plausible/stats/sql/expression.ex b/lib/plausible/stats/sql/expression.ex
index cdec499d15..a6b1835fdc 100644
--- a/lib/plausible/stats/sql/expression.ex
+++ b/lib/plausible/stats/sql/expression.ex
@@ -83,6 +83,28 @@ defmodule Plausible.Stats.SQL.Expression do
})
end
+ # :NOTE: This is not exposed in Query APIv2
+ def select_dimension(q, key, "time:minute", :sessions, %Query{period: period})
+ when period in ["realtime", "30m"] do
+ q
+ |> join(
+ :inner,
+ [s],
+ time_slot in fragment(
+ "timeSlots(?, toUInt32(timeDiff(?, ?)), toUInt32(60))",
+ s.start,
+ s.start,
+ s.timestamp
+ ),
+ as: :time_slot,
+ hints: "ARRAY",
+ on: true
+ )
+ |> select_merge_as([s, time_slot: time_slot], %{
+ key => fragment("?", time_slot)
+ })
+ end
+
# :NOTE: This is not exposed in Query APIv2
def select_dimension(q, key, "time:minute", :sessions, query) do
q
@@ -96,6 +118,14 @@ defmodule Plausible.Stats.SQL.Expression do
})
end
+ # :NOTE: This is not exposed in Query APIv2
+ def select_dimension(q, key, "time:minute", _table, %Query{period: period})
+ when period in ["realtime", "30m"] do
+ select_merge_as(q, [t], %{
+ key => fragment("toStartOfMinute(?)", t.timestamp)
+ })
+ end
+
# :NOTE: This is not exposed in Query APIv2
def select_dimension(q, key, "time:minute", _table, query) do
select_merge_as(q, [t], %{
diff --git a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs
index c5bfe35559..00c2a6e8e0 100644
--- a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs
@@ -20,6 +20,26 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest do
assert Enum.any?(plot, fn pageviews -> pageviews > 0 end)
end
+ test "displays pageviews for the last 30 minutes for a non-UTC timezone site", %{
+ conn: conn,
+ site: site
+ } do
+ Plausible.Site.changeset(site, %{timezone: "Europe/Tallinn"})
+ |> Plausible.Repo.update()
+
+ populate_stats(site, [
+ build(:pageview, timestamp: relative_time(minutes: -5))
+ ])
+
+ conn = get(conn, "/api/stats/#{site.domain}/main-graph?period=realtime&metric=pageviews")
+
+ assert %{"plot" => plot, "labels" => labels} = json_response(conn, 200)
+
+ assert labels == Enum.to_list(-30..-1)
+ assert Enum.count(plot) == 30
+ assert Enum.any?(plot, fn pageviews -> pageviews > 0 end)
+ end
+
test "displays pageviews for a day", %{conn: conn, site: site} do
populate_stats(site, [
build(:pageview, timestamp: ~N[2021-01-01 00:00:00]),