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
Make sure the latest subscription is always used
Uku Taht883841f78998
diff --git a/lib/plausible/auth/user_admin.ex b/lib/plausible/auth/user_admin.exindex 0ecb759038..ec4db077e1 100644--- a/lib/plausible/auth/user_admin.ex+++ b/lib/plausible/auth/user_admin.ex@@ -2,7 +2,8 @@ defmodule Plausible.Auth.UserAdmin douse Plausible.Repodef custom_index_query(_conn, _schema, query) do- from(r in query, preload: [:subscription])+ subscripton_q = from(s in Plausible.Billing.Subscription, order_by: [desc: s.inserted_at])+ from(r in query, preload: [subscription: ^subscripton_q])enddef form_fields(_) dodiff --git a/lib/workers/lock_sites.ex b/lib/workers/lock_sites.exindex 2c85da14e6..69356d6cd7 100644--- a/lib/workers/lock_sites.ex+++ b/lib/workers/lock_sites.ex@@ -4,7 +4,8 @@ defmodule Plausible.Workers.LockSites do@impl Oban.Workerdef perform(_job) do- users = Repo.all(from u in Plausible.Auth.User, preload: :subscription)+ subscription_q = from(s in Plausible.Billing.Subscription, order_by: [desc: s.inserted_at])+ users = Repo.all(from u in Plausible.Auth.User, preload: [subscription: ^subscription_q])for user <- users doPlausible.Billing.SiteLocker.check_sites_for(user)diff --git a/test/workers/lock_sites_test.exs b/test/workers/lock_sites_test.exsindex 27ecc7fdf3..935c85beff 100644--- a/test/workers/lock_sites_test.exs+++ b/test/workers/lock_sites_test.exs@@ -51,7 +51,7 @@ defmodule Plausible.Workers.LockSitesTest doendtest "locks user who cancelled subscription and the cancelled subscription has expired" do- user = insert(:user)+ user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: -1))insert(:subscription,status: "deleted",@@ -63,6 +63,25 @@ defmodule Plausible.Workers.LockSitesTest doLockSites.perform(nil)+ assert Repo.reload!(site).locked+ end++ test "does not lock if user has an old cancelled subscription and a new active subscription" do+ user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: -1))++ insert(:subscription,+ status: "deleted",+ next_bill_date: Timex.today() |> Timex.shift(days: -1),+ user: user,+ inserted_at: Timex.now() |> Timex.shift(days: -1)+ )++ insert(:subscription, status: "active", user: user)++ site = insert(:site, members: [user])++ LockSites.perform(nil)+refute Repo.reload!(site).lockedend