diff --git a/lib/plausible/stats/comparisons.ex b/lib/plausible/stats/comparisons.ex index 0fd993650..05f8eb677 100644 --- a/lib/plausible/stats/comparisons.ex +++ b/lib/plausible/stats/comparisons.ex @@ -26,15 +26,18 @@ defmodule Plausible.Stats.Comparisons do mode, now \\ nil ) do + def compare(%Plausible.Site{} = site, %Stats.Query{} = source_query, mode, opts \\ []) do if valid_mode?(source_query, mode) do - now = now || Timex.now(site.timezone) - {:ok, do_compare(source_query, mode, now)} + opts = Keyword.put_new(opts, :now, Timex.now(site.timezone)) + {:ok, do_compare(source_query, mode, opts)} else {:error, :not_supported} end end - defp do_compare(source_query, "year_over_year", now) do + defp do_compare(source_query, "year_over_year", opts) do + now = Keyword.fetch!(opts, :now) + start_date = Date.add(source_query.date_range.first, -365) end_date = earliest(source_query.date_range.last, now) |> Date.add(-365) @@ -42,7 +45,9 @@ defmodule Plausible.Stats.Comparisons do %Stats.Query{source_query | date_range: range} end - defp do_compare(source_query, "previous_period", now) do + defp do_compare(source_query, "previous_period", opts) do + now = Keyword.fetch!(opts, :now) + last = earliest(source_query.date_range.last, now) diff_in_days = Date.diff(source_query.date_range.first, last) - 1 diff --git a/test/plausible/stats/comparisons_test.exs b/test/plausible/stats/comparisons_test.exs index 043adbad5..3074937dd 100644 --- a/test/plausible/stats/comparisons_test.exs +++ b/test/plausible/stats/comparisons_test.exs @@ -8,7 +8,7 @@ defmodule Plausible.Stats.ComparisonsTest do query = Query.from(site, %{"period" => "month", "date" => "2023-03-02"}) now = ~N[2023-03-02 14:00:00] - {:ok, comparison} = Comparisons.compare(site, query, "previous_period", now) + {:ok, comparison} = Comparisons.compare(site, query, "previous_period", now: now) assert comparison.date_range.first == ~D[2023-02-27] assert comparison.date_range.last == ~D[2023-02-28] @@ -19,7 +19,7 @@ defmodule Plausible.Stats.ComparisonsTest do query = Query.from(site, %{"period" => "month", "date" => "2023-03-01"}) now = ~N[2023-03-01 14:00:00] - {:ok, comparison} = Comparisons.compare(site, query, "previous_period", now) + {:ok, comparison} = Comparisons.compare(site, query, "previous_period", now: now) assert comparison.date_range.first == ~D[2023-02-28] assert comparison.date_range.last == ~D[2023-02-28] @@ -32,7 +32,7 @@ defmodule Plausible.Stats.ComparisonsTest do query = Query.from(site, %{"period" => "month", "date" => "2023-02-01"}) now = ~N[2023-03-01 14:00:00] - {:ok, comparison} = Comparisons.compare(site, query, "previous_period", now) + {:ok, comparison} = Comparisons.compare(site, query, "previous_period", now: now) assert comparison.date_range.first == ~D[2023-01-04] assert comparison.date_range.last == ~D[2023-01-31] @@ -43,7 +43,7 @@ defmodule Plausible.Stats.ComparisonsTest do query = Query.from(site, %{"period" => "month", "date" => "2023-02-01"}) now = ~N[2023-03-01 14:00:00] - {:ok, comparison} = Comparisons.compare(site, query, "year_over_year", now) + {:ok, comparison} = Comparisons.compare(site, query, "year_over_year", now: now) assert comparison.date_range.first == ~D[2022-02-01] assert comparison.date_range.last == ~D[2022-02-28] @@ -54,7 +54,7 @@ defmodule Plausible.Stats.ComparisonsTest do query = Query.from(site, %{"period" => "month", "date" => "2020-02-01"}) now = ~N[2023-03-01 14:00:00] - {:ok, comparison} = Comparisons.compare(site, query, "year_over_year", now) + {:ok, comparison} = Comparisons.compare(site, query, "year_over_year", now: now) assert comparison.date_range.first == ~D[2019-02-01] assert comparison.date_range.last == ~D[2019-03-01] @@ -67,7 +67,7 @@ defmodule Plausible.Stats.ComparisonsTest do query = Query.from(site, %{"period" => "year", "date" => "2023-03-01"}) now = ~N[2023-03-01 14:00:00] - {:ok, comparison} = Comparisons.compare(site, query, "previous_period", now) + {:ok, comparison} = Comparisons.compare(site, query, "previous_period", now: now) assert comparison.date_range.first == ~D[2022-11-02] assert comparison.date_range.last == ~D[2022-12-31] @@ -78,7 +78,7 @@ defmodule Plausible.Stats.ComparisonsTest do query = Query.from(site, %{"period" => "year", "date" => "2023-03-01"}) now = ~N[2023-03-01 14:00:00] - {:ok, comparison} = Comparisons.compare(site, query, "year_over_year", now) + {:ok, comparison} = Comparisons.compare(site, query, "year_over_year", now: now) assert comparison.date_range.first == ~D[2022-01-01] assert comparison.date_range.last == ~D[2022-03-01]