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
Enforce site limit
Uku Taht05c210ad8581
diff --git a/lib/plausible/billing/billing.ex b/lib/plausible/billing/billing.exindex 6d43d70327..dab0eb8b84 100644--- a/lib/plausible/billing/billing.ex+++ b/lib/plausible/billing/billing.ex@@ -208,14 +208,38 @@ defmodule Plausible.Billing douser = Plausible.Repo.preload(user, :enterprise_plan)cond do- Timex.before?(user.inserted_at, @limit_accounts_since) -> nil- Application.get_env(:plausible, :is_selfhost) -> nil- user.email in Application.get_env(:plausible, :site_limit_exempt) -> nil- user.enterprise_plan -> nil- true -> Application.get_env(:plausible, :site_limit)+ Timex.before?(user.inserted_at, @limit_accounts_since) ->+ nil++ Application.get_env(:plausible, :is_selfhost) ->+ nil++ user.email in Application.get_env(:plausible, :site_limit_exempt) ->+ nil++ user.enterprise_plan ->+ if has_active_enterprise_subscription(user) do+ nil+ else+ Application.get_env(:plausible, :site_limit)+ end++ true ->+ Application.get_env(:plausible, :site_limit)endend+ defp has_active_enterprise_subscription(user) do+ Plausible.Repo.exists?(+ from s in Plausible.Billing.Subscription,+ join: e in Plausible.Billing.EnterprisePlan,+ on: s.user_id == e.user_id and s.paddle_plan_id == e.paddle_plan_id,+ where: s.user_id == ^user.id,+ where: s.paddle_plan_id == ^user.enterprise_plan.paddle_plan_id,+ where: s.status == "active"+ )+ end+defp format_subscription(params) do%{paddle_subscription_id: params["subscription_id"],diff --git a/test/plausible/billing/billing_test.exs b/test/plausible/billing/billing_test.exsindex 8e5499f56b..afe5f7dbaf 100644--- a/test/plausible/billing/billing_test.exs+++ b/test/plausible/billing/billing_test.exs@@ -50,6 +50,52 @@ defmodule Plausible.BillingTest doendend+ describe "sites_limit" do+ test "is the globally configured site limit for regular accounts" do+ user = insert(:user, subscription: build(:subscription))++ assert Billing.sites_limit(user) == Application.get_env(:plausible, :site_limit)+ end++ test "is limited for enterprise customers who have not upgraded yet" do+ enterprise_plan_paddle_id = "123321"++ user =+ insert(:user,+ enterprise_plan: build(:enterprise_plan, paddle_plan_id: enterprise_plan_paddle_id),+ subscription: build(:subscription, paddle_plan_id: "99999")+ )++ assert Billing.sites_limit(user) == Application.get_env(:plausible, :site_limit)+ end++ test "is unlimited for enterprise customers. Their site limit is checked in a background job so as to avoid service disruption" do+ enterprise_plan_paddle_id = "123321"++ user =+ insert(:user,+ enterprise_plan: build(:enterprise_plan, paddle_plan_id: enterprise_plan_paddle_id),+ subscription: build(:subscription, paddle_plan_id: enterprise_plan_paddle_id)+ )++ assert Billing.sites_limit(user) == nil+ end++ test "is unlimited for enterprise customers who are due to change a plan" do+ enterprise_plan_paddle_id = "123321"++ user =+ insert(:user,+ enterprise_plan: build(:enterprise_plan, paddle_plan_id: enterprise_plan_paddle_id),+ subscription: build(:subscription, paddle_plan_id: enterprise_plan_paddle_id)+ )++ insert(:enterprise_plan, user_id: user.id, paddle_plan_id: "new-paddle-plan-id")++ assert Billing.sites_limit(user) == nil+ end+ end+describe "last_two_billing_cycles" dotest "billing on the 1st" dolast_bill_date = ~D[2021-01-01]