Skip to content

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

Fix workers dealing with enterprise plans (#6595)

RobertJoonas10e8551d41b3
diff --git a/lib/plausible/teams/billing.ex b/lib/plausible/teams/billing.ex
index 50ee474ba5..db3ced2429 100644
--- a/lib/plausible/teams/billing.ex
+++ b/lib/plausible/teams/billing.ex
@@ -5,11 +5,11 @@ defmodule Plausible.Teams.Billing do
import Ecto.Query
- alias Plausible.Billing.EnterprisePlan
alias Plausible.Billing.Subscription
alias Plausible.Billing.Subscriptions
alias Plausible.Repo
alias Plausible.Teams
+ alias Plausible.Workers.CheckUsage
alias Plausible.Billing.{EnterprisePlan, Feature, Plan, Plans, Quota}
alias Plausible.Billing.Feature.{Goals, Props, SitesAPI, StatsAPI, SharedLinks, SSO}
@@ -141,24 +141,31 @@ defmodule Plausible.Teams.Billing do
{:needs_to_upgrade, :no_active_trial_or_subscription}
Teams.GracePeriod.expired?(team) ->
- revise_pageview_usage(team, usage_mod)
+ revise_usage_for_grace_period_ended(team, usage_mod)
true ->
:no_upgrade_needed
end
end
- defp revise_pageview_usage(team, usage_mod) do
- case Plausible.Workers.CheckUsage.check_pageview_usage_two_cycles(team, usage_mod) do
- {:over_limit, _, _} ->
- {:needs_to_upgrade, :grace_period_ended}
-
- {:below_limit, _, _} ->
- Plausible.Teams.remove_grace_period(team)
- :no_upgrade_needed
+ defp revise_usage_for_grace_period_ended(team, usage_mod) do
+ with {:below_limit, _, _} <- CheckUsage.check_pageview_usage_two_cycles(team, usage_mod),
+ :below_limit <- maybe_check_site_usage(team) do
+ Plausible.Teams.remove_grace_period(team)
+ :no_upgrade_needed
+ else
+ _ -> {:needs_to_upgrade, :grace_period_ended}
end
end
+ defp maybe_check_site_usage(%Teams.Team{enterprise_plan: %EnterprisePlan{}} = team) do
+ {site_usage_status, _, _} = CheckUsage.check_site_usage_for_enterprise(team)
+ site_usage_status
+ end
+
+ # Can skip this check for normal plans where site limit can't be exceeded
+ defp maybe_check_site_usage(_team_with_normal_plan), do: :below_limit
+
@doc """
Enterprise plans are always allowed to add more sites (even when
over limit) to avoid service disruption. Their usage is checked
diff --git a/lib/workers/check_usage.ex b/lib/workers/check_usage.ex
index af583e057f..9b48e83b1a 100644
--- a/lib/workers/check_usage.ex
+++ b/lib/workers/check_usage.ex
@@ -88,8 +88,8 @@ defmodule Plausible.Workers.CheckUsage do
:ok
end
- defp check_site_usage_for_enterprise(subscriber) do
- limit = subscriber.enterprise_plan.site_limit
+ def check_site_usage_for_enterprise(subscriber) do
+ limit = Teams.Billing.site_limit(subscriber)
usage = Teams.Billing.site_usage(subscriber)
diff --git a/lib/workers/lock_sites.ex b/lib/workers/lock_sites.ex
index 6221019923..9429be4774 100644
--- a/lib/workers/lock_sites.ex
+++ b/lib/workers/lock_sites.ex
@@ -1,7 +1,10 @@
defmodule Plausible.Workers.LockSites do
+ @moduledoc false
+
use Plausible.Repo
use Oban.Worker, queue: :lock_sites
+ alias Plausible.Billing.EnterprisePlan
alias Plausible.Teams
@impl Oban.Worker
@@ -12,7 +15,9 @@ defmodule Plausible.Workers.LockSites do
as: :team,
left_lateral_join: s in subquery(Teams.last_subscription_join_query()),
on: true,
- preload: [subscription: s]
+ left_join: ep in EnterprisePlan,
+ on: ep.team_id == t.id and ep.paddle_plan_id == s.paddle_plan_id,
+ preload: [subscription: s, enterprise_plan: ep]
)
for team <- teams do
diff --git a/test/workers/check_usage_test.exs b/test/workers/check_usage_test.exs
index d0ec14243d..f95385b919 100644
--- a/test/workers/check_usage_test.exs
+++ b/test/workers/check_usage_test.exs
@@ -7,7 +7,8 @@ defmodule Plausible.Workers.CheckUsageTest do
require Plausible.Billing.Subscription.Status
- setup [:create_user, :create_site]
+ @moduletag :ee_only
+
@paddle_id_10k "558018"
@date_range Date.range(Date.utc_today(), Date.utc_today())
@@ -17,6 +18,8 @@ defmodule Plausible.Workers.CheckUsageTest do
Plausible.Billing.Subscription.Status.deleted()
]
+ setup [:create_user, :create_site]
+
test "ignores user without subscription" do
CheckUsage.perform(nil)
@@ -271,7 +274,8 @@ defmodule Plausible.Workers.CheckUsageTest do
end
test "skips checking users who already have a grace period", %{user: user} do
- %{grace_period: existing_grace_period} = Plausible.Teams.start_grace_period(team_of(user))
+ %{grace_period: existing_grace_period} =
+ Plausible.Teams.start_grace_period(team_of(user))
usage_stub =
Plausible.Teams.Billing
@@ -542,6 +546,28 @@ defmodule Plausible.Workers.CheckUsageTest do
assert_no_emails_delivered()
assert Repo.reload(team).grace_period == nil
end
+
+ test "respects grandfathered unlimited site limit" do
+ user = new_user(team: [inserted_at: ~N[2021-05-04 23:59:59]])
+
+ subscribe_to_enterprise_plan(user,
+ site_limit: 2,
+ subscription: [
+ last_bill_date: Date.shift(Date.utc_today(), day: -1),
+ status: unquote(status)
+ ]
+ )
+
+ new_site(owner: user)
+ new_site(owner: user)
+ new_site(owner: user)
+
+ CheckUsage.perform(nil)
+
+ assert_no_emails_delivered()
+
+ assert Repo.reload(team_of(user)).grace_period == nil
+ end
end
end
diff --git a/test/workers/lock_sites_test.exs b/test/workers/lock_sites_test.exs
index fb8489fd0b..b2da536b08 100644
--- a/test/workers/lock_sites_test.exs
+++ b/test/workers/lock_sites_test.exs
@@ -3,6 +3,7 @@ defmodule Plausible.Workers.LockSitesTest do
require Plausible.Billing.Subscription.Status
alias Plausible.Workers.LockSites
alias Plausible.Billing.Subscription
+ alias Plausible.Teams
@moduletag :ee_only
@@ -12,13 +13,38 @@ defmodule Plausible.Workers.LockSitesTest do
user
|> team_of()
- |> Plausible.Teams.start_manual_lock_grace_period()
+ |> Teams.start_manual_lock_grace_period()
LockSites.perform(nil)
refute Repo.reload!(site.team).locked
end
+ test "does not unlock a manually locked enterprise team" do
+ user = new_user()
+ site = new_site(owner: user)
+ team = team_of(user)
+
+ subscribe_to_enterprise_plan(user, site_limit: 1)
+
+ new_site(owner: user)
+ assert Teams.Billing.site_usage(team) == 2
+
+ team =
+ team
+ |> Teams.start_manual_lock_grace_period()
+ |> Teams.end_grace_period()
+
+ Plausible.Billing.SiteLocker.set_lock_status_for(team, true)
+
+ LockSites.perform(nil)
+
+ team = Repo.reload!(site.team)
+ assert team.locked
+ assert team.grace_period
+ assert team.grace_period.manual_lock
+ end
+
test "does not lock trial user's site" do
user = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: 1))
site = new_site(owner: user)