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
Trim comparisons for year/month (#5702)
Karl-Aksel Puulmann6216ade4ee00
diff --git a/lib/plausible/stats/query_optimizer.ex b/lib/plausible/stats/query_optimizer.exindex 83b2095771..10734507d2 100644--- a/lib/plausible/stats/query_optimizer.ex+++ b/lib/plausible/stats/query_optimizer.ex@@ -246,10 +246,6 @@ defmodule Plausible.Stats.QueryOptimizer dodefp trim_relative_date_range(query), do: query- defp should_trim_date_range?(%Query{include: %{comparisons: comparison_opts}})- when is_map(comparison_opts),- do: false-defp should_trim_date_range?(%Query{input_date_range: "month"} = query) dotoday = query.now |> DateTime.shift_zone!(query.timezone) |> DateTime.to_date()date_range = Query.date_range(query)@@ -274,7 +270,7 @@ defmodule Plausible.Stats.QueryOptimizer dotoday = query.now |> DateTime.shift_zone!(query.timezone) |> DateTime.to_date()date_range = Query.date_range(query)- date_range.first == today and date_range.last == today+ is_nil(query.include.comparisons) and date_range.first == today and date_range.last == todayenddefp should_trim_date_range?(_query), do: falsediff --git a/test/plausible/stats/query_optimizer_test.exs b/test/plausible/stats/query_optimizer_test.exsindex 25b6fa5c1c..24dfc22d78 100644--- a/test/plausible/stats/query_optimizer_test.exs+++ b/test/plausible/stats/query_optimizer_test.exs@@ -252,7 +252,7 @@ defmodule Plausible.Stats.QueryOptimizerTest doassert result.utc_time_range == original_rangeend- test "does not trim when comparisons are set" do+ test "does not trim day when comparisons are set" donow = DateTime.new!(~D[2024-01-15], ~T[12:00:00], "UTC")original_range = DateTimeRange.new!(~D[2024-01-01], ~D[2024-01-31], "UTC")@@ -272,6 +272,26 @@ defmodule Plausible.Stats.QueryOptimizerTest doassert result.utc_time_range == original_rangeend+ test "trims month when comparisons are set" do+ now = DateTime.new!(~D[2024-01-15], ~T[12:00:00], "UTC")++ result =+ perform(%{+ utc_time_range: DateTimeRange.new!(~D[2024-01-01], ~D[2024-01-31], "UTC"),+ input_date_range: "month",+ now: now,+ timezone: "UTC",+ include:+ Map.merge(+ QueryParser.default_include(),+ %{comparisons: %{mode: "previous_period"}, trim_relative_date_range: true}+ )+ })++ assert result.utc_time_range.first == ~U[2024-01-01 00:00:00Z]+ assert result.utc_time_range.last == ~U[2024-01-15 23:59:59Z]+ end+test "does not trim when flag is false" donow = DateTime.new!(~D[2024-01-15], ~T[12:00:00], "UTC")original_range = DateTimeRange.new!(~D[2024-01-01], ~D[2024-01-31], "UTC")diff --git a/test/plausible_web/controllers/api/external_stats_controller/query_comparisons_test.exs b/test/plausible_web/controllers/api/external_stats_controller/query_comparisons_test.exsindex 42f9f2d8c1..ed584fcf9b 100644--- a/test/plausible_web/controllers/api/external_stats_controller/query_comparisons_test.exs+++ b/test/plausible_web/controllers/api/external_stats_controller/query_comparisons_test.exs@@ -169,31 +169,6 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryComparisonsTest doassert actual_comparison_last_date == expected_comparison_last_dateend- test "regression: does not trim when trim_relative_date_range is true", %{- conn: conn,- site: site- } do- conn =- post(conn, "/api/v2/query-internal-test", %{- "site_id" => site.domain,- "metrics" => ["visitors"],- "date_range" => "month",- "date" => "2021-01-15",- "dimensions" => ["time:day"],- "include" => %{- "trim_relative_date_range" => true,- "comparisons" => %{- "mode" => "previous_period"- }- }- })-- assert json_response(conn, 200)["query"]["date_range"] == [- "2021-01-01T00:00:00+00:00",- "2021-01-31T23:59:59+00:00"- ]- end-test "timeseries last 91d period in year_over_year comparison", %{conn: conn,site: site