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
Teams writes switch (#4883)
Adrian Gruntkowski729a32e6103f
diff --git a/extra/lib/plausible/funnels.ex b/extra/lib/plausible/funnels.exindex 84f30295d6..24ac019cbf 100644--- a/extra/lib/plausible/funnels.ex+++ b/extra/lib/plausible/funnels.ex@@ -18,9 +18,9 @@ defmodule Plausible.Funnels do| {:error, Ecto.Changeset.t() | :invalid_funnel_size | :upgrade_required}def create(site, name, steps)when is_list(steps) and length(steps) in Funnel.min_steps()..Funnel.max_steps() do- site = Plausible.Repo.preload(site, :owner)+ site = Plausible.Repo.preload(site, :team)- case Plausible.Billing.Feature.Funnels.check_availability(site.owner) do+ case Plausible.Billing.Feature.Funnels.check_availability(site.team) do{:error, _} = error ->error@@ -39,9 +39,9 @@ defmodule Plausible.Funnels do{:ok, Funnel.t()}| {:error, Ecto.Changeset.t() | :invalid_funnel_size | :upgrade_required}def update(funnel, name, steps) do- site = Plausible.Repo.preload(funnel, site: :owner).site+ site = Plausible.Repo.preload(funnel, site: :team).site- case Plausible.Billing.Feature.Funnels.check_availability(site.owner) do+ case Plausible.Billing.Feature.Funnels.check_availability(site.team) do{:error, _} = error ->errordiff --git a/extra/lib/plausible/stats/goal/revenue.ex b/extra/lib/plausible/stats/goal/revenue.exindex 08da84d8aa..6c2d96ede1 100644--- a/extra/lib/plausible/stats/goal/revenue.ex+++ b/extra/lib/plausible/stats/goal/revenue.ex@@ -60,8 +60,8 @@ defmodule Plausible.Stats.Goal.Revenue doenddef available?(site) do- site = Plausible.Repo.preload(site, :owner)- Plausible.Billing.Feature.RevenueGoals.check_availability(site.owner) == :ok+ site = Plausible.Repo.preload(site, :team)+ Plausible.Billing.Feature.RevenueGoals.check_availability(site.team) == :okend# :NOTE: Legacy queries don't have metrics associated with them so work around the issue by assumingdiff --git a/lib/mix/tasks/create_free_subscription.ex b/lib/mix/tasks/create_free_subscription.exindex 846e7ce0c8..be89017458 100644--- a/lib/mix/tasks/create_free_subscription.ex+++ b/lib/mix/tasks/create_free_subscription.ex@@ -17,11 +17,9 @@ defmodule Mix.Tasks.CreateFreeSubscription douser = Repo.get(Plausible.Auth.User, user_id){:ok, team} = Plausible.Teams.get_or_create(user)- Subscription.free(%{user_id: user_id, team_id: team.id})+ Subscription.free(%{team_id: team.id})|> Repo.insert!()- Plausible.Teams.sync_team(user)-IO.puts("Created a free subscription for user: #{user.name}")endenddiff --git a/lib/mix/tasks/pull_sandbox_subscription.ex b/lib/mix/tasks/pull_sandbox_subscription.exindex 7aad712547..56ba45b654 100644--- a/lib/mix/tasks/pull_sandbox_subscription.ex+++ b/lib/mix/tasks/pull_sandbox_subscription.ex@@ -41,14 +41,12 @@ defmodule Mix.Tasks.PullSandboxSubscription dores = body["response"] |> List.first()user = Repo.get_by!(User, email: res["user_email"]){:ok, team} = Plausible.Teams.get_or_create(user)- Plausible.Teams.sync_team(user)subscription = %{paddle_subscription_id: res["subscription_id"] |> to_string(),paddle_plan_id: res["plan_id"] |> to_string(),cancel_url: res["cancel_url"],update_url: res["update_url"],- user_id: user.id,team_id: team.id,status: res["state"],last_bill_date: res["last_payment"]["date"],diff --git a/lib/plausible/auth/api_key_admin.ex b/lib/plausible/auth/api_key_admin.exindex aa9dc7be3f..ff7f7094aa 100644--- a/lib/plausible/auth/api_key_admin.ex+++ b/lib/plausible/auth/api_key_admin.ex@@ -14,7 +14,7 @@ defmodule Plausible.Auth.ApiKeyAdmin dodef create_changeset(schema, attrs) doscopes = [attrs["scope"]]- Plausible.Auth.ApiKey.changeset(schema, Map.merge(%{"scopes" => scopes}, attrs))+ Plausible.Auth.ApiKey.changeset(struct(schema, %{}), Map.merge(%{"scopes" => scopes}, attrs))enddef update_changeset(schema, attrs) dodiff --git a/lib/plausible/auth/auth.ex b/lib/plausible/auth/auth.exindex 69d767d595..2ad4ebb295 100644--- a/lib/plausible/auth/auth.ex+++ b/lib/plausible/auth/auth.ex@@ -35,9 +35,6 @@ defmodule Plausible.Auth do@type rate_limit_type() :: unquote(Enum.reduce(@rate_limit_types, &{:|, [], [&1, &2]}))- @spec rate_limits() :: map()- def rate_limits(), do: @rate_limits-@spec rate_limit(rate_limit_type(), Auth.User.t() | Plug.Conn.t()) :::ok | {:error, {:rate_limit, rate_limit_type()}}def rate_limit(limit_type, key) when limit_type in @rate_limit_types do@@ -50,11 +47,6 @@ defmodule Plausible.Auth doendend- def create_user(name, email, pwd) do- Auth.User.new(%{name: name, email: email, password: pwd, password_confirmation: pwd})- |> Repo.insert()- end-@spec find_user_by(Keyword.t()) :: Auth.User.t() | nildef find_user_by(opts) doRepo.get_by(Auth.User, opts)@@ -77,22 +69,6 @@ defmodule Plausible.Auth doendend- def has_active_sites?(user, roles \\ [:owner, :admin, :viewer]) do- sites =- Repo.all(- from u in Plausible.Auth.User,- where: u.id == ^user.id,- join: sm in Plausible.Site.Membership,- on: sm.user_id == u.id,- where: sm.role in ^roles,- join: s in Plausible.Site,- on: s.id == sm.site_id,- select: s- )-- Enum.any?(sites, &Plausible.Sites.has_stats?/1)- end-def delete_user(user) doRepo.transaction(fn ->case Plausible.Teams.get_by_owner(user) dodiff --git a/lib/plausible/auth/grace_period.ex b/lib/plausible/auth/grace_period.exindex 40c5df052f..d709039cc0 100644--- a/lib/plausible/auth/grace_period.ex+++ b/lib/plausible/auth/grace_period.ex@@ -13,7 +13,7 @@ defmodule Plausible.Auth.GracePeriod do"""use Ecto.Schema- alias Plausible.Auth.User+ alias Plausible.Teams@type t() :: %__MODULE__{end_date: Date.t() | nil,@@ -27,59 +27,59 @@ defmodule Plausible.Auth.GracePeriod dofield :manual_lock, :booleanend- @spec start_changeset(User.t()) :: Ecto.Changeset.t()+ @spec start_changeset(Teams.Team.t()) :: Ecto.Changeset.t()@doc """Starts a account locking grace period of 7 days by changing the User struct."""- def start_changeset(%User{} = user) do+ def start_changeset(%Teams.Team{} = team) dograce_period = %__MODULE__{end_date: Date.shift(Date.utc_today(), day: 7),is_over: false,manual_lock: false}- Ecto.Changeset.change(user, grace_period: grace_period)+ Ecto.Changeset.change(team, grace_period: grace_period)end- @spec start_manual_lock_changeset(User.t()) :: Ecto.Changeset.t()+ @spec start_manual_lock_changeset(Teams.Team.t()) :: Ecto.Changeset.t()@doc """Starts a manual account locking grace period by changing the User struct.Manual locking means the grace period can only be removed manually from theCRM."""- def start_manual_lock_changeset(%User{} = user) do+ def start_manual_lock_changeset(%Teams.Team{} = team) dograce_period = %__MODULE__{end_date: nil,is_over: false,manual_lock: true}- Ecto.Changeset.change(user, grace_period: grace_period)+ Ecto.Changeset.change(team, grace_period: grace_period)end- @spec end_changeset(User.t()) :: Ecto.Changeset.t()+ @spec end_changeset(Teams.Team.t()) :: Ecto.Changeset.t()@doc """Ends an existing grace period by `setting users.grace_period.is_over` to true.This means the grace period has expired."""- def end_changeset(%User{} = user) do- Ecto.Changeset.change(user, grace_period: %{is_over: true})+ def end_changeset(%Teams.Team{} = team) do+ Ecto.Changeset.change(team, grace_period: %{is_over: true})end- @spec remove_changeset(User.t()) :: Ecto.Changeset.t()+ @spec remove_changeset(Teams.Team.t()) :: Ecto.Changeset.t()@doc """Removes the grace period from the User completely."""- def remove_changeset(%User{} = user) do- Ecto.Changeset.change(user, grace_period: nil)+ def remove_changeset(%Teams.Team{} = team) do+ Ecto.Changeset.change(team, grace_period: nil)end- @spec active?(User.t() | Plausible.Teams.Team.t()) :: boolean()+ @spec active?(Teams.Team.t() | nil) :: boolean()@doc """Returns whether the grace period is still active for a User. Defaults tofalse if the user is nil or there is no grace period."""- def active?(user_or_team)+ def active?(team)def active?(%{grace_period: %__MODULE__{end_date: %Date{} = end_date}}) doDate.diff(end_date, Date.utc_today()) >= 0@@ -89,14 +89,14 @@ defmodule Plausible.Auth.GracePeriod dotrueend- def active?(_user), do: false+ def active?(_team), do: false- @spec expired?(User.t() | Plausible.Teams.Team.t() | nil) :: boolean()+ @spec expired?(Teams.Team.t() | nil) :: boolean()@doc """Returns whether the grace period has already expired for a User. Defaults tofalse if the user is nil or there is no grace period."""- def expired?(user_or_team) do- if user_or_team && user_or_team.grace_period, do: !active?(user_or_team), else: false+ def expired?(team) do+ if team && team.grace_period, do: !active?(team), else: falseendenddiff --git a/lib/plausible/auth/invitation.ex b/lib/plausible/auth/invitation.exdeleted file mode 100644index d0a2eb70f9..0000000000--- a/lib/plausible/auth/invitation.ex+++ /dev/null@@ -1,30 +0,0 @@-defmodule Plausible.Auth.Invitation do- use Ecto.Schema- import Ecto.Changeset-- @type t() :: %__MODULE__{}-- @derive {Jason.Encoder, only: [:invitation_id, :role, :site]}- @required [:email, :role, :site_id, :inviter_id]- schema "invitations" do- field :invitation_id, :string- field :email, :string- field :role, Ecto.Enum, values: [:owner, :admin, :viewer]-- belongs_to :inviter, Plausible.Auth.User- belongs_to :site, Plausible.Site-- timestamps()- end-- def new(attrs \\ %{}) do- %__MODULE__{invitation_id: Nanoid.generate()}- |> cast(attrs, @required)- |> validate_required(@required)- |> unique_constraint([:email, :site_id],- name: :invitations_site_id_email_index,- error_key: :invitation,- message: "already sent"- )- end-enddiff --git a/lib/plausible/auth/user.ex b/lib/plausible/auth/user.exindex a0682ca91f..e210798f6f 100644--- a/lib/plausible/auth/user.ex+++ b/lib/plausible/auth/user.ex@@ -19,9 +19,6 @@ defmodule Plausible.Auth.User do@required [:email, :name, :password]- @trial_accept_traffic_until_offset_days 14- @susbscription_accept_traffic_until_offset_days 30-schema "users" dofield :email, :stringfield :password_hash@@ -30,18 +27,17 @@ defmodule Plausible.Auth.User dofield :password_confirmation, :string, virtual: truefield :name, :stringfield :last_seen, :naive_datetime- field :trial_expiry_date, :datefield :theme, Ecto.Enum, values: [:system, :light, :dark]field :email_verified, :booleanfield :previous_email, :string- field :accept_traffic_until, :date# Field for purely informational purposes in CRM contextfield :notes, :string- # A field only used as a manual override - allow subscribing- # to any plan, even when exceeding its pageview limit- field :allow_next_upgrade_override, :boolean, default: false+ # Fields used only by CRM for mapping to the ones in the owned team+ field :trial_expiry_date, :date, virtual: true+ field :allow_next_upgrade_override, :boolean, virtual: true+ field :accept_traffic_until, :date, virtual: true# Fields for TOTP authentication. See `Plausible.Auth.TOTP`.field :totp_enabled, :boolean, default: false@@ -49,16 +45,12 @@ defmodule Plausible.Auth.User dofield :totp_token, :stringfield :totp_last_used_at, :naive_datetime- embeds_one :grace_period, Plausible.Auth.GracePeriod, on_replace: :update-has_many :sessions, Plausible.Auth.UserSession- has_many :site_memberships, Plausible.Site.Membershiphas_many :team_memberships, Plausible.Teams.Membership- has_many :sites, through: [:site_memberships, :site]has_many :api_keys, Plausible.Auth.ApiKeyhas_one :google_auth, Plausible.Site.GoogleAuth- has_one :subscription, Plausible.Billing.Subscription- has_one :enterprise_plan, Plausible.Billing.EnterprisePlan+ has_one :owner_membership, Plausible.Teams.Membership, where: [role: :owner]+ has_one :my_team, through: [:owner_membership, :team]timestamps()end@@ -71,7 +63,6 @@ defmodule Plausible.Auth.User do|> validate_confirmation(:password, required: true)|> validate_password_strength()|> hash_password()- |> start_trial()|> set_email_verification_status()|> unique_constraint(:email)end@@ -127,30 +118,15 @@ defmodule Plausible.Auth.User do:name,:email_verified,:theme,+ :notes,:trial_expiry_date,:allow_next_upgrade_override,- :accept_traffic_until,- :notes+ :accept_traffic_until])|> validate_required([:email, :name, :email_verified])- |> maybe_bump_accept_traffic_until()|> unique_constraint(:email)end- defp maybe_bump_accept_traffic_until(changeset) do- expiry_change = get_change(changeset, :trial_expiry_date)-- if expiry_change do- put_change(- changeset,- :accept_traffic_until,- Date.add(expiry_change, @trial_accept_traffic_until_offset_days)- )- else- changeset- end- end-def set_password(user, password) douser|> cast(%{password: password}, [:password])@@ -179,23 +155,6 @@ defmodule Plausible.Auth.User dodef hash_password(changeset), do: changeset- def remove_trial_expiry(user) do- change(user, trial_expiry_date: nil)- end-- def start_trial(user) do- trial_expiry = trial_expiry()-- change(user,- trial_expiry_date: trial_expiry,- accept_traffic_until: Date.add(trial_expiry, @trial_accept_traffic_until_offset_days)- )- end-- def end_trial(user) do- change(user, trial_expiry_date: Date.utc_today() |> Date.shift(day: -1))- end-def password_strength(changeset) docase get_field(changeset, :password) donil ->@@ -237,11 +196,6 @@ defmodule Plausible.Auth.User doPath.join(PlausibleWeb.Endpoint.url(), ["avatar/", hash])end- def trial_accept_traffic_until_offset_days(), do: @trial_accept_traffic_until_offset_days-- def subscription_accept_traffic_until_offset_days(),- do: @susbscription_accept_traffic_until_offset_days-defp validate_email_changed(changeset) doif !get_change(changeset, :email) && !changeset.errors[:email] doadd_error(changeset, :email, "can't be the same", validation: :different_email)@@ -297,14 +251,6 @@ defmodule Plausible.Auth.User do|> Enum.uniq()end- defp trial_expiry() do- on_ee do- Date.utc_today() |> Date.shift(day: 30)- else- Date.utc_today() |> Date.shift(year: 100)- end- end-defp set_email_verification_status(user) doon_ee dochange(user, email_verified: false)diff --git a/lib/plausible/auth/user_admin.ex b/lib/plausible/auth/user_admin.exindex 79057ac17e..4e24f343eb 100644--- a/lib/plausible/auth/user_admin.ex+++ b/lib/plausible/auth/user_admin.ex@@ -6,7 +6,19 @@ defmodule Plausible.Auth.UserAdmin dodef custom_index_query(_conn, _schema, query) dosubscripton_q = from(s in Plausible.Billing.Subscription, order_by: [desc: s.inserted_at])- from(r in query, preload: [subscription: ^subscripton_q])+ from(r in query, preload: [my_team: [subscription: ^subscripton_q]])+ end++ def custom_show_query(_conn, _schema, query) do+ from(u in query,+ left_join: t in assoc(u, :my_team),+ select: %{+ u+ | trial_expiry_date: t.trial_expiry_date,+ allow_next_upgrade_override: t.allow_next_upgrade_override,+ accept_traffic_until: t.accept_traffic_until+ }+ )enddef form_fields(_) do@@ -25,6 +37,37 @@ defmodule Plausible.Auth.UserAdmin do]end+ def update(_conn, changeset) do+ my_team = Repo.preload(changeset.data, :my_team).my_team++ team_changed_params =+ [:trial_expiry_date, :allow_next_upgrade_override, :accept_traffic_until]+ |> Enum.map(&{&1, Ecto.Changeset.get_change(changeset, &1, :no_change)})+ |> Enum.reject(fn {_, val} -> val == :no_change end)+ |> Map.new()++ with {:ok, user} <- Repo.update(changeset) do+ cond do+ my_team && map_size(team_changed_params) > 0 ->+ my_team+ |> Plausible.Teams.Team.crm_sync_changeset(team_changed_params)+ |> Repo.update!()++ team_changed_params[:trial_expiry_date] ->+ {:ok, team} = Plausible.Teams.get_or_create(user)++ team+ |> Plausible.Teams.Team.crm_sync_changeset(team_changed_params)+ |> Repo.update!()++ true ->+ :ignore+ end++ {:ok, user}+ end+ end+def delete(_conn, %{data: user}) doPlausible.Auth.delete_user(user)end@@ -62,25 +105,24 @@ defmodule Plausible.Auth.UserAdmin do]end- def after_update(_conn, user) do- Plausible.Teams.sync_team(user)-- {:ok, user}- end-defp lock(user) do- if user.grace_period do- Plausible.Billing.SiteLocker.set_lock_status_for(user, true)- {:ok, Plausible.Users.end_grace_period(user)}+ user = Repo.preload(user, :my_team)++ if user.my_team && user.my_team.grace_period do+ Plausible.Billing.SiteLocker.set_lock_status_for(user.my_team, true)+ Plausible.Teams.end_grace_period(user.my_team)+ {:ok, user}else{:error, user, "No active grace period on this user"}endenddefp unlock(user) do- if user.grace_period do- Plausible.Users.remove_grace_period(user)- Plausible.Billing.SiteLocker.set_lock_status_for(user, false)+ user = Repo.preload(user, :my_team)++ if user.my_team && user.my_team.grace_period do+ Plausible.Teams.remove_grace_period(user.my_team)+ Plausible.Billing.SiteLocker.set_lock_status_for(user.my_team, false){:ok, user}else{:error, user, "No active grace period on this user"}@@ -91,7 +133,9 @@ defmodule Plausible.Auth.UserAdmin doPlausible.Auth.TOTP.force_disable(user)end- defp grace_period_status(%{grace_period: grace_period}) do+ defp grace_period_status(user) do+ grace_period = user.my_team && user.my_team.grace_period+case grace_period donil ->"--"@@ -112,25 +156,20 @@ defmodule Plausible.Auth.UserAdmin doenddefp subscription_plan(user) do- if Subscription.Status.active?(user.subscription) && user.subscription.paddle_subscription_id do- quota = PlausibleWeb.AuthView.subscription_quota(user.subscription)- interval = PlausibleWeb.AuthView.subscription_interval(user.subscription)+ subscription = user.my_team && user.my_team.subscription- {:safe, ~s(<a href="#{manage_url(user.subscription)}">#{quota} \(#{interval}\)</a>)}+ if Subscription.Status.active?(subscription) && subscription.paddle_subscription_id do+ quota = PlausibleWeb.AuthView.subscription_quota(subscription)+ interval = PlausibleWeb.AuthView.subscription_interval(subscription)++ {:safe, ~s(<a href="#{manage_url(subscription)}">#{quota} \(#{interval}\)</a>)}else"--"endenddefp subscription_status(user) do- team =- case Plausible.Teams.get_by_owner(user) do- {:ok, team} ->- Plausible.Teams.with_subscription(team)-- {:error, :no_team} ->- nil- end+ team = user.my_teamcond doteam && team.subscription ->diff --git a/lib/plausible/billing/billing.ex b/lib/plausible/billing/billing.exindex a4fa1cf32f..459c50fe55 100644--- a/lib/plausible/billing/billing.ex+++ b/lib/plausible/billing/billing.ex@@ -4,6 +4,7 @@ defmodule Plausible.Billing dorequire Plausible.Billing.Subscription.Statusalias Plausible.Billing.Subscriptionalias Plausible.Auth.User+ alias Plausible.Teamsdef subscription_created(params) doRepo.transaction(fn ->@@ -101,7 +102,7 @@ defmodule Plausible.Billing dosubscription =Subscription|> Repo.get_by(paddle_subscription_id: params["subscription_id"])- |> Repo.preload(:user)+ |> Repo.preload(team: :owner)if subscription dochangeset =@@ -111,8 +112,7 @@ defmodule Plausible.Billing doupdated = Repo.update!(changeset)- subscription- |> Map.fetch!(:user)+ subscription.team.owner|> PlausibleWeb.Email.cancellation_email()|> Plausible.Mailer.send()@@ -137,9 +137,9 @@ defmodule Plausible.Billing dolast_bill_date: api_subscription["last_payment"]["date"]})|> Repo.update!()- |> Repo.preload(:user)+ |> Repo.preload(:team)- Plausible.Users.update_accept_traffic_until(subscription.user)+ Plausible.Teams.update_accept_traffic_until(subscription.team)subscriptionend@@ -209,38 +209,38 @@ defmodule Plausible.Billing doenddefp after_subscription_update(subscription) do- user =- User- |> Repo.get!(subscription.user_id)- |> Plausible.Users.with_subscription()+ team =+ Teams.Team+ |> Repo.get!(subscription.team_id)+ |> Teams.with_subscription()+ |> Repo.preload(:owner)- if subscription.id != user.subscription.id do+ if subscription.id != team.subscription.id doSentry.capture_message("Susbscription ID mismatch",- extra: %{subscription: inspect(subscription), user_id: user.id}+ extra: %{subscription: inspect(subscription), team_id: team.id})end- user- |> Plausible.Users.update_accept_traffic_until()- |> Plausible.Users.remove_grace_period()- |> Plausible.Users.maybe_reset_next_upgrade_override()+ team+ |> Plausible.Teams.update_accept_traffic_until()+ |> Plausible.Teams.remove_grace_period()+ |> Plausible.Teams.maybe_reset_next_upgrade_override()|> tap(&Plausible.Billing.SiteLocker.update_sites_for/1)|> maybe_adjust_api_key_limits()end- defp maybe_adjust_api_key_limits(user) do+ defp maybe_adjust_api_key_limits(team) doplan =Repo.get_by(Plausible.Billing.EnterprisePlan,- user_id: user.id,- paddle_plan_id: user.subscription.paddle_plan_id+ team_id: team.id,+ paddle_plan_id: team.subscription.paddle_plan_id)if plan do- user_id = user.id- api_keys = from(key in Plausible.Auth.ApiKey, where: key.user_id == ^user_id)+ api_keys = from(key in Plausible.Auth.ApiKey, where: key.user_id == ^team.owner.id)Repo.update_all(api_keys, set: [hourly_request_limit: plan.hourly_api_request_limit])end- user+ teamendenddiff --git a/lib/plausible/billing/enterprise_plan.ex b/lib/plausible/billing/enterprise_plan.exindex 9589c1e0d8..afc166cc88 100644--- a/lib/plausible/billing/enterprise_plan.ex+++ b/lib/plausible/billing/enterprise_plan.ex@@ -5,7 +5,7 @@ defmodule Plausible.Billing.EnterprisePlan do@type t() :: %__MODULE__{}@required_fields [- :user_id,+ :team_id,:paddle_plan_id,:billing_interval,:monthly_pageview_limit,@@ -15,10 +15,6 @@ defmodule Plausible.Billing.EnterprisePlan do:team_member_limit]- @optional_fields [- :team_id- ]-schema "enterprise_plans" dofield :paddle_plan_id, :stringfield :billing_interval, Ecto.Enum, values: [:monthly, :yearly]@@ -28,7 +24,9 @@ defmodule Plausible.Billing.EnterprisePlan dofield :features, Plausible.Billing.Ecto.FeatureList, default: []field :hourly_api_request_limit, :integer- belongs_to :user, Plausible.Auth.User+ # Field used only by CRM for mapping to the ones in the owned team+ field :user_id, :integer, virtual: true+belongs_to :team, Plausible.Teams.Teamtimestamps()@@ -36,7 +34,7 @@ defmodule Plausible.Billing.EnterprisePlan dodef changeset(model, attrs \\ %{}) domodel- |> cast(attrs, @required_fields ++ @optional_fields)+ |> cast(attrs, @required_fields)|> validate_required(@required_fields)|> unique_constraint(:user_id)enddiff --git a/lib/plausible/billing/enterprise_plan_admin.ex b/lib/plausible/billing/enterprise_plan_admin.exindex 027fdbe706..5ca92b0113 100644--- a/lib/plausible/billing/enterprise_plan_admin.ex+++ b/lib/plausible/billing/enterprise_plan_admin.ex@@ -13,7 +13,7 @@ defmodule Plausible.Billing.EnterprisePlanAdmin dodef search_fields(_schema) do[:paddle_plan_id,- user: [:name, :email]+ team: [owner: [:name, :email]]]end@@ -31,7 +31,15 @@ defmodule Plausible.Billing.EnterprisePlanAdmin doenddef custom_index_query(_conn, _schema, query) do- from(r in query, preload: :user)+ from(r in query, preload: [team: :owner])+ end++ def custom_show_query(_conn, _schema, query) do+ from(ep in query,+ inner_join: t in assoc(ep, :team),+ inner_join: o in assoc(t, :owner),+ select: %{ep | user_id: o.id}+ )enddef index(_) do@@ -47,7 +55,7 @@ defmodule Plausible.Billing.EnterprisePlanAdmin do]end- defp get_user_email(plan), do: plan.user.email+ defp get_user_email(plan), do: plan.team.owner.emaildef create_changeset(schema, attrs) doattrs = sanitize_attrs(attrs)@@ -61,7 +69,7 @@ defmodule Plausible.Billing.EnterprisePlanAdmin doattrs = Map.put(attrs, "team_id", team_id)- Plausible.Billing.EnterprisePlan.changeset(schema, attrs)+ Plausible.Billing.EnterprisePlan.changeset(struct(schema, %{}), attrs)enddef update_changeset(enterprise_plan, attrs) dodiff --git a/lib/plausible/billing/site_locker.ex b/lib/plausible/billing/site_locker.exindex f3f82e5c8e..666bb0e048 100644--- a/lib/plausible/billing/site_locker.ex+++ b/lib/plausible/billing/site_locker.ex@@ -1,6 +1,8 @@defmodule Plausible.Billing.SiteLocker douse Plausible.Repo+ alias Plausible.Teams+@type update_opt() :: {:send_email?, boolean()}@type lock_reason() ::@@ -9,28 +11,23 @@ defmodule Plausible.Billing.SiteLocker do| :no_trial| :no_active_subscription- @spec update_sites_for(Plausible.Auth.User.t(), [update_opt()]) ::+ @spec update_sites_for(Teams.Team.t(), [update_opt()]) ::{:locked, lock_reason()} | :unlocked- def update_sites_for(user, opts \\ []) do+ def update_sites_for(team, opts \\ []) dosend_email? = Keyword.get(opts, :send_email?, true)- user = Plausible.Users.with_subscription(user)-- team =- case Plausible.Teams.get_by_owner(user) do- {:ok, team} -> team- _ -> nil- end+ team = Teams.with_subscription(team)case Plausible.Teams.Billing.check_needs_to_upgrade(team) do{:needs_to_upgrade, :grace_period_ended} ->- set_lock_status_for(user, true)+ set_lock_status_for(team, true)- if user.grace_period.is_over != true do- Plausible.Users.end_grace_period(user)+ if team.grace_period.is_over != true do+ Plausible.Teams.end_grace_period(team)if send_email? do- send_grace_period_end_email(user)+ team = Repo.preload(team, :owner)+ send_grace_period_end_email(team)end{:locked, :grace_period_ended_now}@@ -39,25 +36,18 @@ defmodule Plausible.Billing.SiteLocker doend{:needs_to_upgrade, reason} ->- set_lock_status_for(user, true)+ set_lock_status_for(team, true){:locked, reason}:no_upgrade_needed ->- set_lock_status_for(user, false)+ set_lock_status_for(team, false):unlockedendend- @spec set_lock_status_for(Plausible.Auth.User.t(), boolean()) :: {:ok, non_neg_integer()}- def set_lock_status_for(user, status) do- site_ids =- Repo.all(- from(s in Plausible.Site.Membership,- where: s.user_id == ^user.id,- where: s.role == :owner,- select: s.site_id- )- )+ @spec set_lock_status_for(Teams.Team.t(), boolean()) :: {:ok, non_neg_integer()}+ def set_lock_status_for(team, status) do+ site_ids = Teams.owned_sites_ids(team)site_q =from(@@ -70,18 +60,11 @@ defmodule Plausible.Billing.SiteLocker do{:ok, num_updated}end- @spec send_grace_period_end_email(Plausible.Auth.User.t()) :: Plausible.Mailer.result()- def send_grace_period_end_email(user) do- team =- case Plausible.Teams.get_by_owner(user) do- {:ok, team} -> team- _ -> nil- end-- usage = Plausible.Teams.Billing.monthly_pageview_usage(team)+ defp send_grace_period_end_email(team) do+ usage = Teams.Billing.monthly_pageview_usage(team)suggested_plan = Plausible.Billing.Plans.suggest(team, usage.last_cycle.total)- user+ team.owner|> PlausibleWeb.Email.dashboard_locked(usage, suggested_plan)|> Plausible.Mailer.send()enddiff --git a/lib/plausible/billing/subscription.ex b/lib/plausible/billing/subscription.exindex c4a645dd50..def530a09a 100644--- a/lib/plausible/billing/subscription.ex+++ b/lib/plausible/billing/subscription.ex@@ -16,11 +16,10 @@ defmodule Plausible.Billing.Subscription do:status,:next_bill_amount,:next_bill_date,- # :team_id,:currency_code]- @optional_fields [:last_bill_date, :team_id, :user_id]+ @optional_fields [:last_bill_date, :team_id]schema "subscriptions" dofield :paddle_subscription_id, :string@@ -33,7 +32,6 @@ defmodule Plausible.Billing.Subscription dofield :last_bill_date, :datefield :currency_code, :string- belongs_to :user, Plausible.Auth.Userbelongs_to :team, Plausible.Teams.Teamtimestamps()@@ -54,7 +52,7 @@ defmodule Plausible.Billing.Subscription docurrency_code: "EUR"}|> cast(attrs, @required_fields ++ @optional_fields)- |> validate_required([:user_id])+ |> validate_required([:team_id])|> unique_constraint(:paddle_subscription_id)endenddiff --git a/lib/plausible/data_migration/backfill_teams.ex b/lib/plausible/data_migration/backfill_teams.exdeleted file mode 100644index eb1aee2c69..0000000000--- a/lib/plausible/data_migration/backfill_teams.ex+++ /dev/null@@ -1,848 +0,0 @@-defmodule Plausible.DataMigration.BackfillTeams do- @moduledoc """- Backfill and sync all teams related entities.- """-- import Ecto.Query-- alias Plausible.Auth- alias Plausible.Teams-- @repo Plausible.DataMigration.PostgresRepo- @max_concurrency 12-- defmacrop is_distinct(f1, f2) do- quote do- fragment("? IS DISTINCT FROM ?", unquote(f1), unquote(f2))- end- end-- def run(opts \\ []) do- dry_run? = Keyword.get(opts, :dry_run?, true)-- # Teams backfill- db_url =- System.get_env(- "TEAMS_MIGRATION_DB_URL",- Application.get_env(:plausible, Plausible.Repo)[:url]- )-- @repo.start(db_url, pool_size: 2 * @max_concurrency)-- backfill(dry_run?)- end-- defp backfill(dry_run?) do- # Orphaned teams-- orphaned_teams =- from(- t in Plausible.Teams.Team,- left_join: tm in assoc(t, :team_memberships),- where: is_nil(tm.id),- left_join: sub in assoc(t, :subscription),- where: is_nil(sub.id),- left_join: s in assoc(t, :sites),- where: is_nil(s.id)- )- |> @repo.all(timeout: :infinity)-- log("Found #{length(orphaned_teams)} orphaned teams...")-- if not dry_run? do- delete_orphaned_teams(orphaned_teams)-- log("Deleted orphaned teams")- end-- # Sites without teams-- sites_without_teams =- from(- s in Plausible.Site,- inner_join: m in assoc(s, :memberships),- inner_join: o in assoc(m, :user),- where: m.role == :owner,- where: is_nil(s.team_id),- preload: [memberships: {m, user: o}]- )- |> @repo.all(timeout: :infinity)-- log("Found #{length(sites_without_teams)} sites without teams...")-- if not dry_run? do- teams_count = backfill_teams(sites_without_teams)-- log("Backfilled #{teams_count} teams.")- end-- owner_site_memberships_query =- from(- tm in Plausible.Site.Membership,- where: tm.user_id == parent_as(:user).id,- where: tm.role == :owner,- select: 1- )-- # Users with subscriptions without sites-- users_with_subscriptions_without_sites =- from(- s in Plausible.Billing.Subscription,- inner_join: u in assoc(s, :user),- as: :user,- where: not exists(owner_site_memberships_query),- where: is_nil(s.team_id),- select: u,- distinct: true- )- |> @repo.all(timeout: :infinity)-- log(- "Found #{length(users_with_subscriptions_without_sites)} users with subscriptions without sites..."- )-- if not dry_run? do- teams_count = backfill_teams_for_users(users_with_subscriptions_without_sites)-- log("Backfilled #{teams_count} teams from users with subscriptions without sites.")- end-- # Users on trial without team-- users_on_trial_without_team =- from(- u in Plausible.Auth.User,- as: :user,- where: not is_nil(u.trial_expiry_date),- where:- not exists(- from tm in Teams.Membership,- where: tm.role == :owner,- where: tm.user_id == parent_as(:user).id- )- )- |> @repo.all(timeout: :infinity)-- log("Found #{length(users_on_trial_without_team)} users on trial without team...")-- if not dry_run? do- Enum.each(users_on_trial_without_team, fn user ->- {:ok, _} = Teams.get_or_create(user)- end)-- log("Created teams for all users on trial without a team.")- end-- # Stale teams sync-- stale_teams =- from(- t in Teams.Team,- inner_join: tm in assoc(t, :team_memberships),- inner_join: o in assoc(tm, :user),- where: tm.role == :owner,- where:- is_distinct(o.trial_expiry_date, t.trial_expiry_date) or- is_distinct(o.accept_traffic_until, t.accept_traffic_until) or- is_distinct(o.allow_next_upgrade_override, t.allow_next_upgrade_override) or- (is_distinct(o.grace_period, t.grace_period) and- (is_distinct(o.grace_period["id"], t.grace_period["id"]) or- (is_nil(o.grace_period["is_over"]) and t.grace_period["is_over"] == true) or- (o.grace_period["is_over"] == true and t.grace_period["is_over"] == false) or- (o.grace_period["is_over"] == false and t.grace_period["is_over"] == true) or- is_distinct(o.grace_period["end_date"], t.grace_period["end_date"]) or- (is_nil(o.grace_period["manual_lock"]) and t.grace_period["manual_lock"] == true) or- (o.grace_period["manual_lock"] == true and- t.grace_period["manual_lock"] == false) or- (o.grace_period["manual_lock"] == false and- t.grace_period["manual_lock"] == true))),- preload: [team_memberships: {tm, user: o}]- )- |> @repo.all(timeout: :infinity)-- log("Found #{length(stale_teams)} teams which have fields out of sync...")-- if not dry_run? do- sync_teams(stale_teams)-- log("Brought out of sync teams up to date.")- end-- # Subsciprtions backfill-- subscriptions_without_teams =- from(- s in Plausible.Billing.Subscription,- inner_join: u in assoc(s, :user),- inner_join: tm in assoc(u, :team_memberships),- inner_join: t in assoc(tm, :team),- where: tm.role == :owner,- where: is_nil(s.team_id),- preload: [user: {u, team_memberships: {tm, team: t}}]- )- |> @repo.all(timeout: :infinity)-- log("Found #{length(subscriptions_without_teams)} subscriptions without team...")-- if not dry_run? do- backfill_subscriptions(subscriptions_without_teams)-- log("All subscriptions are linked to a team now.")- end-- # Enterprise plans backfill-- enterprise_plans_without_teams =- from(- ep in Plausible.Billing.EnterprisePlan,- inner_join: u in assoc(ep, :user),- inner_join: tm in assoc(u, :team_memberships),- inner_join: t in assoc(tm, :team),- where: tm.role == :owner,- where: is_nil(ep.team_id),- preload: [user: {u, team_memberships: {tm, team: t}}]- )- |> @repo.all(timeout: :infinity)-- log("Found #{length(enterprise_plans_without_teams)} enterprise plans without team...")-- if not dry_run? do- backfill_enterprise_plans(enterprise_plans_without_teams)-- log("All enterprise plans are linked to a team now.")- end-- # Guest memberships with mismatched team site-- mismatched_guest_memberships_to_remove =- from(- gm in Teams.GuestMembership,- inner_join: tm in assoc(gm, :team_membership),- inner_join: s in assoc(gm, :site),- where: tm.team_id != s.team_id- )- |> @repo.all()-- log(- "Found #{length(mismatched_guest_memberships_to_remove)} guest memberships with mismatched team to remove..."- )-- if not dry_run? do- team_ids_to_prune = remove_guest_memberships(mismatched_guest_memberships_to_remove)-- log("Pruning guest team memberships for #{length(team_ids_to_prune)} teams...")-- from(t in Teams.Team, where: t.id in ^team_ids_to_prune)- |> @repo.all(timeout: :infinity)- |> Enum.each(fn team ->- Plausible.Teams.Memberships.prune_guests(team)- end)-- log("Guest memberships with mismatched team cleared.")- end-- # Guest Memberships cleanup-- site_memberships_query =- from(- sm in Plausible.Site.Membership,- where: sm.site_id == parent_as(:guest_membership).site_id,- where: sm.user_id == parent_as(:team_membership).user_id,- where: sm.role != :owner,- select: 1- )-- guest_memberships_to_remove =- from(- gm in Teams.GuestMembership,- as: :guest_membership,- inner_join: tm in assoc(gm, :team_membership),- as: :team_membership,- where: not exists(site_memberships_query)- )- |> @repo.all(timeout: :infinity)-- log("Found #{length(guest_memberships_to_remove)} guest memberships to remove...")-- if not dry_run? do- team_ids_to_prune = remove_guest_memberships(guest_memberships_to_remove)-- log("Pruning guest team memberships for #{length(team_ids_to_prune)} teams...")-- from(t in Teams.Team, where: t.id in ^team_ids_to_prune)- |> @repo.all(timeout: :infinity)- |> Enum.each(fn team ->- Plausible.Teams.Memberships.prune_guests(team)- end)-- log("Guest memberships cleared.")- end-- # Guest Memberships backfill-- guest_memberships_query =- from(- gm in Teams.GuestMembership,- inner_join: tm in assoc(gm, :team_membership),- where: gm.site_id == parent_as(:site_membership).site_id,- where: tm.user_id == parent_as(:site_membership).user_id,- select: 1- )-- site_memberships_to_backfill =- from(- sm in Plausible.Site.Membership,- as: :site_membership,- inner_join: s in assoc(sm, :site),- inner_join: t in assoc(s, :team),- inner_join: u in assoc(sm, :user),- where: sm.role != :owner,- where: not exists(guest_memberships_query),- preload: [user: u, site: {s, team: t}]- )- |> @repo.all(timeout: :infinity)-- log(- "Found #{length(site_memberships_to_backfill)} site memberships without guest membership..."- )-- if not dry_run? do- backfill_guest_memberships(site_memberships_to_backfill)-- log("Backfilled missing guest memberships.")- end-- # Stale guest memberships sync-- stale_guest_memberships =- from(- sm in Plausible.Site.Membership,- inner_join: tm in Teams.Membership,- on: tm.user_id == sm.user_id,- inner_join: gm in assoc(tm, :guest_memberships),- on: gm.site_id == sm.site_id,- where: tm.role == :guest,- where:- (gm.role == :viewer and sm.role == :admin) or- (gm.role == :editor and sm.role == :viewer),- select: {gm, sm.role}- )- |> @repo.all(timeout: :infinity)-- log("Found #{length(stale_guest_memberships)} guest memberships with role out of sync...")-- if not dry_run? do- sync_guest_memberships(stale_guest_memberships)-- log("All guest memberships are up to date now.")- end-- # Guest invitations cleanup-- site_invitations_query =- from(- i in Auth.Invitation,- where: i.site_id == parent_as(:guest_invitation).site_id,- where: i.email == parent_as(:team_invitation).email,- where:- (i.role == :viewer and parent_as(:guest_invitation).role == :viewer) or- (i.role == :admin and parent_as(:guest_invitation).role == :editor)- )-- guest_invitations_to_remove =- from(- gi in Teams.GuestInvitation,- as: :guest_invitation,- inner_join: ti in assoc(gi, :team_invitation),- as: :team_invitation,- where: not exists(site_invitations_query)- )- |> @repo.all(timeout: :infinity)-- log("Found #{length(guest_invitations_to_remove)} guest invitations to remove...")-- if not dry_run? do- team_ids_to_prune = remove_guest_invitations(guest_invitations_to_remove)-- log("Pruning guest team invitations for #{length(team_ids_to_prune)} teams...")-- from(t in Teams.Team, where: t.id in ^team_ids_to_prune)- |> @repo.all(timeout: :infinity)- |> Enum.each(fn team ->- Plausible.Teams.Invitations.prune_guest_invitations(team)- end)-- log("Guest invitations cleared.")- end-- # Guest invitations backfill-- guest_invitations_query =- from(- gi in Teams.GuestInvitation,- inner_join: ti in assoc(gi, :team_invitation),- where: gi.site_id == parent_as(:site_invitation).site_id,- where: ti.email == parent_as(:site_invitation).email,- select: 1- )-- site_invitations_to_backfill =- from(- si in Auth.Invitation,- as: :site_invitation,- inner_join: s in assoc(si, :site),- inner_join: t in assoc(s, :team),- inner_join: inv in assoc(si, :inviter),- where: si.role != :owner,- where: not exists(guest_invitations_query),- preload: [site: {s, team: t}, inviter: inv]- )- |> @repo.all(timeout: :infinity)-- log(- "Found #{length(site_invitations_to_backfill)} site invitations without guest invitation..."- )-- if not dry_run? do- backfill_guest_invitations(site_invitations_to_backfill)-- log("Backfilled missing guest invitations.")- end-- # Stale guest invitations sync-- stale_guest_invitations =- from(- si in Auth.Invitation,- inner_join: ti in Teams.Invitation,- on: ti.email == si.email,- inner_join: gi in assoc(ti, :guest_invitations),- on: gi.site_id == si.site_id,- where: ti.role == :guest,- where:- (gi.role == :viewer and si.role == :admin) or- (gi.role == :editor and si.role == :viewer) or- is_distinct(gi.invitation_id, si.invitation_id),- select: {gi, si}- )- |> @repo.all(timeout: :infinity)-- log("Found #{length(stale_guest_invitations)} guest invitations with role out of sync...")-- if not dry_run? do- sync_guest_invitations(stale_guest_invitations)-- log("All guest invitations are up to date now.")- end-- # Site transfers cleanup-- site_invitations_query =- from(- i in Auth.Invitation,- where: i.site_id == parent_as(:site_transfer).site_id,- where: i.email == parent_as(:site_transfer).email,- where: i.role == :owner- )-- site_transfers_to_remove =- from(- st in Teams.SiteTransfer,- as: :site_transfer,- where: not exists(site_invitations_query)- )- |> @repo.all(timeout: :infinity)-- log("Found #{length(site_transfers_to_remove)} site transfers to remove...")-- if not dry_run? do- remove_site_transfers(site_transfers_to_remove)-- log("Site transfers cleared.")- end-- # Site transfers backfill-- site_transfers_query =- from(- st in Teams.SiteTransfer,- where: st.site_id == parent_as(:site_invitation).site_id,- where: st.email == parent_as(:site_invitation).email,- select: 1- )-- site_invitations_to_backfill =- from(- si in Auth.Invitation,- as: :site_invitation,- inner_join: s in assoc(si, :site),- inner_join: inv in assoc(si, :inviter),- where: si.role == :owner,- where: not exists(site_transfers_query),- preload: [inviter: inv, site: s]- )- |> @repo.all(timeout: :infinity)-- log(- "Found #{length(site_invitations_to_backfill)} ownership transfers without site transfer..."- )-- if not dry_run? do- backfill_site_transfers(site_invitations_to_backfill)-- log("Backfilled missing site transfers.")-- log("All data are up to date now!")- end- end-- def delete_orphaned_teams(teams) do- Enum.each(teams, &@repo.delete!(&1))- end-- defp backfill_teams(sites) do- sites- |> Enum.map(fn %{id: site_id, memberships: [%{user: owner, role: :owner}]} ->- {owner, site_id}- end)- |> Enum.group_by(&elem(&1, 0), &elem(&1, 1))- |> tap(fn- grouped when grouped != %{} ->- log("Teams about to be created: #{map_size(grouped)}")-- log(- "Max sites: #{Enum.max_by(grouped, fn {_, sites} -> length(sites) end) |> elem(1) |> length()}"- )-- _ ->- :pass- end)- |> Enum.with_index()- |> Task.async_stream(- fn {{owner, site_ids}, idx} ->- @repo.transaction(- fn ->- {:ok, team} = Teams.get_or_create(owner)-- team =- team- |> Ecto.Changeset.change()- |> Ecto.Changeset.put_change(:trial_expiry_date, owner.trial_expiry_date)- |> Ecto.Changeset.put_change(:accept_traffic_until, owner.accept_traffic_until)- |> Ecto.Changeset.put_change(- :allow_next_upgrade_override,- owner.allow_next_upgrade_override- )- |> Ecto.Changeset.put_embed(:grace_period, owner.grace_period)- |> Ecto.Changeset.force_change(:updated_at, owner.updated_at)- |> @repo.update!()-- @repo.update_all(from(s in Plausible.Site, where: s.id in ^site_ids),- set: [team_id: team.id]- )- end,- timeout: :infinity,- max_concurrency: @max_concurrency- )-- if rem(idx, 10) == 0 do- IO.write(".")- end- end,- timeout: :infinity- )- |> Enum.to_list()- |> length()- end-- defp backfill_teams_for_users(users) do- users- |> Enum.with_index()- |> Task.async_stream(- fn {owner, idx} ->- @repo.transaction(- fn ->- {:ok, team} = Teams.get_or_create(owner)-- team- |> Ecto.Changeset.change()- |> Ecto.Changeset.put_change(:trial_expiry_date, owner.trial_expiry_date)- |> Ecto.Changeset.put_change(:accept_traffic_until, owner.accept_traffic_until)- |> Ecto.Changeset.put_change(- :allow_next_upgrade_override,- owner.allow_next_upgrade_override- )- |> Ecto.Changeset.put_embed(:grace_period, owner.grace_period)- |> Ecto.Changeset.force_change(:updated_at, owner.updated_at)- |> @repo.update!()- end,- timeout: :infinity,- max_concurrency: @max_concurrency- )-- if rem(idx, 10) == 0 do- IO.write(".")- end- end,- timeout: :infinity- )- |> Enum.to_list()- |> length()- end-- defp sync_teams(stale_teams) do- Enum.each(stale_teams, fn team ->- [%{user: owner}] = team.team_memberships-- team- |> Ecto.Changeset.change()- |> Ecto.Changeset.put_change(:trial_expiry_date, owner.trial_expiry_date)- |> Ecto.Changeset.put_change(:accept_traffic_until, owner.accept_traffic_until)- |> Ecto.Changeset.put_change(- :allow_next_upgrade_override,- owner.allow_next_upgrade_override- )- |> Ecto.Changeset.put_embed(:grace_period, embed_params(owner.grace_period))- |> @repo.update!()- end)- end-- defp embed_params(nil), do: nil-- defp embed_params(grace_period) do- Map.from_struct(grace_period)- end-- defp backfill_subscriptions(subscriptions) do- subscriptions- |> Enum.with_index()- |> Task.async_stream(- fn {subscription, idx} ->- [%{team: team, role: :owner}] = subscription.user.team_memberships-- subscription- |> Ecto.Changeset.change(team_id: team.id)- |> Ecto.Changeset.put_change(:updated_at, subscription.updated_at)- |> @repo.update!()-- if rem(idx, 1000) == 0 do- IO.write(".")- end- end,- timeout: :infinity,- max_concurrency: @max_concurrency- )- |> Stream.run()- end-- defp backfill_enterprise_plans(enterprise_plans) do- enterprise_plans- |> Enum.with_index()- |> Task.async_stream(- fn {enterprise_plan, idx} ->- [%{team: team, role: :owner}] = enterprise_plan.user.team_memberships-- enterprise_plan- |> Ecto.Changeset.change(team_id: team.id)- |> Ecto.Changeset.put_change(:updated_at, enterprise_plan.updated_at)- |> @repo.update!()-- if rem(idx, 1000) == 0 do- IO.write(".")- end- end,- timeout: :infinity,- max_concurrency: @max_concurrency- )- |> Stream.run()- end-- defp remove_guest_memberships(guest_memberships) do- ids = Enum.map(guest_memberships, & &1.id)-- {_, team_ids} =- @repo.delete_all(- from(- gm in Teams.GuestMembership,- inner_join: tm in assoc(gm, :team_membership),- where: gm.id in ^ids,- select: tm.team_id- )- )-- Enum.uniq(team_ids)- end-- defp backfill_guest_memberships(site_memberships) do- site_memberships- |> Enum.group_by(&{&1.site.team, &1.user}, & &1)- |> tap(fn- grouped when grouped != %{} ->- log("Team memberships to be created: #{map_size(grouped)}")-- log(- "Max guest memberships: #{Enum.max_by(grouped, fn {_, gms} -> length(gms) end) |> elem(1) |> length()}"- )-- _ ->- :pass- end)- |> Enum.with_index()- |> Task.async_stream(- fn {{{team, user}, site_memberships}, idx} ->- first_site_membership =- Enum.min_by(site_memberships, & &1.inserted_at)-- team_membership =- team- |> Teams.Membership.changeset(user, :guest)- |> Ecto.Changeset.put_change(:inserted_at, first_site_membership.inserted_at)- |> Ecto.Changeset.put_change(:updated_at, first_site_membership.updated_at)- |> @repo.insert!(- on_conflict: [set: [updated_at: first_site_membership.updated_at]],- conflict_target: [:team_id, :user_id]- )-- Enum.each(site_memberships, fn site_membership ->- team_membership- |> Teams.GuestMembership.changeset(- site_membership.site,- translate_role(site_membership.role)- )- |> Ecto.Changeset.put_change(:inserted_at, site_membership.inserted_at)- |> Ecto.Changeset.put_change(:updated_at, site_membership.updated_at)- |> @repo.insert!()- end)-- if rem(idx, 1000) == 0 do- IO.write(".")- end- end,- timeout: :infinity,- max_concurrency: @max_concurrency- )- |> Stream.run()- end-- defp sync_guest_memberships(guest_memberships_and_roles) do- guest_memberships_and_roles- |> Enum.with_index()- |> Enum.each(fn {{guest_membership, role}, idx} ->- guest_membership- |> Ecto.Changeset.change(role: translate_role(role))- |> Ecto.Changeset.put_change(:updated_at, guest_membership.updated_at)- |> @repo.update!()-- if rem(idx, 1000) == 0 do- IO.write(".")- end- end)- end-- defp remove_guest_invitations(guest_invitations) do- ids = Enum.map(guest_invitations, & &1.id)-- {_, team_ids} =- @repo.delete_all(- from(- gi in Teams.GuestInvitation,- inner_join: ti in assoc(gi, :team_invitation),- where: gi.id in ^ids,- select: ti.team_id- )- )-- Enum.uniq(team_ids)- end-- defp backfill_guest_invitations(site_invitations) do- site_invitations- |> Enum.group_by(&{&1.site.team, &1.email}, & &1)- |> Enum.with_index()- |> Enum.each(fn {{{team, email}, site_invitations}, idx} ->- first_site_invitation = List.first(site_invitations)-- team_invitation =- team- # NOTE: we put first inviter and invitation ID matching team/email combination- |> Teams.Invitation.changeset(- email: email,- role: :guest,- inviter: first_site_invitation.inviter- )- |> Ecto.Changeset.put_change(:inserted_at, first_site_invitation.inserted_at)- |> Ecto.Changeset.put_change(:updated_at, first_site_invitation.updated_at)- |> @repo.insert!(- on_conflict: [set: [updated_at: first_site_invitation.updated_at]],- conflict_target: [:team_id, :email]- )-- Enum.each(site_invitations, fn site_invitation ->- team_invitation- |> Teams.GuestInvitation.changeset(- site_invitation.site,- translate_role(site_invitation.role)- )- |> Ecto.Changeset.put_change(:invitation_id, site_invitation.invitation_id)- |> Ecto.Changeset.put_change(:inserted_at, site_invitation.inserted_at)- |> Ecto.Changeset.put_change(:updated_at, site_invitation.updated_at)- |> @repo.insert!()- end)-- if rem(idx, 1000) == 0 do- IO.write(".")- end- end)- end-- defp sync_guest_invitations(guest_and_site_invitations) do- guest_and_site_invitations- |> Enum.with_index()- |> Enum.each(fn {{guest_invitation, site_invitation}, idx} ->- guest_invitation- |> Ecto.Changeset.change()- |> Ecto.Changeset.put_change(:role, translate_role(site_invitation.role))- |> Ecto.Changeset.put_change(:invitation_id, site_invitation.invitation_id)- |> Ecto.Changeset.put_change(:updated_at, guest_invitation.updated_at)- |> @repo.update!()-- if rem(idx, 1000) == 0 do- IO.write(".")- end- end)- end-- defp remove_site_transfers(site_transfers) do- ids = Enum.map(site_transfers, & &1.id)-- @repo.delete_all(from(st in Teams.SiteTransfer, where: st.id in ^ids))- end-- defp backfill_site_transfers(site_invitations) do- site_invitations- |> Enum.with_index()- |> Enum.each(fn {site_invitation, idx} ->- site_invitation.site- |> Teams.SiteTransfer.changeset(- initiator: site_invitation.inviter,- email: site_invitation.email- )- |> Ecto.Changeset.put_change(:transfer_id, site_invitation.invitation_id)- |> Ecto.Changeset.put_change(:inserted_at, site_invitation.inserted_at)- |> Ecto.Changeset.put_change(:updated_at, site_invitation.updated_at)- |> @repo.insert!()-- if rem(idx, 1000) == 0 do- IO.write(".")- end- end)- end-- defp translate_role(:admin), do: :editor- defp translate_role(:viewer), do: :viewer-- defp log(msg) do- IO.puts("[#{NaiveDateTime.utc_now(:second)}] #{msg}")- end-enddiff --git a/lib/plausible/data_migration/teams_consistency_check.ex b/lib/plausible/data_migration/teams_consistency_check.exdeleted file mode 100644index e192b04057..0000000000--- a/lib/plausible/data_migration/teams_consistency_check.ex+++ /dev/null@@ -1,335 +0,0 @@-defmodule Plausible.DataMigration.TeamsConsitencyCheck do- @moduledoc """- Verify consistency of teams.- """-- import Ecto.Query-- alias Plausible.Teams-- @repo Plausible.DataMigration.PostgresRepo-- defmacrop is_distinct(f1, f2) do- quote do- fragment("? IS DISTINCT FROM ?", unquote(f1), unquote(f2))- end- end-- def run() do- # Teams consistency check- db_url =- System.get_env(- "TEAMS_MIGRATION_DB_URL",- Application.get_env(:plausible, Plausible.Repo)[:url]- )-- @repo.start(db_url, pool_size: 1)-- check()- end-- defp check() do- # Sites without teams-- sites_without_teams_count =- from(- s in Plausible.Site,- where: is_nil(s.team_id)- )- |> @repo.aggregate(:count, timeout: :infinity)-- log("#{sites_without_teams_count} sites without teams")-- # Teams without owner-- owner_membership_query =- from(- tm in Teams.Membership,- where: tm.team_id == parent_as(:team).id,- where: tm.role == :owner,- select: 1- )-- teams_without_owner_count =- from(- t in Plausible.Teams.Team,- as: :team,- where: not exists(owner_membership_query)- )- |> @repo.aggregate(:count, timeout: :infinity)-- log("#{teams_without_owner_count} teams without owner")-- # Subscriptions without teams-- subscriptions_without_teams_count =- from(- s in Plausible.Billing.Subscription,- where: is_nil(s.team_id)- )- |> @repo.aggregate(:count, timeout: :infinity)-- log("#{subscriptions_without_teams_count} subscriptions without teams")-- # Subscriptions out of sync-- subscriptions_out_of_sync_count =- from(- s in Plausible.Billing.Subscription,- inner_join: u in assoc(s, :user),- left_join: tm in assoc(u, :team_memberships),- on: tm.role == :owner,- where: s.team_id != tm.team_id- )- |> @repo.aggregate(:count, timeout: :infinity)-- log("#{subscriptions_out_of_sync_count} subscriptions out of sync")-- # Enterprise plans without teams-- enterprise_plans_without_teams_count =- from(- ep in Plausible.Billing.EnterprisePlan,- where: is_nil(ep.team_id)- )- |> @repo.aggregate(:count, timeout: :infinity)-- log("#{enterprise_plans_without_teams_count} enterprise_plans without teams")-- # Enterprise plans out of sync-- enterprise_plans_out_of_sync_count =- from(- ep in Plausible.Billing.EnterprisePlan,- inner_join: u in assoc(ep, :user),- left_join: tm in assoc(u, :team_memberships),- on: tm.role == :owner,- where: ep.team_id != tm.team_id- )- |> @repo.aggregate(:count, timeout: :infinity)-- log("#{enterprise_plans_out_of_sync_count} enterprise_plans out of sync")-- # Teams out of sync-- teams_out_of_sync_count =- from(- t in Teams.Team,- inner_join: tm in assoc(t, :team_memberships),- inner_join: o in assoc(tm, :user),- where: tm.role == :owner,- where:- is_distinct(o.trial_expiry_date, t.trial_expiry_date) or- is_distinct(o.accept_traffic_until, t.accept_traffic_until) or- is_distinct(o.allow_next_upgrade_override, t.allow_next_upgrade_override) or- (is_distinct(o.grace_period, t.grace_period) and- (is_distinct(o.grace_period["id"], t.grace_period["id"]) or- (is_nil(o.grace_period["is_over"]) and t.grace_period["is_over"] == true) or- (o.grace_period["is_over"] == true and t.grace_period["is_over"] == false) or- (o.grace_period["is_over"] == false and t.grace_period["is_over"] == true) or- is_distinct(o.grace_period["end_date"], t.grace_period["end_date"]) or- (is_nil(o.grace_period["manual_lock"]) and t.grace_period["manual_lock"] == true) or- (o.grace_period["manual_lock"] == true and- t.grace_period["manual_lock"] == false) or- (o.grace_period["manual_lock"] == false and- t.grace_period["manual_lock"] == true))),- preload: [team_memberships: {tm, user: o}]- )- |> @repo.aggregate(:count, timeout: :infinity)-- log("#{teams_out_of_sync_count} teams out of sync")-- # Non-owner site memberships out of sync-- respective_guest_memberships_query =- from(- tm in Teams.Membership,- inner_join: gm in assoc(tm, :guest_memberships),- on:- gm.site_id == parent_as(:site_membership).site_id and- ((gm.role == :viewer and parent_as(:site_membership).role == :viewer) or- (gm.role == :editor and parent_as(:site_membership).role == :admin)),- where: tm.user_id == parent_as(:site_membership).user_id,- select: 1- )-- out_of_sync_nonowner_memberships_count =- from(- m in Plausible.Site.Membership,- as: :site_membership,- where: m.role != :owner,- where: not exists(respective_guest_memberships_query)- )- |> @repo.aggregate(:count, timeout: :infinity)-- log("#{out_of_sync_nonowner_memberships_count} out of sync non-owner site memberships")-- # Owner site memberships out of sync-- respective_owner_memberships_query =- from(- tm in Teams.Membership,- where: tm.team_id == parent_as(:site).team_id and tm.role == :owner,- select: 1- )-- out_of_sync_owner_memberships_count =- from(- m in Plausible.Site.Membership,- as: :site_membership,- inner_join: s in assoc(m, :site),- as: :site,- where: m.role == :owner,- where: not exists(respective_owner_memberships_query)- )- |> @repo.aggregate(:count, timeout: :infinity)-- log("#{out_of_sync_owner_memberships_count} out of sync owner site memberships")-- # Site invitations out of sync-- respective_guest_invitations_query =- from(- gi in Teams.GuestInvitation,- inner_join: ti in assoc(gi, :team_invitation),- on: ti.email == parent_as(:site_invitation).email,- where: gi.site_id == parent_as(:site_invitation).site_id,- select: 1- )-- out_of_sync_site_invitations_count =- from(- i in Plausible.Auth.Invitation,- as: :site_invitation,- where: i.role != :owner,- where: not exists(respective_guest_invitations_query)- )- |> @repo.aggregate(:count, timeout: :infinity)-- log("#{out_of_sync_site_invitations_count} out of sync site invitations")-- # Site invitations out of sync-- respective_site_transfers_query =- from(- st in Teams.SiteTransfer,- where: st.email == parent_as(:site_invitation).email,- where: st.site_id == parent_as(:site_invitation).site_id,- select: 1- )-- out_of_sync_site_transfers_count =- from(- i in Plausible.Auth.Invitation,- as: :site_invitation,- where: i.role == :owner,- where: not exists(respective_site_transfers_query)- )- |> @repo.aggregate(:count, timeout: :infinity)-- log("#{out_of_sync_site_transfers_count} out of sync site transfers")-- # Guest memberships out of sync-- respective_site_memberships_query =- from(- sm in Plausible.Site.Membership,- where: sm.site_id == parent_as(:guest_membership).site_id,- where: sm.user_id == parent_as(:team_membership).user_id,- where:- (sm.role == :viewer and parent_as(:guest_membership).role == :viewer) or- (sm.role == :admin and parent_as(:guest_membership).role == :editor),- select: 1- )-- out_of_sync_guest_memberships_count =- from(- gm in Plausible.Teams.GuestMembership,- as: :guest_membership,- inner_join: tm in assoc(gm, :team_membership),- as: :team_membership,- where: tm.role != :owner,- where: not exists(respective_site_memberships_query)- )- |> @repo.aggregate(:count, timeout: :infinity)-- log("#{out_of_sync_guest_memberships_count} out of sync guest memberships")-- # Owner memberships out of sync-- respective_site_memberships_query =- from(- sm in Plausible.Site.Membership,- where: sm.site_id == parent_as(:site).id,- where: sm.user_id == parent_as(:team_membership).user_id,- where: sm.role == :owner,- select: 1- )-- out_of_sync_owner_memberships_count =- from(- tm in Plausible.Teams.Membership,- as: :team_membership,- inner_join: t in assoc(tm, :team),- inner_join: s in assoc(t, :sites),- as: :site,- where: tm.role == :owner,- where: not exists(respective_site_memberships_query)- )- |> @repo.aggregate(:count, timeout: :infinity)-- log("#{out_of_sync_owner_memberships_count} out of sync owner team memberships")-- # Guest invitations out of sync-- respective_site_invitations_query =- from(- i in Plausible.Auth.Invitation,- where: i.site_id == parent_as(:guest_invitation).site_id,- where: i.email == parent_as(:team_invitation).email,- where:- (i.role == :viewer and parent_as(:guest_invitation).role == :viewer) or- (i.role == :admin and parent_as(:guest_invitation).role == :editor),- where: i.invitation_id == parent_as(:guest_invitation).invitation_id,- select: 1- )-- out_of_sync_guest_invitations_count =- from(- gi in Plausible.Teams.GuestInvitation,- as: :guest_invitation,- inner_join: ti in assoc(gi, :team_invitation),- as: :team_invitation,- where: ti.role != :owner,- where: not exists(respective_site_invitations_query)- )- |> @repo.aggregate(:count, timeout: :infinity)-- log("#{out_of_sync_guest_invitations_count} out of sync guest invitations")-- # Team site transfers out of sync-- respective_site_transfers_query =- from(- i in Plausible.Auth.Invitation,- where: i.site_id == parent_as(:site_transfer).site_id,- where: i.email == parent_as(:site_transfer).email,- where: i.role == :owner,- select: 1- )-- out_of_sync_site_transfers_count =- from(- st in Plausible.Teams.SiteTransfer,- as: :site_transfer,- where: not exists(respective_site_transfers_query)- )- |> @repo.aggregate(:count, timeout: :infinity)-- log("#{out_of_sync_site_transfers_count} out of sync team site transfers")- end-- defp log(msg) do- IO.puts("[#{NaiveDateTime.utc_now(:second)}] #{msg}")- end-enddiff --git a/lib/plausible/goals/goals.ex b/lib/plausible/goals/goals.exindex e9a6083771..af17a254f4 100644--- a/lib/plausible/goals/goals.ex+++ b/lib/plausible/goals/goals.ex@@ -319,8 +319,8 @@ defmodule Plausible.Goals dodefp maybe_check_feature_access(site, changeset) doif Ecto.Changeset.get_field(changeset, :currency) do- site = Plausible.Repo.preload(site, :owner)- Plausible.Billing.Feature.RevenueGoals.check_availability(site.owner)+ site = Plausible.Repo.preload(site, :team)+ Plausible.Billing.Feature.RevenueGoals.check_availability(site.team)else:okenddiff --git a/lib/plausible/ingestion/counters/buffer.ex b/lib/plausible/ingestion/counters/buffer.exindex 40b3b1b671..2519149a06 100644--- a/lib/plausible/ingestion/counters/buffer.ex+++ b/lib/plausible/ingestion/counters/buffer.ex@@ -52,7 +52,8 @@ defmodule Plausible.Ingestion.Counters.Buffer dodomain,timestamp) do- bucket = bucket_fn.(timestamp)+ bucket =+ bucket_fn.(timestamp):ets.update_counter(buffer_name,diff --git a/lib/plausible/ingestion/event.ex b/lib/plausible/ingestion/event.exindex ad04a639ad..c235e567e5 100644--- a/lib/plausible/ingestion/event.ex+++ b/lib/plausible/ingestion/event.ex@@ -100,11 +100,15 @@ defmodule Plausible.Ingestion.Event do@spec emit_telemetry_dropped(t(), drop_reason()) :: :okdef emit_telemetry_dropped(event, reason) do- :telemetry.execute(telemetry_event_dropped(), %{}, %{- domain: event.domain,- reason: reason,- request_timestamp: event.request.timestamp- })+ :telemetry.execute(+ telemetry_event_dropped(),+ %{},+ %{+ domain: event.domain,+ reason: reason,+ request_timestamp: event.request.timestamp+ }+ )enddefp pipeline() dodiff --git a/lib/plausible/props.ex b/lib/plausible/props.exindex 25c9ca46b8..da1d9054b5 100644--- a/lib/plausible/props.ex+++ b/lib/plausible/props.ex@@ -57,9 +57,9 @@ defmodule Plausible.Props do"""@spec allowed_for(Plausible.Site.t()) :: [prop()] | :alldef allowed_for(site, opts \\ []) do- site = Plausible.Repo.preload(site, :owner)+ site = Plausible.Repo.preload(site, :team)internal_keys = Plausible.Props.internal_keys()- props_enabled? = Plausible.Billing.Feature.Props.check_availability(site.owner) == :ok+ props_enabled? = Plausible.Billing.Feature.Props.check_availability(site.team) == :okbypass_setup? = Keyword.get(opts, :bypass_setup?)cond do@@ -78,8 +78,8 @@ defmodule Plausible.Props dodata to be dropped or lost."""def allow(site, prop_or_props) do- with site <- Plausible.Repo.preload(site, :owner),- :ok <- Plausible.Billing.Feature.Props.check_availability(site.owner) do+ with site <- Plausible.Repo.preload(site, :team),+ :ok <- Plausible.Billing.Feature.Props.check_availability(site.team) dosite|> allow_changeset(prop_or_props)|> Plausible.Repo.update()@@ -139,11 +139,11 @@ defmodule Plausible.Props doallow(site, props_to_allow)end- def ensure_prop_key_accessible(prop_key, user) do+ def ensure_prop_key_accessible(prop_key, team) doif prop_key in @internal_keys do:okelse- Plausible.Billing.Feature.Props.check_availability(user)+ Plausible.Billing.Feature.Props.check_availability(team)endenddiff --git a/lib/plausible/site.ex b/lib/plausible/site.exindex b0ffe7aa1f..5ea17a189f 100644--- a/lib/plausible/site.ex+++ b/lib/plausible/site.ex@@ -5,7 +5,6 @@ defmodule Plausible.Site douse Ecto.Schemause Plausibleimport Ecto.Changeset- alias Plausible.Auth.Useralias Plausible.Site.GoogleAuth@type t() :: %__MODULE__{}@@ -42,16 +41,12 @@ defmodule Plausible.Site doon_replace: :update,defaults_to_struct: true- many_to_many :members, User, join_through: Plausible.Site.Membership- has_many :memberships, Plausible.Site.Membership- has_many :invitations, Plausible.Auth.Invitationhas_many :goals, Plausible.Goal, preload_order: [desc: :id]has_many :revenue_goals, Plausible.Goal, where: [currency: {:not, nil}]has_one :google_auth, GoogleAuthhas_one :weekly_report, Plausible.Site.WeeklyReporthas_one :monthly_report, Plausible.Site.MonthlyReport- has_one :ownership, Plausible.Site.Membership, where: [role: :owner]- has_one :legacy_owner, through: [:ownership, :user]+ has_one :ownership, through: [:team, :ownership]has_one :owner, through: [:team, :owner]# If `from_cache?` is set, the struct might be incomplete - see `Plausible.Site.Cache`.@@ -63,6 +58,8 @@ defmodule Plausible.Site do# user's membership state. Currently it can be either "invitation",# "pinned_site" or "site", where invitations are first.field :entry_type, :string, virtual: true+ field :memberships, {:array, :map}, virtual: true+ field :invitations, {:array, :map}, virtual: truefield :pinned_at, :naive_datetime, virtual: true# Used for caching imports data for the duration of the whole requestdiff --git a/lib/plausible/site/admin.ex b/lib/plausible/site/admin.exindex 1422a62e7f..2607778a31 100644--- a/lib/plausible/site/admin.ex+++ b/lib/plausible/site/admin.ex@@ -18,7 +18,7 @@ defmodule Plausible.SiteAdmin dofrom(r in query,inner_join: o in assoc(r, :owner),as: :owner,- preload: [owner: o, memberships: :user]+ preload: [owner: o, team: [team_memberships: :user]])end@@ -68,15 +68,13 @@ defmodule Plausible.SiteAdmin don -> "⏱ #{n}/#{site.ingest_rate_limit_scale_seconds}s (per server)"end- owner = site.owner-- owner_limits =- if owner.accept_traffic_until &&- Date.after?(Date.utc_today(), owner.accept_traffic_until) do+ team_limits =+ if site.team.accept_traffic_until &&+ Date.after?(Date.utc_today(), site.team.accept_traffic_until) do"💸 Rejecting traffic"end- {:safe, Enum.join([rate_limiting_status, owner_limits], "<br/><br/>")}+ {:safe, Enum.join([rate_limiting_status, team_limits], "<br/><br/>")}end}]@@ -175,7 +173,7 @@ defmodule Plausible.SiteAdmin doenddefp get_other_members(site) do- Enum.filter(site.memberships, &(&1.role != :owner))+ site.team.team_memberships|> Enum.map(fn m -> m.user.email <> "(#{to_string(m.role)})" end)|> Enum.join(", ")enddiff --git a/lib/plausible/site/membership.ex b/lib/plausible/site/membership.exdeleted file mode 100644index 26e791fdb2..0000000000--- a/lib/plausible/site/membership.ex+++ /dev/null@@ -1,31 +0,0 @@-defmodule Plausible.Site.Membership do- use Ecto.Schema- import Ecto.Changeset-- @roles [:owner, :admin, :editor, :viewer]-- @type t() :: %__MODULE__{}-- # Generate a union type for roles- @type role() :: unquote(Enum.reduce(@roles, &{:|, [], [&1, &2]}))-- schema "site_memberships" do- field :role, Ecto.Enum, values: @roles- belongs_to :site, Plausible.Site- belongs_to :user, Plausible.Auth.User-- timestamps()- end-- def new(site, user) do- %__MODULE__{}- |> change()- |> put_assoc(:site, site)- |> put_assoc(:user, user)- end-- def set_role(changeset, role) do- changeset- |> cast(%{role: role}, [:role])- end-enddiff --git a/lib/plausible/site/memberships.ex b/lib/plausible/site/memberships.exindex 9f381ed6ef..ea9797ee7f 100644--- a/lib/plausible/site/memberships.ex+++ b/lib/plausible/site/memberships.ex@@ -3,10 +3,6 @@ defmodule Plausible.Site.Memberships doAPI for site memberships and invitations"""- import Ecto.Query, only: [from: 2]-- alias Plausible.Auth- alias Plausible.Repoalias Plausible.Site.Membershipsdefdelegate accept_invitation(invitation_id, user), to: Memberships.AcceptInvitation@@ -21,20 +17,4 @@ defmodule Plausible.Site.Memberships dodefdelegate bulk_transfer_ownership_direct(sites, new_owner),to: Memberships.AcceptInvitation-- @spec any?(Auth.User.t()) :: boolean()- def any?(user) do- user- |> Ecto.assoc(:site_memberships)- |> Repo.exists?()- end-- @spec pending?(String.t()) :: boolean()- def pending?(email) do- Repo.exists?(- from(i in Plausible.Auth.Invitation,- where: i.email == ^email- )- )- endenddiff --git a/lib/plausible/site/memberships/accept_invitation.ex b/lib/plausible/site/memberships/accept_invitation.exindex 4677cbb374..b7839939bf 100644--- a/lib/plausible/site/memberships/accept_invitation.ex+++ b/lib/plausible/site/memberships/accept_invitation.ex@@ -12,14 +12,11 @@ defmodule Plausible.Site.Memberships.AcceptInvitation dothe invitation and accepting it."""- import Ecto.Query, only: [from: 2]-- alias Ecto.Multialias Plausible.Authalias Plausible.Billingalias Plausible.Repoalias Plausible.Site- alias Plausible.Site.Memberships.Invitations+ alias Plausible.Teamsrequire Logger@@ -52,13 +49,16 @@ defmodule Plausible.Site.Memberships.AcceptInvitation doend@spec accept_invitation(String.t(), Auth.User.t()) ::- {:ok, Site.Membership.t()} | {:error, accept_error()}- def accept_invitation(invitation_id, user) do- with {:ok, invitation} <- Invitations.find_for_user(invitation_id, user) do- if invitation.role == :owner do- do_accept_ownership_transfer(invitation, user)- else- do_accept_invitation(invitation, user)+ {:ok, map()} | {:error, accept_error()}+ def accept_invitation(invitation_or_transfer_id, user) do+ with {:ok, invitation_or_transfer} <-+ Teams.Invitations.find_for_user(invitation_or_transfer_id, user) do+ case invitation_or_transfer do+ %Teams.SiteTransfer{} = site_transfer ->+ do_accept_ownership_transfer(site_transfer, user)++ %Teams.GuestInvitation{} = guest_invitation ->+ do_accept_invitation(guest_invitation, user)endendend@@ -73,28 +73,16 @@ defmodule Plausible.Site.Memberships.AcceptInvitation do:owner),{:ok, new_team} = Plausible.Teams.get_or_create(new_owner),- :ok <- Plausible.Teams.Invitations.ensure_can_take_ownership(site, new_team) do- membership = get_or_create_owner_membership(site, new_owner)-- multi = add_and_transfer_ownership(site, membership, new_owner)-- case Repo.transaction(multi) do- {:ok, changes} ->- Plausible.Teams.Invitations.transfer_site_sync(site, new_owner)-- membership = Repo.preload(changes.membership, [:site, :user])-- {:ok, membership}+ :ok <- Plausible.Teams.Invitations.ensure_can_take_ownership(site, new_team),+ :ok <- Plausible.Teams.Invitations.transfer_site(site, new_owner) do+ site = site |> Repo.reload!() |> Repo.preload(ownership: :user)- {:error, _operation, error, _changes} ->- {:error, error}- end+ {:ok, site.ownership}endend- defp do_accept_ownership_transfer(invitation, user) do- membership = get_or_create_membership(invitation, user)- site = Repo.preload(invitation.site, :team)+ defp do_accept_ownership_transfer(site_transfer, user) do+ site = Repo.preload(site_transfer.site, :team)with :ok <-Plausible.Teams.Invitations.ensure_transfer_valid(@@ -103,136 +91,17 @@ defmodule Plausible.Site.Memberships.AcceptInvitation do:owner),{:ok, team} = Plausible.Teams.get_or_create(user),- :ok <- Plausible.Teams.Invitations.ensure_can_take_ownership(site, team) do- site- |> add_and_transfer_ownership(membership, user)- |> Multi.delete(:invitation, invitation)- |> Multi.run(:sync_transfer, fn _repo, _context ->- Plausible.Teams.Invitations.accept_transfer_sync(invitation, user)- {:ok, nil}- end)- |> finalize_invitation(invitation)- end- end+ :ok <- Plausible.Teams.Invitations.ensure_can_take_ownership(site, team),+ :ok <- Teams.Invitations.accept_site_transfer(site_transfer, user) do+ Teams.Invitations.send_transfer_accepted_email(site_transfer)- defp do_accept_invitation(invitation, user) do- membership = get_or_create_membership(invitation, user)+ site = site |> Repo.reload!() |> Repo.preload(ownership: :user)- invitation- |> add(membership, user)- |> Multi.run(:sync_invitation, fn _repo, _context ->- Plausible.Teams.Invitations.accept_invitation_sync(invitation, user)- {:ok, nil}- end)- |> finalize_invitation(invitation)- end-- defp finalize_invitation(multi, invitation) do- case Repo.transaction(multi) do- {:ok, changes} ->- notify_invitation_accepted(invitation)-- membership = Repo.preload(changes.membership, [:site, :user])-- {:ok, membership}-- {:error, _operation, error, _changes} ->- {:error, error}+ {:ok, %{team_membership: site.ownership, site: site}}endend- defp add_and_transfer_ownership(site, membership, user) do- Multi.new()- |> downgrade_previous_owner(site, user)- |> Multi.insert_or_update(:membership, membership)- |> Multi.run(:update_locked_sites, fn _, _ ->- on_ee do- # At this point this function should be guaranteed to unlock- # the site, via `Invitations.ensure_can_take_ownership/2`.- :unlocked = Billing.SiteLocker.update_sites_for(user, send_email?: false)- end-- {:ok, :unlocked}- end)- end-- # If there's an existing membership, we DO NOT change the role- # to avoid accidental role downgrade.- defp add(invitation, membership, _user) do- if membership.data.id do- Multi.new()- |> Multi.put(:membership, membership.data)- |> Multi.delete(:invitation, invitation)- else- Multi.new()- |> Multi.insert(:membership, membership)- |> Multi.delete(:invitation, invitation)- end- end-- defp get_or_create_membership(invitation, user) do- case Repo.get_by(Site.Membership, user_id: user.id, site_id: invitation.site.id) do- nil -> Site.Membership.new(invitation.site, user)- membership -> membership- end- |> Site.Membership.set_role(invitation.role)- end-- defp get_or_create_owner_membership(site, user) do- case Repo.get_by(Site.Membership, user_id: user.id, site_id: site.id) do- nil -> Site.Membership.new(site, user)- membership -> membership- end- |> Site.Membership.set_role(:owner)- end-- # If the new owner is the same as old owner, we do not downgrade them- # to avoid leaving site without an owner!- defp downgrade_previous_owner(multi, site, new_owner) do- new_owner_id = new_owner.id-- previous_owner =- Repo.one(- from(- sm in Site.Membership,- where: sm.site_id == ^site.id,- where: sm.role == :owner- )- )-- case previous_owner do- %{user_id: ^new_owner_id} ->- Multi.put(multi, :previous_owner_membership, previous_owner)-- nil ->- Logger.warning(- "Transferring ownership from a site with no owner: #{site.domain} " <>- ", new owner ID: #{new_owner_id}"- )-- Multi.put(multi, :previous_owner_membership, nil)-- previous_owner ->- Multi.update(- multi,- :previous_owner_membership,- Site.Membership.set_role(previous_owner, :admin)- )- end- end-- defp notify_invitation_accepted(%Auth.Invitation{role: :owner} = invitation) do- PlausibleWeb.Email.ownership_transfer_accepted(- invitation.email,- invitation.inviter.email,- invitation.site- )- |> Plausible.Mailer.send()- end-- defp notify_invitation_accepted(invitation) do- invitation.inviter.email- |> PlausibleWeb.Email.invitation_accepted(invitation.email, invitation.site)- |> Plausible.Mailer.send()+ defp do_accept_invitation(guest_invitation, user) do+ Teams.Invitations.accept_guest_invitation(guest_invitation, user)endenddiff --git a/lib/plausible/site/memberships/create_invitation.ex b/lib/plausible/site/memberships/create_invitation.exindex 45e903e01a..cb405624c6 100644--- a/lib/plausible/site/memberships/create_invitation.ex+++ b/lib/plausible/site/memberships/create_invitation.ex@@ -48,8 +48,6 @@ defmodule Plausible.Site.Memberships.CreateInvitation doenddefp do_invite(site, inviter, invitee_email, role, opts \\ []) do- attrs = %{email: invitee_email, role: role, site_id: site.id, inviter_id: inviter.id}-with site <- Repo.preload(site, [:owner, :team]),:ok <-Teams.Invitations.check_invitation_permissions(@@ -77,29 +75,25 @@ defmodule Plausible.Site.Memberships.CreateInvitation doinvitee,role),- %Ecto.Changeset{} = changeset <- Invitation.new(attrs),- {:ok, invitation} <- Repo.insert(changeset) do- Teams.Invitations.invite_sync(site, invitation)-- send_invitation_email(inviter, invitation, invitee)+ {:ok, invitation_or_transfer} <-+ Teams.Invitations.invite(site, invitee_email, role, inviter) do+ send_invitation_email(invitation_or_transfer, invitee)- invitation+ invitation_or_transferelse{:error, cause} -> Repo.rollback(cause)endend- defp send_invitation_email(inviter, invitation, invitee) do- if invitation.role == :owner do- Teams.SiteTransfer- |> Repo.get_by!(transfer_id: invitation.invitation_id, initiator_id: inviter.id)- |> Repo.preload([:site, :initiator])- |> Teams.Invitations.send_invitation_email(invitee)- else- Teams.GuestInvitation- |> Repo.get_by!(invitation_id: invitation.invitation_id)- |> Repo.preload([:site, team_invitation: :inviter])- |> Teams.Invitations.send_invitation_email(invitee)- end+ defp send_invitation_email(%Teams.GuestInvitation{} = guest_invitation, invitee) do+ guest_invitation+ |> Repo.preload([:site, team_invitation: :inviter])+ |> Teams.Invitations.send_invitation_email(invitee)+ end++ defp send_invitation_email(%Teams.SiteTransfer{} = site_transfer, invitee) do+ site_transfer+ |> Repo.preload([:site, :initiator])+ |> Teams.Invitations.send_invitation_email(invitee)endenddiff --git a/lib/plausible/site/memberships/invitations.ex b/lib/plausible/site/memberships/invitations.exdeleted file mode 100644index dd2b55af33..0000000000--- a/lib/plausible/site/memberships/invitations.ex+++ /dev/null@@ -1,50 +0,0 @@-defmodule Plausible.Site.Memberships.Invitations do- @moduledoc false-- use Plausible-- import Ecto.Query, only: [from: 2]-- alias Plausible.Auth- alias Plausible.Repo- alias Plausible.Billing.Feature-- @type missing_features_error() :: {:missing_features, [Feature.t()]}-- @spec find_for_user(String.t(), Auth.User.t()) ::- {:ok, Auth.Invitation.t()} | {:error, :invitation_not_found}- def find_for_user(invitation_id, user) do- invitation =- Auth.Invitation- |> Repo.get_by(invitation_id: invitation_id, email: user.email)- |> Repo.preload([:site, :inviter])-- if invitation do- {:ok, invitation}- else- {:error, :invitation_not_found}- end- end-- @spec find_for_site(String.t(), Plausible.Site.t()) ::- {:ok, Auth.Invitation.t()} | {:error, :invitation_not_found}- def find_for_site(invitation_id, site) do- invitation =- Auth.Invitation- |> Repo.get_by(invitation_id: invitation_id, site_id: site.id)- |> Repo.preload([:site, :inviter])-- if invitation do- {:ok, invitation}- else- {:error, :invitation_not_found}- end- end-- @spec delete_invitation(Auth.Invitation.t()) :: :ok- def delete_invitation(invitation) do- Repo.delete_all(from(i in Auth.Invitation, where: i.id == ^invitation.id))-- :ok- end-enddiff --git a/lib/plausible/site/memberships/reject_invitation.ex b/lib/plausible/site/memberships/reject_invitation.exindex 98e9d4c820..d1cca277f8 100644--- a/lib/plausible/site/memberships/reject_invitation.ex+++ b/lib/plausible/site/memberships/reject_invitation.ex@@ -4,32 +4,38 @@ defmodule Plausible.Site.Memberships.RejectInvitation do"""alias Plausible.Auth- alias Plausible.Repo- alias Plausible.Site.Memberships.Invitationsalias Plausible.Teams@spec reject_invitation(String.t(), Auth.User.t()) ::- {:ok, Auth.Invitation.t()} | {:error, :invitation_not_found}- def reject_invitation(invitation_id, user) do- with {:ok, invitation} <- Invitations.find_for_user(invitation_id, user) do- Repo.transaction(fn ->- Invitations.delete_invitation(invitation)- Teams.Invitations.remove_invitation_sync(invitation)- end)+ {:ok, Teams.GuestInvitation.t() | Teams.SiteTransfer.t()}+ | {:error, :invitation_not_found}+ def reject_invitation(invitation_or_transfer_id, user) do+ with {:ok, invitation_or_transfer} <-+ Teams.Invitations.find_for_user(invitation_or_transfer_id, user) do+ do_reject(invitation_or_transfer)+ {:ok, invitation_or_transfer}+ end+ end- notify_invitation_rejected(invitation)+ defp do_reject(%Teams.GuestInvitation{} = guest_invitation) do+ Teams.Invitations.remove_guest_invitation(guest_invitation)- {:ok, invitation}- end+ notify_guest_invitation_rejected(guest_invitation)+ end++ defp do_reject(%Teams.SiteTransfer{} = site_transfer) do+ Teams.Invitations.remove_site_transfer(site_transfer)++ notify_site_transfer_rejected(site_transfer)end- defp notify_invitation_rejected(%Auth.Invitation{role: :owner} = invitation) do- PlausibleWeb.Email.ownership_transfer_rejected(invitation)+ defp notify_site_transfer_rejected(site_transfer) do+ PlausibleWeb.Email.ownership_transfer_rejected(site_transfer)|> Plausible.Mailer.send()end- defp notify_invitation_rejected(invitation) do- PlausibleWeb.Email.invitation_rejected(invitation)+ defp notify_guest_invitation_rejected(guest_invitation) do+ PlausibleWeb.Email.invitation_rejected(guest_invitation)|> Plausible.Mailer.send()endenddiff --git a/lib/plausible/site/memberships/remove_invitation.ex b/lib/plausible/site/memberships/remove_invitation.exindex e4f1baa5b5..97f23ffd73 100644--- a/lib/plausible/site/memberships/remove_invitation.ex+++ b/lib/plausible/site/memberships/remove_invitation.ex@@ -3,21 +3,25 @@ defmodule Plausible.Site.Memberships.RemoveInvitation doService for removing invitations."""- alias Plausible.Auth- alias Plausible.Repo- alias Plausible.Site.Memberships.Invitationsalias Plausible.Teams@spec remove_invitation(String.t(), Plausible.Site.t()) ::- {:ok, Auth.Invitation.t()} | {:error, :invitation_not_found}- def remove_invitation(invitation_id, site) do- with {:ok, invitation} <- Invitations.find_for_site(invitation_id, site) do- Repo.transaction(fn ->- Invitations.delete_invitation(invitation)- Teams.Invitations.remove_invitation_sync(invitation)- end)+ {:ok, Teams.GuestInvitation.t() | Teams.SiteTransfer.t()}+ | {:error, :invitation_not_found}+ def remove_invitation(invitation_or_transfer_id, site) do+ with {:ok, invitation_or_transfer} <-+ Teams.Invitations.find_for_site(invitation_or_transfer_id, site) do+ do_delete(invitation_or_transfer)- {:ok, invitation}+ {:ok, invitation_or_transfer}endend++ defp do_delete(%Teams.GuestInvitation{} = guest_invitation) do+ Teams.Invitations.remove_guest_invitation(guest_invitation)+ end++ defp do_delete(%Teams.SiteTransfer{} = site_transfer) do+ Teams.Invitations.remove_site_transfer(site_transfer)+ endenddiff --git a/lib/plausible/sites.ex b/lib/plausible/sites.exindex cd99d77f71..a56f5db781 100644--- a/lib/plausible/sites.ex+++ b/lib/plausible/sites.ex@@ -78,10 +78,11 @@ defmodule Plausible.Sites doowner_membership =from(tm in Teams.Membership,+ inner_join: u in assoc(tm, :user),where: tm.team_id == ^site.team_id,where: tm.role == :owner,- select: %Plausible.Site.Membership{- user_id: tm.user_id,+ select: %{+ user: u,role: tm.role})@@ -91,9 +92,10 @@ defmodule Plausible.Sites dofrom(gm in Teams.GuestMembership,inner_join: tm in assoc(gm, :team_membership),+ inner_join: u in assoc(tm, :user),where: gm.site_id == ^site.id,- select: %Plausible.Site.Membership{- user_id: tm.user_id,+ select: %{+ user: u,role:fragment("""@@ -109,14 +111,14 @@ defmodule Plausible.Sites do)|> Repo.all()- memberships = Repo.preload([owner_membership | memberships], :user)+ memberships = [owner_membership | memberships]invitations =from(gi in Teams.GuestInvitation,inner_join: ti in assoc(gi, :team_invitation),where: gi.site_id == ^site.id,- select: %Plausible.Auth.Invitation{+ select: %{invitation_id: gi.invitation_id,email: ti.email,role:@@ -138,7 +140,7 @@ defmodule Plausible.Sites dofrom(st in Teams.SiteTransfer,where: st.site_id == ^site.id,- select: %Plausible.Auth.Invitation{+ select: %{invitation_id: st.transfer_id,email: st.email,role: :owner@@ -152,8 +154,11 @@ defmodule Plausible.Sites do@spec for_user_query(Auth.User.t()) :: Ecto.Query.t()def for_user_query(user) dofrom(s in Site,- inner_join: sm in assoc(s, :memberships),- on: sm.user_id == ^user.id,+ inner_join: t in assoc(s, :team),+ inner_join: tm in assoc(t, :team_memberships),+ left_join: gm in assoc(tm, :guest_memberships),+ where: tm.user_id == ^user.id,+ where: tm.role != :guest or gm.site_id == s.id,order_by: [desc: s.id])end@@ -162,7 +167,9 @@ defmodule Plausible.Sites doEcto.Multi.new()|> Ecto.Multi.put(:site_changeset, Site.new(params))|> Ecto.Multi.run(:create_team, fn _repo, _context ->- Plausible.Teams.get_or_create(user)+ {:ok, team} = Plausible.Teams.get_or_create(user)++ {:ok, Plausible.Teams.with_subscription(team)}end)|> Ecto.Multi.run(:ensure_can_add_new_site, fn _repo, %{create_team: team} ->case Plausible.Teams.Billing.ensure_can_add_new_site(team) do@@ -190,29 +197,17 @@ defmodule Plausible.Sites do|> Ecto.Multi.insert(:site, fn %{site_changeset: site, create_team: team} ->Ecto.Changeset.put_assoc(site, :team, team)end)- |> Ecto.Multi.insert(:site_membership, fn %{site: site} ->- Site.Membership.new(site, user)- end)- |> maybe_start_trial(user)- |> Ecto.Multi.run(:sync_team, fn _repo, %{user: user} ->- Plausible.Teams.sync_team(user)- {:ok, nil}+ |> Ecto.Multi.run(:trial, fn _repo, %{create_team: team} ->+ if is_nil(team.trial_expiry_date) and is_nil(team.subscription) do+ Teams.start_trial(team)+ {:ok, :trial_started}+ else+ {:ok, :trial_already_started}+ endend)|> Repo.transaction()end- defp maybe_start_trial(multi, user) do- case user.trial_expiry_date do- nil ->- Ecto.Multi.run(multi, :user, fn _, _ ->- {:ok, Plausible.Users.start_trial(user)}- end)-- _ ->- Ecto.Multi.put(multi, :user, user)- end- end-@spec clear_stats_start_date!(Site.t()) :: Site.t()def clear_stats_start_date!(site) dosite@@ -299,14 +294,6 @@ defmodule Plausible.Sites do)end- def is_member?(user_id, site) do- role(user_id, site) !== nil- end-- def has_admin_access?(user_id, site) do- role(user_id, site) in [:admin, :owner]- end-def locked?(%Site{locked: locked}) dolockedend@@ -360,15 +347,6 @@ defmodule Plausible.Sites do)end- def role(user_id, site) do- Repo.one(- from(sm in Site.Membership,- where: sm.user_id == ^user_id and sm.site_id == ^site.id,- select: sm.role- )- )- end-def owned_sites_locked?(user) douser|> owned_sites_query()diff --git a/lib/plausible/teams.ex b/lib/plausible/teams.exindex 32c9154aa1..ecd430b7e1 100644--- a/lib/plausible/teams.ex+++ b/lib/plausible/teams.ex@@ -6,9 +6,12 @@ defmodule Plausible.Teams doimport Ecto.Queryalias __MODULE__+ alias Plausible.Auth.GracePeriodalias Plausible.Repouse Plausible+ @accept_traffic_until_free ~D[2135-01-01]+@spec get_owner(Teams.Team.t()) ::{:ok, Plausible.Auth.User.t()} | {:error, :no_owner | :multiple_owners}def get_owner(team) do@@ -34,6 +37,10 @@ defmodule Plausible.Teams doend@spec trial_days_left(Teams.Team.t()) :: integer()+ def trial_days_left(nil) do+ nil+ end+def trial_days_left(team) doDate.diff(team.trial_expiry_date, Date.utc_today())end@@ -133,14 +140,6 @@ defmodule Plausible.Teams doendend- def sync_team(user) do- {:ok, team} = get_or_create(user)-- team- |> Teams.Team.sync_changeset(user)- |> Repo.update!()- end-def get_by_owner(user_id) when is_integer(user_id) doresult =from(tm in Teams.Membership,@@ -164,6 +163,82 @@ defmodule Plausible.Teams doget_by_owner(user.id)end+ @spec update_accept_traffic_until(Teams.Team.t()) :: Teams.Team.t()+ def update_accept_traffic_until(team) do+ team+ |> Ecto.Changeset.change(accept_traffic_until: accept_traffic_until(team))+ |> Repo.update!()+ end++ def start_trial(%Teams.Team{} = team) do+ team+ |> Teams.Team.start_trial()+ |> Repo.update!()+ end++ def start_grace_period(team) do+ team+ |> GracePeriod.start_changeset()+ |> Repo.update!()+ end++ def start_manual_lock_grace_period(team) do+ team+ |> GracePeriod.start_manual_lock_changeset()+ |> Repo.update!()+ end++ def end_grace_period(team) do+ team+ |> GracePeriod.end_changeset()+ |> Repo.update!()+ end++ def remove_grace_period(team) do+ team+ |> GracePeriod.remove_changeset()+ |> Repo.update!()+ end++ def maybe_reset_next_upgrade_override(%Teams.Team{} = team) do+ if team.allow_next_upgrade_override do+ team+ |> Ecto.Changeset.change(allow_next_upgrade_override: false)+ |> Repo.update!()+ else+ team+ end+ end++ @spec accept_traffic_until(Teams.Team.t()) :: Date.t()+ on_ee do+ def accept_traffic_until(team) do+ team = with_subscription(team)++ cond do+ on_trial?(team) ->+ Date.shift(team.trial_expiry_date,+ day: Teams.Team.trial_accept_traffic_until_offset_days()+ )++ team.subscription && team.subscription.paddle_plan_id == "free_10k" ->+ @accept_traffic_until_free++ team.subscription && team.subscription.next_bill_date ->+ Date.shift(team.subscription.next_bill_date,+ day: Teams.Team.subscription_accept_traffic_until_offset_days()+ )++ true ->+ raise "This user is neither on trial or has a valid subscription. Manual intervention required."+ end+ end+ else+ def accept_traffic_until(_user) do+ @accept_traffic_until_free+ end+ end+def last_subscription_join_query() dofrom(subscription in last_subscription_query(),where: subscription.team_id == parent_as(:team).iddiff --git a/lib/plausible/teams/billing.ex b/lib/plausible/teams/billing.exindex d1e219878c..e168fc1f5d 100644--- a/lib/plausible/teams/billing.ex+++ b/lib/plausible/teams/billing.ex@@ -183,7 +183,9 @@ defmodule Plausible.Teams.Billing doenddef site_limit(team) do- if Timex.before?(team.inserted_at, @limit_sites_since) do+ {:ok, user} = Teams.get_owner(team)++ if Timex.before?(user.inserted_at, @limit_sites_since) do:unlimitedelseget_site_limit_from_plan(team)@@ -202,10 +204,6 @@ defmodule Plausible.Teams.Billing do|> length()end- defp get_site_limit_from_plan(nil) do- @site_limit_for_trials- end-defp get_site_limit_from_plan(team) doteam =Teams.with_subscription(team)@@ -239,7 +237,7 @@ defmodule Plausible.Teams.Billing do* `pending_ownership_site_ids` - a list of site IDs from which to countadditional usage. This allows us to look at the total usage from pendingownerships and owned sites at the same time, which is useful, for example,- when deciding whether to let the team owner upgrade to a plan, or accept a+ when deciding whether to let the team owner upgrade to a plan, or accept asite ownership.* `with_features` - when `true`, the returned map will contain featuresdiff --git a/lib/plausible/teams/guest_invitation.ex b/lib/plausible/teams/guest_invitation.exindex 815a608fab..a8ecc57e29 100644--- a/lib/plausible/teams/guest_invitation.ex+++ b/lib/plausible/teams/guest_invitation.ex@@ -7,6 +7,8 @@ defmodule Plausible.Teams.GuestInvitation doimport Ecto.Changeset+ @type t() :: %__MODULE__{}+schema "guest_invitations" dofield :invitation_id, :stringfield :role, Ecto.Enum, values: [:viewer, :editor]diff --git a/lib/plausible/teams/guest_membership.ex b/lib/plausible/teams/guest_membership.exindex 3932685e10..d045583de2 100644--- a/lib/plausible/teams/guest_membership.ex+++ b/lib/plausible/teams/guest_membership.ex@@ -7,6 +7,8 @@ defmodule Plausible.Teams.GuestMembership doimport Ecto.Changeset+ @type t() :: %__MODULE__{}+schema "guest_memberships" dofield :role, Ecto.Enum, values: [:viewer, :editor]diff --git a/lib/plausible/teams/invitation.ex b/lib/plausible/teams/invitation.exindex 473dc7ea68..5a5722a09f 100644--- a/lib/plausible/teams/invitation.ex+++ b/lib/plausible/teams/invitation.ex@@ -7,6 +7,8 @@ defmodule Plausible.Teams.Invitation doimport Ecto.Changeset+ @type t() :: %__MODULE__{}+schema "team_invitations" dofield :invitation_id, :stringfield :email, :stringdiff --git a/lib/plausible/teams/invitations.ex b/lib/plausible/teams/invitations.exindex 161d9f8cf1..ff064e0010 100644--- a/lib/plausible/teams/invitations.ex+++ b/lib/plausible/teams/invitations.ex@@ -9,157 +9,159 @@ defmodule Plausible.Teams.Invitations doalias Plausible.Repoalias Plausible.Teams- def invite_sync(site, site_invitation) do- site = Teams.load_for_site(site)- site_invitation = Repo.preload(site_invitation, :inviter)- role = translate_role(site_invitation.role)-- if site_invitation.role == :owner do- {:ok, site_transfer} =- create_site_transfer(- site,- site_invitation.inviter,- site_invitation.email- )+ def find_for_user(invitation_or_transfer_id, user) do+ with {:error, :invitation_not_found} <-+ find_invitation_for_user(invitation_or_transfer_id, user) do+ find_transfer_for_user(invitation_or_transfer_id, user)+ end+ end- site_transfer- |> Ecto.Changeset.change(transfer_id: site_invitation.invitation_id)- |> Repo.update!()- else- {:ok, guest_invitation} =- create_invitation(- site,- site_invitation.email,- role,- site_invitation.inviter- )+ def find_for_site(invitation_or_transfer_id, site) do+ with {:error, :invitation_not_found} <-+ find_invitation_for_site(invitation_or_transfer_id, site) do+ find_transfer_for_site(invitation_or_transfer_id, site)+ end+ end- guest_invitation- |> Ecto.Changeset.change(invitation_id: site_invitation.invitation_id)- |> Repo.update!()+ defp find_invitation_for_user(guest_invitation_id, user) do+ invitation_query =+ from gi in Teams.GuestInvitation,+ inner_join: s in assoc(gi, :site),+ inner_join: ti in assoc(gi, :team_invitation),+ inner_join: inviter in assoc(ti, :inviter),+ where: gi.invitation_id == ^guest_invitation_id,+ where: ti.email == ^user.email,+ preload: [site: s, team_invitation: {ti, inviter: inviter}]++ case Repo.one(invitation_query) do+ nil ->+ {:error, :invitation_not_found}++ invitation ->+ {:ok, invitation}endend- def remove_invitation_sync(site_invitation) do- site = Repo.preload(site_invitation, :site).site- site = Teams.load_for_site(site)+ defp find_transfer_for_user(transfer_id, user) do+ transfer =+ Teams.SiteTransfer+ |> Repo.get_by(transfer_id: transfer_id, email: user.email)+ |> Repo.preload([:site, :initiator])- if site_invitation.role == :owner do- Repo.delete_all(- from(- st in Teams.SiteTransfer,- where: st.email == ^site_invitation.email,- where: st.site_id == ^site.id- )- )- else- Repo.delete_all(- from(- gi in Teams.GuestInvitation,- inner_join: ti in assoc(gi, :team_invitation),- where: ti.email == ^site_invitation.email,- where: gi.site_id == ^site.id- )- )+ case transfer do+ nil ->+ {:error, :invitation_not_found}- prune_guest_invitations(site.team)+ transfer ->+ {:ok, transfer}end-- :okend- def transfer_site_sync(site, user) do- {:ok, team} = Teams.get_or_create(user)- site = Teams.load_for_site(site)+ defp find_invitation_for_site(guest_invitation_id, site) do+ invitation =+ Teams.GuestInvitation+ |> Repo.get_by(invitation_id: guest_invitation_id, site_id: site.id)+ |> Repo.preload([:site, team_invitation: :inviter])- site =- Repo.preload(site, [- :team,- :owner,- guest_memberships: [team_membership: :user],- guest_invitations: [team_invitation: :inviter]- ])+ case invitation do+ nil ->+ {:error, :invitation_not_found}- {:ok, _} =- Repo.transaction(fn ->- :ok = transfer_site_ownership(site, team, NaiveDateTime.utc_now(:second))- end)+ invitation ->+ {:ok, invitation}+ endend- def accept_invitation_sync(site_invitation, user) do- site_invitation =- Repo.preload(- site_invitation,- site: :team- )+ defp find_transfer_for_site(transfer_id, site) do+ transfer =+ Teams.SiteTransfer+ |> Repo.get_by(transfer_id: transfer_id, site_id: site.id)+ |> Repo.preload([:site, :initiator])- site = Teams.load_for_site(site_invitation.site)- site_invitation = %{site_invitation | site: site}+ case transfer do+ nil ->+ {:error, :invitation_not_found}- role =- case site_invitation.role do- :viewer -> :viewer- :admin -> :editor- end+ transfer ->+ {:ok, transfer}+ end+ end++ def invite(site, invitee_email, role, inviter) do+ site = Teams.load_for_site(site)- {:ok, guest_invitation} =+ if role == :owner do+ create_site_transfer(+ site,+ inviter,+ invitee_email+ )+ elsecreate_invitation(- site_invitation.site,- site_invitation.email,+ site,+ invitee_email,role,- site_invitation.inviter+ inviter)+ end+ end- team_invitation =- guest_invitation.team_invitation- |> Repo.preload([- :team,- :inviter,- guest_invitations: :site- ])+ def remove_guest_invitation(guest_invitation) do+ site = Repo.preload(guest_invitation, site: :team).site- {:ok, _} =- result =- do_accept(team_invitation, user, NaiveDateTime.utc_now(:second),- send_email?: false,- guest_invitations: [guest_invitation]- )+ Repo.delete_all(+ from gi in Teams.GuestInvitation,+ where: gi.id == ^guest_invitation.id+ )- prune_guest_invitations(team_invitation.team)- result+ prune_guest_invitations(site.team)end- def accept_transfer_sync(site_invitation, user) do- {:ok, team} = Teams.get_or_create(user)+ def remove_site_transfer(site_transfer) do+ Repo.delete_all(+ from st in Teams.SiteTransfer,+ where: st.id == ^site_transfer.id+ )+ end- site =- site_invitation.site- |> Teams.load_for_site()- |> Repo.preload([- :team,- :owner,- guest_memberships: [team_membership: :user],- guest_invitations: [team_invitation: :inviter]- ])+ def accept_site_transfer(site_transfer, user) do+ {:ok, _} =+ Repo.transaction(fn ->+ {:ok, team} = Teams.get_or_create(user)+ :ok = transfer_site_ownership(site_transfer.site, team, NaiveDateTime.utc_now(:second))+ Repo.delete_all(from st in Teams.SiteTransfer, where: st.id == ^site_transfer.id)+ end)- {:ok, site_transfer} =- create_site_transfer(site, site_invitation.inviter, site_invitation.email)+ :ok+ end+ def transfer_site(site, user) do{:ok, _} =Repo.transaction(fn ->+ {:ok, team} = Teams.get_or_create(user):ok = transfer_site_ownership(site, team, NaiveDateTime.utc_now(:second))- Repo.delete!(site_transfer)end)- end- def check_transfer_permissions(_team, _initiator, false = _check_permissions?) do:okend- def check_transfer_permissions(team, initiator, _) do- case Teams.Memberships.team_role(team, initiator) do- {:ok, :owner} -> :ok- _ -> {:error, :forbidden}+ def accept_guest_invitation(guest_invitation, user) do+ guest_invitation = Repo.preload(guest_invitation, :site)++ team_invitation =+ guest_invitation.team_invitation+ |> Repo.preload([+ :team,+ :inviter,+ guest_invitations: :site+ ])++ now = NaiveDateTime.utc_now(:second)++ with {:ok, team_membership} <-+ do_accept(team_invitation, user, now, guest_invitations: [guest_invitation]) do+ prune_guest_invitations(team_invitation.team)+ {:ok, team_membership}endend@@ -176,26 +178,42 @@ defmodule Plausible.Teams.Invitations dodef ensure_transfer_valid(_team, _new_owner, _role), do: :okdefp create_site_transfer(site, initiator, invitee_email, now \\ NaiveDateTime.utc_now(:second)) do- site- |> Teams.SiteTransfer.changeset(initiator: initiator, email: invitee_email)- |> Repo.insert(- on_conflict: [set: [updated_at: now]],- conflict_target: [:email, :site_id],- returning: true- )- end-- def send_transfer_init_email(site_transfer, new_owner) do- email =- PlausibleWeb.Email.ownership_transfer_request(- site_transfer.email,- site_transfer.transfer_id,- site_transfer.site,- site_transfer.initiator,- new_owner+ result =+ Ecto.Multi.new()+ |> Ecto.Multi.put(+ :site_transfer_changeset,+ Teams.SiteTransfer.changeset(site, initiator: initiator, email: invitee_email)+ )+ |> Ecto.Multi.run(:ensure_no_invitations, fn _repo, %{site_transfer_changeset: changeset} ->+ q =+ from ti in Teams.Invitation,+ inner_join: gi in assoc(ti, :guest_invitations),+ where: ti.email == ^invitee_email,+ where: ti.team_id == ^site.team_id,+ where: gi.site_id == ^site.id++ if Repo.exists?(q) do+ {:error, Ecto.Changeset.add_error(changeset, :invitation, "already sent")}+ else+ {:ok, :pass}+ end+ end)+ |> Ecto.Multi.insert(+ :site_transfer,+ fn %{site_transfer_changeset: changeset} -> changeset end,+ on_conflict: [set: [updated_at: now]],+ conflict_target: [:email, :site_id],+ returning: true)+ |> Repo.transaction()- Plausible.Mailer.send(email)+ case result do+ {:ok, success} ->+ {:ok, success.site_transfer}++ {:error, _, changeset, _} ->+ {:error, changeset}+ endenddefp do_accept(team_invitation, user, now, opts) do@@ -205,7 +223,7 @@ defmodule Plausible.Teams.Invitations doRepo.transaction(fn ->with {:ok, team_membership} <-create_team_membership(team_invitation.team, team_invitation.role, user, now),- {:ok, _guest_memberships} <-+ {:ok, guest_memberships} <-create_guest_memberships(team_membership, guest_invitations, now) do# Clean up guest invitations after acceptingguest_invitation_ids = Enum.map(guest_invitations, & &1.id)@@ -216,7 +234,7 @@ defmodule Plausible.Teams.Invitations dosend_invitation_accepted_email(team_invitation, guest_invitations)end- team_membership+ %{team_membership: team_membership, guest_memberships: guest_memberships}else{:error, changeset} -> Repo.rollback(changeset)end@@ -224,6 +242,14 @@ defmodule Plausible.Teams.Invitations doenddefp transfer_site_ownership(site, team, now) do+ site =+ Repo.preload(site, [+ :team,+ :owner,+ guest_memberships: [team_membership: :user],+ guest_invitations: [team_invitation: :inviter]+ ])+prior_team = site.teamsite@@ -291,6 +317,10 @@ defmodule Plausible.Teams.Invitations do)end+ on_ee do+ :unlocked = Billing.SiteLocker.update_sites_for(team, send_email?: false)+ end+:okend@@ -366,9 +396,6 @@ defmodule Plausible.Teams.Invitations doendend- defp translate_role(:admin), do: :editor- defp translate_role(role), do: role-@doc falsedef check_team_member_limit(_team, :owner, _invitee_email), do: :ok@@ -398,7 +425,10 @@ defmodule Plausible.Teams.Invitations dodefp create_invitation(site, invitee_email, role, inviter) doRepo.transaction(fn ->- with {:ok, team_invitation} <- create_team_invitation(site.team, invitee_email, inviter),+ with {:ok, team_invitation} <-+ create_team_invitation(site.team, invitee_email, inviter,+ ensure_no_site_transfers_for: site.id+ ),{:ok, guest_invitation} <- create_guest_invitation(team_invitation, site, role) doguest_invitationelse@@ -407,16 +437,34 @@ defmodule Plausible.Teams.Invitations doend)end- defp create_team_invitation(team, invitee_email, inviter) do+ defp create_team_invitation(team, invitee_email, inviter, opts \\ []) donow = NaiveDateTime.utc_now(:second)- team- |> Teams.Invitation.changeset(email: invitee_email, role: :guest, inviter: inviter)- |> Repo.insert(- on_conflict: [set: [updated_at: now]],- conflict_target: [:team_id, :email],- returning: true- )+ result =+ Ecto.Multi.new()+ |> Ecto.Multi.put(+ :changeset,+ Teams.Invitation.changeset(team, email: invitee_email, role: :guest, inviter: inviter)+ )+ |> Ecto.Multi.run(:ensure_no_site_transfers, fn _repo, %{changeset: changeset} ->+ ensure_no_site_transfers(changeset, opts[:ensure_no_site_transfers_for], invitee_email)+ end)+ |> Ecto.Multi.insert(+ :team_invitation,+ & &1.changeset,+ on_conflict: [set: [updated_at: now]],+ conflict_target: [:team_id, :email],+ returning: true+ )+ |> Repo.transaction()++ case result do+ {:ok, success} ->+ {:ok, success.team_invitation}++ {:error, _, changeset, _} ->+ {:error, changeset}+ endenddefp create_guest_invitation(team_invitation, site, role) do@@ -513,4 +561,22 @@ defmodule Plausible.Teams.Invitations do|> PlausibleWeb.Email.invitation_accepted(team_invitation.email, guest_invitation.site)|> Plausible.Mailer.send()end++ defp ensure_no_site_transfers(_, nil, _) do+ {:ok, :skip}+ end++ defp ensure_no_site_transfers(changeset, site_id, invitee_email)+ when is_integer(site_id) and is_binary(invitee_email) do+ q =+ from st in Teams.SiteTransfer,+ where: st.email == ^invitee_email,+ where: st.site_id == ^site_id++ if Repo.exists?(q) do+ {:error, Ecto.Changeset.add_error(changeset, :invitation, "already sent")}+ else+ {:ok, :pass}+ end+ endenddiff --git a/lib/plausible/teams/membership.ex b/lib/plausible/teams/membership.exindex b446d995a3..afc740565d 100644--- a/lib/plausible/teams/membership.ex+++ b/lib/plausible/teams/membership.ex@@ -7,6 +7,8 @@ defmodule Plausible.Teams.Membership doimport Ecto.Changeset+ @type t() :: %__MODULE__{}+schema "team_memberships" dofield :role, Ecto.Enum, values: [:guest, :viewer, :editor, :admin, :owner]diff --git a/lib/plausible/teams/memberships.ex b/lib/plausible/teams/memberships.exindex de2c8aac2b..ee1492cc39 100644--- a/lib/plausible/teams/memberships.ex+++ b/lib/plausible/teams/memberships.ex@@ -11,34 +11,6 @@ defmodule Plausible.Teams.Memberships do|> pending_site_transfers_query()|> Repo.all()- |> Enum.map(fn transfer ->- %Plausible.Auth.Invitation{- site_id: transfer.site_id,- email: transfer.email,- invitation_id: transfer.transfer_id,- role: :owner- }- end)- end-- def any_pending_site_transfers?(email) do- |> pending_site_transfers_query()- |> Repo.exists?()- end-- def get(team, user) do- result =- from(tm in Teams.Membership,- left_join: gm in assoc(tm, :guest_memberships),- where: tm.team_id == ^team.id and tm.user_id == ^user.id- )- |> Repo.one()-- case result do- nil -> {:error, :not_a_member}- team_membership -> {:ok, team_membership}- endenddef team_role(team, user) do@@ -83,46 +55,76 @@ defmodule Plausible.Teams.Memberships doendend- def update_role_sync(site_membership) do- site_id = site_membership.site_id- user_id = site_membership.user_id- role = site_membership.role+ def has_admin_access?(site, user) do+ case site_role(site, user) do+ {:ok, role} when role in [:editor, :admin, :owner] ->+ true++ _ ->+ false+ end+ end- new_role =- case role do- :viewer -> :viewer- _ -> :editor- end+ def update_role(site, user_id, new_role_str, current_user, current_user_role) do+ new_role = String.to_existing_atom(new_role_str)- case get_guest_membership(site_id, user_id) do+ case get_guest_membership(site.id, user_id) do{:ok, guest_membership} ->- guest_membership- |> Ecto.Changeset.change(role: new_role)- |> Ecto.Changeset.put_change(:updated_at, site_membership.updated_at)- |> Repo.update!()+ can_grant_role? =+ if guest_membership.team_membership.user_id == current_user.id do+ can_grant_role_to_self?(current_user_role, new_role)+ else+ can_grant_role_to_other?(current_user_role, new_role)+ end++ if can_grant_role? do+ guest_membership =+ guest_membership+ |> Ecto.Changeset.change(role: new_role)+ |> Repo.update!()+ |> Repo.preload(team_membership: :user)++ {:ok, guest_membership}+ else+ {:error, :not_allowed}+ end{:error, _} ->- :pass+ {:error, :no_guest}end-- :okend- def remove_sync(site_membership) do- site_id = site_membership.site_id- user_id = site_membership.user_id-- case get_guest_membership(site_id, user_id) do+ def remove(site, user) do+ case get_guest_membership(site.id, user.id) do{:ok, guest_membership} ->- guest_membership = Repo.preload(guest_membership, team_membership: :team)+ guest_membership =+ Repo.preload(guest_membership, [:site, team_membership: [:team, :user]])+Repo.delete!(guest_membership)prune_guests(guest_membership.team_membership.team)+ send_site_member_removed_email(guest_membership){:error, _} ->:passendend+ defp can_grant_role_to_self?(:editor, :viewer), do: true+ defp can_grant_role_to_self?(_, _), do: false++ defp can_grant_role_to_other?(:owner, :editor), do: true+ defp can_grant_role_to_other?(:owner, :admin), do: true+ defp can_grant_role_to_other?(:owner, :viewer), do: true+ defp can_grant_role_to_other?(:editor, :editor), do: true+ defp can_grant_role_to_other?(:editor, :viewer), do: true+ defp can_grant_role_to_other?(_, _), do: false++ defp send_site_member_removed_email(guest_membership) do+ guest_membership+ |> PlausibleWeb.Email.site_member_removed()+ |> Plausible.Mailer.send()+ end+def prune_guests(team) doguest_query =from(@@ -148,7 +150,8 @@ defmodule Plausible.Teams.Memberships dofrom(gm in Teams.GuestMembership,inner_join: tm in assoc(gm, :team_membership),- where: gm.site_id == ^site_id and tm.user_id == ^user_id+ where: gm.site_id == ^site_id and tm.user_id == ^user_id,+ preload: [team_membership: tm])case Repo.one(query) do@@ -158,6 +161,6 @@ defmodule Plausible.Teams.Memberships doenddefp pending_site_transfers_query(email) do- from st in Teams.SiteTransfer, where: st.email == ^email+ from st in Teams.SiteTransfer, where: st.email == ^email, select: st.site_idendenddiff --git a/lib/plausible/teams/site_transfer.ex b/lib/plausible/teams/site_transfer.exindex d46dfaab0b..54b9f91eff 100644--- a/lib/plausible/teams/site_transfer.ex+++ b/lib/plausible/teams/site_transfer.ex@@ -7,6 +7,8 @@ defmodule Plausible.Teams.SiteTransfer doimport Ecto.Changeset+ @type t() :: %__MODULE__{}+schema "team_site_transfers" dofield :transfer_id, :stringfield :email, :stringdiff --git a/lib/plausible/teams/sites.ex b/lib/plausible/teams/sites.exindex 62e01d9ada..c09ee1a8b6 100644--- a/lib/plausible/teams/sites.ex+++ b/lib/plausible/teams/sites.ex@@ -10,43 +10,6 @@ defmodule Plausible.Teams.Sites do@type list_opt() :: {:filter_by_domain, String.t()}- @spec create(Teams.Team.t(), map()) :: {:ok, map()}- def create(team, params) do- with :ok <- Teams.Billing.ensure_can_add_new_site(team) do- Ecto.Multi.new()- |> Ecto.Multi.put(:site_changeset, Site.new_for_team(team, params))- |> Ecto.Multi.run(:clear_changed_from, fn- _repo, %{site_changeset: %{changes: %{domain: domain}}} ->- if site_to_clear = Repo.get_by(Site, team_id: team.id, domain_changed_from: domain) do- site_to_clear- |> Ecto.Changeset.change()- |> Ecto.Changeset.put_change(:domain_changed_from, nil)- |> Ecto.Changeset.put_change(:domain_changed_at, nil)- |> Repo.update()- else- {:ok, :ignore}- end-- _repo, _context ->- {:ok, :ignore}- end)- |> Ecto.Multi.insert(:site, fn %{site_changeset: site} -> site end)- |> maybe_start_trial(team)- |> Repo.transaction()- end- end-- defp maybe_start_trial(multi, team) do- case team.trial_expiry_date do- nil ->- changeset = Teams.Team.start_trial(team)- Ecto.Multi.update(multi, :team, changeset)-- _ ->- multi- end- end-@spec list(Auth.User.t(), map(), [list_opt()]) :: Scrivener.Page.t()def list(user, pagination_params, opts \\ []) dodomain_filter = Keyword.get(opts, :filter_by_domain)@@ -103,7 +66,7 @@ defmodule Plausible.Teams.Sites do|> Repo.paginate(pagination_params)end- @role_type Plausible.Auth.Invitation.__schema__(:type, :role)+ @role_type Plausible.Teams.Invitation.__schema__(:type, :role)@spec list_with_invitations(Auth.User.t(), map(), [list_opt()]) :: Scrivener.Page.t()def list_with_invitations(user, pagination_params, opts \\ []) do@@ -267,14 +230,14 @@ defmodule Plausible.Teams.Sites do),pinned_at: selected_as(up.pinned_at, :pinned_at),memberships: [- %Plausible.Site.Membership{+ %{role: type(u.role, ^@role_type),site_id: s.id,site: s}],invitations: [- %Plausible.Auth.Invitation{+ %{invitation_id: coalesce(gi.invitation_id, st.transfer_id),email: coalesce(ti.email, st.email),role: type(u.role, ^@role_type),diff --git a/lib/plausible/teams/team.ex b/lib/plausible/teams/team.exindex 3db626150b..f9f732bd92 100644--- a/lib/plausible/teams/team.ex+++ b/lib/plausible/teams/team.ex@@ -11,6 +11,7 @@ defmodule Plausible.Teams.Team do@type t() :: %__MODULE__{}@trial_accept_traffic_until_offset_days 14+ @subscription_accept_traffic_until_offset_days 30schema "teams" dofield :name, :string@@ -32,15 +33,9 @@ defmodule Plausible.Teams.Team dotimestamps()end- def sync_changeset(team, user) do+ def crm_sync_changeset(team, params) doteam- |> change()- |> put_change(:trial_expiry_date, user.trial_expiry_date)- |> put_change(:accept_traffic_until, user.accept_traffic_until)- |> put_change(:allow_next_upgrade_override, user.allow_next_upgrade_override)- |> put_embed(:grace_period, embed_params(user.grace_period))- |> put_change(:inserted_at, user.inserted_at)- |> put_change(:updated_at, user.updated_at)+ |> cast(params, [:trial_expiry_date, :allow_next_upgrade_override, :accept_traffic_until])enddef changeset(name, today \\ Date.utc_today()) do@@ -48,6 +43,7 @@ defmodule Plausible.Teams.Team do|> cast(%{name: name}, [:name])|> validate_required(:name)|> start_trial(today)+ |> maybe_bump_accept_traffic_until()enddef start_trial(team, today \\ Date.utc_today()) do@@ -59,13 +55,31 @@ defmodule Plausible.Teams.Team do)end- defp embed_params(nil), do: nil+ def end_trial(team) do+ change(team, trial_expiry_date: Date.utc_today() |> Date.shift(day: -1))+ end++ defp maybe_bump_accept_traffic_until(changeset) do+ expiry_change = get_change(changeset, :trial_expiry_date)- defp embed_params(grace_period) do- Map.from_struct(grace_period)+ if expiry_change do+ put_change(+ changeset,+ :accept_traffic_until,+ Date.add(expiry_change, @trial_accept_traffic_until_offset_days)+ )+ else+ changeset+ endend- defp trial_expiry(today) do+ def trial_accept_traffic_until_offset_days(), do: @trial_accept_traffic_until_offset_days++ def subscription_accept_traffic_until_offset_days(),+ do: @subscription_accept_traffic_until_offset_days++ @doc false+ def trial_expiry(today \\ Date.utc_today()) doon_ee doDate.shift(today, day: 30)elsediff --git a/lib/plausible/users.ex b/lib/plausible/users.exindex a53121b7ba..e8a2bdb2ea 100644--- a/lib/plausible/users.ex+++ b/lib/plausible/users.ex@@ -2,45 +2,11 @@ defmodule Plausible.Users do@moduledoc """User context"""- use Plausible- @accept_traffic_until_free ~D[2135-01-01]-import Ecto.Queryalias Plausible.Auth- alias Plausible.Auth.GracePeriod- alias Plausible.Billing.Subscriptionalias Plausible.Repo- @spec on_trial?(Auth.User.t()) :: boolean()- on_ee do- def on_trial?(%Auth.User{trial_expiry_date: nil}), do: false-- def on_trial?(user) do- user = with_subscription(user)- not Plausible.Billing.Subscriptions.active?(user.subscription) && trial_days_left(user) >= 0- end- else- def on_trial?(_), do: true- end-- @spec trial_days_left(Auth.User.t()) :: integer()- def trial_days_left(user) do- Date.diff(user.trial_expiry_date, Date.utc_today())- end-- @spec update_accept_traffic_until(Auth.User.t()) :: Auth.User.t()- def update_accept_traffic_until(user) do- user =- user- |> Auth.User.changeset(%{accept_traffic_until: accept_traffic_until(user)})- |> Repo.update!()-- Plausible.Teams.sync_team(user)-- user- end-@spec bump_last_seen(Auth.User.t() | pos_integer(), NaiveDateTime.t()) :: :okdef bump_last_seen(%Auth.User{id: user_id}, now) dobump_last_seen(user_id, now)@@ -54,147 +20,8 @@ defmodule Plausible.Users do:okend- @spec accept_traffic_until(Auth.User.t()) :: Date.t()- on_ee do- def accept_traffic_until(user) do- user = with_subscription(user)-- cond do- Plausible.Users.on_trial?(user) ->- Date.shift(user.trial_expiry_date,- day: Auth.User.trial_accept_traffic_until_offset_days()- )-- user.subscription && user.subscription.paddle_plan_id == "free_10k" ->- @accept_traffic_until_free-- user.subscription && user.subscription.next_bill_date ->- Date.shift(user.subscription.next_bill_date,- day: Auth.User.subscription_accept_traffic_until_offset_days()- )-- true ->- raise "This user is neither on trial or has a valid subscription. Manual intervention required."- end- end- else- def accept_traffic_until(_user) do- @accept_traffic_until_free- end- end-- def with_subscription(%Auth.User{} = user) do- Repo.preload(user, subscription: last_subscription_query())- end-- def with_subscription(user_id) when is_integer(user_id) do- Repo.one(- from(user in Auth.User,- as: :user,- left_lateral_join: s in subquery(last_subscription_join_query()),- on: true,- where: user.id == ^user_id,- preload: [subscription: s]- )- )- end-@spec has_email_code?(Auth.User.t()) :: boolean()def has_email_code?(user) doAuth.EmailVerification.any?(user)end-- def start_trial(%Auth.User{} = user) do- user =- user- |> Auth.User.start_trial()- |> Repo.update!()-- Plausible.Teams.sync_team(user)-- user- end-- def allow_next_upgrade_override(%Auth.User{} = user) do- user =- user- |> Auth.User.changeset(%{allow_next_upgrade_override: true})- |> Repo.update!()-- Plausible.Teams.sync_team(user)-- user- end-- def maybe_reset_next_upgrade_override(%Auth.User{} = user) do- if user.allow_next_upgrade_override do- user =- user- |> Auth.User.changeset(%{allow_next_upgrade_override: false})- |> Repo.update!()-- Plausible.Teams.sync_team(user)-- user- else- user- end- end-- def last_subscription_join_query() do- from(subscription in last_subscription_query(),- where: subscription.user_id == parent_as(:user).id- )- end-- def start_grace_period(user) do- user =- user- |> GracePeriod.start_changeset()- |> Repo.update!()-- Plausible.Teams.sync_team(user)-- user- end-- def start_manual_lock_grace_period(user) do- user =- user- |> GracePeriod.start_manual_lock_changeset()- |> Repo.update!()-- Plausible.Teams.sync_team(user)-- user- end-- def end_grace_period(user) do- user =- user- |> GracePeriod.end_changeset()- |> Repo.update!()-- Plausible.Teams.sync_team(user)-- user- end-- def remove_grace_period(user) do- user =- user- |> GracePeriod.remove_changeset()- |> Repo.update!()-- Plausible.Teams.sync_team(user)-- user- end-- def last_subscription_query() do- from(subscription in Subscription,- order_by: [desc: subscription.inserted_at],- limit: 1- )- endenddiff --git a/lib/plausible_web/components/site/feature.ex b/lib/plausible_web/components/site/feature.exindex 79f0fb4913..92b69971ea 100644--- a/lib/plausible_web/components/site/feature.ex+++ b/lib/plausible_web/components/site/feature.ex@@ -15,7 +15,7 @@ defmodule PlausibleWeb.Components.Site.Feature doassigns =assigns|> assign(:current_setting, assigns.feature_mod.enabled?(assigns.site))- |> assign(:disabled?, assigns.feature_mod.check_availability(assigns.site.owner) !== :ok)+ |> assign(:disabled?, assigns.feature_mod.check_availability(assigns.site.team) !== :ok)~H"""<div>diff --git a/lib/plausible_web/controllers/admin_controller.ex b/lib/plausible_web/controllers/admin_controller.exindex ba5331be7d..f122c20afa 100644--- a/lib/plausible_web/controllers/admin_controller.ex+++ b/lib/plausible_web/controllers/admin_controller.ex@@ -89,7 +89,7 @@ defmodule PlausibleWeb.AdminController do<head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0">- <title>Usage - team:#{team.id}</title>+ <title>Usage - team:#{team && team.id}</title><style>ul, li {margin-top: 10px;}body {padding-top: 10px;}diff --git a/lib/plausible_web/controllers/api/internal_controller.ex b/lib/plausible_web/controllers/api/internal_controller.exindex 686eb99b60..4f6cba764d 100644--- a/lib/plausible_web/controllers/api/internal_controller.ex+++ b/lib/plausible_web/controllers/api/internal_controller.ex@@ -27,7 +27,9 @@ defmodule PlausibleWeb.Api.InternalController dodef disable_feature(conn, %{"domain" => domain, "feature" => feature}) dowith %User{id: user_id} = user <- conn.assigns[:current_user],site <- Sites.get_by_domain(domain),- true <- Sites.has_admin_access?(user_id, site) || Auth.is_super_admin?(user_id),+ true <-+ Plausible.Teams.Memberships.has_admin_access?(site, user) ||+ Auth.is_super_admin?(user_id),{:ok, mod} <- Map.fetch(@features, feature),{:ok, _site} <- mod.toggle(site, user, override: false) dojson(conn, "ok")diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.exindex 119a7f7c84..5fa2372adb 100644--- a/lib/plausible_web/controllers/api/stats_controller.ex+++ b/lib/plausible_web/controllers/api/stats_controller.ex@@ -523,9 +523,9 @@ defmodule PlausibleWeb.Api.StatsController doon_ee dodef funnel(conn, %{"id" => funnel_id} = params) do- site = Plausible.Repo.preload(conn.assigns.site, :owner)+ site = Plausible.Repo.preload(conn.assigns.site, :team)- with :ok <- Plausible.Billing.Feature.Funnels.check_availability(site.owner),+ with :ok <- Plausible.Billing.Feature.Funnels.check_availability(site.team),query <- Query.from(site, params, debug_metadata(conn)),:ok <- validate_funnel_query(query),{funnel_id, ""} <- Integer.parse(funnel_id),@@ -750,7 +750,7 @@ defmodule PlausibleWeb.Api.StatsController dois_admin =if current_user = conn.assigns[:current_user] do- Plausible.Sites.has_admin_access?(current_user.id, site)+ Plausible.Teams.Memberships.has_admin_access?(site, current_user)elsefalseend@@ -1320,10 +1320,10 @@ defmodule PlausibleWeb.Api.StatsController doenddef custom_prop_values(conn, params) do- site = Plausible.Repo.preload(conn.assigns.site, :owner)+ site = Plausible.Repo.preload(conn.assigns.site, :team)prop_key = Map.fetch!(params, "prop_key")- case Plausible.Props.ensure_prop_key_accessible(prop_key, site.owner) do+ case Plausible.Props.ensure_prop_key_accessible(prop_key, site.team) do:ok ->json(conn, breakdown_custom_prop_values(conn, site, params))diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.exindex c326a8434f..f9b53de98f 100644--- a/lib/plausible_web/controllers/auth_controller.ex+++ b/lib/plausible_web/controllers/auth_controller.ex@@ -58,7 +58,7 @@ defmodule PlausibleWeb.AuthController dorender(conn, "activate.html",has_email_code?: Plausible.Users.has_email_code?(user),- has_any_memberships?: Plausible.Site.Memberships.any?(user),+ has_any_memberships?: Plausible.Teams.Users.has_sites?(user),form_submit_url: "/activate?flow=#{flow}")end@@ -66,8 +66,8 @@ defmodule PlausibleWeb.AuthController dodef activate(conn, %{"code" => code}) douser = conn.assigns[:current_user]- has_any_invitations? = Plausible.Site.Memberships.pending?(user.email)- has_any_memberships? = Plausible.Site.Memberships.any?(user)+ has_any_invitations? = Plausible.Teams.Users.has_sites?(user, include_pending?: true)+ has_any_memberships? = Plausible.Teams.Users.has_sites?(user, include_pending?: false)flow = conn.params["flow"]diff --git a/lib/plausible_web/controllers/invitation_controller.ex b/lib/plausible_web/controllers/invitation_controller.exindex cd91c46041..4fc675e49b 100644--- a/lib/plausible_web/controllers/invitation_controller.ex+++ b/lib/plausible_web/controllers/invitation_controller.ex@@ -8,10 +8,19 @@ defmodule PlausibleWeb.InvitationController dodef accept_invitation(conn, %{"invitation_id" => invitation_id}) docase Plausible.Site.Memberships.accept_invitation(invitation_id, conn.assigns.current_user) do- {:ok, membership} ->+ {:ok, result} ->+ site =+ case result do+ %{guest_memberships: [guest_membership]} ->+ Plausible.Repo.preload(guest_membership, :site).site++ %{site: site} ->+ site+ end+conn- |> put_flash(:success, "You now have access to #{membership.site.domain}")- |> redirect(external: "/#{URI.encode_www_form(membership.site.domain)}")+ |> put_flash(:success, "You now have access to #{site.domain}")+ |> redirect(external: "/#{URI.encode_www_form(site.domain)}"){:error, :invitation_not_found} ->conn@@ -54,10 +63,19 @@ defmodule PlausibleWeb.InvitationController dodef remove_invitation(conn, %{"invitation_id" => invitation_id}) docase Plausible.Site.Memberships.remove_invitation(invitation_id, conn.assigns.site) do- {:ok, invitation} ->+ {:ok, invitation_or_transfer} ->+ {site, email} =+ case invitation_or_transfer do+ %Plausible.Teams.GuestInvitation{} = guest_invitation ->+ {guest_invitation.site, guest_invitation.team_invitation.email}++ %Plausible.Teams.SiteTransfer{} = site_transfer ->+ {site_transfer.site, site_transfer.email}+ end+conn- |> put_flash(:success, "You have removed the invitation for #{invitation.email}")- |> redirect(external: Routes.site_path(conn, :settings_people, invitation.site.domain))+ |> put_flash(:success, "You have removed the invitation for #{email}")+ |> redirect(external: Routes.site_path(conn, :settings_people, site.domain)){:error, :invitation_not_found} ->conndiff --git a/lib/plausible_web/controllers/site/membership_controller.ex b/lib/plausible_web/controllers/site/membership_controller.exindex eee18770d1..9476373128 100644--- a/lib/plausible_web/controllers/site/membership_controller.ex+++ b/lib/plausible_web/controllers/site/membership_controller.ex@@ -13,7 +13,7 @@ defmodule PlausibleWeb.Site.MembershipController douse PlausibleWeb, :controlleruse Plausible.Repouse Plausible- alias Plausible.Site.{Membership, Memberships}+ alias Plausible.Site.Memberships@only_owner_is_allowed_to [:transfer_ownership_form, :transfer_ownership]@@ -149,94 +149,48 @@ defmodule PlausibleWeb.Site.MembershipController doOwner - Can update anyone's role except for themselves. If they want to change their own role, they have to use the 'transfer ownership' feature.Admin - Can update anyone's role except for owners. Can downgrade their own access to 'viewer'. Can promote a viewer to admin."""- @role_mappings Membership- |> Ecto.Enum.mappings(:role)- |> Enum.map(fn {k, v} -> {v, k} end)- |> Enum.into(%{})-def update_role_by_user(conn, %{"id" => user_id, "new_role" => new_role_str}) do%{site: site, current_user: current_user, site_role: site_role} = conn.assigns- membership =- Membership |> Repo.get_by!(user_id: user_id, site_id: site.id) |> Repo.preload(:user)-- new_role = Map.fetch!(@role_mappings, new_role_str)-- can_grant_role? =- if membership.user.id == current_user.id do- can_grant_role_to_self?(site_role, new_role)- else- can_grant_role_to_other?(site_role, new_role)- end-- if can_grant_role? do- membership =- membership- |> Ecto.Changeset.change()- |> Membership.set_role(new_role)- |> Repo.update!()-- Plausible.Teams.Memberships.update_role_sync(membership)+ case Plausible.Teams.Memberships.update_role(+ site,+ user_id,+ new_role_str,+ current_user,+ site_role+ ) do+ {:ok, guest_membership} ->+ redirect_target =+ if guest_membership.team_membership.user_id == current_user.id and+ guest_membership.role == :viewer do+ "/#{URI.encode_www_form(site.domain)}"+ else+ Routes.site_path(conn, :settings_people, site.domain)+ end- redirect_target =- if membership.user.id == current_user.id and new_role == :viewer do- "/#{URI.encode_www_form(site.domain)}"- else- Routes.site_path(conn, :settings_people, site.domain)- end+ conn+ |> put_flash(+ :success,+ "#{guest_membership.team_membership.user.name} is now #{PlausibleWeb.SiteView.with_indefinite_article(to_string(guest_membership.role))}"+ )+ |> redirect(external: redirect_target)- conn- |> put_flash(- :success,- "#{membership.user.name} is now #{PlausibleWeb.SiteView.with_indefinite_article(new_role_str)}"- )- |> redirect(external: redirect_target)- else- conn- |> put_flash(:error, "You are not allowed to grant the #{new_role} role")- |> redirect(external: Routes.site_path(conn, :settings_people, site.domain))+ {:error, _} ->+ conn+ |> put_flash(:error, "You are not allowed to grant the #{new_role_str} role")+ |> redirect(external: Routes.site_path(conn, :settings_people, site.domain))endend- defp can_grant_role_to_self?(:editor, :viewer), do: true- defp can_grant_role_to_self?(:admin, :viewer), do: true- defp can_grant_role_to_self?(_, _), do: false-- defp can_grant_role_to_other?(:owner, :editor), do: true- defp can_grant_role_to_other?(:owner, :admin), do: true- defp can_grant_role_to_other?(:owner, :viewer), do: true- defp can_grant_role_to_other?(:editor, :editor), do: true- defp can_grant_role_to_other?(:admin, :admin), do: true- defp can_grant_role_to_other?(:editor, :viewer), do: true- defp can_grant_role_to_other?(:admin, :viewer), do: true- defp can_grant_role_to_other?(_, _), do: false-def remove_member_by_user(conn, %{"id" => user_id} = _params) dosite = conn.assigns.site- site_id = site.id-- membership_q =- from m in Membership,- where: m.user_id == ^user_id,- where: m.site_id == ^site_id,- inner_join: user in assoc(m, :user),- inner_join: site in assoc(m, :site),- preload: [user: user, site: site]-- membership = Repo.one(membership_q)- if membership do- Repo.delete!(membership)-- Plausible.Teams.Memberships.remove_sync(membership)-- membership- |> PlausibleWeb.Email.site_member_removed()- |> Plausible.Mailer.send()+ if user = Repo.get(Plausible.Auth.User, user_id) do+ Plausible.Teams.Memberships.remove(site, user)redirect_target =- if membership.user.id == conn.assigns[:current_user].id do- "/#{URI.encode_www_form(membership.site.domain)}"+ if user_id == conn.assigns[:current_user].id do+ "/#{URI.encode_www_form(site.domain)}"elseRoutes.site_path(conn, :settings_people, site.domain)end@@ -244,14 +198,14 @@ defmodule PlausibleWeb.Site.MembershipController doconn|> put_flash(:success,- "#{membership.user.name} has been removed from #{site.domain}"+ "#{user.name} has been removed from #{site.domain}")|> redirect(external: redirect_target)elseconn|> put_flash(- :error,- "Failed to find membership to remove"+ :success,+ "User has been removed from #{site.domain}")|> redirect(external: Routes.site_path(conn, :settings_people, site.domain))enddiff --git a/lib/plausible_web/email.ex b/lib/plausible_web/email.exindex 0d9383a5dd..2303da96e3 100644--- a/lib/plausible_web/email.ex+++ b/lib/plausible_web/email.ex@@ -42,14 +42,15 @@ defmodule PlausibleWeb.Email do)end- def site_setup_success(user, site) do+ def site_setup_success(user, team, site) dobase_email()|> to(user)|> tag("setup-success-email")|> subject("Plausible is now tracking your website stats")|> render("site_setup_success_email.html",user: user,- site: site+ site: site,+ site_team: team)end@@ -122,7 +123,7 @@ defmodule PlausibleWeb.Email do|> subject("Your Plausible trial has ended")|> render("trial_over_email.html",user: user,- extra_offset: Plausible.Auth.User.trial_accept_traffic_until_offset_days()+ extra_offset: Plausible.Teams.Team.trial_accept_traffic_until_offset_days())end@@ -197,35 +198,35 @@ defmodule PlausibleWeb.Email do})end- def yearly_renewal_notification(user) do- date = Calendar.strftime(user.subscription.next_bill_date, "%B %-d, %Y")+ def yearly_renewal_notification(team) do+ date = Calendar.strftime(team.subscription.next_bill_date, "%B %-d, %Y")priority_email()- |> to(user)+ |> to(team.owner)|> tag("yearly-renewal")|> subject("Your Plausible subscription is up for renewal")|> render("yearly_renewal_notification.html", %{- user: user,+ user: team.owner,date: date,- next_bill_amount: user.subscription.next_bill_amount,- currency: user.subscription.currency_code+ next_bill_amount: team.subscription.next_bill_amount,+ currency: team.subscription.currency_code})end- def yearly_expiration_notification(user) do- next_bill_date = Calendar.strftime(user.subscription.next_bill_date, "%B %-d, %Y")+ def yearly_expiration_notification(team) do+ next_bill_date = Calendar.strftime(team.subscription.next_bill_date, "%B %-d, %Y")accept_traffic_until =- user- |> Plausible.Users.accept_traffic_until()+ team+ |> Plausible.Teams.accept_traffic_until()|> Calendar.strftime("%B %-d, %Y")priority_email()- |> to(user)+ |> to(team.owner)|> tag("yearly-expiration")|> subject("Your Plausible subscription is about to expire")|> render("yearly_expiration_notification.html", %{- user: user,+ user: team.owner,next_bill_date: next_bill_date,accept_traffic_until: accept_traffic_until})@@ -288,16 +289,16 @@ defmodule PlausibleWeb.Email do)end- def invitation_rejected(invitation) do+ def invitation_rejected(guest_invitation) dopriority_email()- |> to(invitation.inviter.email)+ |> to(guest_invitation.team_invitation.inviter.email)|> tag("invitation-rejected")|> subject(- "[#{Plausible.product_name()}] #{invitation.email} rejected your invitation to #{invitation.site.domain}"+ "[#{Plausible.product_name()}] #{guest_invitation.team_invitation.email} rejected your invitation to #{guest_invitation.site.domain}")|> render("invitation_rejected.html",- user: invitation.inviter,- invitation: invitation+ user: guest_invitation.team_invitation.inviter,+ guest_invitation: guest_invitation)end@@ -314,29 +315,29 @@ defmodule PlausibleWeb.Email do)end- def ownership_transfer_rejected(invitation) do+ def ownership_transfer_rejected(site_transfer) dopriority_email()- |> to(invitation.inviter.email)+ |> to(site_transfer.initiator.email)|> tag("ownership-transfer-rejected")|> subject(- "[#{Plausible.product_name()}] #{invitation.email} rejected the ownership transfer of #{invitation.site.domain}"+ "[#{Plausible.product_name()}] #{site_transfer.email} rejected the ownership transfer of #{site_transfer.site.domain}")|> render("ownership_transfer_rejected.html",- user: invitation.inviter,- invitation: invitation+ user: site_transfer.initiator,+ site_transfer: site_transfer)end- def site_member_removed(membership) do+ def site_member_removed(guest_membership) dopriority_email()- |> to(membership.user.email)+ |> to(guest_membership.team_membership.user.email)|> tag("site-member-removed")|> subject(- "[#{Plausible.product_name()}] Your access to #{membership.site.domain} has been revoked"+ "[#{Plausible.product_name()}] Your access to #{guest_membership.site.domain} has been revoked")|> render("site_member_removed.html",- user: membership.user,- membership: membership+ user: guest_membership.team_membership.user,+ guest_membership: guest_membership)enddiff --git a/lib/plausible_web/live/choose_plan.ex b/lib/plausible_web/live/choose_plan.exindex 54fee15399..8b2c189236 100644--- a/lib/plausible_web/live/choose_plan.ex+++ b/lib/plausible_web/live/choose_plan.ex@@ -17,9 +17,7 @@ defmodule PlausibleWeb.Live.ChoosePlan dosocket =socket|> assign_new(:pending_ownership_site_ids, fn %{current_user: current_user} ->- current_user.email- |> Plausible.Teams.Memberships.all_pending_site_transfers()- |> Enum.map(& &1.site_id)+ Plausible.Teams.Memberships.all_pending_site_transfers(current_user.email)end)|> assign_new(:usage, fn %{my_team: my_team,diff --git a/lib/plausible_web/live/goal_settings/form.ex b/lib/plausible_web/live/goal_settings/form.exindex 90371ce98b..c2a9b49da4 100644--- a/lib/plausible_web/live/goal_settings/form.ex+++ b/lib/plausible_web/live/goal_settings/form.ex@@ -9,12 +9,10 @@ defmodule PlausibleWeb.Live.GoalSettings.Form doalias Plausible.Repodef update(assigns, socket) do- site = Repo.preload(assigns.site, :owner)- owner = Plausible.Users.with_subscription(site.owner)- site = %{site | owner: owner}+ site = Repo.preload(assigns.site, [:team, :owner])has_access_to_revenue_goals? =- Plausible.Billing.Feature.RevenueGoals.check_availability(owner) == :ok+ Plausible.Billing.Feature.RevenueGoals.check_availability(site.team) == :okform =(assigns.goal || %Plausible.Goal{})diff --git a/lib/plausible_web/live/register_form.ex b/lib/plausible_web/live/register_form.exindex 848ac8b506..dc7a4aea79 100644--- a/lib/plausible_web/live/register_form.ex+++ b/lib/plausible_web/live/register_form.ex@@ -7,12 +7,13 @@ defmodule PlausibleWeb.Live.RegisterForm doalias Plausible.Authalias Plausible.Repo+ alias Plausible.Teamsdef mount(params, _session, socket) dosocket =assign_new(socket, :invitation, fn ->if invitation_id = params["invitation_id"] do- Repo.get_by(Auth.Invitation, invitation_id: invitation_id)+ find_by_id_unified(invitation_id)endend)@@ -283,13 +284,9 @@ defmodule PlausibleWeb.Live.RegisterForm do|> Map.put("email", invitation.email)|> Auth.User.new()- user =- case invitation.role do- :owner -> user- _ -> Plausible.Auth.User.remove_trial_expiry(user)- end+ with_team? = invitation.role == :owner- add_user(socket, user)+ add_user(socket, user, with_team?: with_team?)else{:noreply, assign(socket, :captcha_error, "Please complete the captcha to register")}end@@ -310,20 +307,10 @@ defmodule PlausibleWeb.Live.RegisterForm do{:noreply, assign(socket, trigger_submit: true)}end- defp add_user(socket, user) do+ defp add_user(socket, user, opts \\ []) doresult =Repo.transaction(fn ->- case Repo.insert(user) do- {:ok, user} when not is_nil(user.trial_expiry_date) ->- Plausible.Teams.get_or_create(user)- user-- {:ok, user} ->- user-- {:error, reason} ->- Repo.rollback(reason)- end+ do_add_user(user, opts)end)case result do@@ -344,4 +331,69 @@ defmodule PlausibleWeb.Live.RegisterForm do)}endend++ defp do_add_user(user, opts) do+ case Repo.insert(user) do+ {:ok, user} ->+ if opts[:with_team?] do+ {:ok, _} = Plausible.Teams.get_or_create(user)+ end++ user++ {:error, reason} ->+ Repo.rollback(reason)+ end+ end++ defp find_by_id_unified(invitation_or_transfer_id) do+ result =+ with {:error, :invitation_not_found} <-+ find_invitation_by_id_unified(invitation_or_transfer_id) do+ find_transfer_by_id_unified(invitation_or_transfer_id)+ end++ case result do+ {:error, :invitation_not_found} -> nil+ {:ok, unified} -> unified+ end+ end++ defp find_invitation_by_id_unified(id) do+ invitation =+ Teams.GuestInvitation+ |> Repo.get_by(invitation_id: id)+ |> Repo.preload([:site, team_invitation: :inviter])++ case invitation do+ nil ->+ {:error, :invitation_not_found}++ guest_invitation ->+ {:ok,+ %{+ role: guest_invitation.role,+ email: guest_invitation.team_invitation.email+ }}+ end+ end++ defp find_transfer_by_id_unified(id) do+ transfer =+ Teams.SiteTransfer+ |> Repo.get_by(transfer_id: id)+ |> Repo.preload([:site, :initiator])++ case transfer do+ nil ->+ {:error, :invitation_not_found}++ transfer ->+ {:ok,+ %{+ role: :owner,+ email: transfer.email+ }}+ end+ endenddiff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.exindex f398af35b2..bb3a1ba9de 100644--- a/lib/plausible_web/live/sites.ex+++ b/lib/plausible_web/live/sites.ex@@ -146,7 +146,7 @@ defmodule PlausibleWeb.Live.Sites doendattr :site, Plausible.Site, required: true- attr :invitation, Plausible.Auth.Invitation, required: true+ attr :invitation, :map, required: trueattr :hourly_stats, :map, required: truedef invitation(assigns) do@@ -686,7 +686,7 @@ defmodule PlausibleWeb.Live.Sites docase ensure_can_take_ownership(site, team) do:ok ->- check_features(invitation, user)+ check_features(invitation, team){:error, :no_plan} ->%{invitation: invitation, no_plan: true}@@ -701,8 +701,8 @@ defmodule PlausibleWeb.Live.Sites dodefdelegate ensure_can_take_ownership(site, team), to: Plausible.Teams.Invitations- def check_features(%{role: :owner, site: site} = invitation, user) do- case check_feature_access(site, user) do+ def check_features(%{role: :owner, site: site} = invitation, team) do+ case check_feature_access(site, team) do:ok ->%{invitation: invitation}@@ -717,10 +717,10 @@ defmodule PlausibleWeb.Live.Sites doendon_ee do- defp check_feature_access(site, new_owner) do+ defp check_feature_access(site, new_team) domissing_features =Plausible.Teams.Billing.features_usage(nil, [site.id])- |> Enum.filter(&(&1.check_availability(new_owner) != :ok))+ |> Enum.filter(&(&1.check_availability(new_team) != :ok))if missing_features == [] do:ok@@ -729,7 +729,7 @@ defmodule PlausibleWeb.Live.Sites doendendelse- defp check_feature_access(_site, _new_owner) do+ defp check_feature_access(_site, _new_team) do:okendenddiff --git a/lib/plausible_web/plugs/authorize_site_access.ex b/lib/plausible_web/plugs/authorize_site_access.exindex d9722d5bb4..4019fdfb9a 100644--- a/lib/plausible_web/plugs/authorize_site_access.ex+++ b/lib/plausible_web/plugs/authorize_site_access.ex@@ -110,10 +110,10 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccess dosite =site|> Plausible.Imported.load_import_data()- |> Repo.preload(- team: [subscription: Plausible.Teams.last_subscription_query()],- owner: [subscription: Plausible.Users.last_subscription_query()]- )+ |> Repo.preload([+ :owner,+ team: [subscription: Plausible.Teams.last_subscription_query()]+ ])conn = merge_assigns(conn, site: site, site_role: role)diff --git a/lib/plausible_web/templates/email/invitation_rejected.html.heex b/lib/plausible_web/templates/email/invitation_rejected.html.heexindex 932b2b8775..bac750d2db 100644--- a/lib/plausible_web/templates/email/invitation_rejected.html.heex+++ b/lib/plausible_web/templates/email/invitation_rejected.html.heex@@ -1,2 +1,2 @@-<%= @invitation.email %> has rejected your invitation to <%= @invitation.site.domain %>.-<a href={Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @invitation.site.domain)}>Click here</a> to view site settings.+<%= @guest_invitation.team_invitation.email %> has rejected your invitation to <%= @guest_invitation.site.domain %>.+<a href={Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @guest_invitation.site.domain)}>Click here</a> to view site settings.diff --git a/lib/plausible_web/templates/email/ownership_transfer_rejected.html.heex b/lib/plausible_web/templates/email/ownership_transfer_rejected.html.heexindex 897cde36cd..81a4fdc9dc 100644--- a/lib/plausible_web/templates/email/ownership_transfer_rejected.html.heex+++ b/lib/plausible_web/templates/email/ownership_transfer_rejected.html.heex@@ -1,2 +1,2 @@-<%= @invitation.email %> has rejected the ownership transfer of <%= @invitation.site.domain %>.-<a href={Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @invitation.site.domain)}>Click here</a> to view site settings.+<%= @site_transfer.email %> has rejected the ownership transfer of <%= @site_transfer.site.domain %>.+<a href={Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @site_transfer.site.domain)}>Click here</a> to view site settings.diff --git a/lib/plausible_web/templates/email/ownership_transfer_request.html.heex b/lib/plausible_web/templates/email/ownership_transfer_request.html.heexindex bbfab461ba..2cf4f0342c 100644--- a/lib/plausible_web/templates/email/ownership_transfer_request.html.heex+++ b/lib/plausible_web/templates/email/ownership_transfer_request.html.heex@@ -5,7 +5,7 @@<% else %><aphx-no-format- href={Routes.auth_url(PlausibleWeb.Endpoint, :register_form, invitation: @invitation_id)}+ href={Routes.auth_url(PlausibleWeb.Endpoint, :register_from_invitation_form, @invitation_id)}>Click here</a> to create your account. <br /><br />Plausible is a lightweight and open-source website analytics tool. We hope you like our simple and ethical approach to tracking website visitors.<% end %>diff --git a/lib/plausible_web/templates/email/site_member_removed.html.heex b/lib/plausible_web/templates/email/site_member_removed.html.heexindex 41b4acae4f..5e00cab2c4 100644--- a/lib/plausible_web/templates/email/site_member_removed.html.heex+++ b/lib/plausible_web/templates/email/site_member_removed.html.heex@@ -1,4 +1,4 @@-An administrator of <%= @membership.site.domain %> has removed you as a member. You won't be able to see the stats anymore.+An administrator of <%= @guest_membership.site.domain %> has removed you as a member. You won't be able to see the stats anymore.<br /><br /><a href={Routes.site_url(PlausibleWeb.Endpoint, :index)}>Click here</a>to view your sites.diff --git a/lib/plausible_web/templates/email/site_setup_help_email.html.heex b/lib/plausible_web/templates/email/site_setup_help_email.html.heexindex 09bb7bc827..8b4ad4e5d9 100644--- a/lib/plausible_web/templates/email/site_setup_help_email.html.heex+++ b/lib/plausible_web/templates/email/site_setup_help_email.html.heex@@ -1,4 +1,4 @@-<%= if Plausible.Users.on_trial?(@user) do %>+<%= if Plausible.Teams.on_trial?(@site.team) do %>You signed up for a free 30-day trial of Plausible, a simple and privacy-friendly website analytics tool.<br /><br /><% end %>diff --git a/lib/plausible_web/templates/email/site_setup_success_email.html.heex b/lib/plausible_web/templates/email/site_setup_success_email.html.heexindex 462949bf9c..a6b70cfebf 100644--- a/lib/plausible_web/templates/email/site_setup_success_email.html.heex+++ b/lib/plausible_web/templates/email/site_setup_success_email.html.heex@@ -5,7 +5,7 @@ Do check out your <a href={"#{plausible_url()}/#{URI.encode_www_form(@site.domai<br /><br />Something looks off? Take a look at our <a href="https://plausible.io/docs/troubleshoot-integration">installation troubleshooting guide</a>.<br /><br />-<%= if not Plausible.ce?() and Plausible.Users.on_trial?(@user) do %>+<%= if not Plausible.ce?() and Plausible.Teams.on_trial?(@site_team) do %>You're on a 30-day free trial with no obligations so do take your time to explore Plausible.Here's how to get <a href="https://plausible.io/docs/your-plausible-experience">the most out of your Plausible experience</a>.<br /><br />diff --git a/lib/plausible_web/templates/layout/_header.html.heex b/lib/plausible_web/templates/layout/_header.html.heexindex bf376249b0..6ca73f09fe 100644--- a/lib/plausible_web/templates/layout/_header.html.heex+++ b/lib/plausible_web/templates/layout/_header.html.heex@@ -44,14 +44,14 @@</.styled_link></li><li- :if={ee?() and Plausible.Users.on_trial?(@conn.assigns[:current_user])}+ :if={ee?() and Plausible.Teams.on_trial?(@conn.assigns[:my_team])}class="hidden mr-6 sm:block"><.styled_linkclass="text-sm text-yellow-900 dark:text-yellow-900 rounded px-3 py-2 rounded-md bg-yellow-100 dark:bg-yellow-100"href={Routes.settings_path(@conn, :subscription)}>- <%= trial_notificaton(@conn.assigns[:current_user]) %>+ <%= trial_notification(@conn.assigns[:my_team]) %></.styled_link></li><li class="w-full sm:w-auto">diff --git a/lib/plausible_web/templates/site/membership/invite_member_form.html.heex b/lib/plausible_web/templates/site/membership/invite_member_form.html.heexindex 57a759a5df..de7e53a176 100644--- a/lib/plausible_web/templates/site/membership/invite_member_form.html.heex+++ b/lib/plausible_web/templates/site/membership/invite_member_form.html.heex@@ -45,7 +45,7 @@type="radio"field={f[:role]}id="role_admin"- value="admin"+ value="editor"x-model="selectedOption"required="true"width="w-4"diff --git a/lib/plausible_web/templates/site/new.html.heex b/lib/plausible_web/templates/site/new.html.heexindex d0c5c64d67..efc28c8d02 100644--- a/lib/plausible_web/templates/site/new.html.heex+++ b/lib/plausible_web/templates/site/new.html.heex@@ -15,7 +15,7 @@resource="sites"/>- <%= if is_nil(@current_user.trial_expiry_date) do %>+ <%= if is_nil(@my_team) or is_nil(@my_team.trial_expiry_date) do %><div class="rounded-md bg-blue-50 dark:bg-transparent dark:border border-blue-200 p-4"><div class="flex"><div class="flex-shrink-0">diff --git a/lib/plausible_web/templates/site/settings_people.html.heex b/lib/plausible_web/templates/site/settings_people.html.heexindex 50f7c39c8f..b72d6b56f3 100644--- a/lib/plausible_web/templates/site/settings_people.html.heex+++ b/lib/plausible_web/templates/site/settings_people.html.heex@@ -15,7 +15,7 @@<div class="flow-root"><ul class="divide-y divide-gray-200 dark:divide-gray-400"><%= for membership <- @memberships do %>- <li class="py-4" id={"membership-#{membership.user_id}"}>+ <li class="py-4" id={"membership-#{membership.user.id}"}><div class="flex items-center space-x-4"><div class="flex-shrink-0"><imgdiff --git a/lib/plausible_web/templates/stats/stats.html.heex b/lib/plausible_web/templates/stats/stats.html.heexindex f89d4a0068..7575a60b8f 100644--- a/lib/plausible_web/templates/stats/stats.html.heex+++ b/lib/plausible_web/templates/stats/stats.html.heex@@ -22,10 +22,10 @@data-funnels-opted-out={to_string(Plausible.Billing.Feature.Funnels.opted_out?(@site))}data-props-opted-out={to_string(Plausible.Billing.Feature.Props.opted_out?(@site))}data-funnels-available={- to_string(Plausible.Billing.Feature.Funnels.check_availability(@site.owner) == :ok)+ to_string(Plausible.Billing.Feature.Funnels.check_availability(@site.team) == :ok)}data-props-available={- to_string(Plausible.Billing.Feature.Props.check_availability(@site.owner) == :ok)+ to_string(Plausible.Billing.Feature.Props.check_availability(@site.team) == :ok)}data-revenue-goals={Jason.encode!(@revenue_goals)}data-funnels={Jason.encode!(@funnels)}diff --git a/lib/plausible_web/two_factor/session.ex b/lib/plausible_web/two_factor/session.exindex ecd97ee346..c8d3a7d399 100644--- a/lib/plausible_web/two_factor/session.ex+++ b/lib/plausible_web/two_factor/session.ex@@ -32,7 +32,7 @@ defmodule PlausibleWeb.TwoFactor.Session dosession_2fa = conn.cookies[@session_2fa_cookie]with id when is_integer(id) <- session_2fa[:current_2fa_user_id],- %Auth.User{} = user <- Plausible.Users.with_subscription(id) do+ %Auth.User{} = user <- Plausible.Repo.get(Auth.User, id) do{:ok, user}else_ -> {:error, :not_found}diff --git a/lib/plausible_web/user_auth.ex b/lib/plausible_web/user_auth.exindex 67041d8652..3753c5d329 100644--- a/lib/plausible_web/user_auth.ex+++ b/lib/plausible_web/user_auth.ex@@ -123,7 +123,6 @@ defmodule PlausibleWeb.UserAuth dodefp get_session_by_token(token) donow = NaiveDateTime.utc_now(:second)- last_user_subscription_query = Plausible.Users.last_subscription_join_query()last_team_subscription_query = Plausible.Teams.last_subscription_join_query()token_query =@@ -138,10 +137,8 @@ defmodule PlausibleWeb.UserAuth doas: :team,left_lateral_join: ts in subquery(last_team_subscription_query),on: true,- left_lateral_join: s in subquery(last_user_subscription_query),- on: true,where: us.token == ^token and us.timeout_at > ^now,- preload: [user: {u, subscription: s, team_memberships: {tm, team: {t, subscription: ts}}}]+ preload: [user: {u, team_memberships: {tm, team: {t, subscription: ts}}}])case Repo.one(token_query) dodiff --git a/lib/plausible_web/views/layout_view.ex b/lib/plausible_web/views/layout_view.exindex ac53f6c69a..33435af9dd 100644--- a/lib/plausible_web/views/layout_view.ex+++ b/lib/plausible_web/views/layout_view.ex@@ -93,8 +93,8 @@ defmodule PlausibleWeb.LayoutView do|> List.flatten()end- def trial_notificaton(user) do- case Plausible.Users.trial_days_left(user) do+ def trial_notification(team) do+ case Plausible.Teams.trial_days_left(team) dodays when days > 1 ->"#{days} trial days left"diff --git a/lib/workers/accept_traffic_until_notification.ex b/lib/workers/accept_traffic_until_notification.exindex d7327f09d2..585c9c2aff 100644--- a/lib/workers/accept_traffic_until_notification.ex+++ b/lib/workers/accept_traffic_until_notification.ex@@ -11,8 +11,6 @@ defmodule Plausible.Workers.AcceptTrafficUntil douse Oban.Worker, queue: :check_accept_traffic_untilimport Ecto.Query- alias Plausible.Auth.User- alias Plausible.Sitealias Plausible.Repoalias Plausible.ClickhouseRepo@@ -33,21 +31,20 @@ defmodule Plausible.Workers.AcceptTrafficUntil donotifications =Repo.all(- from u in User,+ from t in Plausible.Teams.Team,+ inner_join: u in assoc(t, :owner),as: :user,- join: sm in Site.Membership,- on: sm.user_id == u.id,- where: sm.role == :owner,- where: u.accept_traffic_until == ^tomorrow or u.accept_traffic_until == ^next_week,+ inner_join: s in assoc(t, :sites),+ where: t.accept_traffic_until == ^tomorrow or t.accept_traffic_until == ^next_week,where: not exists(sent_today_query),select: %{id: u.id,email: u.email,- deadline: u.accept_traffic_until,- site_ids: fragment("array_agg(?.site_id)", sm),+ deadline: t.accept_traffic_until,+ site_ids: fragment("array_agg(?.id)", s),name: u.name},- group_by: u.id+ group_by: [u.id, t.accept_traffic_until])for notification <- notifications dodiff --git a/lib/workers/check_usage.ex b/lib/workers/check_usage.exindex d9149732ec..33568cacb2 100644--- a/lib/workers/check_usage.ex+++ b/lib/workers/check_usage.ex@@ -95,7 +95,7 @@ defmodule Plausible.Workers.CheckUsage dodef maybe_remove_grace_period(subscriber, usage_mod) docase check_pageview_usage_last_cycle(subscriber, usage_mod) do{:below_limit, _} ->- Plausible.Users.remove_grace_period(subscriber.owner)+ Plausible.Teams.remove_grace_period(subscriber):ok_ ->@@ -112,7 +112,7 @@ defmodule Plausible.Workers.CheckUsage doPlausibleWeb.Email.over_limit_email(subscriber.owner, pageview_usage, suggested_plan)|> Plausible.Mailer.send()- Plausible.Users.start_grace_period(subscriber.owner)+ Plausible.Teams.start_grace_period(subscriber)_ ->nil@@ -136,7 +136,7 @@ defmodule Plausible.Workers.CheckUsage do)|> Plausible.Mailer.send()- Plausible.Users.start_manual_lock_grace_period(subscriber.owner)+ Plausible.Teams.start_manual_lock_grace_period(subscriber)endenddiff --git a/lib/workers/clean_invitations.ex b/lib/workers/clean_invitations.exindex a494a06e19..84b9a99ef3 100644--- a/lib/workers/clean_invitations.ex+++ b/lib/workers/clean_invitations.ex@@ -10,11 +10,6 @@ defmodule Plausible.Workers.CleanInvitations doNaiveDateTime.utc_now(:second)|> NaiveDateTime.shift(@cutoff)- Repo.delete_all(- from i in Plausible.Auth.Invitation,- where: i.inserted_at < ^cutoff_time- )-Repo.delete_all(from ti in Plausible.Teams.Invitation,where: ti.inserted_at < ^cutoff_timediff --git a/lib/workers/lock_sites.ex b/lib/workers/lock_sites.exindex e1007dcb39..2b4babab9e 100644--- a/lib/workers/lock_sites.ex+++ b/lib/workers/lock_sites.ex@@ -2,13 +2,21 @@ defmodule Plausible.Workers.LockSites douse Plausible.Repouse Oban.Worker, queue: :lock_sites+ alias Plausible.Teams+@impl Oban.Workerdef perform(_job) do- 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])+ teams =+ Repo.all(+ from t in Teams.Team,+ as: :team,+ left_lateral_join: s in subquery(Teams.last_subscription_join_query()),+ on: true,+ preload: [subscription: s]+ )- for user <- users do- Plausible.Billing.SiteLocker.update_sites_for(user)+ for team <- teams do+ Plausible.Billing.SiteLocker.update_sites_for(team)end:okdiff --git a/lib/workers/notify_annual_renewal.ex b/lib/workers/notify_annual_renewal.exindex 6b55899a6a..e959e22abd 100644--- a/lib/workers/notify_annual_renewal.ex+++ b/lib/workers/notify_annual_renewal.ex@@ -1,9 +1,12 @@defmodule Plausible.Workers.NotifyAnnualRenewal douse Plausible.Repouse Oban.Worker, queue: :notify_annual_renewal+require Plausible.Billing.Subscription.Status+alias Money.Subscriptionalias Plausible.Billing.Subscription+ alias Plausible.Teams@yearly_plans Plausible.Billing.Plans.yearly_product_ids()@@ -12,56 +15,46 @@ defmodule Plausible.Workers.NotifyAnnualRenewal doSends a notification at most 7 days and at least 1 day before the renewal of an annual subscription"""def perform(_job) do- current_subscriptions =- from(- s in Plausible.Billing.Subscription,- group_by: s.user_id,- select: %{- user_id: s.user_id,- inserted_at: max(s.inserted_at)- }- )-sent_notification =from(s in "sent_renewal_notifications",where: s.timestamp > fragment("now() - INTERVAL '1 month'"))- users =+ teams =Repo.all(- from u in Plausible.Auth.User,- join: cs in subquery(current_subscriptions),- on: cs.user_id == u.id,- join: s in Plausible.Billing.Subscription,- on: s.inserted_at == cs.inserted_at,+ from t in Teams.Team,+ as: :team,+ inner_join: o in assoc(t, :owner),+ inner_lateral_join: s in subquery(Teams.last_subscription_join_query()),+ on: true,left_join: sent in ^sent_notification,- on: s.user_id == sent.user_id,+ on: o.id == sent.user_id,where: is_nil(sent.id),where: s.paddle_plan_id in @yearly_plans,where:s.next_bill_date > fragment("now()::date") ands.next_bill_date <= fragment("now()::date + INTERVAL '7 days'"),- preload: [subscription: s]+ preload: [owner: o, subscription: s])- for user <- users do- case user.subscription.status do+ for team <- teams do+ case team.subscription.status doSubscription.Status.active() ->- template = PlausibleWeb.Email.yearly_renewal_notification(user)+ template = PlausibleWeb.Email.yearly_renewal_notification(team)Plausible.Mailer.send(template)Subscription.Status.deleted() ->- template = PlausibleWeb.Email.yearly_expiration_notification(user)+ template = PlausibleWeb.Email.yearly_expiration_notification(team)Plausible.Mailer.send(template)_ ->- Sentry.capture_message("Invalid subscription for renewal", user: user)+ Sentry.capture_message("Invalid subscription for renewal", team: team, user: team.owner)endRepo.insert_all("sent_renewal_notifications", [%{- user_id: user.id,+ user_id: team.owner.id,timestamp: NaiveDateTime.utc_now()}])diff --git a/lib/workers/send_check_stats_emails.ex b/lib/workers/send_check_stats_emails.exindex c0a820bc62..c0ec65da5f 100644--- a/lib/workers/send_check_stats_emails.ex+++ b/lib/workers/send_check_stats_emails.ex@@ -12,14 +12,11 @@ defmodule Plausible.Workers.SendCheckStatsEmails dowhere:u.inserted_at > fragment("(now() at time zone 'utc') - '14 days'::interval") andu.inserted_at < fragment("(now() at time zone 'utc') - '7 days'::interval") and- u.last_seen < fragment("(now() at time zone 'utc') - '7 days'::interval"),- preload: [sites: :weekly_report]+ u.last_seen < fragment("(now() at time zone 'utc') - '7 days'::interval"))for user <- Repo.all(q) do- enabled_report = Enum.any?(user.sites, fn site -> site.weekly_report end)-- if Plausible.Auth.has_active_sites?(user) && !enabled_report do+ if eligible_for_check_stats_email?(user) dosend_check_stats_email(user)endend@@ -27,6 +24,23 @@ defmodule Plausible.Workers.SendCheckStatsEmails do:okend+ defp eligible_for_check_stats_email?(user) do+ sites =+ from(tm in Plausible.Teams.Membership,+ inner_join: t in assoc(tm, :team),+ inner_join: s in assoc(t, :sites),+ left_join: gm in assoc(tm, :guest_memberships),+ where: tm.user_id == ^user.id,+ where: tm.role != :guest or gm.site_id == s.id,+ select: s+ )+ |> Repo.all()+ |> Repo.preload(:weekly_report)++ not Enum.any?(sites, fn site -> site.weekly_report end) and+ Enum.any?(sites, &Plausible.Sites.has_stats?/1)+ end+defp send_check_stats_email(user) doPlausibleWeb.Email.check_stats_email(user)|> Plausible.Mailer.send()diff --git a/lib/workers/send_email_report.ex b/lib/workers/send_email_report.exindex 4494ea3950..05c1aab6fc 100644--- a/lib/workers/send_email_report.ex+++ b/lib/workers/send_email_report.ex@@ -47,7 +47,7 @@ defmodule Plausible.Workers.SendEmailReport do"/sites/#{URI.encode_www_form(assigns.site.domain)}/#{assigns.type}-report/unsubscribe?email=#{email}"user = Plausible.Auth.find_user_by(email: email)- login_link = user && Plausible.Sites.is_member?(user.id, assigns.site)+ login_link = user && Plausible.Teams.Memberships.site_member?(assigns.site, user)template_assigns =assignsdiff --git a/lib/workers/send_site_setup_emails.ex b/lib/workers/send_site_setup_emails.exindex b6c8804bec..db34d9366d 100644--- a/lib/workers/send_site_setup_emails.ex+++ b/lib/workers/send_site_setup_emails.ex@@ -14,20 +14,26 @@ defmodule Plausible.Workers.SendSiteSetupEmails dodefp send_create_site_emails() doq =- from(s in Plausible.Auth.User,- left_join: se in "create_site_emails",- on: se.user_id == s.id,- where: is_nil(se.id),+ from u in Plausible.Auth.User,+ as: :user,where:- s.inserted_at > fragment("(now() at time zone 'utc') - '72 hours'::interval") and- s.inserted_at < fragment("(now() at time zone 'utc') - '48 hours'::interval"),- preload: :sites- )+ not exists(+ from tm in Plausible.Teams.Membership,+ where: tm.user_id == parent_as(:user).id,+ select: true+ ),+ where:+ not exists(+ from se in "create_site_emails",+ where: se.user_id == parent_as(:user).id,+ select: true+ ),+ where:+ u.inserted_at > fragment("(now() at time zone 'utc') - '72 hours'::interval") and+ u.inserted_at < fragment("(now() at time zone 'utc') - '48 hours'::interval")for user <- Repo.all(q) do- if Enum.empty?(user.sites) do- send_create_site_email(user)- end+ send_create_site_email(user)endend@@ -38,11 +44,11 @@ defmodule Plausible.Workers.SendSiteSetupEmails doon: se.site_id == s.id,where: is_nil(se.id),where: s.inserted_at > fragment("(now() at time zone 'utc') - '72 hours'::interval"),- preload: [:owner]+ preload: [:owner, :team])for site <- Repo.all(q) do- owner = Plausible.Users.with_subscription(site.owner)+ owner = site.ownersetup_completed = Plausible.Sites.has_stats?(site)hours_passed = NaiveDateTime.diff(DateTime.utc_now(), site.inserted_at, :hour)@@ -58,15 +64,14 @@ defmodule Plausible.Workers.SendSiteSetupEmails doleft_join: se in "setup_success_emails",on: se.site_id == s.id,where: is_nil(se.id),+ inner_join: t in assoc(s, :team),where: s.inserted_at > fragment("(now() at time zone 'utc') - '72 hours'::interval"),- preload: :owner+ preload: [:owner, team: t])for site <- Repo.all(q) do- owner = Plausible.Users.with_subscription(site.owner)-if Plausible.Sites.has_stats?(site) do- send_setup_success_email(owner, site)+ send_setup_success_email(site)endendend@@ -83,8 +88,8 @@ defmodule Plausible.Workers.SendSiteSetupEmails do])end- defp send_setup_success_email(user, site) do- PlausibleWeb.Email.site_setup_success(user, site)+ defp send_setup_success_email(site) do+ PlausibleWeb.Email.site_setup_success(site.owner, site.team, site)|> Plausible.Mailer.send()Repo.insert_all("setup_success_emails", [diff --git a/lib/workers/traffic_change_notifier.ex b/lib/workers/traffic_change_notifier.exindex 206f15e5c0..98ba573ff6 100644--- a/lib/workers/traffic_change_notifier.ex+++ b/lib/workers/traffic_change_notifier.ex@@ -18,17 +18,12 @@ defmodule Plausible.Workers.TrafficChangeNotifier donotifications =Repo.all(from sn in TrafficChangeNotification,- where: is_nil(sn.last_sent),- or_where: sn.last_sent < fragment("now() - INTERVAL ?", @at_most_every),- join: s in Plausible.Site,- on: sn.site_id == s.id,+ where:+ is_nil(sn.last_sent) or sn.last_sent < fragment("now() - INTERVAL ?", @at_most_every),+ inner_join: s in assoc(sn, :site),+ inner_join: t in assoc(s, :team),where: not s.locked,- join: sm in Plausible.Site.Membership,- on: sm.site_id == s.id,- where: sm.role == :owner,- join: u in Plausible.Auth.User,- on: u.id == sm.user_id,- where: is_nil(u.accept_traffic_until) or u.accept_traffic_until > ^today,+ where: is_nil(t.accept_traffic_until) or t.accept_traffic_until > ^today,preload: [site: s])@@ -77,10 +72,8 @@ defmodule Plausible.Workers.TrafficChangeNotifier doenddefp send_spike_notification(recipient, site, current_visitors, sources) do- site = Repo.preload(site, :members)-dashboard_link =- if Enum.any?(site.members, &(&1.email == recipient)) do+ if Repo.exists?(email_match_query(site, recipient)) doRoutes.stats_url(PlausibleWeb.Endpoint, :stats, site.domain, [])end@@ -97,10 +90,8 @@ defmodule Plausible.Workers.TrafficChangeNotifier doenddefp send_drop_notification(recipient, site, current_visitors) do- site = Repo.preload(site, :members)-{dashboard_link, installation_link} =- if Enum.any?(site.members, &(&1.email == recipient)) do+ if Repo.exists?(email_match_query(site, recipient)) do{Routes.stats_url(PlausibleWeb.Endpoint, :stats, site.domain, []),Routes.site_url(PlausibleWeb.Endpoint, :installation, site.domain,@@ -122,4 +113,13 @@ defmodule Plausible.Workers.TrafficChangeNotifier doPlausible.Mailer.send(template)end++ defp email_match_query(site, recipient) do+ from tm in Plausible.Teams.Membership,+ inner_join: u in assoc(tm, :user),+ left_join: gm in assoc(tm, :guest_memberships),+ where: tm.team_id == ^site.team_id,+ where: tm.role != :guest or gm.site_id == ^site.id,+ where: u.email == ^recipient+ endenddiff --git a/test/plausible/auth/auth_test.exs b/test/plausible/auth/auth_test.exsindex 67cbe29c5d..dac250d497 100644--- a/test/plausible/auth/auth_test.exs+++ b/test/plausible/auth/auth_test.exs@@ -3,45 +3,6 @@ defmodule Plausible.AuthTest douse Plausible.Teams.Testalias Plausible.Auth- describe "user_completed_setup?" do- test "is false if user does not have any sites" do- user = insert(:user)-- refute Auth.has_active_sites?(user)- end-- test "is false if user does not have any events" do- user = insert(:user)- insert(:site, members: [user])-- refute Auth.has_active_sites?(user)- end-- test "is true if user does have events" do- user = insert(:user)- site = insert(:site, members: [user])-- populate_stats(site, [- build(:pageview)- ])-- assert Auth.has_active_sites?(user)- end-- test "can specify which roles we're looking for" do- user = insert(:user)-- insert(:site,- domain: "test-site.com",- memberships: [- build(:site_membership, user: user, role: :admin)- ]- )-- refute Auth.has_active_sites?(user, [:owner])- end- end-test "enterprise_configured?/1 returns whether the user has an enterprise plan" douser_without_plan = new_user()user_with_plan = new_user() |> subscribe_to_enterprise_plan()@@ -59,14 +20,14 @@ defmodule Plausible.AuthTest dodescribe "create_api_key/3" dotest "creates a new api key" do- user = new_user()+ user = new_user(trial_expiry_date: Date.utc_today())key = Ecto.UUID.generate()assert {:ok, %Auth.ApiKey{}} = Auth.create_api_key(user, "my new key", key)end@tag :ee_onlytest "defaults to 600 requests per hour limit in EE" do- user = new_user()+ user = new_user(trial_expiry_date: Date.utc_today()){:ok, %Auth.ApiKey{hourly_request_limit: hourly_request_limit}} =Auth.create_api_key(user, "my new EE key", Ecto.UUID.generate())@@ -76,7 +37,7 @@ defmodule Plausible.AuthTest do@tag :ce_build_onlytest "defaults to 1000000 requests per hour limit in CE" do- user = new_user()+ user = new_user(trial_expiry_date: Date.utc_today()){:ok, %Auth.ApiKey{hourly_request_limit: hourly_request_limit}} =Auth.create_api_key(user, "my new CE key", Ecto.UUID.generate())@@ -85,8 +46,8 @@ defmodule Plausible.AuthTest doendtest "errors when key already exists" do- u1 = new_user()- u2 = new_user()+ u1 = new_user(trial_expiry_date: Date.utc_today())+ u2 = new_user(trial_expiry_date: Date.utc_today())key = Ecto.UUID.generate()assert {:ok, %Auth.ApiKey{}} = Auth.create_api_key(u1, "my new key", key)assert {:error, changeset} = Auth.create_api_key(u2, "my other key", key)@@ -98,7 +59,7 @@ defmodule Plausible.AuthTest do@tag :ee_onlytest "returns error when user is on a growth plan" do- user = insert(:user, subscription: build(:growth_subscription))+ user = new_user() |> subscribe_to_growth_plan()assert {:error, :upgrade_required} =Auth.create_api_key(user, "my new key", Ecto.UUID.generate())@@ -107,16 +68,16 @@ defmodule Plausible.AuthTest dodescribe "delete_api_key/2" dotest "deletes the record" do- user = new_user()+ user = new_user(trial_expiry_date: Date.utc_today())assert {:ok, api_key} = Auth.create_api_key(user, "my new key", Ecto.UUID.generate())assert :ok = Auth.delete_api_key(user, api_key.id)refute Plausible.Repo.reload(api_key)endtest "returns error when api key does not exist or does not belong to user" do- me = new_user()+ me = new_user(trial_expiry_date: Date.utc_today())- other_user = new_user()+ other_user = new_user(trial_expiry_date: Date.utc_today()){:ok, other_api_key} = Auth.create_api_key(other_user, "my new key", Ecto.UUID.generate())assert {:error, :not_found} = Auth.delete_api_key(me, other_api_key.id)diff --git a/test/plausible/auth/grace_period_test.exs b/test/plausible/auth/grace_period_test.exsindex 42a7845e7d..b3e32f6055 100644--- a/test/plausible/auth/grace_period_test.exs+++ b/test/plausible/auth/grace_period_test.exs@@ -1,12 +1,16 @@defmodule Plausible.Auth.GracePeriodTest douse Plausible.DataCase, async: true+ use Plausible.Teams.Testtest "active?/1 returns false when grace period cannot be telled" do- without_grace_period = build(:user, grace_period: nil)+ without_grace_period =+ new_user(trial_expiry_date: Date.utc_today(), team: [grace_period: nil])+ |> team_of()+refute Plausible.Auth.GracePeriod.active?(without_grace_period)- without_user = nil- refute Plausible.Auth.GracePeriod.active?(without_user)+ without_team = nil+ refute Plausible.Auth.GracePeriod.active?(without_team)endtest "active?/1 returns false when grace period is expired" do@@ -17,9 +21,11 @@ defmodule Plausible.Auth.GracePeriodTest dois_over: false}- user = build(:user, grace_period: grace_period)+ team =+ new_user(trial_expiry_date: Date.utc_today(), team: [grace_period: grace_period])+ |> team_of()- refute Plausible.Auth.GracePeriod.active?(user)+ refute Plausible.Auth.GracePeriod.active?(team)endtest "active?/1 returns true when grace period is still active" do@@ -30,17 +36,22 @@ defmodule Plausible.Auth.GracePeriodTest dois_over: false}- user = build(:user, grace_period: grace_period)+ team =+ new_user(trial_expiry_date: Date.utc_today(), team: [grace_period: grace_period])+ |> team_of()- assert Plausible.Auth.GracePeriod.active?(user)+ assert Plausible.Auth.GracePeriod.active?(team)endtest "expired?/1 returns false when grace period cannot be telled" do- without_grace_period = build(:user, grace_period: nil)+ without_grace_period =+ new_user(trial_expiry_date: Date.utc_today(), team: [grace_period: nil])+ |> team_of()+refute Plausible.Auth.GracePeriod.expired?(without_grace_period)- without_user = nil- refute Plausible.Auth.GracePeriod.expired?(without_user)+ without_team = nil+ refute Plausible.Auth.GracePeriod.expired?(without_team)endtest "expired?/1 returns true when grace period is expired" do@@ -51,9 +62,11 @@ defmodule Plausible.Auth.GracePeriodTest dois_over: true}- user = build(:user, grace_period: grace_period)+ team =+ new_user(trial_expiry_date: Date.utc_today(), team: [grace_period: grace_period])+ |> team_of()- assert Plausible.Auth.GracePeriod.expired?(user)+ assert Plausible.Auth.GracePeriod.expired?(team)endtest "expired?/1 returns false when grace period is still active" do@@ -64,38 +77,40 @@ defmodule Plausible.Auth.GracePeriodTest dois_over: false}- user = build(:user, grace_period: grace_period)+ team =+ new_user(trial_expiry_date: Date.utc_today(), team: [grace_period: grace_period])+ |> team_of()- refute Plausible.Auth.GracePeriod.expired?(user)+ refute Plausible.Auth.GracePeriod.expired?(team)endtest "start_manual_lock_changeset/1 creates an active grace period" do- user = build(:user)- changeset = Plausible.Auth.GracePeriod.start_manual_lock_changeset(user)- user = Ecto.Changeset.apply_changes(changeset)+ team = new_user(trial_expiry_date: Date.utc_today()) |> team_of()+ changeset = Plausible.Auth.GracePeriod.start_manual_lock_changeset(team)+ team = Ecto.Changeset.apply_changes(changeset)- assert Plausible.Auth.GracePeriod.active?(user)- refute Plausible.Auth.GracePeriod.expired?(user)+ assert Plausible.Auth.GracePeriod.active?(team)+ refute Plausible.Auth.GracePeriod.expired?(team)endtest "start_changeset/1 creates an active grace period" do- user = build(:user)- changeset = Plausible.Auth.GracePeriod.start_changeset(user)- user = Ecto.Changeset.apply_changes(changeset)+ team = new_user(trial_expiry_date: Date.utc_today()) |> team_of()+ changeset = Plausible.Auth.GracePeriod.start_changeset(team)+ team = Ecto.Changeset.apply_changes(changeset)- assert Plausible.Auth.GracePeriod.active?(user)- refute Plausible.Auth.GracePeriod.expired?(user)+ assert Plausible.Auth.GracePeriod.active?(team)+ refute Plausible.Auth.GracePeriod.expired?(team)endtest "remove_changeset/1 removes the active grace period" do- user = build(:user)- start_changeset = Plausible.Auth.GracePeriod.start_changeset(user)- user = Ecto.Changeset.apply_changes(start_changeset)+ team = new_user(trial_expiry_date: Date.utc_today()) |> team_of()+ start_changeset = Plausible.Auth.GracePeriod.start_changeset(team)+ team = Ecto.Changeset.apply_changes(start_changeset)- remove_changeset = Plausible.Auth.GracePeriod.remove_changeset(user)- user = Ecto.Changeset.apply_changes(remove_changeset)+ remove_changeset = Plausible.Auth.GracePeriod.remove_changeset(team)+ team = Ecto.Changeset.apply_changes(remove_changeset)- refute Plausible.Auth.GracePeriod.active?(user)- refute Plausible.Auth.GracePeriod.expired?(user)+ refute Plausible.Auth.GracePeriod.active?(team)+ refute Plausible.Auth.GracePeriod.expired?(team)endenddiff --git a/test/plausible/auth/users_test.exs b/test/plausible/auth/users_test.exsdeleted file mode 100644index be57e9a71d..0000000000--- a/test/plausible/auth/users_test.exs+++ /dev/null@@ -1,91 +0,0 @@-defmodule Plausible.UsersTest do- use Plausible.DataCase, async: true-- alias Plausible.Users- alias Plausible.Auth.User- alias Plausible.Repo-- describe "trial_days_left" do- test "is 30 days for new signup" do- user = insert(:user)-- assert Users.trial_days_left(user) == 30- end-- test "is based on trial_expiry_date" do- user = insert(:user, trial_expiry_date: Timex.shift(Timex.now(), days: 1))-- assert Users.trial_days_left(user) == 1- end- end-- describe "on_trial?" do- @describetag :ee_only- test "is true with >= 0 trial days left" do- user = insert(:user)-- assert Users.on_trial?(user)- end-- test "is false with < 0 trial days left" do- user = insert(:user, trial_expiry_date: Timex.shift(Timex.now(), days: -1))-- refute Users.on_trial?(user)- end-- test "is false if user has subscription" do- user = insert(:user, subscription: build(:subscription))-- refute Users.on_trial?(user)- end- end-- describe "update_accept_traffic_until" do- @describetag :ee_only- test "update" do- user = insert(:user) |> User.start_trial() |> Repo.update!()- # 30 for trial + 14- assert Date.diff(user.accept_traffic_until, Date.utc_today()) ==- 30 + User.trial_accept_traffic_until_offset_days()-- future = Date.add(Date.utc_today(), 30)- insert(:subscription, user: user, next_bill_date: future)-- assert updated_user = Users.update_accept_traffic_until(user)-- assert Date.diff(updated_user.accept_traffic_until, future) ==- User.subscription_accept_traffic_until_offset_days()- end-- test "retrieve: trial + 14 days" do- user = insert(:user)-- assert Users.accept_traffic_until(user) ==- Date.utc_today() |> Date.add(30 + User.trial_accept_traffic_until_offset_days())- end-- test "retrieve: last_bill_date + 30 days" do- future = Date.add(Date.utc_today(), 30)- user = insert(:user, subscription: build(:subscription, next_bill_date: future))-- assert Users.accept_traffic_until(user) ==- future |> Date.add(User.subscription_accept_traffic_until_offset_days())- end-- test "retrieve: free plan" do- user = insert(:user, subscription: build(:subscription, paddle_plan_id: "free_10k"))-- assert Users.accept_traffic_until(user) == ~D[2135-01-01]- end-- test "retrieve: invalid user (there's one in the prod DB as of today, due to some testing)" do- user = insert(:user, trial_expiry_date: nil)-- assert_raise RuntimeError,- ~r/Manual intervention required/,- fn ->- assert Users.accept_traffic_until(user) == ~D[2135-01-01]- end- end- end-enddiff --git a/test/plausible/billing/billing_test.exs b/test/plausible/billing/billing_test.exsindex 4599643332..b33c9fd3a2 100644--- a/test/plausible/billing/billing_test.exs+++ b/test/plausible/billing/billing_test.exs@@ -8,7 +8,7 @@ defmodule Plausible.BillingTest dodescribe "check_needs_to_upgrade" dotest "is false for a trial user" do- team = new_user() |> team_of()+ team = new_user(trial_expiry_date: Date.utc_today()) |> team_of()assert Plausible.Teams.Billing.check_needs_to_upgrade(team) == :no_upgrade_neededend@@ -90,9 +90,7 @@ defmodule Plausible.BillingTest donext_bill_date: Date.utc_today())- user = Plausible.Users.end_grace_period(user)-- team = user |> Repo.reload!() |> team_of()+ team = user |> team_of() |> Repo.reload!() |> Plausible.Teams.end_grace_period()assert Plausible.Teams.Billing.check_needs_to_upgrade(team) =={:needs_to_upgrade, :grace_period_ended}@@ -134,12 +132,14 @@ defmodule Plausible.BillingTest dodescribe "subscription_created" dotest "creates a subscription" do- user = insert(:user)+ user = new_user()%{@subscription_created_params | "passthrough" => user.id}|> Billing.subscription_created()- subscription = Repo.get_by(Plausible.Billing.Subscription, user_id: user.id)+ subscription =+ user |> team_of() |> Plausible.Teams.with_subscription() |> Map.fetch!(:subscription)+assert subscription.paddle_subscription_id == @subscription_idassert subscription.next_bill_date == ~D[2019-06-01]assert subscription.last_bill_date == ~D[2019-05-01]@@ -149,47 +149,23 @@ defmodule Plausible.BillingTest do@tag :teamstest "creates a subscription with teams passthrough" do- user = insert(:user)+ user = new_user(){:ok, team} = Plausible.Teams.get_or_create(user)- assert_team_exists(user)-%{@subscription_created_params | "passthrough" => "user:#{user.id};team:#{team.id}"}|> Billing.subscription_created()- assert Repo.get_by(Plausible.Billing.Subscription, user_id: user.id, team_id: team.id)- end-- @tag :teams- test "creates a team on create subscription" do- user = insert(:user)-- %{@subscription_created_params | "passthrough" => user.id}- |> Billing.subscription_created()-- team = assert_team_exists(user)- assert Repo.get_by(Plausible.Billing.Subscription, user_id: user.id, team_id: team.id)- end-- @tag :teams- test "doesn't create additional teams on create subscription" do- user = insert(:user)- {:ok, team} = Plausible.Teams.get_or_create(user)-- %{@subscription_created_params | "passthrough" => user.id}- |> Billing.subscription_created()-- team = assert_team_exists(user, team.id)- assert Repo.get_by(Plausible.Billing.Subscription, user_id: user.id, team_id: team.id)+ assert user |> team_of() |> Plausible.Teams.with_subscription() |> Map.fetch!(:subscription)endtest "create with email address" do- user = insert(:user)+ user = new_user()%{@subscription_created_params | "email" => user.email}|> Billing.subscription_created()- subscription = Repo.get_by(Plausible.Billing.Subscription, user_id: user.id)+ subscription = subscription_of(user)+assert subscription.paddle_subscription_id == @subscription_idassert subscription.next_bill_date == ~D[2019-06-01]assert subscription.last_bill_date == ~D[2019-05-01]@@ -197,8 +173,8 @@ defmodule Plausible.BillingTest doendtest "unlocks sites if user has any locked sites" do- user = insert(:user)- site = insert(:site, locked: true, members: [user])+ user = new_user()+ site = new_site(owner: user, locked: true)%{@subscription_created_params | "passthrough" => user.id}|> Billing.subscription_created()@@ -208,142 +184,104 @@ defmodule Plausible.BillingTest do@tag :ee_onlytest "updates accept_traffic_until" do- user = insert(:user)+ user = new_user()%{@subscription_created_params | "passthrough" => user.id}|> Billing.subscription_created()next_bill = Date.from_iso8601!(@subscription_created_params["next_bill_date"])- assert Repo.reload!(user).accept_traffic_until ==+ assert Repo.reload!(team_of(user)).accept_traffic_until ==Date.add(next_bill, 30)endtest "sets user.allow_next_upgrade_override field to false" do- user = insert(:user, allow_next_upgrade_override: true)+ user = new_user(team: [allow_next_upgrade_override: true])%{@subscription_created_params | "passthrough" => user.id}|> Billing.subscription_created()- refute Repo.reload!(user).allow_next_upgrade_override+ refute Repo.reload!(team_of(user)).allow_next_upgrade_overrideendtest "if user upgraded to an enterprise plan, their API key limits are automatically adjusted" do- user = insert(:user)+ user = new_user()- plan =- insert(:enterprise_plan,- user: user,- paddle_plan_id: @plan_id_10k,- hourly_api_request_limit: 10_000- )+ subscribe_to_enterprise_plan(user,+ hourly_api_request_limit: 10_000,+ paddle_plan_id: @plan_id_10k+ )api_key = insert(:api_key, user: user, hourly_request_limit: 1)%{@subscription_created_params | "passthrough" => user.id}|> Billing.subscription_created()- assert Repo.reload!(api_key).hourly_request_limit == plan.hourly_api_request_limit+ assert Repo.reload!(api_key).hourly_request_limit == 10_000endenddescribe "subscription_updated" dotest "updates an existing subscription" do- user = insert(:user)- subscription = insert(:subscription, user: user)+ user = new_user()+ subscribe_to_growth_plan(user)@subscription_updated_params|> Map.merge(%{- "subscription_id" => subscription.paddle_subscription_id,+ "subscription_id" => subscription_of(user).paddle_subscription_id,"passthrough" => user.id})|> Billing.subscription_updated()- subscription = Repo.get_by(Plausible.Billing.Subscription, user_id: user.id)+ subscription = subscription_of(user)assert subscription.paddle_plan_id == @plan_id_10kassert subscription.next_bill_amount == "12.00"end- @tag :teams- test "creates a team on subscription update" do- user = insert(:user)- subscription = insert(:subscription, user: user)-- @subscription_updated_params- |> Map.merge(%{- "subscription_id" => subscription.paddle_subscription_id,- "passthrough" => user.id- })- |> Billing.subscription_updated()-- team = assert_team_exists(user)- assert Repo.get_by(Plausible.Billing.Subscription, user_id: user.id, team_id: team.id)- end-@tag :teamstest "updates subscription with user/team passthrough" do- user = insert(:user)- subscription = insert(:subscription, user: user)- {:ok, team} = Plausible.Teams.get_or_create(user)+ user = new_user()+ subscribe_to_growth_plan(user)+ team = team_of(user)++ subscription_id = subscription_of(user).paddle_subscription_id@subscription_updated_params|> Map.merge(%{- "subscription_id" => subscription.paddle_subscription_id,+ "next_bill_date" => "2021-01-01",+ "subscription_id" => subscription_id,"passthrough" => "user:#{user.id};team:#{team.id}"})|> Billing.subscription_updated()- team = assert_team_exists(user)- assert Repo.get_by(Plausible.Billing.Subscription, user_id: user.id, team_id: team.id)- end-- @tag :teams- test "syncs team properties with user on subscription update" do- user =- insert(:user, accept_traffic_until: ~D[2001-01-01], allow_next_upgrade_override: true)-- user = Plausible.Users.start_grace_period(user)-- subscription = insert(:subscription, user: user)-- @subscription_updated_params- |> Map.merge(%{- "subscription_id" => subscription.paddle_subscription_id,- "passthrough" => user.id- })- |> Billing.subscription_updated()+ subscription =+ user |> team_of() |> Plausible.Teams.with_subscription() |> Map.fetch!(:subscription)- team = assert_team_exists(user)- user = Repo.reload!(user)- assert team.grace_period == user.grace_period- assert team.trial_expiry_date == user.trial_expiry_date- assert team.accept_traffic_until == user.accept_traffic_until- assert team.allow_next_upgrade_override == user.allow_next_upgrade_override+ assert subscription.next_bill_date == ~D[2021-01-01]endtest "status update from 'paused' to 'past_due' is ignored" do- user = insert(:user)- subscription = insert(:subscription, user: user, status: Subscription.Status.paused())+ user = new_user()+ subscribe_to_growth_plan(user, status: Subscription.Status.paused())%{@subscription_updated_params | "old_status" => "paused", "status" => "past_due"}|> Map.merge(%{- "subscription_id" => subscription.paddle_subscription_id,+ "subscription_id" => subscription_of(user).paddle_subscription_id,"passthrough" => user.id})|> Billing.subscription_updated()- subscription = Repo.get_by(Subscription, user_id: user.id)- assert subscription.status == Subscription.Status.paused()+ assert subscription_of(user).status == Subscription.Status.paused()endtest "unlocks sites if subscription is changed from past_due to active" do- user = insert(:user)- subscription = insert(:subscription, user: user, status: Subscription.Status.past_due())- site = insert(:site, locked: true, members: [user])+ user = new_user()+ subscribe_to_growth_plan(user, status: Subscription.Status.past_due())+ site = new_site(locked: true, owner: user)@subscription_updated_params|> Map.merge(%{- "subscription_id" => subscription.paddle_subscription_id,+ "subscription_id" => subscription_of(user).paddle_subscription_id,"passthrough" => user.id,"old_status" => "past_due"})@@ -354,43 +292,43 @@ defmodule Plausible.BillingTest do@tag :ee_onlytest "updates accept_traffic_until" do- user = insert(:user)- subscription = insert(:subscription, user: user)+ user = new_user() |> subscribe_to_growth_plan()@subscription_updated_params|> Map.merge(%{- "subscription_id" => subscription.paddle_subscription_id,+ "subscription_id" => subscription_of(user).paddle_subscription_id,"passthrough" => user.id})|> Billing.subscription_updated()next_bill = Date.from_iso8601!(@subscription_updated_params["next_bill_date"])- assert Repo.reload!(user).accept_traffic_until ==+ assert Repo.reload!(team_of(user)).accept_traffic_until ==Date.add(next_bill, 30)endtest "sets user.allow_next_upgrade_override field to false" do- user = insert(:user, allow_next_upgrade_override: true)- subscription = insert(:subscription, user: user)+ user = new_user(team: [allow_next_upgrade_override: true])+ subscribe_to_growth_plan(user)++ assert Repo.reload!(team_of(user)).allow_next_upgrade_override++ subscription_id = subscription_of(user).paddle_subscription_id@subscription_updated_params|> Map.merge(%{- "subscription_id" => subscription.paddle_subscription_id,+ "subscription_id" => subscription_id,"passthrough" => user.id})|> Billing.subscription_updated()- refute Repo.reload!(user).allow_next_upgrade_override+ refute Repo.reload!(team_of(user)).allow_next_upgrade_overrideendtest "if user upgraded to an enterprise plan, their API key limits are automatically adjusted" do- user = insert(:user)- subscription = insert(:subscription, user: user)-- plan =- insert(:enterprise_plan,- user: user,+ user =+ new_user()+ |> subscribe_to_enterprise_plan(paddle_plan_id: "new-plan-id",hourly_api_request_limit: 10_000)@@ -399,32 +337,35 @@ defmodule Plausible.BillingTest do@subscription_updated_params|> Map.merge(%{- "subscription_id" => subscription.paddle_subscription_id,+ "subscription_id" => subscription_of(user).paddle_subscription_id,"passthrough" => user.id,- "subscription_plan_id" => plan.paddle_plan_id+ "subscription_plan_id" => "new-plan-id"})|> Billing.subscription_updated()- assert Repo.reload!(api_key).hourly_request_limit == plan.hourly_api_request_limit+ assert Repo.reload!(api_key).hourly_request_limit == 10_000endtest "if user's grace period has ended, upgrading will unlock sites and remove grace period" dograce_period = %Plausible.Auth.GracePeriod{end_date: Timex.shift(Timex.today(), days: -1)}- user = insert(:user, grace_period: grace_period)+ user = new_user(team: [grace_period: grace_period])++ subscribe_to_growth_plan(user)- subscription = insert(:subscription, user: user)- site = insert(:site, locked: true, members: [user])+ site = new_site(locked: true, owner: user)++ subscription_id = subscription_of(user).paddle_subscription_id@subscription_updated_params|> Map.merge(%{- "subscription_id" => subscription.paddle_subscription_id,+ "subscription_id" => subscription_id,"passthrough" => user.id,"subscription_plan_id" => @plan_id_100k})|> Billing.subscription_updated()assert Repo.reload!(site).locked == false- assert Repo.reload!(user).grace_period == nil+ assert Repo.reload!(team_of(user)).grace_period == nilendtest "ignores if subscription cannot be found" do@@ -444,17 +385,23 @@ defmodule Plausible.BillingTest dodescribe "subscription_cancelled" dotest "sets the status to deleted" do- user = insert(:user)- subscription = insert(:subscription, status: Subscription.Status.active(), user: user)+ user = new_user()+ subscribe_to_growth_plan(user, status: Subscription.Status.active())++ subscription_id = subscription_of(user).paddle_subscription_idBilling.subscription_cancelled(%{"alert_name" => "subscription_cancelled",- "subscription_id" => subscription.paddle_subscription_id,+ "subscription_id" => subscription_id,"status" => "deleted"})- subscription = Repo.get_by(Plausible.Billing.Subscription, user_id: user.id)- assert Subscription.Status.deleted?(subscription)+ assert user+ |> team_of()+ |> Repo.reload!()+ |> Plausible.Teams.with_subscription()+ |> Map.fetch!(:subscription)+ |> Subscription.Status.deleted?()endtest "ignores if the subscription cannot be found" do@@ -469,12 +416,12 @@ defmodule Plausible.BillingTest doendtest "sends an email to confirm cancellation" do- user = insert(:user)- subscription = insert(:subscription, status: Subscription.Status.active(), user: user)+ user = new_user()+ subscribe_to_growth_plan(user, status: Subscription.Status.active())Billing.subscription_cancelled(%{"alert_name" => "subscription_cancelled",- "subscription_id" => subscription.paddle_subscription_id,+ "subscription_id" => subscription_of(user).paddle_subscription_id,"status" => "deleted"})@@ -485,30 +432,28 @@ defmodule Plausible.BillingTest dodescribe "subscription_payment_succeeded" do@tag :ee_onlytest "updates accept_traffic_until" do- user = insert(:user)- subscription = insert(:subscription, user: user)+ user = new_user() |> subscribe_to_growth_plan()- refute user.accept_traffic_until+ subscription_id = subscription_of(user).paddle_subscription_idBilling.subscription_payment_succeeded(%{"alert_name" => "subscription_payment_succeeded",- "subscription_id" => subscription.paddle_subscription_id+ "subscription_id" => subscription_id})- user = Plausible.Users.with_subscription(user.id)- assert user.accept_traffic_until == Date.add(user.subscription.next_bill_date, 30)+ team = user |> team_of() |> Repo.reload!() |> Plausible.Teams.with_subscription()+ assert team.accept_traffic_until == Date.add(team.subscription.next_bill_date, 30)endtest "sets the next bill amount and date, last bill date" do- user = insert(:user)- subscription = insert(:subscription, user: user)+ user = new_user() |> subscribe_to_growth_plan()Billing.subscription_payment_succeeded(%{"alert_name" => "subscription_payment_succeeded",- "subscription_id" => subscription.paddle_subscription_id+ "subscription_id" => subscription_of(user).paddle_subscription_id})- subscription = Repo.get_by(Plausible.Billing.Subscription, user_id: user.id)+ subscription = subscription_of(user)assert subscription.next_bill_date == ~D[2019-07-10]assert subscription.next_bill_amount == "6.00"assert subscription.last_bill_date == ~D[2019-06-10]@@ -533,7 +478,7 @@ defmodule Plausible.BillingTest doPlausible.Teams.Billing.change_plan(team, "123123")- subscription = Repo.get_by(Plausible.Billing.Subscription, team_id: team.id)+ subscription = subscription_of(team)assert subscription.paddle_plan_id == "123123"assert subscription.next_bill_date == ~D[2019-07-10]assert subscription.next_bill_amount == "6.00"diff --git a/test/plausible/billing/enterprise_plan_admin_test.exs b/test/plausible/billing/enterprise_plan_admin_test.exsindex edf48595d1..0d064ed869 100644--- a/test/plausible/billing/enterprise_plan_admin_test.exs+++ b/test/plausible/billing/enterprise_plan_admin_test.exs@@ -1,5 +1,6 @@defmodule Plausible.Billing.EnterprisePlanAdminTest douse Plausible.DataCase, async: true+ use Plausible.Teams.Testalias Plausible.Billing.EnterprisePlanalias Plausible.Billing.EnterprisePlanAdmin@@ -7,7 +8,7 @@ defmodule Plausible.Billing.EnterprisePlanAdminTest do@moduletag :ee_onlytest "sanitizes number inputs and whitespace" do- user = insert(:user)+ user = new_user()changeset =EnterprisePlanAdmin.create_changeset(%EnterprisePlan{}, %{@@ -22,7 +23,7 @@ defmodule Plausible.Billing.EnterprisePlanAdminTest do})assert changeset.valid?- assert changeset.changes.user_id == user.id+ assert changeset.changes.team_id == team_of(user).idassert changeset.changes.paddle_plan_id == "123456"assert changeset.changes.billing_interval == :monthlyassert changeset.changes.monthly_pageview_limit == 100_000_000@@ -32,7 +33,7 @@ defmodule Plausible.Billing.EnterprisePlanAdminTest doendtest "scrubs empty attrs" do- user = insert(:user)+ user = new_user()changeset =EnterprisePlanAdmin.create_changeset(%EnterprisePlan{}, %{diff --git a/test/plausible/billing/enterprise_plan_test.exs b/test/plausible/billing/enterprise_plan_test.exsindex b8b6c3bb6f..3a7101ea91 100644--- a/test/plausible/billing/enterprise_plan_test.exs+++ b/test/plausible/billing/enterprise_plan_test.exs@@ -1,9 +1,11 @@defmodule Plausible.Billing.EnterprisePlanTest douse Plausible.DataCase+ use Plausible.Teams.Testalias Plausible.Billing.EnterprisePlantest "changeset/2 loads and dumps the list of features" do- plan = build(:enterprise_plan, user_id: insert(:user).id)+ team = new_user(trial_expiry_date: Date.utc_today()) |> team_of()+ plan = build(:enterprise_plan, team_id: team.id)attrs = %{features: ["props", "stats_api"]}assert {:ok, enterprise_plan} =@@ -21,7 +23,8 @@ defmodule Plausible.Billing.EnterprisePlanTest doendtest "changeset/2 fails when feature does not exist" do- plan = build(:enterprise_plan, user_id: insert(:user).id)+ team = new_user(trial_expiry_date: Date.utc_today()) |> team_of()+ plan = build(:enterprise_plan, team_id: team.id)attrs = %{features: ["ga4_import"]}assert {:error, changeset} =@@ -34,7 +37,8 @@ defmodule Plausible.Billing.EnterprisePlanTest doendtest "changeset/2 loads and dumps limits" do- plan = build(:enterprise_plan, user_id: insert(:user).id)+ team = new_user(trial_expiry_date: Date.utc_today()) |> team_of()+ plan = build(:enterprise_plan, team_id: team.id)attrs = %{team_member_limit: :unlimited, monthly_pageview_limit: 10_000}assert {:ok, enterprise_plan} =diff --git a/test/plausible/billing/feature_test.exs b/test/plausible/billing/feature_test.exsindex 7a9c4213b7..40f7e3d86c 100644--- a/test/plausible/billing/feature_test.exs+++ b/test/plausible/billing/feature_test.exs@@ -41,7 +41,7 @@ defmodule Plausible.Billing.FeatureTest doendtest "Plausible.Billing.Feature.StatsAPI.check_availability/2 returns :ok when user is on trial" do- team = new_user() |> team_of()+ team = new_user(trial_expiry_date: Date.utc_today()) |> team_of()assert :ok == Plausible.Billing.Feature.StatsAPI.check_availability(team)enddiff --git a/test/plausible/billing/plans_test.exs b/test/plausible/billing/plans_test.exsindex a7a665a226..b394c77287 100644--- a/test/plausible/billing/plans_test.exs+++ b/test/plausible/billing/plans_test.exs@@ -46,7 +46,7 @@ defmodule Plausible.Billing.PlansTest doendtest "growth_plans_for/1 shows v4 plans for everyone else" do- new_user()+ new_user(trial_expiry_date: Date.utc_today())|> team_of(with_subscription?: true)|> Map.fetch!(:subscription)|> Plans.growth_plans_for()@@ -54,7 +54,7 @@ defmodule Plausible.Billing.PlansTest doendtest "growth_plans_for/1 does not return business plans" do- new_user()+ new_user(trial_expiry_date: Date.utc_today())|> team_of(with_subscription?: true)|> Map.fetch!(:subscription)|> Plans.growth_plans_for()@@ -93,9 +93,7 @@ defmodule Plausible.Billing.PlansTest doendtest "business_plans_for/1 returns v4 plans for invited users with trial_expiry = nil" do- new_user(trial_expiry_date: nil)- |> Repo.preload(:subscription)- |> Map.fetch!(:subscription)+ nil|> Plans.business_plans_for()|> assert_generation(4)end@@ -113,7 +111,7 @@ defmodule Plausible.Billing.PlansTest doendtest "business_plans_for/1 returns v4 business plans for everyone else" do- user = new_user()+ user = new_user(trial_expiry_date: Date.utc_today())subscription =user@@ -156,7 +154,7 @@ defmodule Plausible.Billing.PlansTest dotest "latest_enterprise_plan_with_price/1" donow = NaiveDateTime.utc_now()- user = new_user()+ user = new_user(trial_expiry_date: Date.utc_today())team = team_of(user)subscribe_to_enterprise_plan(user,diff --git a/test/plausible/billing/quota_test.exs b/test/plausible/billing/quota_test.exsindex 5e963706f2..1028a62fa6 100644--- a/test/plausible/billing/quota_test.exs+++ b/test/plausible/billing/quota_test.exs@@ -1,4 +1,5 @@defmodule Plausible.Billing.QuotaTest do+ alias Plausible.Billing.EnterprisePlanuse Plausible.DataCase, async: trueuse Plausiblealias Plausible.Billing.{Quota, Plans}@@ -181,7 +182,7 @@ defmodule Plausible.Billing.QuotaTest doendtest "returns error with exceeded limits for enterprise plans" do- user = insert(:user)+ user = new_user()usage = %{monthly_pageviews: %{penultimate_cycle: %{total: 1}, last_cycle: %{total: 1}},@@ -189,12 +190,13 @@ defmodule Plausible.Billing.QuotaTest dosites: 2}- enterprise_plan =- insert(:enterprise_plan,- user: user,- paddle_plan_id: "whatever",- site_limit: 1- )+ subscribe_to_enterprise_plan(user,+ subscription?: false,+ paddle_plan_id: "whatever",+ site_limit: 1+ )++ enterprise_plan = Repo.get_by!(EnterprisePlan, paddle_plan_id: "whatever")assert Quota.ensure_within_plan_limits(usage, enterprise_plan) =={:error, {:over_plan_limits, [:site_limit]}}@@ -319,7 +321,7 @@ defmodule Plausible.Billing.QuotaTest doendtest "counts team members from pending ownerships when specified" do- me = new_user()+ me = new_user(trial_expiry_date: Date.utc_today())my_team = team_of(me)user_1 = new_user()@@ -336,7 +338,7 @@ defmodule Plausible.Billing.QuotaTest doendtest "counts invitations towards team members from pending ownership sites" do- me = new_user()+ me = new_user(trial_expiry_date: Date.utc_today())user_1 = new_user()user_2 = new_user()pending_ownership_site = new_site(owner: user_1)@@ -386,11 +388,13 @@ defmodule Plausible.Billing.QuotaTest doassert Plausible.Teams.Billing.team_member_usage(team, exclude_emails: [member.email]) == 3- assert Plausible.Teams.Billing.team_member_usage(team, exclude_emails: [invitation.email]) ==+ assert Plausible.Teams.Billing.team_member_usage(team,+ exclude_emails: [invitation.team_invitation.email]+ ) ==3assert Plausible.Teams.Billing.team_member_usage(team,- exclude_emails: [member.email, invitation.email]+ exclude_emails: [member.email, invitation.team_invitation.email]) == 2endend@@ -398,9 +402,9 @@ defmodule Plausible.Billing.QuotaTest dodescribe "team_member_limit/1" do@describetag :ee_onlytest "returns unlimited when user is on an old plan" do- team_on_v1 = new_user() |> subscribe_to_plan(@v1_plan_id)- team_on_v2 = new_user() |> subscribe_to_plan(@v2_plan_id)- team_on_v3 = new_user() |> subscribe_to_plan(@v3_plan_id)+ team_on_v1 = new_user() |> subscribe_to_plan(@v1_plan_id) |> team_of()+ team_on_v2 = new_user() |> subscribe_to_plan(@v2_plan_id) |> team_of()+ team_on_v3 = new_user() |> subscribe_to_plan(@v3_plan_id) |> team_of()assert :unlimited == Plausible.Teams.Billing.team_member_limit(team_on_v1)assert :unlimited == Plausible.Teams.Billing.team_member_limit(team_on_v2)@@ -473,7 +477,7 @@ defmodule Plausible.Billing.QuotaTest doendtest "returns [RevenueGoals] when user/site uses revenue goals" do- user = new_user()+ user = new_user(trial_expiry_date: Date.utc_today())team = team_of(user)site = new_site(owner: user)insert(:goal, currency: :USD, site: site, event_name: "Purchase")@@ -484,7 +488,7 @@ defmodule Plausible.Billing.QuotaTest doendtest "returns [StatsAPI] when user has a stats api key" do- user = new_user()+ user = new_user(trial_expiry_date: Date.utc_today())team = team_of(user)insert(:api_key, user: user)@@ -492,7 +496,7 @@ defmodule Plausible.Billing.QuotaTest doendtest "returns feature usage based on a user and a custom list of site_ids" do- user = new_user()+ user = new_user(trial_expiry_date: Date.utc_today())team = team_of(user)insert(:api_key, user: user)site_using_props = new_site(allowed_event_props: ["dummy"])@@ -573,7 +577,7 @@ defmodule Plausible.Billing.QuotaTest doendtest "returns all features when user in on trial" do- team = new_user(trial_expiry_date: Date.shift(Date.utc_today(), day: 7))+ team = new_user(trial_expiry_date: Date.shift(Date.utc_today(), day: 7)) |> team_of()assert Plausible.Billing.Feature.list() ==Plausible.Teams.Billing.allowed_features_for(team)diff --git a/test/plausible/billing/site_locker_test.exs b/test/plausible/billing/site_locker_test.exsindex 2b0b5cfdd4..a0f97f0adf 100644--- a/test/plausible/billing/site_locker_test.exs+++ b/test/plausible/billing/site_locker_test.exs@@ -9,8 +9,9 @@ defmodule Plausible.Billing.SiteLockerTest dotest "does not lock sites if user is on trial" douser = new_user(trial_expiry_date: Date.utc_today())site = new_site(owner: user, locked: true)+ team = team_of(user)- assert SiteLocker.update_sites_for(user) == :unlocked+ assert SiteLocker.update_sites_for(team) == :unlockedrefute Repo.reload!(site).lockedend@@ -18,8 +19,9 @@ defmodule Plausible.Billing.SiteLockerTest dotest "does not lock if user has an active subscription" douser = new_user() |> subscribe_to_growth_plan()site = new_site(owner: user)+ team = team_of(user)- assert SiteLocker.update_sites_for(user) == :unlocked+ assert SiteLocker.update_sites_for(team) == :unlockedrefute Repo.reload!(site).lockedend@@ -27,8 +29,9 @@ defmodule Plausible.Billing.SiteLockerTest dotest "does not lock user who is past due" douser = new_user() |> subscribe_to_growth_plan(status: Subscription.Status.past_due())site = new_site(owner: user)+ team = team_of(user)- assert SiteLocker.update_sites_for(user) == :unlocked+ assert SiteLocker.update_sites_for(team) == :unlockedrefute Repo.reload!(site).lockedend@@ -36,8 +39,9 @@ defmodule Plausible.Billing.SiteLockerTest dotest "does not lock user who cancelled subscription but it hasn't expired yet" douser = new_user() |> subscribe_to_growth_plan(status: Subscription.Status.deleted())site = new_site(owner: user)+ team = team_of(user)- assert SiteLocker.update_sites_for(user) == :unlocked+ assert SiteLocker.update_sites_for(team) == :unlockedrefute Repo.reload!(site).lockedend@@ -46,12 +50,13 @@ defmodule Plausible.Billing.SiteLockerTest dograce_period = %Plausible.Auth.GracePeriod{end_date: Timex.shift(Timex.today(), days: 1)}user =- new_user(grace_period: grace_period, team: [grace_period: grace_period])+ new_user(team: [grace_period: grace_period])|> subscribe_to_growth_plan()site = new_site(owner: user)+ team = team_of(user)- assert SiteLocker.update_sites_for(user) == :unlocked+ assert SiteLocker.update_sites_for(team) == :unlockedrefute Repo.reload!(site).lockedend@@ -65,45 +70,33 @@ defmodule Plausible.Billing.SiteLockerTest do)site = new_site(owner: user)+ team = team_of(user)- assert SiteLocker.update_sites_for(user) == {:locked, :no_active_subscription}+ assert SiteLocker.update_sites_for(team) == {:locked, :no_active_subscription}assert Repo.reload!(site).lockedendtest "locks all sites if user has active subscription but grace period has ended" dograce_period = %Plausible.Auth.GracePeriod{end_date: Timex.shift(Timex.today(), days: -1)}- user = new_user(grace_period: grace_period, team: [grace_period: grace_period])+ user = new_user(team: [grace_period: grace_period])subscribe_to_plan(user, "123")site = new_site(owner: user)+ team = team_of(user)- assert SiteLocker.update_sites_for(user) == {:locked, :grace_period_ended_now}+ assert SiteLocker.update_sites_for(team) == {:locked, :grace_period_ended_now}assert Repo.reload!(site).lockedend- @tag :teams- test "syncs grace period end with teams" do- grace_period = %Plausible.Auth.GracePeriod{end_date: Timex.shift(Timex.today(), days: -1)}- user = new_user(grace_period: grace_period, team: [grace_period: grace_period])- subscribe_to_plan(user, "123")- new_site(owner: user)-- assert SiteLocker.update_sites_for(user) == {:locked, :grace_period_ended_now}-- assert user = Repo.reload!(user)- team = assert_team_exists(user)- assert user.grace_period.is_over- assert team.grace_period.is_over- end-test "sends email if grace period has ended" dograce_period = %Plausible.Auth.GracePeriod{end_date: Timex.shift(Timex.today(), days: -1)}- user = new_user(grace_period: grace_period, team: [grace_period: grace_period])+ user = new_user(team: [grace_period: grace_period])subscribe_to_plan(user, "123")new_site(owner: user)+ team = team_of(user)- assert SiteLocker.update_sites_for(user) == {:locked, :grace_period_ended_now}+ assert SiteLocker.update_sites_for(team) == {:locked, :grace_period_ended_now}assert_email_delivered_with(to: [user],@@ -117,20 +110,21 @@ defmodule Plausible.Billing.SiteLockerTest dois_over: false}- user = new_user(grace_period: grace_period, team: [grace_period: grace_period])+ user = new_user(team: [grace_period: grace_period])subscribe_to_plan(user, "123")new_site(owner: user)+ team = team_of(user)- assert SiteLocker.update_sites_for(user) == {:locked, :grace_period_ended_now}+ assert SiteLocker.update_sites_for(team) == {:locked, :grace_period_ended_now}assert_email_delivered_with(to: [user],subject: "[Action required] Your Plausible dashboard is now locked")- user = Repo.reload!(user)- assert SiteLocker.update_sites_for(user) == {:locked, :grace_period_ended_already}+ team = Repo.reload!(team)+ assert SiteLocker.update_sites_for(team) == {:locked, :grace_period_ended_already}assert_no_emails_delivered()end@@ -138,23 +132,19 @@ defmodule Plausible.Billing.SiteLockerTest dotest "locks all sites if user has no trial or active subscription" douser = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: -1))site = new_site(owner: user)+ team = team_of(user)- assert SiteLocker.update_sites_for(user) == {:locked, :no_active_subscription}+ assert SiteLocker.update_sites_for(team) == {:locked, :no_active_subscription}assert Repo.reload!(site).lockedendtest "locks sites for user with empty trial - shouldn't happen under normal circumstances" do- user = insert(:user, trial_expiry_date: nil)-- site =- insert(:site,- memberships: [- build(:site_membership, user: user, role: :owner)- ]- )+ user = new_user()+ site = new_site(owner: user)+ team = user |> team_of() |> Ecto.Changeset.change(trial_expiry_date: nil) |> Repo.update!()- assert SiteLocker.update_sites_for(user) == {:locked, :no_trial}+ assert SiteLocker.update_sites_for(team) == {:locked, :no_trial}assert Repo.reload!(site).lockedend@@ -165,8 +155,9 @@ defmodule Plausible.Billing.SiteLockerTest doowner_site = new_site(owner: user)viewer_site = new_site()add_guest(viewer_site, user: user, role: :viewer)+ team = team_of(user)- assert SiteLocker.update_sites_for(user) == {:locked, :no_active_subscription}+ assert SiteLocker.update_sites_for(team) == {:locked, :no_active_subscription}owner_site = Repo.reload!(owner_site)viewer_site = Repo.reload!(viewer_site)diff --git a/test/plausible/help_scout_test.exs b/test/plausible/help_scout_test.exsindex d17ebc55cb..67d88674a2 100644--- a/test/plausible/help_scout_test.exs+++ b/test/plausible/help_scout_test.exs@@ -55,7 +55,7 @@ defmodule Plausible.HelpScoutTest dodescribe "get_details_for_customer/2" dotest "returns details for user on trial" do- %{id: user_id, email: email} = new_user()+ %{id: user_id, email: email} = new_user(trial_expiry_date: Date.utc_today())stub_help_scout_requests(email)crm_url = "#{PlausibleWeb.Endpoint.url()}/crm/auth/user/#{user_id}"@@ -405,7 +405,7 @@ defmodule Plausible.HelpScoutTest dodescribe "get_details_for_emails/2" dotest "returns details for user and persists mapping" do- %{id: user_id, email: email} = new_user()+ %{id: user_id, email: email} = new_user(trial_expiry_date: Date.utc_today())crm_url = "#{PlausibleWeb.Endpoint.url()}/crm/auth/user/#{user_id}"diff --git a/test/plausible/ingestion/counters_test.exs b/test/plausible/ingestion/counters_test.exsindex 5bfaffd163..d7ce3b75a6 100644--- a/test/plausible/ingestion/counters_test.exs+++ b/test/plausible/ingestion/counters_test.exs@@ -10,26 +10,35 @@ defmodule Plausible.Ingestion.CountersTest doimport Phoenix.ConnTest+ @ts ~N[2023-02-14 01:00:03]+describe "integration" dotest "periodically flushes buffer aggregates to the database", %{test: test} doon_exit(:detach, fn ->:telemetry.detach("ingest-counters-#{test}")end)+ now = NaiveDateTime.utc_now()+start_counters(buffer_name: test,interval: 100,- aggregate_bucket_fn: fn _now ->- System.os_time(:second)+ aggregate_bucket_fn: fn _real_now ->+ now+ |> DateTime.from_naive!("Etc/UTC")+ |> DateTime.to_unix()end,- flush_boundary_fn: fn _now ->- System.os_time(:second) + 1000+ flush_boundary_fn: fn _real_now ->+ now+ |> DateTime.from_naive!("Etc/UTC")+ |> DateTime.shift(second: 1)+ |> DateTime.to_unix()end)- {:ok, dropped} = emit_dropped_request()- {:ok, _dropped} = emit_dropped_request(domain: dropped.domain)- {:ok, buffered} = emit_buffered_request()+ {:ok, dropped} = emit_dropped_request(at: now)+ {:ok, _dropped} = emit_dropped_request(domain: dropped.domain, at: now)+ {:ok, buffered} = emit_buffered_request(at: now)verify_record_written(dropped.domain, "dropped_not_found", 2)@@ -50,10 +59,14 @@ defmodule Plausible.Ingestion.CountersTest dobuffer_name: test,interval: 100,aggregate_bucket_fn: fn _now ->- System.os_time(:second)+ ~N[2023-02-14 01:00:03]+ |> DateTime.from_naive!("Etc/UTC")+ |> DateTime.to_unix()end,flush_boundary_fn: fn _now ->- System.os_time(:second) + 1000+ ~N[2023-02-14 01:00:56]+ |> DateTime.from_naive!("Etc/UTC")+ |> DateTime.to_unix()end)@@ -95,9 +108,9 @@ defmodule Plausible.Ingestion.CountersTest doendend- defp emit_dropped_request(opts \\ []) do+ defp emit_dropped_request(opts) dodomain = Keyword.get(opts, :domain, random_domain())- at = Keyword.get(opts, :at, NaiveDateTime.utc_now())+ at = Keyword.get(opts, :at, @ts)site = build(:site, domain: domain)@@ -112,9 +125,9 @@ defmodule Plausible.Ingestion.CountersTest do{:ok, dropped}end- defp emit_buffered_request(opts \\ []) do+ defp emit_buffered_request(opts) dodomain = Keyword.get(opts, :domain, random_domain())- at = Keyword.get(opts, :at, NaiveDateTime.utc_now())+ at = Keyword.get(opts, :at, @ts)site = new_site(domain: domain)@@ -139,10 +152,9 @@ defmodule Plausible.Ingestion.CountersTest dodefp verify_record_written(domain, metric, value, site_id \\ nil) doquery =from(r in Record,- where:- r.domain == ^domain and- r.metric == ^metric and- r.value == ^value+ group_by: [:site_id, :domain, :metric, :event_timebucket],+ where: r.domain == ^domain and r.metric == ^metric,+ select: sum(r.value))query =@@ -152,7 +164,17 @@ defmodule Plausible.Ingestion.CountersTest doquery |> where([r], is_nil(r.site_id))end- assert await_clickhouse_count(query, 1)+ assert eventually(+ fn ->+ sums =+ query+ |> Plausible.ClickhouseRepo.all()++ {sums == [value], sums}+ end,+ 100,+ 10+ )enddefp random_domain() dodiff --git a/test/plausible/purge_test.exs b/test/plausible/purge_test.exsindex 14cbbc7836..e34ceadfeb 100644--- a/test/plausible/purge_test.exs+++ b/test/plausible/purge_test.exs@@ -1,9 +1,10 @@defmodule Plausible.PurgeTest douse Plausible.DataCase+ use Plausible.Teams.Testsetup do- user = insert(:user)- site = insert(:site, members: [user], stats_start_date: ~D[2005-01-01])+ user = new_user()+ site = new_site(owner: user, stats_start_date: ~D[2005-01-01])import_params = %{source: :universal_analytics,diff --git a/test/plausible/site/membership_test.exs b/test/plausible/site/membership_test.exsdeleted file mode 100644index ff2fcc8071..0000000000--- a/test/plausible/site/membership_test.exs+++ /dev/null@@ -1,13 +0,0 @@-defmodule Plausible.Site.MembershipTest do- use Plausible.DataCase-- test "raises on trying to insert two owner memberships for the same site" do- user1 = insert(:user)- user2 = insert(:user)- site = insert(:site, memberships: [build(:site_membership, user: user1, role: "owner")])-- assert_raise Ecto.ConstraintError, ~r/site_memberships_site_id_index/, fn ->- insert(:site_membership, site: site, user: user2, role: "owner")- end- end-enddiff --git a/test/plausible/site/memberships/accept_invitation_test.exs b/test/plausible/site/memberships/accept_invitation_test.exsindex 289fdc06de..2c84c16ae2 100644--- a/test/plausible/site/memberships/accept_invitation_test.exs+++ b/test/plausible/site/memberships/accept_invitation_test.exs@@ -22,7 +22,7 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest donew_owner)- team = assert_team_exists(new_owner)+ team = assert_team_exists(Repo.reload!(new_owner))assert_team_membership(new_owner, team, :owner)assert_team_membership(new_owner, team, :owner)assert_guest_membership(team, site1, current_owner, :editor)@@ -87,7 +87,6 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest doold_owner = new_user() |> subscribe_to_business_plan()new_owner = new_user() |> subscribe_to_growth_plan()- insert_list(10, :site, members: [new_owner])for _ <- 1..10, do: new_site(owner: new_owner)site =@@ -123,29 +122,6 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do)end- @tag :teams- test "does not create redundant guest membership when owner team membership exists" do- user = insert(:user)- {:ok, team} = Plausible.Teams.get_or_create(user)- site = insert(:site, team: team, members: [user])-- invitation =- insert(:invitation,- site_id: site.id,- inviter: insert(:user),- email: user.email,- role: :admin- )-- {:ok, team_membership} =- Plausible.Teams.Invitations.accept_invitation_sync(invitation, user)-- team_membership = team_membership |> Repo.reload!() |> Repo.preload(:guest_memberships)-- assert team_membership.role == :owner- assert team_membership.guest_memberships == []- end-test "does not degrade role when trying to invite self as an owner" douser = new_user()site = new_site(owner: user)@@ -162,19 +138,28 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest doinviter = new_user()invitee = new_user()site = new_site(owner: inviter)- user = add_guest(site, user: invitee, role: :editor)- existing_membership = List.first(user.site_memberships)+ add_guest(site, user: invitee, role: :editor)++ existing_team_membership =+ %{guest_memberships: [existing_guest_membership]} =+ Plausible.Teams.Membership+ |> Repo.get_by(user_id: invitee.id)+ |> Repo.preload(:guest_memberships)invitation = invite_guest(site, invitee, inviter: inviter, role: :viewer)- assert {:ok, new_membership} =+ assert {:ok,+ %{team_membership: new_team_membership, guest_memberships: [new_guest_membership]}} =AcceptInvitation.accept_invitation(invitation.invitation_id, invitee)- assert existing_membership.id == new_membership.id- assert existing_membership.user_id == new_membership.user_id- assert existing_membership.site_id == new_membership.site_id- assert existing_membership.role == new_membership.role- assert new_membership.role == :admin+ new_team_membership = Repo.reload!(new_team_membership)+ new_guest_membership = Repo.reload!(new_guest_membership)+ assert existing_team_membership.id == new_team_membership.id+ assert existing_team_membership.user_id == new_team_membership.user_id+ assert existing_guest_membership.id == new_guest_membership.id+ assert existing_guest_membership.site_id == new_guest_membership.site_id+ assert existing_guest_membership.role == new_guest_membership.role+ assert new_guest_membership.role == :editorrefute Repo.reload(invitation)end@@ -194,17 +179,17 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest donew_owner = new_user() |> subscribe_to_growth_plan()new_team = team_of(new_owner)- invitation = invite_transfer(site, new_owner, inviter: existing_owner)+ transfer = invite_transfer(site, new_owner, inviter: existing_owner)assert {:ok, _new_membership} =AcceptInvitation.accept_invitation(- invitation.invitation_id,+ transfer.transfer_id,new_owner)assert_team_attached(site, new_team.id)- refute Repo.reload(invitation)+ refute Repo.reload(transfer)assert_guest_membership(new_team, site, existing_owner, :editor)@@ -227,7 +212,7 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest doinvite_transfer(site, new_owner, inviter: existing_owner)assert {:ok, _new_membership} =- AcceptInvitation.accept_invitation(site_transfer.invitation_id, new_owner)+ AcceptInvitation.accept_invitation(site_transfer.transfer_id, new_owner)assert_guest_invitation(new_team, site, "[email protected]", :viewer)assert_team_attached(site, new_team.id)@@ -239,16 +224,15 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest dosite = new_site(owner: existing_owner, locked: true)new_owner = new_user() |> subscribe_to_growth_plan()- invitation = invite_transfer(site, new_owner, inviter: existing_owner)+ transfer = invite_transfer(site, new_owner, inviter: existing_owner)assert {:ok, _new_membership} =AcceptInvitation.accept_invitation(- invitation.invitation_id,+ transfer.transfer_id,new_owner)- refute Repo.reload(invitation)-+ refute Repo.reload(transfer)refute Repo.reload!(site).lockedend@@ -261,17 +245,17 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest dosite = new_site(owner: existing_owner)add_guest(site, user: new_owner, role: unquote(role))- invitation =+ transfer =invite_transfer(site, new_owner, inviter: existing_owner)assert {:ok, _} =- AcceptInvitation.accept_invitation(invitation.invitation_id, new_owner)+ AcceptInvitation.accept_invitation(transfer.transfer_id, new_owner)assert_guest_membership(new_team, site, existing_owner, :editor)assert_team_membership(new_owner, new_team, :owner)- refute Repo.reload(invitation)+ refute Repo.reload(transfer)endend@@ -283,11 +267,11 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest dofor _ <- 1..3, do: add_guest(site, role: :editor)- invitation = invite_transfer(site, new_owner, inviter: old_owner)+ transfer = invite_transfer(site, new_owner, inviter: old_owner)assert {:error, {:over_plan_limits, [:team_member_limit]}} =AcceptInvitation.accept_invitation(- invitation.invitation_id,+ transfer.transfer_id,new_owner)end@@ -302,11 +286,11 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest doadd_guest(site, user: new_owner, role: :editor)for _ <- 1..2, do: add_guest(site, role: :editor)- invitation = invite_transfer(site, new_owner, inviter: old_owner)+ transfer = invite_transfer(site, new_owner, inviter: old_owner)assert {:ok, _} =AcceptInvitation.accept_invitation(- invitation.invitation_id,+ transfer.transfer_id,new_owner)end@@ -320,11 +304,11 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest dosite = new_site(owner: old_owner)- invitation = invite_transfer(site, new_owner, inviter: old_owner)+ transfer = invite_transfer(site, new_owner, inviter: old_owner)assert {:error, {:over_plan_limits, [:site_limit]}} =AcceptInvitation.accept_invitation(- invitation.invitation_id,+ transfer.transfer_id,new_owner)end@@ -346,16 +330,18 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest dogenerate_usage_for(old_owner_site, 6_000, somewhere_last_month)generate_usage_for(old_owner_site, 10_000, somewhere_penultimate_month)- invitation = invite_transfer(old_owner_site, new_owner, inviter: old_owner)+ transfer = invite_transfer(old_owner_site, new_owner, inviter: old_owner)assert {:error, {:over_plan_limits, [:monthly_pageview_limit]}} =- AcceptInvitation.accept_invitation(invitation.invitation_id, new_owner)+ AcceptInvitation.accept_invitation(transfer.transfer_id, new_owner)end@tag :ee_onlytest "allow_next_upgrade_override field has no effect when checking the pageview limit on ownership transfer" doold_owner = new_user() |> subscribe_to_business_plan()- new_owner = new_user(allow_next_upgrade_override: true) |> subscribe_to_growth_plan()++ new_owner =+ new_user(team: [allow_next_upgrade_override: true]) |> subscribe_to_growth_plan()new_owner_site = new_site(owner: new_owner)old_owner_site = new_site(owner: old_owner)@@ -369,7 +355,7 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest dogenerate_usage_for(old_owner_site, 6_000, somewhere_last_month)generate_usage_for(old_owner_site, 10_000, somewhere_penultimate_month)- transfer_id = invite_transfer(old_owner_site, new_owner, inviter: old_owner).invitation_id+ transfer_id = invite_transfer(old_owner_site, new_owner, inviter: old_owner).transfer_idassert {:error, {:over_plan_limits, [:monthly_pageview_limit]}} =AcceptInvitation.accept_invitation(transfer_id, new_owner)@@ -391,10 +377,10 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest dofor _ <- 1..3, do: add_guest(site, role: :editor)- invitation = invite_transfer(site, new_owner, inviter: old_owner)+ transfer = invite_transfer(site, new_owner, inviter: old_owner)assert {:error, {:over_plan_limits, [:team_member_limit, :site_limit]}} =- AcceptInvitation.accept_invitation(invitation.invitation_id, new_owner)+ AcceptInvitation.accept_invitation(transfer.transfer_id, new_owner)end@tag :ee_only@@ -420,21 +406,21 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest dotransfer = invite_transfer(site, trial_user, inviter: current_owner)assert {:error, :no_plan} =- AcceptInvitation.accept_invitation(transfer.invitation_id, trial_user)+ AcceptInvitation.accept_invitation(transfer.transfer_id, trial_user)Repo.delete!(transfer)transfer = invite_transfer(site, invited_user, inviter: current_owner)assert {:error, :no_plan} =- AcceptInvitation.accept_invitation(transfer.invitation_id, invited_user)+ AcceptInvitation.accept_invitation(transfer.transfer_id, invited_user)Repo.delete!(transfer)transfer = invite_transfer(site, user_on_free_10k, inviter: current_owner)assert {:error, :no_plan} =- AcceptInvitation.accept_invitation(transfer.invitation_id, user_on_free_10k)+ AcceptInvitation.accept_invitation(transfer.transfer_id, user_on_free_10k)Repo.delete!(transfer)@@ -442,7 +428,7 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest doassert {:error, :no_plan} =AcceptInvitation.accept_invitation(- transfer.invitation_id,+ transfer.transfer_id,user_on_expired_subscription)@@ -452,7 +438,7 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest doassert {:error, :no_plan} =AcceptInvitation.accept_invitation(- transfer.invitation_id,+ transfer.transfer_id,user_on_paused_subscription)@@ -466,7 +452,7 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest dotransfer = invite_transfer(site, current_owner, inviter: current_owner)assert {:error, :transfer_to_self} =- AcceptInvitation.accept_invitation(transfer.invitation_id, current_owner)+ AcceptInvitation.accept_invitation(transfer.transfer_id, current_owner)end@tag :ee_only@@ -477,12 +463,11 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do# fill site quotafor _ <- 1..10, do: new_site(owner: new_owner)- insert_list(10, :site, members: [new_owner])transfer = invite_transfer(site, new_owner, inviter: current_owner)assert {:error, {:over_plan_limits, [:site_limit]}} =- AcceptInvitation.accept_invitation(transfer.invitation_id, new_owner)+ AcceptInvitation.accept_invitation(transfer.transfer_id, new_owner)end@tag :ce_build_only@@ -508,23 +493,23 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest dotransfer = invite_transfer(site, trial_user, inviter: current_owner)assert {:ok, _} =- AcceptInvitation.accept_invitation(transfer.invitation_id, trial_user)+ AcceptInvitation.accept_invitation(transfer.transfer_id, trial_user)transfer = invite_transfer(site, invited_user, inviter: current_owner)assert {:ok, _} =- AcceptInvitation.accept_invitation(transfer.invitation_id, invited_user)+ AcceptInvitation.accept_invitation(transfer.transfer_id, invited_user)transfer = invite_transfer(site, user_on_free_10k, inviter: current_owner)assert {:ok, _} =- AcceptInvitation.accept_invitation(transfer.invitation_id, user_on_free_10k)+ AcceptInvitation.accept_invitation(transfer.transfer_id, user_on_free_10k)transfer = invite_transfer(site, user_on_expired_subscription, inviter: current_owner)assert {:ok, _} =AcceptInvitation.accept_invitation(- transfer.invitation_id,+ transfer.transfer_id,user_on_expired_subscription)@@ -532,7 +517,7 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest doassert {:ok, _} =AcceptInvitation.accept_invitation(- transfer.invitation_id,+ transfer.transfer_id,user_on_paused_subscription)enddiff --git a/test/plausible/site/memberships/create_invitation_test.exs b/test/plausible/site/memberships/create_invitation_test.exsindex 14d8587897..50e1f619b5 100644--- a/test/plausible/site/memberships/create_invitation_test.exs+++ b/test/plausible/site/memberships/create_invitation_test.exs@@ -13,7 +13,7 @@ defmodule Plausible.Site.Memberships.CreateInvitationTest doinvitee = new_user()site = new_site(owner: inviter)- assert {:ok, %Plausible.Auth.Invitation{}} =+ assert {:ok, %Plausible.Teams.GuestInvitation{}} =CreateInvitation.create_invitation(site, inviter, invitee.email, :viewer)end@@ -42,7 +42,7 @@ defmodule Plausible.Site.Memberships.CreateInvitationTest do[inviter, invitee] = for _ <- 1..2, do: new_user()site = new_site(owner: inviter)- assert {:ok, %Plausible.Auth.Invitation{}} =+ assert {:ok, %Plausible.Teams.GuestInvitation{}} =CreateInvitation.create_invitation(site, inviter, invitee.email, :viewer)assert_email_delivered_with(@@ -55,7 +55,7 @@ defmodule Plausible.Site.Memberships.CreateInvitationTest doinviter = new_user()site = new_site(owner: inviter)- assert {:ok, %Plausible.Auth.Invitation{invitation_id: invitation_id}} =+ assert {:ok, %Plausible.Teams.GuestInvitation{invitation_id: invitation_id}} =CreateInvitation.create_invitation(site, inviter, "[email protected]", :viewer)assert_email_delivered_with(@@ -96,8 +96,6 @@ defmodule Plausible.Site.Memberships.CreateInvitationTest doassert {:ok, _} = invite.(site2, "[email protected]")end- import Ecto.Query-@tag :ee_onlytest "allows inviting users who are already members of other sites, within the limit" do[u1, u2, u3, u4] = for _ <- 1..4, do: new_user()@@ -123,7 +121,7 @@ defmodule Plausible.Site.Memberships.CreateInvitationTest doinviter = new_user()site = new_site(owner: inviter)- assert {:ok, %Plausible.Auth.Invitation{}} =+ assert {:ok, %Plausible.Teams.SiteTransfer{}} =CreateInvitation.create_invitation(site, inviter, "[email protected]", :owner)assert_email_delivered_with(@@ -148,7 +146,7 @@ defmodule Plausible.Site.Memberships.CreateInvitationTest dosite = new_site(owner: inviter)add_guest(site, user: invitee, role: :viewer)- assert {:ok, %Plausible.Auth.Invitation{}} =+ assert {:ok, %Plausible.Teams.SiteTransfer{}} =CreateInvitation.create_invitation(site, inviter, invitee.email, :owner)end@@ -189,8 +187,8 @@ defmodule Plausible.Site.Memberships.CreateInvitationTest dosite = new_site()add_guest(site, user: inviter, role: :editor)- assert {:ok, %Plausible.Auth.Invitation{}} =- CreateInvitation.create_invitation(site, inviter, "[email protected]", :admin)+ assert {:ok, %Plausible.Teams.GuestInvitation{}} =+ CreateInvitation.create_invitation(site, inviter, "[email protected]", :editor)endend@@ -215,21 +213,14 @@ defmodule Plausible.Site.Memberships.CreateInvitationTest dosubject: @subject_prefix <> "Request to transfer ownership of #{site1.domain}")- assert Repo.exists?(- from(i in Plausible.Auth.Invitation,- where:- i.site_id == ^site1.id and i.email == ^new_owner.email and i.role == :owner- )- )-- assert_invitation_exists(site1, new_owner.email, :owner)+ assert_site_transfer(site1, new_owner)assert_email_delivered_with(to: [nil: new_owner.email],subject: @subject_prefix <> "Request to transfer ownership of #{site2.domain}")- assert_invitation_exists(site2, new_owner.email, :owner)+ assert_site_transfer(site2, new_owner)endtest "initiates ownership transfer for multiple sites in one action skipping permission checks" do@@ -253,29 +244,14 @@ defmodule Plausible.Site.Memberships.CreateInvitationTest dosubject: @subject_prefix <> "Request to transfer ownership of #{site1.domain}")- assert Repo.exists?(- from(i in Plausible.Auth.Invitation,- where:- i.site_id == ^site1.id and i.email == ^new_owner.email and i.role == :owner- )- )-- assert_invitation_exists(site1, new_owner.email, :owner)+ assert_site_transfer(site1, new_owner)assert_email_delivered_with(to: [nil: new_owner.email],subject: @subject_prefix <> "Request to transfer ownership of #{site2.domain}")- assert_invitation_exists(site2, new_owner.email, :owner)+ assert_site_transfer(site2, new_owner)endend-- defp assert_invitation_exists(site, email, role) do- assert Repo.exists?(- from(i in Plausible.Auth.Invitation,- where: i.site_id == ^site.id and i.email == ^email and i.role == ^role- )- )- endenddiff --git a/test/plausible/site/memberships/reject_invitation_test.exs b/test/plausible/site/memberships/reject_invitation_test.exsindex 6fc153f723..2c436fea3f 100644--- a/test/plausible/site/memberships/reject_invitation_test.exs+++ b/test/plausible/site/memberships/reject_invitation_test.exs@@ -28,25 +28,18 @@ defmodule Plausible.Site.Memberships.RejectInvitationTest doendtest "returns error for non-existent invitation" do- invitee = insert(:user)+ invitee = new_user()assert {:error, :invitation_not_found} =RejectInvitation.reject_invitation("does_not_exist", invitee)endtest "does not allow rejecting invitation by anyone other than invitee" do- inviter = insert(:user)- invitee = insert(:user)- other_user = insert(:user)- site = insert(:site, members: [inviter])-- invitation =- insert(:invitation,- site_id: site.id,- inviter: inviter,- email: invitee.email,- role: :admin- )+ inviter = new_user()+ invitee = new_user()+ other_user = new_user()+ site = new_site(owner: inviter)+ invitation = invite_guest(site, invitee, role: :editor, inviter: inviter)assert {:error, :invitation_not_found} =RejectInvitation.reject_invitation(invitation.invitation_id, other_user)diff --git a/test/plausible/site/memberships/remove_invitation_test.exs b/test/plausible/site/memberships/remove_invitation_test.exsindex 5e1b82d7ca..416a643bf9 100644--- a/test/plausible/site/memberships/remove_invitation_test.exs+++ b/test/plausible/site/memberships/remove_invitation_test.exs@@ -20,25 +20,18 @@ defmodule Plausible.Site.Memberships.RemoveInvitationTest doendtest "returns error for non-existent invitation" do- site = insert(:site)+ site = new_site()assert {:error, :invitation_not_found} =RemoveInvitation.remove_invitation("does_not_exist", site)endtest "does not allow removing invitation from another site" do- inviter = insert(:user)- invitee = insert(:user)- site = insert(:site, members: [inviter])- other_site = insert(:site, members: [inviter])-- invitation =- insert(:invitation,- site_id: site.id,- inviter: inviter,- email: invitee.email,- role: :admin- )+ inviter = new_user()+ invitee = new_user()+ site = new_site(owner: inviter)+ other_site = new_site(owner: inviter)+ invitation = invite_guest(site, invitee, role: :editor, inviter: inviter)assert {:error, :invitation_not_found} =RemoveInvitation.remove_invitation(invitation.invitation_id, other_site)diff --git a/test/plausible/site/sites_test.exs b/test/plausible/site/sites_test.exsindex 7c6494939f..9fd70b922d 100644--- a/test/plausible/site/sites_test.exs+++ b/test/plausible/site/sites_test.exs@@ -5,42 +5,39 @@ defmodule Plausible.SitesTest doalias Plausible.Sitesdescribe "create a site" do- @tag :teamstest "creates a site" do- user = insert(:user)+ user = new_user()params = %{"domain" => "example.com", "timezone" => "Europe/London"}- assert {:ok, %{site: %{domain: "example.com", timezone: "Europe/London"} = site}} =+ assert {:ok, %{site: %{domain: "example.com", timezone: "Europe/London"}}} =Sites.create(user, params)-- assert_team_attached(site)end- @tag :teams- test "creates a site and syncs the team properties" do- user = insert(:user, trial_expiry_date: nil)+ test "does not start a trial for pre-teams guest users without trial expiry date" do+ user = new_user() |> subscribe_to_growth_plan()+ new_site(owner: user)- params = %{"domain" => "example.com", "timezone" => "Europe/London"}+ three_hundred_days_from_now = Date.shift(Date.utc_today(), day: 300)- assert {:ok, %{site: %{domain: "example.com", timezone: "Europe/London"} = site}} =- Sites.create(user, params)-- team = assert_team_attached(site)- user = Repo.reload!(user)- assert not is_nil(user.trial_expiry_date)- assert user.trial_expiry_date == team.trial_expiry_date- end-- @tag :teams- test "creates a site (TEAM)" do- user = insert(:user)- {:ok, team} = Plausible.Teams.get_or_create(user)+ user+ |> team_of()+ |> Ecto.Changeset.change(+ trial_expiry_date: nil,+ accept_traffic_until: three_hundred_days_from_now+ )+ |> Plausible.Repo.update!()params = %{"domain" => "example.com", "timezone" => "Europe/London"}+ user = Plausible.Repo.reload!(user)+assert {:ok, %{site: %{domain: "example.com", timezone: "Europe/London"}}} =- Plausible.Teams.Sites.create(team, params)+ Sites.create(user, params)++ team = user |> team_of() |> Repo.reload!()+ refute team.trial_expiry_date+ assert Date.compare(team.accept_traffic_until, three_hundred_days_from_now) == :eqendtest "fails on invalid timezone" do@@ -51,33 +48,6 @@ defmodule Plausible.SitesTest doassert {:error, :site, %{errors: [timezone: {"is invalid", []}]}, %{}} =Sites.create(user, params)end-- @tag :teams- test "fails on invalid timezone (TEAM)" do- user = insert(:user)- {:ok, team} = Plausible.Teams.get_or_create(user)-- params = %{"domain" => "example.com", "timezone" => "blah"}-- assert {:error, :site, %{errors: [timezone: {"is invalid", []}]}, %{}} =- Plausible.Teams.Sites.create(team, params)- end- end-- describe "is_member?" do- test "is true if user is a member of the site" do- user = insert(:user)- site = insert(:site, members: [user])-- assert Sites.is_member?(user.id, site)- end-- test "is false if user is not a member" do- user = insert(:user)- site = insert(:site)-- refute Sites.is_member?(user.id, site)- endenddescribe "stats_start_date" do@@ -556,8 +526,8 @@ defmodule Plausible.SitesTest doendtest "raises on invalid option" do- user = insert(:user)- site = insert(:site, members: [user])+ user = new_user()+ site = new_site(owner: user)assert_raise FunctionClauseError, fn ->Sites.set_option(user, site, :invalid, false)@@ -626,7 +596,7 @@ defmodule Plausible.SitesTest doassert {:ok, _} = Sites.toggle_pin(user, site)end- site = insert(:site, members: [user])+ site = new_site(owner: user)assert {:error, :too_many_pins} = Sites.toggle_pin(user, site)enddiff --git a/test/plausible/stats/query_test.exs b/test/plausible/stats/query_test.exsindex 8662bd8f9c..b6928122a0 100644--- a/test/plausible/stats/query_test.exs+++ b/test/plausible/stats/query_test.exs@@ -1,5 +1,6 @@defmodule Plausible.Stats.QueryTest douse Plausible.DataCase, async: true+ use Plausible.Teams.Testalias Plausible.Stats.Queryalias Plausible.Stats.Legacy.QueryBuilderalias Plausible.Stats.DateTimeRange@@ -7,11 +8,11 @@ defmodule Plausible.Stats.QueryTest dodoctest Plausible.Stats.Legacy.QueryBuildersetup do- user = insert(:user)+ user = new_user()site =- insert(:site,- members: [user],+ new_site(+ owner: user,inserted_at: ~N[2020-01-01T00:00:00],stats_start_date: ~D[2020-01-01],timezone: "US/Eastern"diff --git a/test/plausible/stats/sampling_cache_test.exs b/test/plausible/stats/sampling_cache_test.exsindex 095d8b6145..d9953d3117 100644--- a/test/plausible/stats/sampling_cache_test.exs+++ b/test/plausible/stats/sampling_cache_test.exs@@ -6,48 +6,53 @@ defmodule Plausible.Stats.SamplingCacheTest doon_ee doalias Plausible.Stats.SamplingCache+ @site_id1 100_000+ @site_id2 200_000+ @site_id3 300_000+ @site_id4 400_000+describe "getter" dotest "returns cached values for traffic in past 30 days", %{test: test} donow = DateTime.utc_now()Plausible.IngestRepo.insert_all(Plausible.Ingestion.Counters.Record, [%{- site_id: 1,+ site_id: @site_id1,domain: "1.com",value: 11_000_000,event_timebucket: add(now, -1, :day),metric: "buffered"},%{- site_id: 2,+ site_id: @site_id2,domain: "2.com",value: 11_000_000,event_timebucket: add(now, -1, :day),metric: "buffered"},%{- site_id: 2,+ site_id: @site_id2,domain: "2.com",value: 11_000_000,event_timebucket: add(now, -5, :day),metric: "buffered"},%{- site_id: 2,+ site_id: @site_id2,domain: "2.com",value: 11_000_000,event_timebucket: add(now, -35, :day),metric: "buffered"},%{- site_id: 3,+ site_id: @site_id3,domain: "3.com",value: 44_000_000,event_timebucket: add(now, -35, :day),metric: "buffered"},%{- site_id: 4,+ site_id: @site_id4,domain: "4.com",value: 11_000_000,event_timebucket: add(now, -35, :day),@@ -58,14 +63,14 @@ defmodule Plausible.Stats.SamplingCacheTest dostart_test_cache(test)assert SamplingCache.count_all() == 1- assert SamplingCache.get(1, force?: true, cache_name: test) == nil- assert SamplingCache.get(2, force?: true, cache_name: test) == 22_000_000- assert SamplingCache.get(3, force?: true, cache_name: test) == nil- assert SamplingCache.get(4, force?: true, cache_name: test) == nil+ assert SamplingCache.get(@site_id1, force?: true, cache_name: test) == nil+ assert SamplingCache.get(@site_id2, force?: true, cache_name: test) == 22_000_000+ assert SamplingCache.get(@site_id3, force?: true, cache_name: test) == nil+ assert SamplingCache.get(@site_id4, force?: true, cache_name: test) == nilPlausible.IngestRepo.insert_all(Plausible.Ingestion.Counters.Record, [%{- site_id: 1,+ site_id: @site_id1,value: 11_000_000,event_timebucket: add(now, -1, :day),metric: "buffered"@@ -75,8 +80,8 @@ defmodule Plausible.Stats.SamplingCacheTest do:ok = SamplingCache.refresh_all(cache_name: test)assert SamplingCache.count_all() == 2- assert SamplingCache.get(1, force?: true, cache_name: test) == 22_000_000- assert SamplingCache.get(2, force?: true, cache_name: test) == 22_000_000+ assert SamplingCache.get(@site_id1, force?: true, cache_name: test) == 22_000_000+ assert SamplingCache.get(@site_id2, force?: true, cache_name: test) == 22_000_000endenddiff --git a/test/plausible/teams_test.exs b/test/plausible/teams_test.exsnew file mode 100644index 0000000000..641feaaf6b--- /dev/null+++ b/test/plausible/teams_test.exs@@ -0,0 +1,92 @@+defmodule Plausible.TeamsTest do+ use Plausible.DataCase, async: true+ use Plausible+ use Plausible.Teams.Test++ alias Plausible.Teams+ alias Plausible.Repo++ describe "trial_days_left" do+ test "is 30 days for new signup" do+ user = new_user(trial_expiry_date: Teams.Team.trial_expiry())++ on_ee do+ assert Teams.trial_days_left(team_of(user)) == 30+ else+ assert Teams.trial_days_left(team_of(user)) > 1000+ end+ end++ test "is based on trial_expiry_date" do+ user = new_user(trial_expiry_date: Date.shift(Date.utc_today(), day: 1))++ assert Teams.trial_days_left(team_of(user)) == 1+ end+ end++ describe "on_trial?" do+ @describetag :ee_only+ test "is true with >= 0 trial days left" do+ user = new_user(trial_expiry_date: Date.utc_today())++ assert Teams.on_trial?(team_of(user))+ end++ test "is false with < 0 trial days left" do+ user = new_user(trial_expiry_date: Date.shift(Date.utc_today(), day: -1))++ refute Teams.on_trial?(team_of(user))+ end++ test "is false if user has subscription" do+ user = new_user(trial_expiry_date: Date.utc_today())+ subscribe_to_growth_plan(user)++ refute Teams.on_trial?(team_of(user))+ end+ end++ describe "update_accept_traffic_until" do+ @describetag :ee_only+ test "update" do+ user = new_user()+ {:ok, team} = Teams.get_or_create(user)+ team = Teams.start_trial(team)+ # 30 for trial + 14+ assert Date.diff(team.accept_traffic_until, Date.utc_today()) ==+ 30 + Teams.Team.trial_accept_traffic_until_offset_days()++ future = Date.add(Date.utc_today(), 30)+ subscribe_to_growth_plan(user, next_bill_date: future)++ assert updated_team = Teams.update_accept_traffic_until(team)++ assert Date.diff(updated_team.accept_traffic_until, future) ==+ Teams.Team.subscription_accept_traffic_until_offset_days()+ end++ test "retrieve: trial + 14 days" do+ user = new_user()+ {:ok, team} = Teams.get_or_create(user)+ team = Teams.start_trial(team)++ assert Teams.accept_traffic_until(Repo.reload!(team)) ==+ Date.utc_today()+ |> Date.add(30 + Teams.Team.trial_accept_traffic_until_offset_days())+ end++ test "retrieve: last_bill_date + 30 days" do+ future = Date.add(Date.utc_today(), 30)+ user = new_user() |> subscribe_to_growth_plan(next_bill_date: future)++ assert Teams.accept_traffic_until(team_of(user)) ==+ future |> Date.add(Teams.Team.subscription_accept_traffic_until_offset_days())+ end++ test "retrieve: free plan" do+ user = new_user() |> subscribe_to_plan("free_10k")++ assert Teams.accept_traffic_until(team_of(user)) == ~D[2135-01-01]+ end+ end+enddiff --git a/test/plausible_web/components/billing/notice_test.exs b/test/plausible_web/components/billing/notice_test.exsindex a9ac57329a..822ec10108 100644--- a/test/plausible_web/components/billing/notice_test.exs+++ b/test/plausible_web/components/billing/notice_test.exs@@ -5,7 +5,7 @@ defmodule PlausibleWeb.Components.Billing.NoticeTest doalias PlausibleWeb.Components.Billing.Noticetest "premium_feature/1 does not render a notice when user is on trial" do- me = new_user()+ me = new_user(trial_expiry_date: Date.utc_today())assert render_component(&Notice.premium_feature/1,billable_user: me,@@ -98,7 +98,7 @@ defmodule PlausibleWeb.Components.Billing.NoticeTest do@tag :ee_onlytest "limit_exceeded/1 when billable user is on trial displays upgrade link" do- me = new_user()+ me = new_user(trial_expiry_date: Date.utc_today())rendered =render_component(&Notice.limit_exceeded/1,diff --git a/test/plausible_web/controllers/admin_controller_test.exs b/test/plausible_web/controllers/admin_controller_test.exsindex db79d0bc3d..5eccef884a 100644--- a/test/plausible_web/controllers/admin_controller_test.exs+++ b/test/plausible_web/controllers/admin_controller_test.exs@@ -69,7 +69,7 @@ defmodule PlausibleWeb.AdminControllerTest dopatch_env(:super_admin_user_ids, [user.id])site =- insert(:site,+ new_site(public: false,stats_start_date: ~D[2022-03-14],native_stats_start_at: ~N[2024-01-22 14:28:00]diff --git a/test/plausible_web/controllers/api/external_sites_controller_test.exs b/test/plausible_web/controllers/api/external_sites_controller_test.exsindex dd19aa07bb..f1f6884ead 100644--- a/test/plausible_web/controllers/api/external_sites_controller_test.exs+++ b/test/plausible_web/controllers/api/external_sites_controller_test.exs@@ -134,8 +134,8 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest doendtest "cannot delete a site that the user does not own", %{conn: conn, user: user} do- site = insert(:site, members: [])- insert(:site_membership, user: user, site: site, role: :admin)+ site = new_site()+ add_guest(site, user: user, role: :editor)conn = delete(conn, "/api/v1/sites/" <> site.domain)assert json_response(conn, 404) == %{"error" => "Site could not be found"}@@ -487,8 +487,8 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest doconn: conn,user: user} do- site = insert(:site, members: [])- insert(:site_membership, user: user, site: site, role: :viewer)+ site = new_site()+ add_guest(site, user: user, role: :viewer)conn =delete(conn, "/api/v1/sites/goals/1", %{@@ -532,8 +532,10 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest doendtest "returns sites when present", %{conn: conn, user: user} do- [site1, site2] = insert_list(2, :site, members: [user])- _unrelated_site = insert(:site)+ site1 = new_site(owner: user)+ site2 = new_site(owner: user)++ _unrelated_site = new_site()conn = get(conn, "/api/v1/sites")@@ -551,9 +553,9 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest doendtest "returns sites where user is only a viewer", %{conn: conn, user: user} do- %{domain: owned_site_domain} = insert(:site, members: [user])- other_site = %{domain: other_site_domain} = insert(:site)- insert(:site_membership, site: other_site, user: user, role: :viewer)+ %{domain: owned_site_domain} = new_site(owner: user)+ other_site = %{domain: other_site_domain} = new_site()+ add_guest(other_site, user: user, role: :viewer)conn = get(conn, "/api/v1/sites")@@ -570,7 +572,7 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest do%{domain: site1_domain},%{domain: site2_domain},%{domain: site3_domain}- ] = insert_list(3, :site, members: [user])+ ] = for _ <- 1..3, do: new_site(owner: user)conn1 = get(conn, "/api/v1/sites?limit=2")@@ -603,7 +605,7 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest doendtest "lists sites for user with read-only scope", %{conn: conn, user: user} do- %{domain: site_domain} = insert(:site, members: [user])+ %{domain: site_domain} = new_site(owner: user)api_key = insert(:api_key, user: user, scopes: ["stats:read:*"])conn =@@ -733,16 +735,15 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest do}end- test "returns goals for site where user is viewer", %{conn: conn, user: user, site: site} do- Repo.update_all(- from(sm in Plausible.Site.Membership,- where: sm.site_id == ^site.id and sm.user_id == ^user.id- ),- set: [role: :viewer]- )+ test "returns goals for site where user is viewer", %{site: site} do+ viewer = new_user()+ add_guest(site, user: viewer, role: :viewer)%{id: goal_id} = insert(:goal, %{site: site, event_name: "Signup"})+ api_key = insert(:api_key, user: viewer, scopes: ["sites:provision:*"])+ conn = Plug.Conn.put_req_header(build_conn(), "authorization", "Bearer #{api_key.key}")+conn = get(conn, "/api/v1/sites/goals?site_id=" <> site.domain)assert %{"goals" => [%{"id" => ^goal_id}]} = json_response(conn, 200)diff --git a/test/plausible_web/controllers/api/internal_controller/sync_test.exs b/test/plausible_web/controllers/api/internal_controller/sync_test.exsindex 1a048b0721..b130f0898d 100644--- a/test/plausible_web/controllers/api/internal_controller/sync_test.exs+++ b/test/plausible_web/controllers/api/internal_controller/sync_test.exs@@ -1,13 +1,14 @@defmodule PlausibleWeb.Api.InternalController.SyncTest douse PlausibleWeb.ConnCase, async: falseuse Plausible.Repo+ use Plausible.Teams.Testdescribe "PUT /api/:domain/disable-feature" dosetup [:create_user, :log_in]@tag :ee_onlytest "when the logged-in user is an super-admin", %{conn: conn, user: user} do- site = insert(:site)+ site = new_site()patch_env(:super_admin_user_ids, [user.id])conn = put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "conversions"})diff --git a/test/plausible_web/controllers/api/internal_controller_test.exs b/test/plausible_web/controllers/api/internal_controller_test.exsindex 579c926877..191278434c 100644--- a/test/plausible_web/controllers/api/internal_controller_test.exs+++ b/test/plausible_web/controllers/api/internal_controller_test.exs@@ -72,8 +72,8 @@ defmodule PlausibleWeb.Api.InternalControllerTest dosetup [:create_user, :log_in]test "when the logged-in user is an admin of the site", %{conn: conn, user: user} do- site = insert(:site)- insert(:site_membership, user: user, site: site, role: :admin)+ site = new_site()+ add_guest(site, user: user, role: :editor)conn = put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "conversions"})@@ -85,8 +85,8 @@ defmodule PlausibleWeb.Api.InternalControllerTest doconn: conn,user: user} do- site = insert(:site)- insert(:site_membership, user: user, site: site, role: :admin)+ site = new_site()+ add_guest(site, user: user, role: :editor)put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "conversions"})put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "funnels"})@@ -97,7 +97,7 @@ defmodule PlausibleWeb.Api.InternalControllerTest doendtest "when the logged-in user is an owner of the site", %{conn: conn, user: user} do- site = insert(:site, memberships: [build(:site_membership, user: user, role: :owner)])+ site = new_site(owner: user)conn = put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "conversions"})assert json_response(conn, 200) == "ok"@@ -105,8 +105,8 @@ defmodule PlausibleWeb.Api.InternalControllerTest doendtest "returns 401 when the logged-in user is a viewer of the site", %{conn: conn, user: user} do- site = insert(:site)- insert(:site_membership, user: user, site: site, role: :viewer)+ site = new_site()+ add_guest(site, user: user, role: :viewer)conn = put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "conversions"})@@ -118,7 +118,7 @@ defmodule PlausibleWeb.Api.InternalControllerTest doendtest "returns 401 when the logged-in user doesn't have site access at all", %{conn: conn} do- site = insert(:site)+ site = new_site()conn = put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "conversions"})diff --git a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs b/test/plausible_web/controllers/api/stats_controller/conversions_test.exsindex 95a702619a..260573f4a8 100644--- a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs@@ -1,5 +1,6 @@defmodule PlausibleWeb.Api.StatsController.ConversionsTest douse PlausibleWeb.ConnCase+ use Plausible.Teams.Test@user_id Enum.random(1000..9999)@@ -324,12 +325,10 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest dosite: site,user: user} do- user =- user- |> Plausible.Auth.User.end_trial()- |> Plausible.Repo.update!()-- Plausible.Teams.sync_team(user)+ user+ |> team_of()+ |> Plausible.Teams.Team.end_trial()+ |> Plausible.Repo.update!()populate_stats(site, [build(:event,diff --git a/test/plausible_web/controllers/auth_controller_test.exs b/test/plausible_web/controllers/auth_controller_test.exsindex deb5908c4d..ba11ac5dc1 100644--- a/test/plausible_web/controllers/auth_controller_test.exs+++ b/test/plausible_web/controllers/auth_controller_test.exs@@ -98,16 +98,10 @@ defmodule PlausibleWeb.AuthControllerTest dodescribe "GET /register/invitations/:invitation_id" dotest "shows the register form", %{conn: conn} do- inviter = insert(:user)- site = insert(:site, members: [inviter])-- invitation =- insert(:invitation,- site_id: site.id,- inviter: inviter,- email: "[email protected]",- role: :admin- )+ inviter = new_user()+ site = new_site(owner: inviter)++ invitation = invite_guest(site, "[email protected]", role: :editor, inviter: inviter)conn = get(conn, "/register/invitation/#{invitation.invitation_id}")@@ -117,16 +111,10 @@ defmodule PlausibleWeb.AuthControllerTest dodescribe "POST /login (register_action = register_from_invitation_form)" dosetup do- inviter = insert(:user)- site = insert(:site, members: [inviter])-- invitation =- insert(:invitation,- site_id: site.id,- inviter: inviter,- email: "[email protected]",- role: :admin- )+ inviter = new_user()+ site = new_site(owner: inviter)++ invitation = invite_guest(site, "[email protected]", role: :editor, inviter: inviter)user =Repo.insert!(@@ -298,9 +286,12 @@ defmodule PlausibleWeb.AuthControllerTest doendtest "redirects to /sites if user has invitation", %{conn: conn, user: user} do- site = insert(:site)- insert(:invitation, inviter: build(:user), site: site, email: user.email)+ owner = new_user()+ site = new_site(owner: owner)+ invite_guest(site, user, role: :viewer, inviter: owner)+Repo.update!(Plausible.Auth.User.changeset(user, %{email_verified: false}))+post(conn, "/activate/request-code")verification = Repo.get_by!(Auth.EmailActivationCode, user_id: user.id)@@ -587,7 +578,7 @@ defmodule PlausibleWeb.AuthControllerTest dosubscribe_to_growth_plan(user, status: Subscription.Status.active())subscribe_to_enterprise_plan(user, site_limit: 1, subscription?: false)- {:ok, _team} = Plausible.Teams.get_or_create(user)+ {:ok, team} = Plausible.Teams.get_or_create(user)conn = delete(conn, "/me")assert redirected_to(conn) == "/"@@ -595,13 +586,12 @@ defmodule PlausibleWeb.AuthControllerTest doassert Repo.reload(user) == nilassert Repo.all(Plausible.Billing.Subscription) == []assert Repo.all(Plausible.Billing.EnterprisePlan) == []- assert Repo.all(Plausible.Site.Membership) == []- assert Repo.all(Plausible.Teams.Team) == []+ refute Repo.get(Plausible.Teams.Team, team.id)endtest "deletes sites that the user owns", %{conn: conn, user: user, site: owner_site} do- viewer_site = insert(:site)- insert(:site_membership, site: viewer_site, user: user, role: "viewer")+ viewer_site = new_site()+ add_guest(viewer_site, user: user, role: :viewer)delete(conn, "/me")diff --git a/test/plausible_web/controllers/billing_controller_test.exs b/test/plausible_web/controllers/billing_controller_test.exsindex 8c556f2540..a9e750e40f 100644--- a/test/plausible_web/controllers/billing_controller_test.exs+++ b/test/plausible_web/controllers/billing_controller_test.exs@@ -43,11 +43,14 @@ defmodule PlausibleWeb.BillingControllerTest douser: user} dosubscribe_to_plan(user, "123123")- team = team_of(user)- for _ <- 1..11, do: new_site(owner: user)+ team =+ user+ |> team_of()+ |> Ecto.Changeset.change(allow_next_upgrade_override: true)+ |> Plausible.Repo.update!()- Plausible.Users.allow_next_upgrade_override(user)+ for _ <- 1..11, do: new_site(owner: user)conn = post(conn, Routes.billing_path(conn, :change_plan, @v4_growth_plan))@@ -78,7 +81,10 @@ defmodule PlausibleWeb.BillingControllerTest doassert subscription.paddle_plan_id == "123123"- Plausible.Users.allow_next_upgrade_override(user)+ user+ |> team_of()+ |> Ecto.Changeset.change(allow_next_upgrade_override: true)+ |> Plausible.Repo.update!()conn2 = post(conn, Routes.billing_path(conn, :change_plan, @v4_growth_plan))@@ -232,7 +238,9 @@ defmodule PlausibleWeb.BillingControllerTest doassert html_response =~ ~s[<a href="/billing/choose-plan"]end- test "flashes error and redirects to choose-plan page", %{conn: conn} do+ test "flashes error and redirects to choose-plan page", %{conn: conn, user: user} do+ # choose-plan enforces at least 1 site, which implies team created, before allowing the user to upgrade+ new_site(owner: user)conn = get(conn, Routes.billing_path(conn, :change_plan_preview, @v4_business_plan))assert Phoenix.Flash.get(conn.assigns.flash, :error) =~@@ -354,10 +362,7 @@ defmodule PlausibleWeb.BillingControllerTest dodefp subscribe_enterprise(%{user: user}, opts \\ []) do{paddle_plan_id, opts} = Keyword.pop(opts, :paddle_plan_id, "321")- opts =- opts- |> Keyword.put(:user, user)- |> Keyword.put_new(:status, Subscription.Status.active())+ opts = Keyword.put_new(opts, :status, Subscription.Status.active())user = subscribe_to_plan(user, paddle_plan_id, opts)diff --git a/test/plausible_web/controllers/invitation_controller_test.exs b/test/plausible_web/controllers/invitation_controller_test.exsindex e56d9440fb..c4ecdeca52 100644--- a/test/plausible_web/controllers/invitation_controller_test.exs+++ b/test/plausible_web/controllers/invitation_controller_test.exs@@ -21,72 +21,15 @@ defmodule PlausibleWeb.Site.InvitationControllerTest doassert redirected_to(conn) == "/#{URI.encode_www_form(site.domain)}"- refute Repo.exists?(from(i in Plausible.Auth.Invitation, where: i.email == ^user.email))+ refute Repo.exists?(from(i in Plausible.Teams.Invitation, where: i.email == ^user.email))- membership = Repo.get_by(Plausible.Site.Membership, user_id: user.id, site_id: site.id)- assert membership.role == :admin- end-- @tag :teams- test "multiple invites per same team sync regression", %{conn: conn, user: user} do- inviter = insert(:user)- {:ok, team} = Plausible.Teams.get_or_create(inviter)- site1 = insert(:site, team: team, members: [inviter])- site2 = insert(:site, team: team, members: [inviter])-- invitation1 =- insert(:invitation,- site_id: site1.id,- inviter: inviter,- email: user.email,- role: :viewer- )-- invitation2 =- insert(:invitation,- site_id: site2.id,- inviter: inviter,- email: user.email,- role: :viewer- )-- Plausible.Teams.Invitations.invite_sync(site1, invitation1)- Plausible.Teams.Invitations.invite_sync(site2, invitation2)-- resp = post(conn, "/sites/invitations/#{invitation1.invitation_id}/accept")- assert redirected_to(resp, 302)-- assert Repo.get_by(Plausible.Site.Membership, site_id: site1.id, user_id: user.id)- refute Repo.get_by(Plausible.Site.Membership, site_id: site2.id, user_id: user.id)-- assert tm =- Repo.get_by(Plausible.Teams.Membership,- team_id: team.id,- user_id: user.id,- role: :guest- )-- assert Repo.get_by(Plausible.Teams.GuestMembership,- team_membership_id: tm.id,- site_id: site1.id- )-- refute Repo.get_by(Plausible.Teams.GuestMembership,- team_membership_id: tm.id,- site_id: site2.id- )+ assert_guest_membership(site.team, site, user, :editor)endtest "does not crash if clicked for the 2nd time in another tab", %{conn: conn, user: user} do- site = new_site()-- invitation =- insert(:invitation,- site_id: site.id,- inviter: build(:user),- email: user.email,- role: :admin- )+ owner = new_user()+ site = new_site(owner: owner)+ invitation = invite_guest(site, user.email, role: :editor, inviter: owner)c1 = post(conn, "/sites/invitations/#{invitation.invitation_id}/accept")assert redirected_to(c1) == "/#{URI.encode_www_form(site.domain)}"@@ -110,16 +53,16 @@ defmodule PlausibleWeb.Site.InvitationControllerTest dosubscribe_to_growth_plan(user)new_team = team_of(user)- invitation = invite_transfer(site, user, inviter: old_owner)+ transfer = invite_transfer(site, user, inviter: old_owner)- conn = post(conn, "/sites/invitations/#{invitation.invitation_id}/accept")+ conn = post(conn, "/sites/invitations/#{transfer.transfer_id}/accept")assert redirected_to(conn, 302) == "/#{URI.encode_www_form(site.domain)}"assert Phoenix.Flash.get(conn.assigns.flash, :success) =~"You now have access to"- refute Repo.reload(invitation)+ refute Repo.reload(transfer)assert_guest_membership(new_team, site, old_owner, :editor)@@ -131,9 +74,9 @@ defmodule PlausibleWeb.Site.InvitationControllerTest doold_owner = new_user()site = new_site(owner: old_owner)- invitation = invite_transfer(site, user, inviter: old_owner)+ transfer = invite_transfer(site, user, inviter: old_owner)- conn = post(conn, "/sites/invitations/#{invitation.invitation_id}/accept")+ conn = post(conn, "/sites/invitations/#{transfer.transfer_id}/accept")assert redirected_to(conn, 302) == Routes.site_path(conn, :index)@@ -151,9 +94,9 @@ defmodule PlausibleWeb.Site.InvitationControllerTest do# fill site limit quotafor _ <- 1..10, do: new_site(owner: user)- invitation = invite_transfer(site, user, inviter: old_owner)+ transfer = invite_transfer(site, user, inviter: old_owner)- conn = post(conn, "/sites/invitations/#{invitation.invitation_id}/accept")+ conn = post(conn, "/sites/invitations/#{transfer.transfer_id}/accept")assert redirected_to(conn, 302) == Routes.site_path(conn, :index)@@ -208,17 +151,17 @@ defmodule PlausibleWeb.Site.InvitationControllerTest doowner = new_user()site = new_site(owner: owner)add_guest(site, user: user, role: :editor)- invitation = invite_transfer(site, "[email protected]", inviter: owner)+ transfer = invite_transfer(site, "[email protected]", inviter: owner)conn =delete(conn,- Routes.invitation_path(conn, :remove_invitation, site.domain, invitation.invitation_id)+ Routes.invitation_path(conn, :remove_invitation, site.domain, transfer.transfer_id))assert redirected_to(conn, 302) == "/#{URI.encode_www_form(site.domain)}/settings/people"- refute Repo.reload(invitation)+ refute Repo.reload(transfer)endtest "fails to remove an invitation with insufficient permission", %{conn: conn, user: user} dodiff --git a/test/plausible_web/controllers/settings_controller_test.exs b/test/plausible_web/controllers/settings_controller_test.exsindex 17a8b12e33..3e5232dfd2 100644--- a/test/plausible_web/controllers/settings_controller_test.exs+++ b/test/plausible_web/controllers/settings_controller_test.exs@@ -477,7 +477,7 @@ defmodule PlausibleWeb.SettingsControllerTest do# for a free_10k subscription (without a `last_bill_date`)Repo.delete!(subscription)- Plausible.Billing.Subscription.free(%{user_id: user.id})+ Plausible.Billing.Subscription.free(%{team_id: team_of(user).id})|> Repo.insert!()conn@@ -502,7 +502,7 @@ defmodule PlausibleWeb.SettingsControllerTest do@tag :ee_onlytest "renders team members usage and limit", %{conn: conn, user: user} do- insert(:subscription, paddle_plan_id: @v4_plan_id, user: user)+ subscribe_to_plan(user, @v4_plan_id)team_member_usage_row_text =conn@@ -531,7 +531,9 @@ defmodule PlausibleWeb.SettingsControllerTest dosetup [:create_user, :log_in]test "does not show invoice section for a free subscription", %{conn: conn, user: user} do- Plausible.Billing.Subscription.free(%{user_id: user.id, currency_code: "EUR"})+ new_site(owner: user)++ Plausible.Billing.Subscription.free(%{team_id: team_of(user).id, currency_code: "EUR"})|> Repo.insert!()html =@@ -1007,11 +1009,7 @@ defmodule PlausibleWeb.SettingsControllerTest dodescribe "GET /settings/api-keys" dosetup [:create_user, :log_in]- test "handles user without a team gracefully", %{conn: conn, user: user} do- user- |> team_of()- |> Repo.delete!()-+ test "handles user without a team gracefully", %{conn: conn} doconn = get(conn, Routes.settings_path(conn, :api_keys))assert html_response(conn, 200)@@ -1022,7 +1020,7 @@ defmodule PlausibleWeb.SettingsControllerTest dosetup [:create_user, :log_in]test "can create an API key", %{conn: conn, user: user} do- insert(:site, memberships: [build(:site_membership, user: user, role: "owner")])+ new_site(owner: user)conn =post(conn, Routes.settings_path(conn, :api_keys), %{@@ -1039,7 +1037,7 @@ defmodule PlausibleWeb.SettingsControllerTest doendtest "cannot create a duplicate API key", %{conn: conn, user: user} do- insert(:site, memberships: [build(:site_membership, user: user, role: "owner")])+ new_site(owner: user)conn =post(conn, Routes.settings_path(conn, :api_keys), %{@@ -1087,8 +1085,8 @@ defmodule PlausibleWeb.SettingsControllerTest doalias Plausible.Auth.ApiKeytest "can't delete api key that doesn't belong to me", %{conn: conn} do- other_user = insert(:user)- insert(:site, memberships: [build(:site_membership, user: other_user, role: "owner")])+ other_user = new_user()+ new_site(owner: other_user)assert {:ok, %ApiKey{} = api_key} =%ApiKey{user_id: other_user.id}diff --git a/test/plausible_web/controllers/site/membership_controller_test.exs b/test/plausible_web/controllers/site/membership_controller_test.exsindex cd4d0ea91a..2a0c95ac1b 100644--- a/test/plausible_web/controllers/site/membership_controller_test.exs+++ b/test/plausible_web/controllers/site/membership_controller_test.exs@@ -49,12 +49,11 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doconn =post(conn, "/sites/#{site.domain}/memberships/invite", %{email: "[email protected]",- role: "admin"+ role: "editor"})- invitation = Repo.get_by(Plausible.Auth.Invitation, email: "[email protected]")+ assert_guest_invitation(site.team, site, "[email protected]", :editor)- assert invitation.role == :adminassert redirected_to(conn) == "/#{URI.encode_www_form(site.domain)}/settings/people"end@@ -89,6 +88,26 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doassert conn.status == 404end+ test "fails to create invitation if site transfer already exists", %{conn: conn, user: user} do+ site = new_site(owner: user)++ new_owner = new_user()++ post(conn, "/sites/#{site.domain}/transfer-ownership", %{email: new_owner.email})+ assert_site_transfer(site, new_owner.email)++ conn =+ post(conn, "/sites/#{site.domain}/memberships/invite", %{+ email: new_owner.email,+ role: "editor"+ })++ conn = get(recycle(conn), redirected_to(conn, 302))+ html = html_response(conn, 200)+ assert html =~ "Error"+ assert html =~ "This invitation has been already sent"+ end+test "fails to create invitation for a foreign site", %{conn: my_conn, user: me} do_my_site = new_site(owner: me)@@ -99,12 +118,12 @@ defmodule PlausibleWeb.Site.MembershipControllerTest domy_conn =post(my_conn, "/sites/#{other_site.domain}/memberships/invite", %{email: "[email protected]",- role: "admin"+ role: "editor"})assert my_conn.status == 404- refute Repo.get_by(Plausible.Auth.Invitation, email: "[email protected]")+ refute Repo.get_by(Plausible.Teams.Invitation, email: "[email protected]")endtest "sends invitation email for new user", %{conn: conn, user: user} do@@ -112,7 +131,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest dopost(conn, "/sites/#{site.domain}/memberships/invite", %{email: "[email protected]",- role: "admin"+ role: "editor"})assert_email_delivered_with(@@ -122,12 +141,12 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doendtest "sends invitation email for existing user", %{conn: conn, user: user} do- existing_user = insert(:user)+ existing_user = new_user()site = new_site(owner: user)post(conn, "/sites/#{site.domain}/memberships/invite", %{email: existing_user.email,- role: "admin"+ role: "editor"})assert_email_delivered_with(@@ -152,7 +171,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest do"#{second_member.email} is already a member of #{site.domain}"end- test "redirects with an error flash when the invitation already exists", %{+ test "handles repeat invitation gracefully", %{conn: conn,user: user} do@@ -161,7 +180,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest do_req1 =post(conn, "/sites/#{site.domain}/memberships/invite", %{email: "[email protected]",- role: "admin"+ role: "editor"})assert_email_delivered_with(@@ -172,25 +191,16 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doreq2 =post(conn, "/sites/#{site.domain}/memberships/invite", %{email: "[email protected]",- role: "admin"+ role: "editor"})- refute_email_delivered_with(+ assert_email_delivered_with(to: [nil: "[email protected]"],subject: @subject_prefix <> "You've been invited to #{site.domain}")- assert people_settings = redirected_to(req2, 302)-- assert ^people_settings =- PlausibleWeb.Router.Helpers.site_path(- PlausibleWeb.Endpoint,- :settings_people,- site.domain- )-- assert Phoenix.Flash.get(req2.assigns.flash, :error) =~- "This invitation has been already sent."+ assert Phoenix.Flash.get(req2.assigns.flash, :success) =~+ "has been invited to"endend@@ -211,9 +221,8 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doconn =post(conn, "/sites/#{site.domain}/transfer-ownership", %{email: "[email protected]"})- invitation = Repo.get_by(Plausible.Auth.Invitation, email: "[email protected]")+ assert_site_transfer(site, "[email protected]")- assert invitation.role == :ownerassert redirected_to(conn) == "/#{URI.encode_www_form(site.domain)}/settings/people"end@@ -262,13 +271,13 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doconn =post(conn, "/sites/#{site.domain}/memberships/invite", %{email: invited,- role: "admin"+ role: "editor"})conn = get(recycle(conn), redirected_to(conn, 302))assert html_response(conn, 200) =~- "#{invited} has been invited to #{site.domain} as an admin"+ "#{invited} has been invited to #{site.domain} as an editor"# transferring ownership to that domain now fails@@ -300,9 +309,8 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doconn = put(conn, "/sites/#{site.domain}/memberships/u/#{user.id}/role/viewer")- membership = Repo.get_by(Plausible.Site.Membership, user_id: user.id)+ assert_guest_membership(site.team, site, user, :viewer)- assert membership.role == :viewerassert redirected_to(conn) == "/#{URI.encode_www_form(site.domain)}"end@@ -329,7 +337,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doconn = put(conn, "/sites/#{site.domain}/memberships/u/#{user.id}/role/admin")- membership = Repo.get_by(Plausible.Site.Membership, user_id: user.id)+ membership = Repo.get_by(Plausible.Teams.Membership, user_id: user.id)assert membership.role == :owner@@ -346,9 +354,9 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doadd_guest(site, user: user, role: :editor)viewer = add_guest(site, user: new_user(), role: :viewer)- conn = put(conn, "/sites/#{site.domain}/memberships/u/#{viewer.id}/role/admin")+ conn = put(conn, "/sites/#{site.domain}/memberships/u/#{viewer.id}/role/editor")- assert_team_membership(viewer, site.team, :viewer)+ assert_team_membership(viewer, site.team, :editor)assert redirected_to(conn) == "/#{URI.encode_www_form(site.domain)}/settings/people"end@@ -373,10 +381,10 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doconn = delete(conn, "/sites/#{site.domain}/memberships/u/#{admin.id}")assert Phoenix.Flash.get(conn.assigns.flash, :success) =~ "has been removed"- refute Repo.exists?(from sm in Plausible.Site.Membership, where: sm.user_id == ^admin.id)+ refute Repo.exists?(from tm in Plausible.Teams.Membership, where: tm.user_id == ^admin.id)end- test "fails to remove a member from a foreign site", %{conn: conn, user: user} do+ test "fails to remove a member from a foreign site (silently)", %{conn: conn, user: user} doforeign_member = new_user()foreign_site = new_site()add_guest(foreign_site, user: foreign_member, role: :editor)@@ -385,8 +393,9 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doconn = delete(conn, "/sites/#{site.domain}/memberships/u/#{foreign_member.id}")- assert Phoenix.Flash.get(conn.assigns.flash, :error) ==- "Failed to find membership to remove"+ assert Phoenix.Flash.get(conn.assigns.flash, :success) =~ "has been removed"++ assert_guest_membership(foreign_site.team, foreign_site, foreign_member, :editor)endtest "notifies the user who has been removed via email", %{conn: conn, user: user} dodiff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exsindex a878949f1d..ba88a05bd8 100644--- a/test/plausible_web/controllers/site_controller_test.exs+++ b/test/plausible_web/controllers/site_controller_test.exs@@ -31,7 +31,7 @@ defmodule PlausibleWeb.SiteControllerTest doassert html_response(conn, 200) =~ "Add site info"- insert(:site, members: [user], domain: "test-site.com")+ new_site(owner: user, domain: "test-site.com")conn = get(conn1, "/sites/new")@@ -155,9 +155,9 @@ defmodule PlausibleWeb.SiteControllerTest dorefute resp =~ nag_messageuser- |> Plausible.Auth.User.end_trial()+ |> team_of()+ |> Plausible.Teams.Team.end_trial()|> Repo.update!()- |> Plausible.Teams.sync_team()conn = get(initial_conn, "/sites")resp = html_response(conn, 200)@@ -256,7 +256,7 @@ defmodule PlausibleWeb.SiteControllerTest doendtest "starts trial if user does not have trial yet", %{conn: conn, user: user} do- Plausible.Auth.User.remove_trial_expiry(user) |> Repo.update!()+ refute team_of(user)post(conn, "/sites", %{"site" => %{@@ -265,7 +265,7 @@ defmodule PlausibleWeb.SiteControllerTest do}})- assert Repo.reload!(user).trial_expiry_date+ assert Repo.reload!(team_of(user)).trial_expiry_dateendtest "sends welcome email if this is the user's first site", %{conn: conn} do@@ -319,8 +319,9 @@ defmodule PlausibleWeb.SiteControllerTest doconn: conn,user: user} do- insert(:subscription, paddle_plan_id: @v4_business_plan_id, user: user)- insert_list(51, :site, members: [user])+ subscribe_to_plan(user, @v4_business_plan_id)++ for _ <- 1..51, do: new_site(owner: user)Ecto.Changeset.change(user, %{inserted_at: ~N[2021-05-04 00:00:00]})|> Repo.update()@@ -562,7 +563,7 @@ defmodule PlausibleWeb.SiteControllerTest doconn = get(conn, "/#{site.domain}/settings/people")resp = html_response(conn, 200)- assert text_of_element(resp, "#invitation-#{st.invitation_id}") ==+ assert text_of_element(resp, "#invitation-#{st.transfer_id}") =="#{new_owner.email} Owner"endenddiff --git a/test/plausible_web/controllers/stats_controller_test.exs b/test/plausible_web/controllers/stats_controller_test.exsindex 4bb5faa132..0aa89f9bc6 100644--- a/test/plausible_web/controllers/stats_controller_test.exs+++ b/test/plausible_web/controllers/stats_controller_test.exs@@ -57,7 +57,7 @@ defmodule PlausibleWeb.StatsControllerTest dotest "public site - redirect to /login when no stats because verification requires it", %{conn: conn} do- insert(:site, domain: "some-other-public-site.io", public: true)+ new_site(domain: "some-other-public-site.io", public: true)conn = get(conn, conn |> get("/some-other-public-site.io") |> redirected_to())assert redirected_to(conn) == "/login"diff --git a/test/plausible_web/email_test.exs b/test/plausible_web/email_test.exsindex 03e5085d82..280664c06b 100644--- a/test/plausible_web/email_test.exs+++ b/test/plausible_web/email_test.exs@@ -1,9 +1,12 @@defmodule PlausibleWeb.EmailTest do- alias PlausibleWeb.Email- use ExUnit.Case, async: true+ use Plausible.DataCase, async: true+ use Plausible.Teams.Test+import Plausible.Factoryimport Plausible.Test.Support.HTML+ alias PlausibleWeb.Email+describe "base_email layout" dotest "greets user by first name if user in template assigns" doemail =@@ -282,15 +285,9 @@ defmodule PlausibleWeb.EmailTest dodescribe "site_setup_success" dosetup do- trial_user =- build(:user,- id: -1,- subscription: nil,- trial_expiry_date: Date.add(Date.utc_today(), 100)- )-- site = build(:site, members: [trial_user])- email = PlausibleWeb.Email.site_setup_success(trial_user, site)+ trial_user = new_user(trial_expiry_date: Date.add(Date.utc_today(), 100))+ site = new_site(owner: trial_user)+ email = PlausibleWeb.Email.site_setup_success(trial_user, team_of(trial_user), site){:ok, email: email}enddiff --git a/test/plausible_web/live/choose_plan_test.exs b/test/plausible_web/live/choose_plan_test.exsindex 523f2a0828..ecd5f1ec07 100644--- a/test/plausible_web/live/choose_plan_test.exs+++ b/test/plausible_web/live/choose_plan_test.exs@@ -321,9 +321,9 @@ defmodule PlausibleWeb.Live.ChoosePlanTest dotest "allows upgrade to a 10k plan with a pageview allowance margin of 0.3 when trial ended 10 days ago",%{conn: conn, site: site, user: user} douser- |> Plausible.Auth.User.changeset(%{trial_expiry_date: Timex.shift(Timex.today(), days: -10)})+ |> team_of()+ |> Ecto.Changeset.change(trial_expiry_date: Date.shift(Date.utc_today(), day: -10))|> Repo.update!()- |> Plausible.Teams.sync_team()generate_usage_for(site, 13_000)@@ -348,9 +348,9 @@ defmodule PlausibleWeb.Live.ChoosePlanTest douser: user} douser- |> Plausible.Auth.User.changeset(%{trial_expiry_date: Timex.shift(Timex.today(), days: -11)})+ |> team_of()+ |> Ecto.Changeset.change(trial_expiry_date: Date.shift(Date.utc_today(), day: -11))|> Repo.update!()- |> Plausible.Teams.sync_team()generate_usage_for(site, 11_000)@@ -712,7 +712,10 @@ defmodule PlausibleWeb.Live.ChoosePlanTest dogenerate_usage_for(site, 11_000, Timex.shift(now, days: -5))generate_usage_for(site, 11_000, Timex.shift(now, days: -35))- Plausible.Users.allow_next_upgrade_override(user)+ user+ |> team_of()+ |> Ecto.Changeset.change(allow_next_upgrade_override: true)+ |> Plausible.Repo.update!(){:ok, lv, _doc} = get_liveview(conn)diff --git a/test/plausible_web/live/funnel_settings_test.exs b/test/plausible_web/live/funnel_settings_test.exsindex 1e27ace001..6f0c0f0f5a 100644--- a/test/plausible_web/live/funnel_settings_test.exs+++ b/test/plausible_web/live/funnel_settings_test.exs@@ -1,5 +1,6 @@defmodule PlausibleWeb.Live.FunnelSettingsTest douse PlausibleWeb.ConnCase, async: true+ use Plausible.Teams.Testuse Plausible@moduletag :ee_only@@ -13,9 +14,9 @@ defmodule PlausibleWeb.Live.FunnelSettingsTest do@tag :ee_onlytest "premium feature notice renders", %{conn: conn, site: site, user: user} douser- |> Plausible.Auth.User.end_trial()+ |> team_of()+ |> Plausible.Teams.Team.end_trial()|> Plausible.Repo.update!()- |> Plausible.Teams.sync_team()conn = get(conn, "/#{site.domain}/settings/funnels")resp = conn |> html_response(200) |> text()diff --git a/test/plausible_web/live/goal_settings_test.exs b/test/plausible_web/live/goal_settings_test.exsindex 653ddd44e8..cdeb9e5190 100644--- a/test/plausible_web/live/goal_settings_test.exs+++ b/test/plausible_web/live/goal_settings_test.exs@@ -1,5 +1,6 @@defmodule PlausibleWeb.Live.GoalSettingsTest douse PlausibleWeb.ConnCase, async: true+ use Plausible.Teams.Testimport Phoenix.LiveViewTestimport Plausible.Test.Support.HTML@@ -31,9 +32,9 @@ defmodule PlausibleWeb.Live.GoalSettingsTest do{:ok, [_, _, g3]} = setup_goals(site)user- |> Plausible.Auth.User.end_trial()+ |> team_of()+ |> Plausible.Teams.Team.end_trial()|> Plausible.Repo.update!()- |> Plausible.Teams.sync_team()conn = get(conn, "/#{site.domain}/settings/goals")diff --git a/test/plausible_web/live/props_settings_test.exs b/test/plausible_web/live/props_settings_test.exsindex b993dacba6..d301bb85a5 100644--- a/test/plausible_web/live/props_settings_test.exs+++ b/test/plausible_web/live/props_settings_test.exs@@ -1,5 +1,6 @@defmodule PlausibleWeb.Live.PropsSettingsTest douse PlausibleWeb.ConnCase, async: true+ use Plausible.Teams.Testimport Phoenix.LiveViewTestimport Plausible.Test.Support.HTML@@ -9,9 +10,9 @@ defmodule PlausibleWeb.Live.PropsSettingsTest do@tag :ee_onlytest "premium feature notice renders", %{conn: conn, site: site, user: user} douser- |> Plausible.Auth.User.end_trial()+ |> team_of()+ |> Plausible.Teams.Team.end_trial()|> Plausible.Repo.update!()- |> Plausible.Teams.sync_team()conn = get(conn, "/#{site.domain}/settings/properties")resp = conn |> html_response(200) |> text()diff --git a/test/plausible_web/live/register_form_test.exs b/test/plausible_web/live/register_form_test.exsindex c946140e17..b4b05037ba 100644--- a/test/plausible_web/live/register_form_test.exs+++ b/test/plausible_web/live/register_form_test.exs@@ -5,6 +5,8 @@ defmodule PlausibleWeb.Live.RegisterFormTest doimport Phoenix.LiveViewTestimport Plausible.Test.Support.HTML+ use Plausible.Teams.Test+alias Plausible.Auth.Useralias Plausible.Repo@@ -138,16 +140,11 @@ defmodule PlausibleWeb.Live.RegisterFormTest dodescribe "/register/invitation/:invitation_id" dosetup do- inviter = insert(:user)- site = insert(:site, members: [inviter])+ inviter = new_user()+ site = new_site(owner: inviter)invitation =- insert(:invitation,- site_id: site.id,- inviter: inviter,- email: "[email protected]",- role: :admin- )+ invite_guest(site, "[email protected]", role: :editor, inviter: inviter){:ok, %{site: site, invitation: invitation, inviter: inviter}}end@@ -183,13 +180,14 @@ defmodule PlausibleWeb.Live.RegisterFormTest doassert text_of_attr(password_input, "value") == "very-long-and-very-secret-123"assert text_of_attr(password_confirmation_input, "value") == "very-long-and-very-secret-123"- assert %{- name: "Mary Sue",- email: "[email protected]",- password_hash: password_hash,- # leaves trial_expiry_date null when invitation role is not :owner- trial_expiry_date: nil- } = Repo.get_by(User, email: "[email protected]")+ assert user =+ %{+ name: "Mary Sue",+ email: "[email protected]",+ password_hash: password_hash+ } = Repo.get_by(User, email: "[email protected]")++ assert team_of(user) == nilassert String.length(password_hash) > 0end@@ -201,15 +199,9 @@ defmodule PlausibleWeb.Live.RegisterFormTest do} domock_captcha_success()- invitation =- insert(:invitation,- site_id: site.id,- inviter: inviter,- email: "[email protected]",- role: :owner- )+ invitation = invite_transfer(site, "[email protected]", inviter: inviter)- lv = get_liveview(conn, "/register/invitation/#{invitation.invitation_id}")+ lv = get_liveview(conn, "/register/invitation/#{invitation.transfer_id}")type_into_input(lv, "user[name]", "Mary Sue")type_into_input(lv, "user[password]", "very-long-and-very-secret-123")@@ -217,12 +209,9 @@ defmodule PlausibleWeb.Live.RegisterFormTest do_html = lv |> element("form") |> render_submit()- assert %{- email: "[email protected]",- trial_expiry_date: trial_expiry_date- } = Repo.get_by(User, email: "[email protected]")+ assert user = Repo.get_by(User, email: "[email protected]")- assert trial_expiry_date != nil+ assert team_of(user).trial_expiry_date != nilendtest "always uses original email from the invitation", %{conn: conn, invitation: invitation} dodiff --git a/test/plausible_web/live/sites_test.exs b/test/plausible_web/live/sites_test.exsindex 7a919c7433..1038da2ea4 100644--- a/test/plausible_web/live/sites_test.exs+++ b/test/plausible_web/live/sites_test.exs@@ -40,13 +40,13 @@ defmodule PlausibleWeb.Live.SitesTest doinviter = new_user()site = new_site(owner: inviter)- invitation = invite_transfer(site, user, inviter: inviter)+ transfer = invite_transfer(site, user, inviter: inviter){:ok, _lv, html} = live(conn, "/sites")invitation_data = get_invitation_data(html)- assert get_in(invitation_data, ["invitations", invitation.invitation_id, "no_plan"])+ assert get_in(invitation_data, ["invitations", transfer.transfer_id, "no_plan"])end@tag :ee_only@@ -57,7 +57,7 @@ defmodule PlausibleWeb.Live.SitesTest doinviter = new_user()site = new_site(owner: inviter)- invitation = invite_transfer(site, user, inviter: inviter)+ transfer = invite_transfer(site, user, inviter: inviter)# fill site quotasubscribe_to_growth_plan(user)@@ -67,7 +67,7 @@ defmodule PlausibleWeb.Live.SitesTest doinvitation_data = get_invitation_data(html)- assert get_in(invitation_data, ["invitations", invitation.invitation_id, "exceeded_limits"]) ==+ assert get_in(invitation_data, ["invitations", transfer.transfer_id, "exceeded_limits"]) =="site limit"end@@ -79,7 +79,7 @@ defmodule PlausibleWeb.Live.SitesTest doinviter = new_user()site = new_site(owner: inviter, allowed_event_props: ["dummy"])- invitation = invite_transfer(site, user, inviter: inviter)+ transfer = invite_transfer(site, user, inviter: inviter)subscribe_to_growth_plan(user)@@ -87,7 +87,7 @@ defmodule PlausibleWeb.Live.SitesTest doinvitation_data = get_invitation_data(html)- assert get_in(invitation_data, ["invitations", invitation.invitation_id, "missing_features"]) ==+ assert get_in(invitation_data, ["invitations", transfer.transfer_id, "missing_features"]) =="Custom Properties"enddiff --git a/test/plausible_web/plugs/auth_plug_test.exs b/test/plausible_web/plugs/auth_plug_test.exsindex 32911da7d9..278daab612 100644--- a/test/plausible_web/plugs/auth_plug_test.exs+++ b/test/plausible_web/plugs/auth_plug_test.exs@@ -1,5 +1,6 @@defmodule PlausibleWeb.AuthPlugTest douse PlausibleWeb.ConnCase, async: true+ use Plausible.Teams.Testalias PlausibleWeb.AuthPlug@@ -15,7 +16,7 @@ defmodule PlausibleWeb.AuthPlugTest doendtest "looks up current user if they are logged in", %{conn: conn, user: user} do- subscription = insert(:subscription, user: user, inserted_at: Timex.now())+ subscribe_to_plan(user, "123", inserted_at: NaiveDateTime.utc_now())conn =conn@@ -23,14 +24,22 @@ defmodule PlausibleWeb.AuthPlugTest do|> AuthPlug.call(%{})assert conn.assigns[:current_user].id == user.id- assert conn.assigns[:current_user].subscription.id == subscription.id+ assert conn.assigns[:my_team].subscription.paddle_plan_id == "123"endtest "looks up the latest subscription", %{conn: conn, user: user} do- _old_subscription =- insert(:subscription, user: user, inserted_at: Timex.now() |> Timex.shift(days: -1))-- subscription = insert(:subscription, user: user, inserted_at: Timex.now())+ # old subscription+ subscribe_to_plan(+ user,+ "123",+ inserted_at: NaiveDateTime.shift(NaiveDateTime.utc_now(), day: -1)+ )++ subscribe_to_plan(+ user,+ "456",+ inserted_at: NaiveDateTime.utc_now()+ )conn =conn@@ -38,6 +47,6 @@ defmodule PlausibleWeb.AuthPlugTest do|> AuthPlug.call(%{})assert conn.assigns[:current_user].id == user.id- assert conn.assigns[:current_user].subscription.id == subscription.id+ assert conn.assigns[:my_team].subscription.paddle_plan_id == "456"endenddiff --git a/test/plausible_web/plugs/authorize_public_api_test.exs b/test/plausible_web/plugs/authorize_public_api_test.exsindex 958ca37fec..e7dec4ce66 100644--- a/test/plausible_web/plugs/authorize_public_api_test.exs+++ b/test/plausible_web/plugs/authorize_public_api_test.exs@@ -98,8 +98,8 @@ defmodule PlausibleWeb.Plugs.AuthorizePublicAPITest doendtest "halts with error when site ID is invalid", %{conn: conn} do- user = insert(:user)- _site = insert(:site, members: [user])+ user = new_user(trial_expiry_date: Date.utc_today())+ _site = new_site(owner: user)api_key = insert(:api_key, user: user)conn =@@ -116,7 +116,7 @@ defmodule PlausibleWeb.Plugs.AuthorizePublicAPITest dotest "halts with error when API key owner does not have access to the requested site", %{conn: conn} do- user = new_user()+ user = new_user(trial_expiry_date: Date.utc_today())site = new_site()api_key = insert(:api_key, user: user)diff --git a/test/plausible_web/plugs/authorize_site_access_test.exs b/test/plausible_web/plugs/authorize_site_access_test.exsindex 087b4f7362..2ceb61693a 100644--- a/test/plausible_web/plugs/authorize_site_access_test.exs+++ b/test/plausible_web/plugs/authorize_site_access_test.exs@@ -287,7 +287,7 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccessTest doendtest "allows user based on website visibility (anonymous request)" do- site = insert(:site, members: [build(:user)], public: true)+ site = new_site(public: true)opts = AuthorizeSiteAccess.init([:public])@@ -318,7 +318,7 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccessTest doendtest "allows user based on shared link auth (anonymous request)" do- site = insert(:site, members: [build(:user)])+ site = new_site()shared_link = insert(:shared_link, site: site)opts = AuthorizeSiteAccess.init([:public])diff --git a/test/support/factory.ex b/test/support/factory.exindex 62de00560b..5126b3552d 100644--- a/test/support/factory.ex+++ b/test/support/factory.ex@@ -53,7 +53,6 @@ defmodule Plausible.Factory doname: "Jane Smith",email: sequence(:email, &"email-#{&1}@example.com"),password_hash: Plausible.Auth.Password.hash(pw),- trial_expiry_date: Timex.today() |> Timex.shift(days: 30),email_verified: true}@@ -78,16 +77,6 @@ defmodule Plausible.Factory do# The é exercises unicode support in domain namesdomain = sequence(:domain, &"é-#{&1}.example.com")- defined_memberships? =- Map.has_key?(attrs, :memberships) ||- Map.has_key?(attrs, :members) ||- Map.has_key?(attrs, :owner)-- attrs =- if defined_memberships?,- do: attrs,- else: Map.put_new(attrs, :members, [build(:user)])-site = %Plausible.Site{native_stats_start_at: ~N[2000-01-01 00:00:00],domain: domain,@@ -97,13 +86,6 @@ defmodule Plausible.Factory domerge_attributes(site, attrs)end- def site_membership_factory do- %Plausible.Site.Membership{- user: build(:user),- role: :viewer- }- end-def site_import_factory dotoday = Date.utc_today()@@ -250,14 +232,6 @@ defmodule Plausible.Factory do}end- def invitation_factory do- %Plausible.Auth.Invitation{- invitation_id: Nanoid.generate(),- email: sequence(:email, &"email-#{&1}@example.com"),- role: :admin- }- end-def api_key_factory dokey = :crypto.strong_rand_bytes(64) |> Base.url_encode64() |> binary_part(0, 64)diff --git a/test/support/teams/test.ex b/test/support/teams/test.exindex 0bde3ba1bd..bc435e2234 100644--- a/test/support/teams/test.ex+++ b/test/support/teams/test.ex@@ -24,19 +24,16 @@ defmodule Plausible.Teams.Test doargs|> Keyword.put(:team, team)- |> Keyword.put(:members, [user])elseuser = new_user(){:ok, team} = Teams.get_or_create(user)args|> Keyword.put(:team, team)- |> Keyword.put(:members, [user])end:site|> insert(args)- |> Repo.preload(:memberships)enddef new_team() do@@ -47,12 +44,21 @@ defmodule Plausible.Teams.Test dodef new_user(args \\ []) do{team_args, args} = Keyword.pop(args, :team, [])+ {trial_expiry_date, args} = Keyword.pop(args, :trial_expiry_date)user = insert(:user, args)- if user.trial_expiry_date do+ trial_expiry_date =+ if team_args != [] && !trial_expiry_date do+ Date.add(Date.utc_today(), 30)+ else+ trial_expiry_date+ end++ if trial_expiry_date do{:ok, team} = Teams.get_or_create(user)- team_args = Keyword.merge(team_args, trial_expiry_date: user.trial_expiry_date)+ team_args =+ Keyword.merge(team_args, trial_expiry_date: trial_expiry_date)team|> Ecto.Changeset.change(team_args)@@ -73,12 +79,16 @@ defmodule Plausible.Teams.Test doenddef team_of(user, opts) do- {:ok, team} = Plausible.Teams.get_by_owner(user)-- if opts[:with_subscription?] do- Plausible.Teams.with_subscription(team)- else- team+ case Plausible.Teams.get_by_owner(user) do+ {:ok, team} ->+ if opts[:with_subscription?] do+ Plausible.Teams.with_subscription(team)+ else+ team+ end++ _ ->+ nilendend@@ -87,8 +97,6 @@ defmodule Plausible.Teams.Test dorole = Keyword.fetch!(args, :role)team = Repo.preload(site, :team).team- insert(:site_membership, user: user, role: translate_role_to_old_model(role), site: site)-team_membership =build(:team_membership, team: team, user: user, role: :guest)|> Repo.insert!(@@ -99,12 +107,13 @@ defmodule Plausible.Teams.Test doinsert(:guest_membership, site: site, team_membership: team_membership, role: role)- user |> Repo.preload([:site_memberships, :team_memberships])+ user |> Repo.preload(:team_memberships)enddef invite_guest(site, invitee_or_email, args \\ []) when not is_nil(invitee_or_email) do- role = Keyword.fetch!(args, :role)- inviter = Keyword.fetch!(args, :inviter)+ {role, args} = Keyword.pop!(args, :role)+ {inviter, args} = Keyword.pop!(args, :inviter)+ {team_invitation_args, args} = Keyword.pop(args, :team_invitation, [])team = Repo.preload(site, :team).teamemail =@@ -113,34 +122,35 @@ defmodule Plausible.Teams.Test doemail when is_binary(email) -> emailend- old_model_invitation =- insert(:invitation,- email: email,- inviter: inviter,- role: translate_role_to_old_model(role),- site: site- )-team_invitation =- insert(:team_invitation,- team: team,- email: email,- inviter: inviter,- role: :guest+ insert(+ :team_invitation,+ Keyword.merge(+ [+ team: team,+ email: email,+ inviter: inviter,+ role: :guest+ ],+ team_invitation_args+ ))- insert(:guest_invitation,- invitation_id: old_model_invitation.invitation_id,- team_invitation: team_invitation,- site: site,- role: role+ insert(+ :guest_invitation,+ Keyword.merge(+ [+ team_invitation: team_invitation,+ site: site,+ role: role+ ],+ args+ ))-- old_model_invitationenddef invite_transfer(site, invitee_or_email, args \\ []) do- inviter = Keyword.fetch!(args, :inviter)+ {inviter, args} = Keyword.pop!(args, :inviter)email =case invitee_or_email do@@ -148,36 +158,31 @@ defmodule Plausible.Teams.Test doemail when is_binary(email) -> emailend- old_model_invitation =- insert(:invitation, email: email, inviter: inviter, role: :owner, site: site)-- insert(:site_transfer,- transfer_id: old_model_invitation.invitation_id,- email: email,- site: site,- initiator: inviter+ insert(+ :site_transfer,+ Keyword.merge(+ [+ email: email,+ site: site,+ initiator: inviter+ ],+ args+ ))-- old_model_invitationenddef revoke_membership(site, user) do- Repo.delete_all(- from sm in Plausible.Site.Membership,- where: sm.user_id == ^user.id and sm.site_id == ^site.id- )-Repo.delete_all(from tm in Plausible.Teams.Membership,where: tm.user_id == ^user.id and tm.team_id == ^site.team.id)- user |> Repo.preload([:site_memberships, :team_memberships])+ user |> Repo.preload(:team_memberships)enddef subscribe_to_growth_plan(user, attrs \\ []) do{:ok, team} = Teams.get_or_create(user)- attrs = Keyword.merge([user: user, team: team], attrs)+ attrs = Keyword.merge([team: team], attrs)insert(:growth_subscription, attrs)user@@ -186,17 +191,17 @@ defmodule Plausible.Teams.Test dodef subscribe_to_business_plan(user) do{:ok, team} = Teams.get_or_create(user)- insert(:business_subscription, user: user, team: team)+ insert(:business_subscription, team: team)userenddef subscribe_to_plan(user, paddle_plan_id, attrs \\ []) do{:ok, team} = Teams.get_or_create(user)- attrs = Keyword.merge([user: user, team: team, paddle_plan_id: paddle_plan_id], attrs)+ attrs = Keyword.merge([team: team, paddle_plan_id: paddle_plan_id], attrs)- subscription = insert(:subscription, attrs)+ insert(:subscription, attrs)- %{user | subscription: subscription}+ userenddef subscribe_to_enterprise_plan(user, attrs \\ []) do@@ -205,7 +210,7 @@ defmodule Plausible.Teams.Test do{subscription?, attrs} = Keyword.pop(attrs, :subscription?, true){subscription_attrs, attrs} = Keyword.pop(attrs, :subscription, [])- enterprise_plan = insert(:enterprise_plan, Keyword.merge([user: user, team: team], attrs))+ enterprise_plan = insert(:enterprise_plan, Keyword.merge([team: team], attrs))if subscription? doinsert(@@ -213,7 +218,6 @@ defmodule Plausible.Teams.Test doKeyword.merge([team: team,- user: user,paddle_plan_id: enterprise_plan.paddle_plan_id],subscription_attrs@@ -300,6 +304,17 @@ defmodule Plausible.Teams.Test do)end+ def assert_site_transfer(site, %Plausible.Auth.User{} = user) do+ assert_site_transfer(site, user.email)+ end++ def assert_site_transfer(site, email) when is_binary(email) do+ assert Repo.get_by(Plausible.Teams.SiteTransfer,+ site_id: site.id,+ email: email+ )+ end+def assert_guest_membership(team, site, user, role) doassert team_membership =Repo.get_by(Plausible.Teams.Membership,@@ -315,6 +330,15 @@ defmodule Plausible.Teams.Test do)end- defp translate_role_to_old_model(:editor), do: :admin- defp translate_role_to_old_model(role), do: role+ def subscription_of(%Plausible.Auth.User{} = user) do+ user+ |> team_of()+ |> subscription_of()+ end++ def subscription_of(team) do+ team+ |> Plausible.Teams.with_subscription()+ |> Map.fetch!(:subscription)+ endenddiff --git a/test/support/test_utils.ex b/test/support/test_utils.exindex 52693066cf..18c2fb97bb 100644--- a/test/support/test_utils.ex+++ b/test/support/test_utils.ex@@ -226,7 +226,7 @@ defmodule Plausible.TestUtils do{count == expected, count}end,- 200,+ 100,10)enddiff --git a/test/workers/accept_traffic_until_test.exs b/test/workers/accept_traffic_until_test.exsindex 8cd4ba21a7..a6fc6f242a 100644--- a/test/workers/accept_traffic_until_test.exs+++ b/test/workers/accept_traffic_until_test.exs@@ -1,5 +1,6 @@defmodule Plausible.Workers.AcceptTrafficUntilTest douse Plausible.DataCase, async: true+ use Plausible.Teams.Testuse Bamboo.Testalias Plausible.Workers.AcceptTrafficUntil@@ -11,13 +12,13 @@ defmodule Plausible.Workers.AcceptTrafficUntilTest donext_week = today |> Date.add(+7)tomorrow = today |> Date.add(+1)- user1 = insert(:user, accept_traffic_until: next_week)+ user1 = new_user(team: [accept_traffic_until: next_week])- user2 = insert(:user, accept_traffic_until: tomorrow)+ user2 = new_user(team: [accept_traffic_until: tomorrow])- _site1 = insert(:site, members: [user1])+ _site1 = new_site(owner: user1)- _site2 = insert(:site, members: [user2])+ _site2 = new_site(owner: user2){:ok, 2} = AcceptTrafficUntil.perform(nil)@@ -29,10 +30,9 @@ defmodule Plausible.Workers.AcceptTrafficUntilTest dotoday = Date.utc_today()next_week = today |> Date.add(+7)- user = insert(:user, accept_traffic_until: next_week)+ user = new_user(team: [accept_traffic_until: next_week])- :site- |> insert(members: [user])+ new_site(owner: user)|> populate_stats([build(:pageview, timestamp: Date.add(today, -3))]){:ok, 1} = AcceptTrafficUntil.perform(nil)@@ -44,11 +44,9 @@ defmodule Plausible.Workers.AcceptTrafficUntilTest dotoday = Date.utc_today()next_week = today |> Date.add(+7)- user =- insert(:user, accept_traffic_until: next_week)+ user = new_user(team: [accept_traffic_until: next_week])- :site- |> insert(members: [user])+ new_site(owner: user)|> populate_stats([build(:pageview, timestamp: Date.add(today, -2))]){:ok, 1} = AcceptTrafficUntil.perform(nil)@@ -58,9 +56,9 @@ defmodule Plausible.Workers.AcceptTrafficUntilTest dotest "tomorrow: sends one e-mail" dotomorrow = Date.utc_today() |> Date.add(+1)- user = insert(:user, accept_traffic_until: tomorrow)+ user = new_user(team: [accept_traffic_until: tomorrow])- :site |> insert(members: [user]) |> populate_stats([build(:pageview)])+ new_site(owner: user) |> populate_stats([build(:pageview)]){:ok, 1} = AcceptTrafficUntil.perform(nil)assert_final_notification(user.email)@@ -68,9 +66,9 @@ defmodule Plausible.Workers.AcceptTrafficUntilTest dotest "next week: sends one e-mail" donext_week = Date.utc_today() |> Date.add(+7)- user = insert(:user, accept_traffic_until: next_week)+ user = new_user(team: [accept_traffic_until: next_week])- :site |> insert(members: [user]) |> populate_stats([build(:pageview)])+ new_site(owner: user) |> populate_stats([build(:pageview)]){:ok, 1} = AcceptTrafficUntil.perform(nil)assert_weekly_notification(user.email)@@ -82,15 +80,15 @@ defmodule Plausible.Workers.AcceptTrafficUntilTest dotomorrow = today |> Date.add(+1)in_8_days = today |> Date.add(+8)- user1 = insert(:user, accept_traffic_until: next_week)- user2 = insert(:user, accept_traffic_until: tomorrow)- user3 = insert(:user, accept_traffic_until: in_8_days, email: "[email protected]")- user4 = insert(:user, accept_traffic_until: today, email: "[email protected]")+ user1 = new_user(team: [accept_traffic_until: next_week])+ user2 = new_user(team: [accept_traffic_until: tomorrow])+ user3 = new_user(team: [accept_traffic_until: in_8_days], email: "[email protected]")+ user4 = new_user(team: [accept_traffic_until: today], email: "[email protected]")- :site |> insert(members: [user1]) |> populate_stats([build(:pageview)])- :site |> insert(members: [user2]) |> populate_stats([build(:pageview)])- :site |> insert(members: [user3]) |> populate_stats([build(:pageview)])- :site |> insert(members: [user4]) |> populate_stats([build(:pageview)])+ new_site(owner: user1) |> populate_stats([build(:pageview)])+ new_site(owner: user2) |> populate_stats([build(:pageview)])+ new_site(owner: user3) |> populate_stats([build(:pageview)])+ new_site(owner: user4) |> populate_stats([build(:pageview)]){:ok, 2} = AcceptTrafficUntil.perform(nil)assert_weekly_notification(user1.email)@@ -102,14 +100,22 @@ defmodule Plausible.Workers.AcceptTrafficUntilTest dotest "sends multiple notifications per recipient as the time passes" dotoday = Date.utc_today()email = "[email protected]"- user = insert(:user, email: email) |> Plausible.Auth.User.start_trial() |> Repo.update!()- site = insert(:site, members: [user])++ user =+ new_user(+ email: email,+ trial_expiry_date: Plausible.Teams.Team.trial_expiry()+ )++ team = team_of(user)++ site = new_site(owner: user)populate_stats(site, [build(:pageview, timestamp: today),- build(:pageview, timestamp: Date.add(user.trial_expiry_date, 7)),- build(:pageview, timestamp: Date.add(user.trial_expiry_date, 8)),- build(:pageview, timestamp: Date.add(user.trial_expiry_date, 13))+ build(:pageview, timestamp: Date.add(team.trial_expiry_date, 7)),+ build(:pageview, timestamp: Date.add(team.trial_expiry_date, 8)),+ build(:pageview, timestamp: Date.add(team.trial_expiry_date, 13))])# today's worker is no-op@@ -117,23 +123,23 @@ defmodule Plausible.Workers.AcceptTrafficUntilTest dorefute_notifications(email)# trial_expiry + 7 days worker => we'll stop counting next week- {:ok, 1} = AcceptTrafficUntil.perform(nil, Date.add(user.trial_expiry_date, 7))+ {:ok, 1} = AcceptTrafficUntil.perform(nil, Date.add(team.trial_expiry_date, 7))assert_weekly_notification(email)# another call on the same day == no-op, e-mail already sent- {:ok, 0} = AcceptTrafficUntil.perform(nil, Date.add(user.trial_expiry_date, 7))+ {:ok, 0} = AcceptTrafficUntil.perform(nil, Date.add(team.trial_expiry_date, 7))refute_notifications(email)# another call on another day == no-op, no notification type applies- {:ok, 0} = AcceptTrafficUntil.perform(nil, Date.add(user.trial_expiry_date, 8))+ {:ok, 0} = AcceptTrafficUntil.perform(nil, Date.add(team.trial_expiry_date, 8))refute_notifications(email)# day before accept_stats_until (trial_expiry_date + 14 - 1)- {:ok, 1} = AcceptTrafficUntil.perform(nil, Date.add(user.trial_expiry_date, 13))+ {:ok, 1} = AcceptTrafficUntil.perform(nil, Date.add(team.trial_expiry_date, 13))assert_final_notification(email)# another one on the day before accept_stats_until (trial_expiry_date + 14 - 1) == no-op- {:ok, 0} = AcceptTrafficUntil.perform(nil, Date.add(user.trial_expiry_date, 13))+ {:ok, 0} = AcceptTrafficUntil.perform(nil, Date.add(team.trial_expiry_date, 13))refute_notifications(email)enddiff --git a/test/workers/check_usage_test.exs b/test/workers/check_usage_test.exsindex aa36164adb..33239554d9 100644--- a/test/workers/check_usage_test.exs+++ b/test/workers/check_usage_test.exs@@ -70,8 +70,8 @@ defmodule Plausible.Workers.CheckUsageTest do}end)- user2 = insert(:user)- insert(:site, members: [user2])+ user2 = new_user()+ new_site(owner: user2)for u <- [user, user2] dosubscribe_to_plan(@@ -97,9 +97,9 @@ defmodule Plausible.Workers.CheckUsageTest doendtest "ignores user with paused subscription", %{user: user} do- insert(:subscription,- user: user,- paddle_plan_id: @paddle_id_10k,+ subscribe_to_plan(+ user,+ @paddle_id_10k,last_bill_date: Timex.shift(Timex.today(), days: -1),status: Plausible.Billing.Subscription.Status.paused())@@ -112,9 +112,7 @@ defmodule Plausible.Workers.CheckUsageTest dofor status <- @accepted_status_values dodescribe "#{status} subscription, regular customers" dotest "ignores user with subscription but no usage", %{user: user} do- insert(:subscription,- user: user,- paddle_plan_id: @paddle_id_10k,+ subscribe_to_plan(user, @paddle_id_10k,last_bill_date: Timex.shift(Timex.today(), days: -1),status: unquote(status))@@ -122,7 +120,7 @@ defmodule Plausible.Workers.CheckUsageTest doCheckUsage.perform(nil)assert_no_emails_delivered()- assert Repo.reload(user).grace_period == nil+ assert Repo.reload(team_of(user)).grace_period == nilendtest "does not send an email if account has been over the limit for one billing month", %{@@ -137,9 +135,7 @@ defmodule Plausible.Workers.CheckUsageTest do}end)- insert(:subscription,- user: user,- paddle_plan_id: @paddle_id_10k,+ subscribe_to_plan(user, @paddle_id_10k,last_bill_date: Timex.shift(Timex.today(), days: -1),status: unquote(status))@@ -147,7 +143,7 @@ defmodule Plausible.Workers.CheckUsageTest doCheckUsage.perform(nil, usage_stub)assert_no_emails_delivered()- assert Repo.reload(user).grace_period == nil+ assert Repo.reload(team_of(user)).grace_period == nilendtest "does not send an email if account is over the limit by less than 10%", %{@@ -162,9 +158,7 @@ defmodule Plausible.Workers.CheckUsageTest do}end)- insert(:subscription,- user: user,- paddle_plan_id: @paddle_id_10k,+ subscribe_to_plan(user, @paddle_id_10k,last_bill_date: Timex.shift(Timex.today(), days: -1),status: unquote(status))@@ -172,7 +166,7 @@ defmodule Plausible.Workers.CheckUsageTest doCheckUsage.perform(nil, usage_stub)assert_no_emails_delivered()- assert Repo.reload(user).grace_period == nil+ assert Repo.reload(team_of(user)).grace_period == nilendtest "sends an email when an account is over their limit for two consecutive billing months",@@ -202,38 +196,8 @@ defmodule Plausible.Workers.CheckUsageTest dosubject: "[Action required] You have outgrown your Plausible subscription tier")- assert Repo.reload(user).grace_period.end_date == Timex.shift(Timex.today(), days: 7)- end-- @tag :teams- test "syncs grace period start with teams",- %{- user: user- } do- usage_stub =- Plausible.Teams.Billing- |> stub(:monthly_pageview_usage, fn _user ->- %{- penultimate_cycle: %{date_range: @date_range, total: 11_000},- last_cycle: %{date_range: @date_range, total: 11_000}- }- end)-- subscribe_to_plan(- user,- @paddle_id_10k,- last_bill_date: Date.shift(Date.utc_today(), day: -1),- status: unquote(status)- )-- CheckUsage.perform(nil, usage_stub)-- assert user = Repo.reload!(user)- assert user.grace_period.end_date == Timex.shift(Timex.today(), days: 7)- team = assert_team_exists(user)- assert team.grace_period.end_date == user.grace_period.end_date-- assert team.grace_period.id == user.grace_period.id+ assert Repo.reload(team_of(user)).grace_period.end_date ==+ Timex.shift(Timex.today(), days: 7)endtest "sends an email suggesting enterprise plan when usage is greater than 10M ", %{@@ -264,7 +228,7 @@ defmodule Plausible.Workers.CheckUsageTest doendtest "skips checking users who already have a grace period", %{user: user} do- %{grace_period: existing_grace_period} = Plausible.Users.start_grace_period(user)+ %{grace_period: existing_grace_period} = Plausible.Teams.start_grace_period(team_of(user))usage_stub =Plausible.Teams.Billing@@ -275,9 +239,7 @@ defmodule Plausible.Workers.CheckUsageTest do}end)- insert(:subscription,- user: user,- paddle_plan_id: @paddle_id_10k,+ subscribe_to_plan(user, @paddle_id_10k,last_bill_date: Timex.shift(Timex.today(), days: -1),status: unquote(status))@@ -285,7 +247,7 @@ defmodule Plausible.Workers.CheckUsageTest doCheckUsage.perform(nil, usage_stub)assert_no_emails_delivered()- assert Repo.reload(user).grace_period.id == existing_grace_period.id+ assert Repo.reload(team_of(user)).grace_period.id == existing_grace_period.idendtest "recommends a plan to upgrade to", %{@@ -334,42 +296,7 @@ defmodule Plausible.Workers.CheckUsageTest do)CheckUsage.perform(nil, usage_stub)- assert user |> Repo.reload() |> Plausible.Auth.GracePeriod.active?()-- usage_stub =- Plausible.Teams.Billing- |> stub(:monthly_pageview_usage, fn _user ->- %{- penultimate_cycle: %{date_range: @date_range, total: 11_000},- last_cycle: %{date_range: @date_range, total: 9_000}- }- end)-- CheckUsage.perform(nil, usage_stub)- refute user |> Repo.reload() |> Plausible.Auth.GracePeriod.active?()- end-- @tag :teams- test "syncs clearing grace period with teams", %{user: user} do- usage_stub =- Plausible.Teams.Billing- |> stub(:monthly_pageview_usage, fn _user ->- %{- penultimate_cycle: %{date_range: @date_range, total: 11_000},- last_cycle: %{date_range: @date_range, total: 11_000}- }- end)-- subscribe_to_plan(user, @paddle_id_10k,- last_bill_date: Timex.shift(Timex.today(), days: -1),- status: unquote(status)- )-- CheckUsage.perform(nil, usage_stub)- assert user |> Repo.reload() |> Plausible.Auth.GracePeriod.active?()- team = user |> team_of() |> Repo.reload!()-- assert Plausible.Auth.GracePeriod.active?(team)+ assert user |> team_of() |> Repo.reload() |> Plausible.Auth.GracePeriod.active?()usage_stub =Plausible.Teams.Billing@@ -381,7 +308,7 @@ defmodule Plausible.Workers.CheckUsageTest doend)CheckUsage.perform(nil, usage_stub)- refute team |> Repo.reload!() |> Plausible.Auth.GracePeriod.active?()+ refute user |> team_of() |> Repo.reload() |> Plausible.Auth.GracePeriod.active?()endendend@@ -390,7 +317,7 @@ defmodule Plausible.Workers.CheckUsageTest dodescribe "#{status} subscription, enterprise customers" dotest "skips checking enterprise users who already have a grace period", %{user: user} do%{grace_period: existing_grace_period} =- Plausible.Users.start_manual_lock_grace_period(user)+ Plausible.Teams.start_manual_lock_grace_period(team_of(user))usage_stub =Plausible.Teams.Billing@@ -401,19 +328,18 @@ defmodule Plausible.Workers.CheckUsageTest do}end)- enterprise_plan = insert(:enterprise_plan, user: user, monthly_pageview_limit: 1_000_000)-- insert(:subscription,- user: user,- paddle_plan_id: enterprise_plan.paddle_plan_id,- last_bill_date: Timex.shift(Timex.today(), days: -1),- status: unquote(status)+ subscribe_to_enterprise_plan(user,+ monthly_pageview_limit: 1_000_000,+ subscription: [+ last_bill_date: Timex.shift(Timex.today(), days: -1),+ status: unquote(status)+ ])CheckUsage.perform(nil, usage_stub)assert_no_emails_delivered()- assert Repo.reload(user).grace_period.id == existing_grace_period.id+ assert Repo.reload(team_of(user)).grace_period.id == existing_grace_period.idendtest "checks billable pageview usage for enterprise customer, sends usage information to [email protected]",@@ -479,33 +405,6 @@ defmodule Plausible.Workers.CheckUsageTest do)end- test "manual lock grace period is synced with teams", %{user: user} do- usage_stub =- Plausible.Teams.Billing- |> stub(:monthly_pageview_usage, fn _user ->- %{- penultimate_cycle: %{date_range: @date_range, total: 1_100_000},- last_cycle: %{date_range: @date_range, total: 1_100_000}- }- end)-- subscribe_to_enterprise_plan(- user,- monthly_pageview_limit: 1_000_000,- subscription: [- last_bill_date: Timex.shift(Timex.today(), days: -1),- status: unquote(status)- ]- )-- CheckUsage.perform(nil, usage_stub)-- assert user = Repo.reload!(user)- team = assert_team_exists(user)- assert team.grace_period.manual_lock == user.grace_period.manual_lock- assert team.grace_period.manual_lock == true- end-test "starts grace period when plan is outgrown", %{user: user} dousage_stub =Plausible.Teams.Billing@@ -526,7 +425,7 @@ defmodule Plausible.Workers.CheckUsageTest do)CheckUsage.perform(nil, usage_stub)- assert user |> Repo.reload() |> Plausible.Auth.GracePeriod.active?()+ assert user |> team_of() |> Repo.reload() |> Plausible.Auth.GracePeriod.active?()endendend@@ -570,11 +469,7 @@ defmodule Plausible.Workers.CheckUsageTest do}end)- insert(:subscription,- user: user,- paddle_plan_id: @paddle_id_10k,- last_bill_date: ~D[2021-03-28]- )+ subscribe_to_plan(user, @paddle_id_10k, last_bill_date: ~D[2021-03-28])CheckUsage.perform(nil, usage_stub, ~D[2021-03-28])diff --git a/test/workers/clean_invitations_test.exs b/test/workers/clean_invitations_test.exsindex ff0ee03cac..38fc012f41 100644--- a/test/workers/clean_invitations_test.exs+++ b/test/workers/clean_invitations_test.exs@@ -1,42 +1,28 @@defmodule Plausible.Workers.CleanInvitationsTest douse Plausible.DataCase+ use Plausible.Teams.Testalias Plausible.Workers.CleanInvitationstest "cleans invitations and transfers that are more than 48h old" donow = NaiveDateTime.utc_now(:second)- insert(:invitation,- inserted_at: NaiveDateTime.shift(now, hour: -49),- site: build(:site),- inviter: build(:user)- )-- site = insert(:site, team: build(:team))+ owner = new_user()+ site = new_site(owner: owner)- team_invitation =- insert(:team_invitation,- inserted_at: NaiveDateTime.shift(now, hour: -49),- team: site.team,- inviter: build(:user),- role: :guest- )-- insert(:guest_invitation,+ invite_guest(site, new_user(),+ role: :viewer,+ inviter: owner,inserted_at: NaiveDateTime.shift(now, hour: -49),- team_invitation: team_invitation,- site: site,- role: :viewer+ team_invitation: [inserted_at: NaiveDateTime.shift(now, hour: -49)])- insert(:site_transfer,- inserted_at: NaiveDateTime.shift(now, hour: -49),- site: site,- initiator: build(:user)+ invite_transfer(site, new_user(),+ inviter: owner,+ inserted_at: NaiveDateTime.shift(now, hour: -49))CleanInvitations.perform(nil)- refute Repo.exists?(Plausible.Auth.Invitation)refute Repo.exists?(Plausible.Teams.Invitation)refute Repo.exists?(Plausible.Teams.GuestInvitation)refute Repo.exists?(Plausible.Teams.SiteTransfer)@@ -45,37 +31,25 @@ defmodule Plausible.Workers.CleanInvitationsTest dotest "does not clean invitations and transfers that are less than 48h old" donow = NaiveDateTime.utc_now(:second)- insert(:invitation,- inserted_at: NaiveDateTime.shift(now, hour: -47),- site: build(:site),- inviter: build(:user)- )-- site = insert(:site, team: build(:team))+ owner = new_user()+ site = new_site(owner: owner)- team_invitation =- insert(:team_invitation,- inserted_at: NaiveDateTime.shift(now, hour: -47),- team: site.team,- inviter: build(:user),- role: :guest- )-- insert(:guest_invitation,+ invite_guest(site, new_user(),+ role: :viewer,+ inviter: owner,inserted_at: NaiveDateTime.shift(now, hour: -47),- team_invitation: team_invitation,- site: site,- role: :viewer+ team_invitation: [inserted_at: NaiveDateTime.shift(now, hour: -47)])- insert(:site_transfer,- inserted_at: NaiveDateTime.shift(now, hour: -47),- site: site,- initiator: build(:user)+ invite_transfer(site, new_user(),+ inviter: owner,+ inserted_at: NaiveDateTime.shift(now, hour: -47))CleanInvitations.perform(nil)- assert Repo.exists?(Plausible.Auth.Invitation)+ assert Repo.exists?(Plausible.Teams.Invitation)+ assert Repo.exists?(Plausible.Teams.GuestInvitation)+ assert Repo.exists?(Plausible.Teams.SiteTransfer)endenddiff --git a/test/workers/import_analytics_test.exs b/test/workers/import_analytics_test.exsindex 94f5d330a0..f50e618f34 100644--- a/test/workers/import_analytics_test.exs+++ b/test/workers/import_analytics_test.exs@@ -1,6 +1,7 @@defmodule Plausible.Workers.ImportAnalyticsTest douse Plausible.DataCaseuse Bamboo.Test+ use Plausible.Teams.Testalias Plausible.Imported.SiteImportalias Plausible.Workers.ImportAnalytics@@ -22,8 +23,8 @@ defmodule Plausible.Workers.ImportAnalyticsTest dotest "updates site import after successful import", %{import_opts: import_opts} do- user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: 1))- site = insert(:site, members: [user])+ user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ site = new_site(owner: user){:ok, job} = Plausible.Imported.NoopImporter.new_import(site, user, import_opts)@@ -47,8 +48,8 @@ defmodule Plausible.Workers.ImportAnalyticsTest dotest "clears stats_start_date field for the site after successful import", %{import_opts: import_opts} do- user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: 1))- site = insert(:site, members: [user], stats_start_date: ~D[2005-01-01])+ user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ site = new_site(owner: user, stats_start_date: ~D[2005-01-01]){:ok, job} = Plausible.Imported.NoopImporter.new_import(site, user, import_opts)@@ -64,8 +65,8 @@ defmodule Plausible.Workers.ImportAnalyticsTest doendtest "sends email to owner after successful import", %{import_opts: import_opts} do- user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: 1))- site = insert(:site, members: [user])+ user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ site = new_site(owner: user){:ok, job} = Plausible.Imported.NoopImporter.new_import(site, user, import_opts)@@ -83,12 +84,12 @@ defmodule Plausible.Workers.ImportAnalyticsTest dotest "send email after successful import only to the user who ran the import", %{import_opts: import_opts} do- owner = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: 1))- site = insert(:site, members: [owner])+ owner = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ site = new_site(owner: owner)- importing_user = insert(:user)+ importing_user = new_user()- insert(:site_membership, site: site, user: importing_user, role: :admin)+ add_guest(site, user: importing_user, role: :editor){:ok, job} = Plausible.Imported.NoopImporter.new_import(site, importing_user, import_opts)@@ -109,8 +110,8 @@ defmodule Plausible.Workers.ImportAnalyticsTest doendtest "updates site import record after failed import", %{import_opts: import_opts} do- user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: 1))- site = insert(:site, members: [user])+ user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ site = new_site(owner: user)import_opts = Keyword.put(import_opts, :error, true){:ok, job} = Plausible.Imported.NoopImporter.new_import(site, user, import_opts)@@ -124,8 +125,8 @@ defmodule Plausible.Workers.ImportAnalyticsTest doendtest "clears any orphaned data during import", %{import_opts: import_opts} do- user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: 1))- site = insert(:site, members: [user])+ user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ site = new_site(owner: user)import_opts = Keyword.put(import_opts, :error, true){:ok, job} = Plausible.Imported.NoopImporter.new_import(site, user, import_opts)@@ -149,8 +150,8 @@ defmodule Plausible.Workers.ImportAnalyticsTest doendtest "sends email to owner after failed import", %{import_opts: import_opts} do- user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: 1))- site = insert(:site, members: [user])+ user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ site = new_site(owner: user)import_opts = Keyword.put(import_opts, :error, true){:ok, job} = Plausible.Imported.NoopImporter.new_import(site, user, import_opts)@@ -169,13 +170,13 @@ defmodule Plausible.Workers.ImportAnalyticsTest dotest "sends email after failed import only to the user who ran the import", %{import_opts: import_opts} do- owner = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: 1))- site = insert(:site, members: [owner])+ owner = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ site = new_site(owner: owner)import_opts = Keyword.put(import_opts, :error, true)- importing_user = insert(:user)+ importing_user = new_user()- insert(:site_membership, site: site, user: importing_user, role: :admin)+ add_guest(site, user: importing_user, role: :editor){:ok, job} = Plausible.Imported.NoopImporter.new_import(site, importing_user, import_opts)@@ -220,8 +221,8 @@ defmodule Plausible.Workers.ImportAnalyticsTest doimport_opts: import_opts} doEcto.Adapters.SQL.Sandbox.unboxed_run(Plausible.Repo, fn ->- user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: 1))- site = insert(:site, members: [user])+ user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ site = new_site(owner: user)site_id = site.idimport_opts = Keyword.put(import_opts, :listen?, true)@@ -241,8 +242,8 @@ defmodule Plausible.Workers.ImportAnalyticsTest doimport_opts: import_opts} doEcto.Adapters.SQL.Sandbox.unboxed_run(Plausible.Repo, fn ->- user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: 1))- site = insert(:site, members: [user])+ user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ site = new_site(owner: user)site_id = site.idimport_opts =@@ -266,8 +267,8 @@ defmodule Plausible.Workers.ImportAnalyticsTest doimport_opts: import_opts} doEcto.Adapters.SQL.Sandbox.unboxed_run(Plausible.Repo, fn ->- user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: 1))- site = insert(:site, members: [user])+ user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ site = new_site(owner: user)site_id = site.idimport_opts =@@ -303,8 +304,8 @@ defmodule Plausible.Workers.ImportAnalyticsTest doimport_opts: import_opts} doEcto.Adapters.SQL.Sandbox.unboxed_run(Plausible.Repo, fn ->- user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: 1))- site = insert(:site, members: [user])+ user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ site = new_site(owner: user)site_id = site.id{:ok, job} = Plausible.Imported.NoopImporter.new_import(site, user, import_opts)diff --git a/test/workers/lock_sites_test.exs b/test/workers/lock_sites_test.exsindex 041a919fda..84a9a7f7f3 100644--- a/test/workers/lock_sites_test.exs+++ b/test/workers/lock_sites_test.exs@@ -6,12 +6,13 @@ defmodule Plausible.Workers.LockSitesTest doalias Plausible.Billing.Subscriptiontest "does not lock enterprise site on grace period" do- user =- new_user()- |> Plausible.Users.start_manual_lock_grace_period()-+ user = new_user()site = new_site(owner: user)+ user+ |> team_of()+ |> Plausible.Teams.start_manual_lock_grace_period()+LockSites.perform(nil)refute Repo.reload!(site).locked@@ -96,21 +97,11 @@ defmodule Plausible.Workers.LockSitesTest dodescribe "locking" dotest "only locks sites that the user owns" do- user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: -1))-- owner_site =- insert(:site,- memberships: [- build(:site_membership, user: user, role: :owner)- ]- )-- viewer_site =- insert(:site,- memberships: [- build(:site_membership, user: user, role: :viewer)- ]- )+ user = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: -1))++ owner_site = new_site(owner: user)+ viewer_site = new_site()+ add_guest(viewer_site, user: user, role: :viewer)LockSites.perform(nil)diff --git a/test/workers/notify_annual_renewal_test.exs b/test/workers/notify_annual_renewal_test.exsindex 55d991682e..8f1c7f42e1 100644--- a/test/workers/notify_annual_renewal_test.exs+++ b/test/workers/notify_annual_renewal_test.exs@@ -1,6 +1,7 @@defmodule Plausible.Workers.NotifyAnnualRenewalTest douse Plausible.DataCase, async: trueuse Bamboo.Test+ use Plausible.Teams.Testrequire Plausible.Billing.Subscription.Statusalias Plausible.Workers.NotifyAnnualRenewalalias Plausible.Billing.Subscription@@ -17,11 +18,7 @@ defmodule Plausible.Workers.NotifyAnnualRenewalTest doendtest "ignores user with monthly subscription", %{user: user} do- insert(:subscription,- user: user,- paddle_plan_id: @monthly_plan,- next_bill_date: Timex.shift(Timex.today(), days: 7)- )+ subscribe_to_plan(user, @monthly_plan, next_bill_date: Date.shift(Date.utc_today(), day: 7))NotifyAnnualRenewal.perform(nil)@@ -29,11 +26,7 @@ defmodule Plausible.Workers.NotifyAnnualRenewalTest doendtest "ignores user with yearly subscription that's not due for renewal in 7 days", %{user: user} do- insert(:subscription,- user: user,- paddle_plan_id: @yearly_plan,- next_bill_date: Timex.shift(Timex.today(), days: 10)- )+ subscribe_to_plan(user, @yearly_plan, next_bill_date: Date.shift(Date.utc_today(), day: 10))NotifyAnnualRenewal.perform(nil)@@ -43,18 +36,18 @@ defmodule Plausible.Workers.NotifyAnnualRenewalTest dotest "ignores user with old yearly subscription that's been superseded by a newer one", %{user: user} do- insert(:subscription,- inserted_at: Timex.shift(Timex.now(), days: -1),- user: user,- paddle_plan_id: @yearly_plan,- next_bill_date: Timex.shift(Timex.today(), days: 5)+ subscribe_to_plan(+ user,+ @yearly_plan,+ next_bill_date: Date.shift(Date.utc_today(), day: 5),+ inserted_at: NaiveDateTime.shift(NaiveDateTime.utc_now(), day: -1))- insert(:subscription,- inserted_at: Timex.now(),- user: user,- paddle_plan_id: @yearly_plan,- next_bill_date: Timex.shift(Timex.today(), days: 30)+ subscribe_to_plan(+ user,+ @yearly_plan,+ next_bill_date: Date.shift(Date.utc_today(), day: 30),+ inserted_at: NaiveDateTime.utc_now())NotifyAnnualRenewal.perform(nil)@@ -65,10 +58,10 @@ defmodule Plausible.Workers.NotifyAnnualRenewalTest dotest "sends renewal notification to user whose subscription is due for renewal in 7 days", %{user: user} do- insert(:subscription,- user: user,- paddle_plan_id: @yearly_plan,- next_bill_date: Timex.shift(Timex.today(), days: 7)+ subscribe_to_plan(+ user,+ @yearly_plan,+ next_bill_date: Date.shift(Date.utc_today(), day: 7))NotifyAnnualRenewal.perform(nil)@@ -82,10 +75,10 @@ defmodule Plausible.Workers.NotifyAnnualRenewalTest dotest "sends renewal notification to user whose subscription is due for renewal in 2 days", %{user: user} do- insert(:subscription,- user: user,- paddle_plan_id: @yearly_plan,- next_bill_date: Timex.shift(Timex.today(), days: 2)+ subscribe_to_plan(+ user,+ @yearly_plan,+ next_bill_date: Date.shift(Date.utc_today(), day: 2))NotifyAnnualRenewal.perform(nil)@@ -97,11 +90,7 @@ defmodule Plausible.Workers.NotifyAnnualRenewalTest doendtest "does not send renewal notification multiple times", %{user: user} do- insert(:subscription,- user: user,- paddle_plan_id: @yearly_plan,- next_bill_date: Timex.shift(Timex.today(), days: 7)- )+ subscribe_to_plan(user, @yearly_plan, next_bill_date: Date.shift(Date.utc_today(), day: 7))NotifyAnnualRenewal.perform(nil)@@ -116,16 +105,12 @@ defmodule Plausible.Workers.NotifyAnnualRenewalTest doendtest "sends a renewal notification again a year after the previous one", %{user: user} do- insert(:subscription,- user: user,- paddle_plan_id: @yearly_plan,- next_bill_date: Timex.shift(Timex.today(), days: 7)- )+ subscribe_to_plan(user, @yearly_plan, next_bill_date: Date.shift(Date.utc_today(), day: 7))Repo.insert_all("sent_renewal_notifications", [%{user_id: user.id,- timestamp: Timex.shift(Timex.today(), years: -1) |> Timex.to_naive_datetime()+ timestamp: Date.shift(Date.utc_today(), year: -1) |> NaiveDateTime.new!(~T[00:00:00])}])@@ -138,11 +123,7 @@ defmodule Plausible.Workers.NotifyAnnualRenewalTest doendtest "does not send multiple notifications on second year", %{user: user} do- insert(:subscription,- user: user,- paddle_plan_id: @yearly_plan,- next_bill_date: Timex.shift(Timex.today(), days: 7)- )+ subscribe_to_plan(user, @yearly_plan, next_bill_date: Date.shift(Date.utc_today(), day: 7))Repo.insert_all("sent_renewal_notifications", [%{@@ -166,10 +147,8 @@ defmodule Plausible.Workers.NotifyAnnualRenewalTest dotest "sends renewal notification to user on v2 yearly pricing plans", %{user: user} do- insert(:subscription,- user: user,- paddle_plan_id: @v2_pricing_yearly_plan,- next_bill_date: Timex.shift(Timex.today(), days: 7)+ subscribe_to_plan(user, @v2_pricing_yearly_plan,+ next_bill_date: Date.shift(Date.utc_today(), day: 7))NotifyAnnualRenewal.perform(nil)@@ -182,10 +161,8 @@ defmodule Plausible.Workers.NotifyAnnualRenewalTest dodescribe "expiration" dotest "if user subscription is 'deleted', notify them about expiration instead", %{user: user} do- insert(:subscription,- user: user,- paddle_plan_id: @yearly_plan,- next_bill_date: Timex.shift(Timex.today(), days: 7),+ subscribe_to_plan(user, @yearly_plan,+ next_bill_date: Date.shift(Date.utc_today(), day: 7),status: Subscription.Status.deleted())diff --git a/test/workers/notify_exported_analytics_test.exs b/test/workers/notify_exported_analytics_test.exsindex b3caecbe07..502f8f416a 100644--- a/test/workers/notify_exported_analytics_test.exs+++ b/test/workers/notify_exported_analytics_test.exs@@ -1,12 +1,13 @@defmodule Plausible.Workers.NotifyExportedAnalyticsTest douse Plausibleuse Plausible.DataCase+ use Plausible.Teams.Testuse Bamboo.Testdescribe "perform/1" dosetup do- user = insert(:user)- site = insert(:site, members: [user])+ user = new_user()+ site = new_site(owner: user){:ok, user: user, site: site}enddiff --git a/test/workers/send_check_stats_emails_test.exs b/test/workers/send_check_stats_emails_test.exsindex b247e119c5..ac6f6b43af 100644--- a/test/workers/send_check_stats_emails_test.exs+++ b/test/workers/send_check_stats_emails_test.exs@@ -2,11 +2,13 @@ defmodule Plausible.Workers.SendCheckStatsEmailsTest douse Plausible.DataCase, async: trueuse Oban.Testing, repo: Plausible.Repouse Bamboo.Test+ use Plausible.Teams.Test+alias Plausible.Workers.SendCheckStatsEmailstest "does not send an email before a week has passed" do- user = insert(:user, inserted_at: days_ago(6), last_seen: days_ago(6))- insert(:site, domain: "test-site.com", members: [user])+ user = new_user(inserted_at: days_ago(6), last_seen: days_ago(6))+ new_site(domain: "test-site.com", owner: user)perform_job(SendCheckStatsEmails, %{})@@ -14,8 +16,8 @@ defmodule Plausible.Workers.SendCheckStatsEmailsTest doendtest "does not send an email if the user has logged in recently" do- user = insert(:user, inserted_at: days_ago(9), last_seen: days_ago(6))- insert(:site, domain: "test-site.com", members: [user])+ user = new_user(inserted_at: days_ago(9), last_seen: days_ago(6))+ new_site(domain: "test-site.com", owner: user)perform_job(SendCheckStatsEmails, %{})@@ -23,8 +25,8 @@ defmodule Plausible.Workers.SendCheckStatsEmailsTest doendtest "does not send an email if the user has configured a weekly report" do- user = insert(:user, inserted_at: days_ago(9), last_seen: days_ago(7))- site = insert(:site, domain: "test-site.com", members: [user])+ user = new_user(inserted_at: days_ago(9), last_seen: days_ago(7))+ site = new_site(domain: "test-site.com", owner: user)populate_stats(site, [build(:pageview)])insert(:weekly_report, site: site, recipients: ["[email protected]"])@@ -35,8 +37,8 @@ defmodule Plausible.Workers.SendCheckStatsEmailsTest doendtest "sends an email after a week of signup if the user hasn't logged in" do- user = insert(:user, inserted_at: days_ago(8), last_seen: days_ago(8))- site = insert(:site, domain: "test-site.com", members: [user])+ user = new_user(inserted_at: days_ago(8), last_seen: days_ago(8))+ site = new_site(domain: "test-site.com", owner: user)populate_stats(site, [build(:pageview)])perform_job(SendCheckStatsEmails, %{})diff --git a/test/workers/send_site_setup_emails_test.exs b/test/workers/send_site_setup_emails_test.exsindex 16a00953e5..0b018ff163 100644--- a/test/workers/send_site_setup_emails_test.exs+++ b/test/workers/send_site_setup_emails_test.exs@@ -29,8 +29,8 @@ defmodule Plausible.Workers.SendSiteSetupEmailsTest doendtest "does not send an email more than 72 hours after signup" do- user = insert(:user)- insert(:site, members: [user], inserted_at: hours_ago(73))+ user = new_user()+ new_site(owner: user, inserted_at: hours_ago(73))perform_job(SendSiteSetupEmails, %{})diff --git a/test/workers/send_trial_notifications_test.exs b/test/workers/send_trial_notifications_test.exsindex 69eccdc029..1927d9a6b7 100644--- a/test/workers/send_trial_notifications_test.exs+++ b/test/workers/send_trial_notifications_test.exs@@ -17,8 +17,9 @@ defmodule Plausible.Workers.SendTrialNotificationsTest doendtest "does not send a notification if user does not have a trial" do- user = new_user(trial_expiry_date: nil)- new_site(members: user)+ user = new_user()+ new_site(owner: user)+ user |> team_of() |> Ecto.Changeset.change(trial_expiry_date: nil) |> Plausible.Repo.update!()perform_job(SendTrialNotifications, %{})diff --git a/test/workers/traffic_change_notifier_test.exs b/test/workers/traffic_change_notifier_test.exsindex e460297eb5..2f7aa706c3 100644--- a/test/workers/traffic_change_notifier_test.exs+++ b/test/workers/traffic_change_notifier_test.exs@@ -1,20 +1,14 @@defmodule Plausible.Workers.TrafficChangeNotifierTest douse Plausible.DataCase, async: trueuse Bamboo.Test+ use Plausible.Teams.Testimport Doublealias Plausible.Workers.TrafficChangeNotifierdescribe "drops" dotest "does not notify anyone if we've stopped accepting traffic for the owner" do- site =- insert(:site,- memberships: [- build(:site_membership,- user: build(:user, accept_traffic_until: Date.utc_today()),- role: :owner- )- ]- )+ user = new_user(team: [accept_traffic_until: Date.utc_today()])+ site = new_site(owner: user)insert(:drop_notification,site: site,@@ -31,15 +25,8 @@ defmodule Plausible.Workers.TrafficChangeNotifierTest doendtest "does notify if threshold reached and we're accepting traffic" do- site =- insert(:site,- memberships: [- build(:site_membership,- user: build(:user, accept_traffic_until: Date.utc_today() |> Date.add(+1)),- role: :owner- )- ]- )+ user = new_user(team: [accept_traffic_until: Date.utc_today() |> Date.add(+1)])+ site = new_site(owner: user)insert(:drop_notification,site: site,@@ -76,7 +63,7 @@ defmodule Plausible.Workers.TrafficChangeNotifierTest doendtest "notifies all recipients when traffic drops under configured threshold" do- site = insert(:site)+ site = new_site()insert(:drop_notification,site: site,@@ -101,7 +88,7 @@ defmodule Plausible.Workers.TrafficChangeNotifierTest doendtest "does not notify anyone if a notification already went out in the last 12 hours" do- site = insert(:site)+ site = new_site()insert(:drop_notification,site: site,@@ -125,8 +112,8 @@ defmodule Plausible.Workers.TrafficChangeNotifierTest doendtest "adds settings link if recipient has access to the site" do- user = insert(:user, email: "[email protected]")- site = insert(:site, domain: "example.com", members: [user])+ user = new_user(email: "[email protected]")+ site = new_site(domain: "example.com", owner: user)insert(:drop_notification,site: site,@@ -165,7 +152,7 @@ defmodule Plausible.Workers.TrafficChangeNotifierTest doendtest "notifies all recipients when traffic is higher than configured threshold" do- site = insert(:site)+ site = new_site()insert(:spike_notification,site: site,@@ -209,7 +196,7 @@ defmodule Plausible.Workers.TrafficChangeNotifierTest doendtest "does not notify anyone if a notification already went out in the last 12 hours" do- site = insert(:site)+ site = new_site()insert(:spike_notification, site: site, threshold: 10, recipients: ["[email protected]"])clickhouse_stub =@@ -229,8 +216,8 @@ defmodule Plausible.Workers.TrafficChangeNotifierTest doendtest "adds a dashboard link if recipient has access to the site" do- user = insert(:user, email: "[email protected]")- site = insert(:site, domain: "example.com", members: [user])+ user = new_user(email: "[email protected]")+ site = new_site(domain: "example.com", owner: user)insert(:spike_notification, site: site, threshold: 10, recipients: ["[email protected]"])clickhouse_stub =