Skip to content

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

Fix off-by-one error in date calculation for grace period notice (#6175)

Uku Taht842c40ab07f5
diff --git a/lib/plausible/teams/grace_period.ex b/lib/plausible/teams/grace_period.ex
index 67a0c64611..5a9c1b5545 100644
--- a/lib/plausible/teams/grace_period.ex
+++ b/lib/plausible/teams/grace_period.ex
@@ -141,7 +141,7 @@ defmodule Plausible.Teams.GracePeriod do
end
defp full_hours_left(%Date{} = end_date, now) do
- end_date
+ Date.add(end_date, 1)
|> NaiveDateTime.new!(~T[00:00:00])
|> NaiveDateTime.diff(now, :second)
|> max(0)
diff --git a/test/plausible/teams/grace_period_test.exs b/test/plausible/teams/grace_period_test.exs
index 54170eba35..25ab6e5692 100644
--- a/test/plausible/teams/grace_period_test.exs
+++ b/test/plausible/teams/grace_period_test.exs
@@ -152,7 +152,7 @@ defmodule Plausible.Teams.GracePeriodTest do
now = ~N[2021-01-01 00:00:01]
grace_period = %Plausible.Teams.GracePeriod{
- end_date: ~D[2021-01-03],
+ end_date: ~D[2021-01-02],
is_over: false
}
@@ -165,7 +165,7 @@ defmodule Plausible.Teams.GracePeriodTest do
now = ~N[2021-01-01 23:00:01]
grace_period = %Plausible.Teams.GracePeriod{
- end_date: ~D[2021-01-02],
+ end_date: ~D[2021-01-01],
is_over: false
}
@@ -178,7 +178,7 @@ defmodule Plausible.Teams.GracePeriodTest do
now = ~N[2021-01-01 10:00:00]
grace_period = %Plausible.Teams.GracePeriod{
- end_date: ~D[2021-01-01],
+ end_date: ~D[2020-12-31],
is_over: false
}