Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
fix(main-graph): fix 12mo and other comparisons with blanks (#4333)
Karl-Aksel Puulmann645b81376c04
diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.exindex b3beef0e2b..b308f43e00 100644--- a/lib/plausible_web/controllers/api/stats_controller.ex+++ b/lib/plausible_web/controllers/api/stats_controller.ex@@ -172,36 +172,36 @@ defmodule PlausibleWeb.Api.StatsController doendend- defp build_full_intervals(%{interval: "week", date_range: range}, labels) do- for label <- labels, into: %{} do- date = Date.from_iso8601!(label)-- interval_start = Timex.beginning_of_week(date)- interval_end = Timex.end_of_week(date)+ defp build_full_intervals(%{interval: "week", date_range: date_range}, labels) do+ build_intervals(labels, date_range, &Timex.beginning_of_week/1, &Timex.end_of_week/1)+ end- within_interval? = Enum.member?(range, interval_start) && Enum.member?(range, interval_end)+ defp build_full_intervals(%{interval: "month", date_range: date_range}, labels) do+ build_intervals(labels, date_range, &Timex.beginning_of_month/1, &Timex.end_of_month/1)+ end- {label, within_interval?}- end+ defp build_full_intervals(_query, _labels) do+ nilend- defp build_full_intervals(%{interval: "month", date_range: range}, labels) do+ def build_intervals(labels, date_range, start_fn, end_fn) dofor label <- labels, into: %{} do- date = Date.from_iso8601!(label)+ case Date.from_iso8601(label) do+ {:ok, date} ->+ interval_start = start_fn.(date)+ interval_end = end_fn.(date)- interval_start = Timex.beginning_of_month(date)- interval_end = Timex.end_of_month(date)+ within_interval? =+ Enum.member?(date_range, interval_start) && Enum.member?(date_range, interval_end)- within_interval? = Enum.member?(range, interval_start) && Enum.member?(range, interval_end)+ {label, within_interval?}- {label, within_interval?}+ _ ->+ {label, false}+ endendend- defp build_full_intervals(_query, _labels) do- nil- end-def top_stats(conn, params) dosite = conn.assigns[:site]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.exsindex f04cbacbb0..74b7bbaeee 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@@ -683,6 +683,36 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest doassert [0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0] = prevassert [0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0] = currend++ test "displays conversions per month with 12mo comparison plot", %{+ conn: conn,+ site: site+ } do+ insert(:goal, site: site, event_name: "Signup")++ populate_stats(site, [+ build(:event, name: "Different", timestamp: ~N[2020-01-10 00:00:00]),+ build(:event, name: "Signup", timestamp: ~N[2020-02-10 00:00:00]),+ build(:event, name: "Signup", timestamp: ~N[2020-03-10 00:00:00]),+ build(:event, name: "Signup", timestamp: ~N[2020-04-10 00:00:00]),+ build(:pageview, timestamp: ~N[2021-05-10 00:00:00]),+ build(:event, name: "Signup", timestamp: ~N[2021-06-11 04:00:00]),+ build(:event, name: "Signup", timestamp: ~N[2021-07-11 00:00:00]),+ build(:event, name: "Signup", timestamp: ~N[2021-08-11 00:00:00])+ ])++ filters = Jason.encode!(%{goal: "Signup"})++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/main-graph?period=12mo&date=2021-12-11&metric=events&filters=#{filters}&comparison=previous_period"+ )++ assert %{"plot" => curr, "comparison_plot" => prev} = json_response(conn, 200)+ assert [0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0] = prev+ assert [0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0] = curr+ endenddescribe "GET /api/stats/main-graph - bounce_rate plot" do