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 manual lock grace period bug (#6503)
RobertJoonas2c7d1ec678ff
diff --git a/lib/plausible/teams/grace_period.ex b/lib/plausible/teams/grace_period.exindex 5a9c1b5545..b773af68ad 100644--- a/lib/plausible/teams/grace_period.ex+++ b/lib/plausible/teams/grace_period.ex@@ -81,12 +81,12 @@ defmodule Plausible.Teams.GracePeriod do"""def active?(team)- def active?(%{grace_period: %__MODULE__{end_date: %Date{} = end_date}}) do- Date.diff(end_date, Date.utc_today()) >= 0+ def active?(%{grace_period: %__MODULE__{manual_lock: true}} = team) do+ manual_lock_active?(team)end- def active?(%{grace_period: %__MODULE__{manual_lock: true}}) do- true+ def active?(%{grace_period: %__MODULE__{end_date: %Date{} = end_date}}) do+ Date.diff(end_date, Date.utc_today()) >= 0enddef active?(_team), do: falsediff --git a/test/plausible/billing/quota_test.exs b/test/plausible/billing/quota_test.exsindex cf7f0c9317..670e628a35 100644--- a/test/plausible/billing/quota_test.exs+++ b/test/plausible/billing/quota_test.exs@@ -1244,6 +1244,16 @@ defmodule Plausible.Billing.QuotaTest do:grace_period_activeend+ @some_usage %{+ monthly_pageviews: %{+ current_cycle: %{total: 5000},+ last_cycle: %{total: 15_000},+ penultimate_cycle: %{total: 14_000}+ },+ sites: 3,+ team_members: 2+ }+test "returns :manual_lock_grace_period_active when manual lock is active" douser = new_user() |> subscribe_to_enterprise_plan(monthly_pageview_limit: 10_000)team = team_of(user)@@ -1256,18 +1266,24 @@ defmodule Plausible.Billing.QuotaTest doteam = %{team | grace_period: manual_lock_grace_period}- usage = %{- monthly_pageviews: %{- current_cycle: %{total: 5000},- last_cycle: %{total: 15_000},- penultimate_cycle: %{total: 14_000}- },- sites: 3,- team_members: 2+ assert Plausible.Billing.Quota.usage_notification_type(team, @some_usage) ==+ :manual_lock_grace_period_active+ end++ test "returns :dashboard_locked when manual lock grace_period has been manually locked" do+ user = new_user() |> subscribe_to_enterprise_plan(monthly_pageview_limit: 10_000)+ team = team_of(user)++ manual_lock_grace_period = %Plausible.Teams.GracePeriod{+ end_date: nil,+ is_over: true,+ manual_lock: true}- assert Plausible.Billing.Quota.usage_notification_type(team, usage) ==- :manual_lock_grace_period_active+ team = %{team | grace_period: manual_lock_grace_period}++ assert Plausible.Billing.Quota.usage_notification_type(team, @some_usage) ==+ :dashboard_lockedendtest "returns :trial_ended when trial expired and no subscription" dodiff --git a/test/plausible/billing/site_locker_test.exs b/test/plausible/billing/site_locker_test.exsindex 2d217f4edc..75c3ce2f38 100644--- a/test/plausible/billing/site_locker_test.exs+++ b/test/plausible/billing/site_locker_test.exs@@ -85,6 +85,51 @@ defmodule Plausible.Billing.SiteLockerTest dorefute Repo.reload!(site.team).lockedend+ test "keeps a manually locked enterprise customer locked while over limits, unlocks once usage drops within limits" do+ user = new_user() |> subscribe_to_enterprise_plan(monthly_pageview_limit: 10_000)+ team = team_of(user)+ site = new_site(owner: user)++ # The usage check worker flags the account for manual locking+ # (see Plausible.Workers.CheckUsage.check_enterprise_subscriber/2)+ team = Plausible.Teams.start_manual_lock_grace_period(team)+ refute Repo.reload!(team).locked++ # Customer support locks the team from the CS panel+ # (see PlausibleWeb.Live.CustomerSupport.Team.lock_team/1)+ team = Plausible.Teams.end_grace_period(team)+ SiteLocker.set_lock_status_for(team, true)+ team = Repo.reload!(team)++ assert team.locked+ assert team.grace_period.manual_lock+ assert team.grace_period.is_over++ over_limits_usage_stub = monthly_pageview_usage_stub(15_000, 15_000)++ # while usage is still over the limit, the daily LockSites run keeps+ # the team locked and leaves the grace period in place+ assert SiteLocker.update_for(team, usage_mod: over_limits_usage_stub) ==+ {:locked, :grace_period_ended_already}++ team = Repo.reload!(team)+ assert team.locked+ assert Repo.reload!(site.team).locked+ assert team.grace_period.manual_lock+ assert team.grace_period.is_over++ within_limits_usage_stub = monthly_pageview_usage_stub(5_000, 5_000)++ # once usage drops within limits, the next run unlocks the team and+ # removes the grace period+ assert SiteLocker.update_for(team, usage_mod: within_limits_usage_stub) == :unlocked++ team = Repo.reload!(team)+ refute team.locked+ refute Repo.reload!(site.team).locked+ refute team.grace_period+ end+test "locks user who cancelled subscription and the cancelled subscription has expired" douser =new_user(trial_expiry_date: Date.shift(Date.utc_today(), day: -1))diff --git a/test/plausible/teams/grace_period_test.exs b/test/plausible/teams/grace_period_test.exsindex 25ab6e5692..af43672633 100644--- a/test/plausible/teams/grace_period_test.exs+++ b/test/plausible/teams/grace_period_test.exs@@ -1,15 +1,16 @@defmodule Plausible.Teams.GracePeriodTest douse Plausible.DataCase, async: true- test "active?/1 returns false when grace period cannot be telled" do+ test "active?/1 returns false when grace period is nil" dowithout_grace_period =new_user(trial_expiry_date: Date.utc_today(), team: [grace_period: nil])|> team_of()refute Plausible.Teams.GracePeriod.active?(without_grace_period)+ end- without_team = nil- refute Plausible.Teams.GracePeriod.active?(without_team)+ test "active?/1 returns false when team is nil" do+ refute Plausible.Teams.GracePeriod.active?(nil)endtest "active?/1 returns false when grace period is expired" do@@ -42,15 +43,29 @@ defmodule Plausible.Teams.GracePeriodTest doassert Plausible.Teams.GracePeriod.active?(team)end- test "expired?/1 returns false when grace period cannot be telled" do+ test "active?/1 returns false for a manual lock grace period with is_over = true" do+ grace_period = %Plausible.Teams.GracePeriod{+ manual_lock: true,+ is_over: true+ }++ team =+ new_user(trial_expiry_date: Date.utc_today(), team: [grace_period: grace_period])+ |> team_of()++ refute Plausible.Teams.GracePeriod.active?(team)+ end++ test "expired?/1 returns false when grace period is nil" dowithout_grace_period =new_user(trial_expiry_date: Date.utc_today(), team: [grace_period: nil])|> team_of()refute Plausible.Teams.GracePeriod.expired?(without_grace_period)+ end- without_team = nil- refute Plausible.Teams.GracePeriod.expired?(without_team)+ test "expired?/1 returns false when team is nil" do+ refute Plausible.Teams.GracePeriod.expired?(nil)endtest "expired?/1 returns true when grace period is expired" do@@ -68,6 +83,19 @@ defmodule Plausible.Teams.GracePeriodTest doassert Plausible.Teams.GracePeriod.expired?(team)end+ test "expired?/1 returns true when manual lock grace period is manually terminated" do+ grace_period = %Plausible.Teams.GracePeriod{+ manual_lock: true,+ is_over: true+ }++ team =+ new_user(trial_expiry_date: Date.utc_today(), team: [grace_period: grace_period])+ |> team_of()++ assert Plausible.Teams.GracePeriod.expired?(team)+ end+test "expired?/1 returns false when grace period is still active" dotomorrow = Date.add(Date.utc_today(), 1)