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
Provide safeguards for regular/consolidated sites distinction (#5742)
Adam Rutkowski26285a0636c7
diff --git a/extra/lib/plausible/consolidated_view.ex b/extra/lib/plausible/consolidated_view.exindex ced2465b16..5792ece751 100644--- a/extra/lib/plausible/consolidated_view.ex+++ b/extra/lib/plausible/consolidated_view.ex@@ -9,9 +9,17 @@ defmodule Plausible.ConsolidatedView doimport Ecto.Query+ alias Plausible.Teamsalias Plausible.Teams.Teamalias Plausible.{Repo, Site}+ import Ecto.Query++ @spec sites(Ecto.Query.t() | Site) :: Ecto.Query.t()+ def sites(q \\ Site) do+ from s in q, where: s.consolidated == true+ end+@spec enable(Team.t()) :: {:ok, Site.t()} | {:error, :upgrade_required}def enable(%Team{} = team) doif eligible?(team) do@@ -23,9 +31,7 @@ defmodule Plausible.ConsolidatedView do@spec disable(Team.t()) :: :okdef disable(%Team{} = team) do- from(s in Site, where: s.consolidated and s.domain == ^make_id(team))- |> Plausible.Repo.delete_all()-+ Plausible.Repo.delete_all(from(s in sites(), where: s.domain == ^make_id(team))):okend@@ -33,7 +39,7 @@ defmodule Plausible.ConsolidatedView dodef site_ids(%Team{} = team) docase get(team) donil -> {:error, :not_found}- _found -> {:ok, owned_site_ids(team)}+ _found -> {:ok, Teams.owned_sites_ids(team)}endend@@ -45,13 +51,14 @@ defmodule Plausible.ConsolidatedView doenddef get(id) when is_binary(id) do- Repo.get_by(Site, domain: id, consolidated: true)+ Repo.one(from s in sites(), where: s.domain == ^id)enddefp do_enable(%Team{} = team) docase get(team) donil ->- Site.new_for_team(team, %{consolidated: true, domain: make_id(team)})+ team+ |> Site.new_for_team(%{consolidated: true, domain: make_id(team)})|> Repo.insert()cv ->@@ -66,18 +73,4 @@ defmodule Plausible.ConsolidatedView do# TODO: Only active trials and business subscriptions should be eligible.# This function should call a new underlying feature module.defp eligible?(%Team{}), do: always(true)-- # TEMPORARY: Will be replaced with `Teams.owned_site_ids` once it starts- # filtering out consolidated sites. There are many other list/count all- # sites queries for which there will probably be a dedicated DB view that- # applies the where clause.- defp owned_site_ids(team) do- Repo.all(- from(s in Site,- where: s.team_id == ^team.id and not s.consolidated,- select: s.id,- order_by: [desc: s.id]- )- )- endenddiff --git a/extra/lib/plausible/customer_support/resource/site.ex b/extra/lib/plausible/customer_support/resource/site.exindex 561ddea0ef..5320073839 100644--- a/extra/lib/plausible/customer_support/resource/site.ex+++ b/extra/lib/plausible/customer_support/resource/site.ex@@ -15,7 +15,7 @@ defmodule Plausible.CustomerSupport.Resource.Site dolimit = Keyword.fetch!(opts, :limit)q =- from s in Plausible.Site,+ from s in Plausible.Site.regular(),inner_join: t in assoc(s, :team),inner_join: o in assoc(t, :owners),order_by: [@@ -31,7 +31,7 @@ defmodule Plausible.CustomerSupport.Resource.Site dolimit = Keyword.fetch!(opts, :limit)q =- from s in Plausible.Site,+ from s in Plausible.Site.regular(),inner_join: t in assoc(s, :team),inner_join: o in assoc(t, :owners),where:diff --git a/extra/lib/plausible/help_scout.ex b/extra/lib/plausible/help_scout.exindex dfe1d2079e..d23d2d0b2b 100644--- a/extra/lib/plausible/help_scout.ex+++ b/extra/lib/plausible/help_scout.ex@@ -171,7 +171,7 @@ defmodule Plausible.HelpScout dosearch_term = "%#{term}%"domain_query =- from(s in Plausible.Site,+ from(s in Plausible.Site.regular(),inner_join: t in assoc(s, :team),inner_join: tm in assoc(t, :team_memberships),where: tm.user_id == parent_as(:user).id and tm.role == :owner,@@ -296,6 +296,7 @@ defmodule Plausible.HelpScout doleft_join: t in assoc(tm, :team),left_join: s in assoc(t, :sites),as: :sites,+ where: is_nil(s) or not s.consolidated,group_by: u.id,order_by: [desc: count(s.id)])diff --git a/extra/lib/plausible_web/controllers/api/external_sites_controller.ex b/extra/lib/plausible_web/controllers/api/external_sites_controller.exindex 13299f606b..220e8dd149 100644--- a/extra/lib/plausible_web/controllers/api/external_sites_controller.ex+++ b/extra/lib/plausible_web/controllers/api/external_sites_controller.ex@@ -454,7 +454,7 @@ defmodule PlausibleWeb.Api.ExternalSitesController doenddefp find_site(user, team, site_id, roles) do- case Plausible.Sites.get_for_user(user, site_id, roles) do+ case Plausible.Sites.get_for_user(user, site_id, roles: roles) donil ->{:error, :site_not_found}diff --git a/extra/lib/plausible_web/live/funnel_settings.ex b/extra/lib/plausible_web/live/funnel_settings.exindex 9a69679136..99ea3189db 100644--- a/extra/lib/plausible_web/live/funnel_settings.ex+++ b/extra/lib/plausible_web/live/funnel_settings.ex@@ -16,12 +16,14 @@ defmodule PlausibleWeb.Live.FunnelSettings dosocket =socket|> assign_new(:site, fn %{current_user: current_user} ->- Plausible.Sites.get_for_user!(current_user, domain, [- :owner,- :admin,- :editor,- :super_admin- ])+ Plausible.Sites.get_for_user!(current_user, domain,+ roles: [+ :owner,+ :admin,+ :editor,+ :super_admin+ ]+ )end)|> assign_new(:all_funnels, fn %{site: %{id: ^site_id} = site} ->Funnels.list(site)@@ -114,7 +116,7 @@ defmodule PlausibleWeb.Live.FunnelSettings doPlausible.Sites.get_for_user!(socket.assigns.current_user,socket.assigns.domain,- [:owner, :admin, :editor]+ roles: [:owner, :admin, :editor])id = String.to_integer(id)diff --git a/extra/lib/plausible_web/live/funnel_settings/form.ex b/extra/lib/plausible_web/live/funnel_settings/form.exindex 045ab27e44..bccb82348d 100644--- a/extra/lib/plausible_web/live/funnel_settings/form.ex+++ b/extra/lib/plausible_web/live/funnel_settings/form.ex@@ -13,12 +13,14 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form dodef mount(_params, %{"domain" => domain} = session, socket) dosite =- Plausible.Sites.get_for_user!(socket.assigns.current_user, domain, [- :owner,- :admin,- :editor,- :super_admin- ])+ Plausible.Sites.get_for_user!(socket.assigns.current_user, domain,+ roles: [+ :owner,+ :admin,+ :editor,+ :super_admin+ ]+ )# We'll have the options trimmed to only the data we care about, to keep# it minimal at the socket assigns, yet, we want to retain specific %Goal{}diff --git a/lib/plausible/auth/auth.ex b/lib/plausible/auth/auth.exindex a8b0fb0690..4c6ab1b5f7 100644--- a/lib/plausible/auth/auth.ex+++ b/lib/plausible/auth/auth.ex@@ -299,7 +299,7 @@ defmodule Plausible.Auth dodefp find_team_by_site(domain) doRepo.one(- from s in Plausible.Site,+ from s in Plausible.Site.regular(),inner_join: t in assoc(s, :team),where: s.domain == ^domain or s.domain_changed_from == ^domain,select: tdiff --git a/lib/plausible/cache.ex b/lib/plausible/cache.exindex 735138b2ed..be715a21e5 100644--- a/lib/plausible/cache.ex+++ b/lib/plausible/cache.ex@@ -107,9 +107,12 @@ defmodule Plausible.Cache do@spec refresh_updated_recently(Keyword.t()) :: :okdef refresh_updated_recently(opts \\ []) dorecently_updated_query =- from [s, ...] in base_db_query(),+ from([s, ...] in base_db_query(),order_by: [asc: s.updated_at],- where: s.updated_at > ago(^15, "minute")+ where:+ s.updated_at >+ ago(^15, "minute")+ )refresh(:updated_recently,diff --git a/lib/plausible/site.ex b/lib/plausible/site.exindex 05470468a2..5ab58e9781 100644--- a/lib/plausible/site.ex+++ b/lib/plausible/site.ex@@ -5,6 +5,7 @@ defmodule Plausible.Site douse Ecto.Schemause Plausibleimport Ecto.Changeset+ import Ecto.Query, only: [from: 2]alias Plausible.Site.GoogleAuth@type t() :: %__MODULE__{}@@ -22,9 +23,7 @@ defmodule Plausible.Site dofield :funnels_enabled, :boolean, default: truefield :legacy_time_on_page_cutoff, :date, default: ~D[1970-01-01]- on_ee do- field :consolidated, :boolean- end+ field :consolidated, :boolean, default: falsefield :ingest_rate_limit_scale_seconds, :integer, default: 60# default is set via changeset/2@@ -71,6 +70,10 @@ defmodule Plausible.Site dotimestamps()end+ def regular(q \\ __MODULE__) do+ from s in q, where: not s.consolidated+ end+def rollup(team) do%Plausible.Site{id: 0,diff --git a/lib/plausible/site/cache.ex b/lib/plausible/site/cache.exindex 1514bc006a..ab085585b8 100644--- a/lib/plausible/site/cache.ex+++ b/lib/plausible/site/cache.ex@@ -41,12 +41,13 @@ defmodule Plausible.Site.Cache do@impl truedef count_all() do- Plausible.Repo.aggregate(Site, :count)+ from(s in Site.regular())+ |> Plausible.Repo.aggregate(:count)end@impl truedef base_db_query() do- from s in Site,+ from s in Site.regular(),left_join: rg in assoc(s, :revenue_goals),inner_join: team in assoc(s, :team),select: {diff --git a/lib/plausible/site/domain.ex b/lib/plausible/site/domain.exindex 6afe7b890b..9767b09b07 100644--- a/lib/plausible/site/domain.ex+++ b/lib/plausible/site/domain.ex@@ -4,12 +4,12 @@ defmodule Plausible.Site.Domain do@moduledoc """Basic interface for domain changes.- Once `Plausible.DataMigration.NumericIDs` schema migration is ready,+ Once `Plausible.DataMigration.NumericIDs` schema migration is ready,domain change operation will be enabled, accessible to the users.We will set a transition period of #{@expire_threshold_hours} hoursduring which, both old and new domains, will be accepted as traffic- identifiers to the same site.+ identifiers to the same site.A periodic worker will call the `expire/0` function to end it where applicable.See: `Plausible.Workers.ExpireDomainChangeTransitions`.@@ -29,7 +29,7 @@ defmodule Plausible.Site.Domain dodef expire_change_transitions(expire_threshold_hours \\ @expire_threshold_hours) do{updated, _} =Repo.update_all(- from(s in Site,+ from(s in Site.regular(),where: s.domain_changed_at < ago(^expire_threshold_hours, "hour")),set: [diff --git a/lib/plausible/site/gate_keeper.ex b/lib/plausible/site/gate_keeper.exindex d3d2736f18..8e06349504 100644--- a/lib/plausible/site/gate_keeper.ex+++ b/lib/plausible/site/gate_keeper.ex@@ -43,8 +43,9 @@ defmodule Plausible.Site.GateKeeper doenddefp policy(domain, opts) when is_binary(domain) do- with from_cache <- Cache.get(domain, Keyword.get(opts, :cache_opts, [])),- site = %Site{team: %{accept_traffic_until: accept_traffic_until}} <- from_cache do+ with %Site{team: %{accept_traffic_until: accept_traffic_until}} = site <-+ Cache.get(domain, Keyword.get(opts, :cache_opts, [])),+ true <- Plausible.Sites.regular?(site) doif not is_nil(accept_traffic_until) andDate.after?(Date.utc_today(), accept_traffic_until) do:payment_requireddiff --git a/lib/plausible/sites.ex b/lib/plausible/sites.exindex 0ffb65f089..3b0ed17a68 100644--- a/lib/plausible/sites.ex+++ b/lib/plausible/sites.ex@@ -45,12 +45,24 @@ defmodule Plausible.Sites do"""def shared_link_special_names(), do: @shared_link_special_names- def get_by_domain(domain) do- Repo.get_by(Site, domain: domain)+ def get_by_domain(domain, opts \\ []) do+ include_consolidated? = Keyword.get(opts, :include_consolidated?, false)++ if include_consolidated? do+ Repo.get_by(Site, domain: domain)+ else+ Repo.get_by(Site.regular(), domain: domain)+ endend- def get_by_domain!(domain) do- Repo.get_by!(Site, domain: domain)+ def get_by_domain!(domain, opts \\ []) do+ include_consolidated? = Keyword.get(opts, :include_consolidated?, false)++ if include_consolidated? do+ Repo.get_by!(Site, domain: domain)+ else+ Repo.get_by!(Site.regular(), domain: domain)+ endend@spec toggle_pin(Auth.User.t(), Site.t()) ::@@ -88,7 +100,7 @@ defmodule Plausible.Sites do@spec set_option(Auth.User.t(), Site.t(), atom(), any()) :: Site.UserPreference.t()def set_option(user, site, option, value) when option in Site.UserPreference.options() do- Plausible.Sites.get_for_user!(user, site.domain)+ get_for_user!(user, site.domain)user|> Site.UserPreference.changeset(site, %{option => value})@@ -227,7 +239,7 @@ defmodule Plausible.Sites do@spec for_user_query(Auth.User.t(), Teams.Team.t() | nil) :: Ecto.Query.t()def for_user_query(user, team \\ nil) doquery =- from(s in Site,+ from(s in Site.regular(),as: :site,inner_join: t in assoc(s, :team),as: :team,@@ -279,7 +291,7 @@ defmodule Plausible.Sites doend)|> Ecto.Multi.run(:clear_changed_from, fn_repo, %{site_changeset: %{changes: %{domain: domain}}} ->- case Plausible.Sites.get_for_user(user, domain, [:owner]) do+ case get_for_user(user, domain, roles: [:owner]) do%Site{domain_changed_from: ^domain} = site ->site|> Ecto.Changeset.change()@@ -406,41 +418,64 @@ defmodule Plausible.Sites do)end- def get_for_user!(user, domain, roles \\ [:owner, :admin, :editor, :viewer]) do+ def get_for_user!(user, domain, opts \\ []) do+ opts = default_get_for_user_opts(opts)+ roles = Keyword.fetch!(opts, :roles)+ include_consolidated? = Keyword.fetch!(opts, :include_consolidated?)+site =if :super_admin in roles and Plausible.Auth.is_super_admin?(user.id) do- get_by_domain!(domain)+ get_by_domain!(domain, include_consolidated?: include_consolidated?)elseuser.id- |> get_for_user_query(domain, List.delete(roles, :super_admin))+ |> get_for_user_query(domain, List.delete(roles, :super_admin), opts)|> Repo.one!()endRepo.preload(site, :team)end- def get_for_user(user, domain, roles \\ [:owner, :admin, :editor, :viewer]) do+ def get_for_user(user, domain, opts \\ []) do+ opts = default_get_for_user_opts(opts)+ roles = Keyword.fetch!(opts, :roles)+ include_consolidated? = Keyword.fetch!(opts, :include_consolidated?)+if :super_admin in roles and Plausible.Auth.is_super_admin?(user.id) do- get_by_domain(domain)+ get_by_domain(domain, include_consolidated?: include_consolidated?)elseuser.id- |> get_for_user_query(domain, List.delete(roles, :super_admin))+ |> get_for_user_query(domain, List.delete(roles, :super_admin), opts)|> Repo.one()endend- defp get_for_user_query(user_id, domain, roles) do+ defp get_for_user_query(user_id, domain, roles, opts) do+ include_consolidated? = Keyword.fetch!(opts, :include_consolidated?)roles = Enum.map(roles, &to_string/1)- from(s in Plausible.Site,- join: t in assoc(s, :team),- join: tm in assoc(t, :team_memberships),- left_join: gm in assoc(tm, :guest_memberships),- where: tm.user_id == ^user_id,- where: coalesce(gm.role, tm.role) in ^roles,- where: s.domain == ^domain or s.domain_changed_from == ^domain,- where: is_nil(gm.id) or gm.site_id == s.id,- select: s+ q =+ from(s in Site,+ join: t in assoc(s, :team),+ join: tm in assoc(t, :team_memberships),+ left_join: gm in assoc(tm, :guest_memberships),+ where: tm.user_id == ^user_id,+ where: coalesce(gm.role, tm.role) in ^roles,+ where: s.domain == ^domain or s.domain_changed_from == ^domain,+ where: is_nil(gm.id) or gm.site_id == s.id,+ select: s+ )++ if include_consolidated? do+ q+ else+ from(s in Site.regular(q))+ end+ end++ defp default_get_for_user_opts(opts) do+ Keyword.merge(+ [include_consolidated?: false, roles: [:owner, :admin, :editor, :viewer]],+ opts)endenddiff --git a/lib/plausible/teams.ex b/lib/plausible/teams.exindex 42f6f1bef6..45c671e175 100644--- a/lib/plausible/teams.ex+++ b/lib/plausible/teams.ex@@ -89,7 +89,11 @@ defmodule Plausible.Teams dodef owned_sites(nil, _), do: []def owned_sites(team, limit) do- query = from(s in Plausible.Site, where: s.team_id == ^team.id, order_by: [asc: s.domain])+ query =+ from(s in Plausible.Site.regular(),+ where: s.team_id == ^team.id,+ order_by: [asc: s.domain]+ )if limit doquery@@ -107,7 +111,7 @@ defmodule Plausible.Teams dodef owned_sites_ids(team) doRepo.all(- from(s in Plausible.Site,+ from(s in Plausible.Site.regular(),where: s.team_id == ^team.id,select: s.id,order_by: [desc: s.id]@@ -120,7 +124,7 @@ defmodule Plausible.Teams dodef owned_sites_count(team) doRepo.aggregate(- from(s in Plausible.Site,+ from(s in Plausible.Site.regular(),where: s.team_id == ^team.id),:countdiff --git a/lib/plausible/teams/billing.ex b/lib/plausible/teams/billing.exindex 02af0ff637..828eb02838 100644--- a/lib/plausible/teams/billing.ex+++ b/lib/plausible/teams/billing.ex@@ -581,7 +581,7 @@ defmodule Plausible.Teams.Billing dodefp query_team_member_emails(team, pending_ownership_site_ids, exclude_emails) dopending_owner_memberships_q =- from s in Plausible.Site,+ from s in Plausible.Site.regular(),inner_join: t in assoc(s, :team),inner_join: tm in assoc(t, :team_memberships),inner_join: u in assoc(tm, :user),diff --git a/lib/plausible/teams/sites.ex b/lib/plausible/teams/sites.exindex bfb56052e5..552b3ceca3 100644--- a/lib/plausible/teams/sites.ex+++ b/lib/plausible/teams/sites.ex@@ -47,7 +47,7 @@ defmodule Plausible.Teams.Sites doendfrom(u in subquery(all_query),- inner_join: s in Plausible.Site,+ inner_join: s in ^Plausible.Site.regular(),on: u.site_id == s.id,as: :site,left_join: up in Site.UserPreference,@@ -95,7 +95,7 @@ defmodule Plausible.Teams.Sites doendfrom(u in subquery(union_query),- inner_join: s in Plausible.Site,+ inner_join: s in ^Plausible.Site.regular(),on: u.site_id == s.id,as: :site,left_join: up in Site.UserPreference,diff --git a/lib/plausible_web/live/change_domain_v2.ex b/lib/plausible_web/live/change_domain_v2.exindex fbca32a9e9..5271c4516b 100644--- a/lib/plausible_web/live/change_domain_v2.ex+++ b/lib/plausible_web/live/change_domain_v2.ex@@ -23,11 +23,13 @@ defmodule PlausibleWeb.Live.ChangeDomainV2 dosocket) dosite =- Plausible.Sites.get_for_user!(socket.assigns.current_user, domain, [- :owner,- :admin,- :super_admin- ])+ Plausible.Sites.get_for_user!(socket.assigns.current_user, domain,+ roles: [+ :owner,+ :admin,+ :super_admin+ ]+ ){:ok,assign(socket,diff --git a/lib/plausible_web/live/goal_settings.ex b/lib/plausible_web/live/goal_settings.exindex 74c26140c6..b95c2d092b 100644--- a/lib/plausible_web/live/goal_settings.ex+++ b/lib/plausible_web/live/goal_settings.ex@@ -16,7 +16,7 @@ defmodule PlausibleWeb.Live.GoalSettings dosocket|> assign_new(:site, fn %{current_user: current_user} ->current_user- |> Plausible.Sites.get_for_user!(domain, [:owner, :admin, :editor, :super_admin])+ |> Plausible.Sites.get_for_user!(domain, roles: [:owner, :admin, :editor, :super_admin])end)|> assign_new(:site_role, fn %{site: site, current_user: current_user} ->if Plausible.Auth.is_super_admin?(current_user) dodiff --git a/lib/plausible_web/live/imports_exports_settings.ex b/lib/plausible_web/live/imports_exports_settings.exindex ddc3dbe639..13dd25d01c 100644--- a/lib/plausible_web/live/imports_exports_settings.ex+++ b/lib/plausible_web/live/imports_exports_settings.ex@@ -15,12 +15,14 @@ defmodule PlausibleWeb.Live.ImportsExportsSettings dosocket =socket|> assign_new(:site, fn %{current_user: current_user} ->- Plausible.Sites.get_for_user!(current_user, domain, [- :owner,- :admin,- :editor,- :super_admin- ])+ Plausible.Sites.get_for_user!(current_user, domain,+ roles: [+ :owner,+ :admin,+ :editor,+ :super_admin+ ]+ )end)|> assign_new(:site_imports, fn %{site: site} ->sitediff --git a/lib/plausible_web/live/installation.ex b/lib/plausible_web/live/installation.exindex 583c67ef81..9ba6bb0567 100644--- a/lib/plausible_web/live/installation.ex+++ b/lib/plausible_web/live/installation.ex@@ -32,13 +32,15 @@ defmodule PlausibleWeb.Live.Installation dosocket) dosite =- Plausible.Sites.get_for_user!(socket.assigns.current_user, domain, [- :owner,- :admin,- :editor,- :super_admin,- :viewer- ])+ Plausible.Sites.get_for_user!(socket.assigns.current_user, domain,+ roles: [+ :owner,+ :admin,+ :editor,+ :super_admin,+ :viewer+ ]+ )if PlausibleWeb.Tracker.scriptv2?(site) do{:ok,diff --git a/lib/plausible_web/live/installationv2.ex b/lib/plausible_web/live/installationv2.exindex 78f1a7dee1..70407561ec 100644--- a/lib/plausible_web/live/installationv2.ex+++ b/lib/plausible_web/live/installationv2.ex@@ -23,13 +23,15 @@ defmodule PlausibleWeb.Live.InstallationV2 dosocket) dosite =- Plausible.Sites.get_for_user!(socket.assigns.current_user, domain, [- :owner,- :admin,- :editor,- :super_admin,- :viewer- ])+ Plausible.Sites.get_for_user!(socket.assigns.current_user, domain,+ roles: [+ :owner,+ :admin,+ :editor,+ :super_admin,+ :viewer+ ]+ )flow = params["flow"] || Flows.provisioning()diff --git a/lib/plausible_web/live/plugins/api/settings.ex b/lib/plausible_web/live/plugins/api/settings.exindex 5699f7fac1..04659818fe 100644--- a/lib/plausible_web/live/plugins/api/settings.ex+++ b/lib/plausible_web/live/plugins/api/settings.ex@@ -11,12 +11,14 @@ defmodule PlausibleWeb.Live.Plugins.API.Settings dosocket =socket|> assign_new(:site, fn %{current_user: current_user} ->- Plausible.Sites.get_for_user!(current_user, domain, [- :owner,- :admin,- :editor,- :super_admin- ])+ Plausible.Sites.get_for_user!(current_user, domain,+ roles: [+ :owner,+ :admin,+ :editor,+ :super_admin+ ]+ )end)|> assign_new(:displayed_tokens, fn %{site: site} ->Tokens.list(site)diff --git a/lib/plausible_web/live/plugins/api/token_form.ex b/lib/plausible_web/live/plugins/api/token_form.exindex 644a2793d9..0ed0f38552 100644--- a/lib/plausible_web/live/plugins/api/token_form.ex+++ b/lib/plausible_web/live/plugins/api/token_form.ex@@ -19,12 +19,14 @@ defmodule PlausibleWeb.Live.Plugins.API.TokenForm dosocket =socket|> assign_new(:site, fn %{current_user: current_user} ->- Plausible.Sites.get_for_user!(current_user, domain, [- :owner,- :admin,- :editor,- :super_admin- ])+ Plausible.Sites.get_for_user!(current_user, domain,+ roles: [+ :owner,+ :admin,+ :editor,+ :super_admin+ ]+ )end)token = Token.generate()diff --git a/lib/plausible_web/live/props_settings.ex b/lib/plausible_web/live/props_settings.exindex de565f23e7..bfe48544e2 100644--- a/lib/plausible_web/live/props_settings.ex+++ b/lib/plausible_web/live/props_settings.ex@@ -11,12 +11,14 @@ defmodule PlausibleWeb.Live.PropsSettings dosocket =socket|> assign_new(:site, fn %{current_user: current_user} ->- Plausible.Sites.get_for_user!(current_user, domain, [- :owner,- :admin,- :editor,- :super_admin- ])+ Plausible.Sites.get_for_user!(current_user, domain,+ roles: [+ :owner,+ :admin,+ :editor,+ :super_admin+ ]+ )end)|> assign_new(:all_props, fn %{site: site} ->site.allowed_event_props || []diff --git a/lib/plausible_web/live/props_settings/form.ex b/lib/plausible_web/live/props_settings/form.exindex 460cf7d8dd..67933454d1 100644--- a/lib/plausible_web/live/props_settings/form.ex+++ b/lib/plausible_web/live/props_settings/form.ex@@ -18,12 +18,14 @@ defmodule PlausibleWeb.Live.PropsSettings.Form dosocket =socket|> assign_new(:site, fn %{current_user: current_user} ->- Plausible.Sites.get_for_user!(current_user, domain, [- :owner,- :admin,- :editor,- :super_admin- ])+ Plausible.Sites.get_for_user!(current_user, domain,+ roles: [+ :owner,+ :admin,+ :editor,+ :super_admin+ ]+ )end)|> assign_new(:form, fn %{site: site} ->new_form(site)diff --git a/lib/plausible_web/live/shields/countries.ex b/lib/plausible_web/live/shields/countries.exindex 08956d522c..49e89b9012 100644--- a/lib/plausible_web/live/shields/countries.ex+++ b/lib/plausible_web/live/shields/countries.ex@@ -14,12 +14,14 @@ defmodule PlausibleWeb.Live.Shields.Countries dosocket =socket|> assign_new(:site, fn %{current_user: current_user} ->- Plausible.Sites.get_for_user!(current_user, domain, [- :owner,- :admin,- :editor,- :super_admin- ])+ Plausible.Sites.get_for_user!(current_user, domain,+ roles: [+ :owner,+ :admin,+ :editor,+ :super_admin+ ]+ )end)|> assign_new(:country_rules_count, fn %{site: site} ->Shields.count_country_rules(site)diff --git a/lib/plausible_web/live/shields/hostnames.ex b/lib/plausible_web/live/shields/hostnames.exindex da05b0d4f8..cf00142e60 100644--- a/lib/plausible_web/live/shields/hostnames.ex+++ b/lib/plausible_web/live/shields/hostnames.ex@@ -10,12 +10,14 @@ defmodule PlausibleWeb.Live.Shields.Hostnames dosocket =socket|> assign_new(:site, fn %{current_user: current_user} ->- Plausible.Sites.get_for_user!(current_user, domain, [- :owner,- :admin,- :editor,- :super_admin- ])+ Plausible.Sites.get_for_user!(current_user, domain,+ roles: [+ :owner,+ :admin,+ :editor,+ :super_admin+ ]+ )end)|> assign_new(:hostname_rules_count, fn %{site: site} ->Shields.count_hostname_rules(site)diff --git a/lib/plausible_web/live/shields/ip_addresses.ex b/lib/plausible_web/live/shields/ip_addresses.exindex 106e255991..b14c6b7999 100644--- a/lib/plausible_web/live/shields/ip_addresses.ex+++ b/lib/plausible_web/live/shields/ip_addresses.ex@@ -17,12 +17,14 @@ defmodule PlausibleWeb.Live.Shields.IPAddresses dosocket =socket|> assign_new(:site, fn %{current_user: current_user} ->- Plausible.Sites.get_for_user!(current_user, domain, [- :owner,- :admin,- :editor,- :super_admin- ])+ Plausible.Sites.get_for_user!(current_user, domain,+ roles: [+ :owner,+ :admin,+ :editor,+ :super_admin+ ]+ )end)|> assign_new(:ip_rules_count, fn %{site: site} ->Shields.count_ip_rules(site)diff --git a/lib/plausible_web/live/shields/pages.ex b/lib/plausible_web/live/shields/pages.exindex a0192b176c..5c6932a0d2 100644--- a/lib/plausible_web/live/shields/pages.ex+++ b/lib/plausible_web/live/shields/pages.ex@@ -10,12 +10,14 @@ defmodule PlausibleWeb.Live.Shields.Pages dosocket =socket|> assign_new(:site, fn %{current_user: current_user} ->- Plausible.Sites.get_for_user!(current_user, domain, [- :owner,- :admin,- :editor,- :super_admin- ])+ Plausible.Sites.get_for_user!(current_user, domain,+ roles: [+ :owner,+ :admin,+ :editor,+ :super_admin+ ]+ )end)|> assign_new(:page_rules_count, fn %{site: site} ->Shields.count_page_rules(site)diff --git a/lib/plausible_web/live/verification.ex b/lib/plausible_web/live/verification.exindex 4680bf4ab3..0e674d93b4 100644--- a/lib/plausible_web/live/verification.ex+++ b/lib/plausible_web/live/verification.ex@@ -22,13 +22,15 @@ defmodule PlausibleWeb.Live.Verification docurrent_user = socket.assigns.current_usersite =- Plausible.Sites.get_for_user!(current_user, domain, [- :owner,- :admin,- :editor,- :super_admin,- :viewer- ])+ Plausible.Sites.get_for_user!(current_user, domain,+ roles: [+ :owner,+ :admin,+ :editor,+ :super_admin,+ :viewer+ ]+ )private = Map.get(socket.private.connect_info, :private, %{})diff --git a/lib/plausible_web/plugs/authorize_public_api.ex b/lib/plausible_web/plugs/authorize_public_api.exindex d18aa644d5..9aa4244117 100644--- a/lib/plausible_web/plugs/authorize_public_api.ex+++ b/lib/plausible_web/plugs/authorize_public_api.ex@@ -186,7 +186,8 @@ defmodule PlausibleWeb.Plugs.AuthorizePublicAPI dodefp find_site(site_id, _api_key) dodomain_based_search =- from s in Plausible.Site, where: s.domain == ^site_id or s.domain_changed_from == ^site_id+ from s in Plausible.Site.regular(),+ where: s.domain == ^site_id or s.domain_changed_from == ^site_idcase Repo.one(domain_based_search) do%Plausible.Site{} = site ->diff --git a/lib/workers/clickhouse_clean_sites.ex b/lib/workers/clickhouse_clean_sites.exindex 72a1f4711b..43279dbce7 100644--- a/lib/workers/clickhouse_clean_sites.ex+++ b/lib/workers/clickhouse_clean_sites.ex@@ -55,7 +55,7 @@ defmodule Plausible.Workers.ClickhouseCleanSites dodef get_deleted_sites_with_clickhouse_data() dopg_sites =- from(s in Plausible.Site, select: s.id)+ from(s in Plausible.Site.regular(), select: s.id)|> Plausible.Repo.all()|> MapSet.new()diff --git a/lib/workers/export_analytics.ex b/lib/workers/export_analytics.exindex 15678fb601..755aea162b 100644--- a/lib/workers/export_analytics.ex+++ b/lib/workers/export_analytics.ex@@ -30,6 +30,7 @@ defmodule Plausible.Workers.ExportAnalytics do} = argssite = Plausible.Repo.get!(Plausible.Site, site_id)+ true = Plausible.Sites.regular?(site)%Date.Range{} = date_range = Exports.date_range(site.id, site.timezone)queries =diff --git a/lib/workers/schedule_email_reports.ex b/lib/workers/schedule_email_reports.exindex 91f2090f9a..6924224055 100644--- a/lib/workers/schedule_email_reports.ex+++ b/lib/workers/schedule_email_reports.ex@@ -6,7 +6,7 @@ defmodule Plausible.Workers.ScheduleEmailReports do@impl Oban.Worker@doc """- Email reports should be sent on Monday at 9am according to the timezone+ Email reports should be sent on Monday at 9am according to the timezoneof a site. This job runs every day at midnight to ensure that all siteshave a scheduled job for email reports."""diff --git a/lib/workers/send_site_setup_emails.ex b/lib/workers/send_site_setup_emails.exindex 96ba2f532e..7e44e783e9 100644--- a/lib/workers/send_site_setup_emails.ex+++ b/lib/workers/send_site_setup_emails.ex@@ -39,7 +39,7 @@ defmodule Plausible.Workers.SendSiteSetupEmails dodefp send_setup_help_emails() doq =- from(s in Plausible.Site,+ from(s in Plausible.Site.regular(),left_join: se in "setup_help_emails",on: se.site_id == s.id,where: is_nil(se.id),@@ -60,7 +60,7 @@ defmodule Plausible.Workers.SendSiteSetupEmails dodefp send_setup_success_emails() doq =- from(s in Plausible.Site,+ from(s in Plausible.Site.regular(),left_join: se in "setup_success_emails",on: se.site_id == s.id,where: is_nil(se.id),diff --git a/lib/workers/set_legacy_time_on_page_cutoff.ex b/lib/workers/set_legacy_time_on_page_cutoff.exindex 9a1d06bee3..391c58d91b 100644--- a/lib/workers/set_legacy_time_on_page_cutoff.ex+++ b/lib/workers/set_legacy_time_on_page_cutoff.ex@@ -29,7 +29,7 @@ defmodule Plausible.Workers.SetLegacyTimeOnPageCutoff do{count, _} =Repo.update_all(- from(s in Plausible.Site,+ from(s in Plausible.Site.regular(),where: s.id in ^to_update,where: is_nil(s.legacy_time_on_page_cutoff)),@@ -81,7 +81,7 @@ defmodule Plausible.Workers.SetLegacyTimeOnPageCutoff dodefp filter_sites_needing_update({small_sites, large_sites}) doneeding_update =- from(s in Plausible.Site,+ from(s in Plausible.Site.regular(),where: is_nil(s.legacy_time_on_page_cutoff),select: s.id)diff --git a/test/plausible/billing/quota_test.exs b/test/plausible/billing/quota_test.exsindex f8b6d7b89f..0f482f2dde 100644--- a/test/plausible/billing/quota_test.exs+++ b/test/plausible/billing/quota_test.exs@@ -91,9 +91,10 @@ defmodule Plausible.Billing.QuotaTest doendend- test "site_usage/1 returns the amount of sites the user owns" do+ test "site_usage/1 returns the amount of sites the user owns (excludes consolidated)" douser = new_user()for _ <- 1..3, do: new_site(owner: user)+ new_site(owner: user, consolidated: true)add_guest(new_site(), user: user, role: :editor)add_guest(new_site(), user: user, role: :viewer)team = team_of(user)diff --git a/test/plausible/help_scout_test.exs b/test/plausible/help_scout_test.exsindex 377ad8939d..3b549ff43a 100644--- a/test/plausible/help_scout_test.exs+++ b/test/plausible/help_scout_test.exs@@ -478,6 +478,9 @@ defmodule Plausible.HelpScoutTest donew_site(owner: user3)new_site(domain: "big.match.example.com/hit", owner: user3)+ # excluded+ new_site(domain: "consolidated.example.com", owner: user3, consolidated: true)+assert HelpScout.search_users("match.example.co", "123") == [%{email: user3.email, sites_count: 2},%{email: user2.email, sites_count: 1},diff --git a/test/plausible/site/cache_test.exs b/test/plausible/site/cache_test.exsindex 4d47344341..0ae035307b 100644--- a/test/plausible/site/cache_test.exs+++ b/test/plausible/site/cache_test.exs@@ -23,6 +23,9 @@ defmodule Plausible.Site.CacheTest doadd_guest(site, user: viewer, role: :viewer)add_guest(site, user: admin, role: :editor)+ # excluded from cache+ new_site(owner: owner, domain: "consolidated.example.com", consolidated: true)+:ok = Cache.refresh_all(cache_name: test){:ok, _} = Plausible.Repo.delete(site1)@@ -39,6 +42,7 @@ defmodule Plausible.Site.CacheTest doCache.get("site2.example.com", cache_name: test)refute Cache.get("site3.example.com", cache_name: test, force?: true)+ refute Cache.get("consolidated.example.com", cache_name: test, force?: true)end@tag :ee_onlydiff --git a/test/plausible/site/gate_keeper_test.exs b/test/plausible/site/gate_keeper_test.exsindex 8b69b72f36..d1829cd975 100644--- a/test/plausible/site/gate_keeper_test.exs+++ b/test/plausible/site/gate_keeper_test.exs@@ -15,6 +15,18 @@ defmodule Plausible.Site.GateKeeperTest doassert {:deny, :not_found} = GateKeeper.check("example.com", opts)end+ @tag :ee_only+ test "consolidated sites should be treated as not found", %{opts: opts, test: test} do+ consolidated_site =+ add_site_and_refresh_cache(test, domain: "consolidated.example.com", consolidated: true)++ assert {:deny, :not_found} = GateKeeper.check("consolidated.example.com", opts)++ Plausible.Cache.Adapter.put(test, "consolidated.example.com", consolidated_site)++ assert {:deny, :not_found} = GateKeeper.check("consolidated.example.com", opts)+ end+test "sites with accepted_traffic_until < now are denied", %{test: test, opts: opts} dodomain = "expired.example.com"yesterday = Date.utc_today() |> Date.add(-1)diff --git a/test/plausible/site/sites_test.exs b/test/plausible/sites_test.exssimilarity index 91%rename from test/plausible/site/sites_test.exsrename to test/plausible/sites_test.exsindex 6c7bdb5512..7643360fb9 100644--- a/test/plausible/site/sites_test.exs+++ b/test/plausible/sites_test.exs@@ -227,15 +227,29 @@ defmodule Plausible.SitesTest dopatch_env(:super_admin_user_ids, [user2.id])%{id: site_id, domain: domain} = new_site(owner: user1)- assert %{id: ^site_id} = Plausible.Sites.get_for_user(user1, domain)+ assert %{id: ^site_id} = Sites.get_for_user(user1, domain)assert %{id: ^site_id} =- Plausible.Sites.get_for_user(user1, domain, [:owner])+ Sites.get_for_user(user1, domain, roles: [:owner])- assert is_nil(Plausible.Sites.get_for_user(user2, domain))+ assert is_nil(Sites.get_for_user(user2, domain))assert %{id: ^site_id} =- Plausible.Sites.get_for_user(user2, domain, [:super_admin])+ Sites.get_for_user(user2, domain, roles: [:super_admin])+ end++ test "ignores consolidated site by default" do+ user = new_user()+ %{domain: domain} = new_site(owner: user, consolidated: true)+ refute Sites.get_for_user(user, domain)+ assert_raise(Ecto.NoResultsError, fn -> Sites.get_for_user!(user, domain) end)+ end++ test "includes consolidated site when explicitly requested" do+ user = new_user()+ %{domain: domain} = new_site(owner: user, consolidated: true)+ assert Sites.get_for_user(user, domain, include_consolidated?: true)+ assert Sites.get_for_user!(user, domain, include_consolidated?: true)endend@@ -285,8 +299,12 @@ defmodule Plausible.SitesTest do# owned site on a setup teamsite1 = new_site(owner: user1, domain: "own.example.com")+Plausible.Teams.complete_setup(site1.team)+ # excluded+ new_site(owner: user1, domain: "consolidated.example.com", consolidated: true)+# guest site accesssite2 = new_site(owner: user2, domain: "guest.example.com")add_guest(site2, user: user1, role: :editor)@@ -338,6 +356,9 @@ defmodule Plausible.SitesTest dosite5 = new_site(domain: "team.example.com", owner: user4)add_member(site5.team, user: user1, role: :editor)+ # excluded+ new_site(owner: user1, domain: "consolidated.example.com", consolidated: true)+assert %{entries: [%{domain: "invitation.example.com"},@@ -375,6 +396,9 @@ defmodule Plausible.SitesTest doteam5 = Plausible.Teams.complete_setup(site5.team)add_member(site5.team, user: user1, role: :admin)+ # excluded+ new_site(owner: user1, domain: "consolidated.example.com", consolidated: true)+assert %{entries: [%{domain: "transfer.example.com"},@@ -394,6 +418,10 @@ defmodule Plausible.SitesTest do{:ok, _} = Sites.toggle_pin(pending_owner, site)+ # excluded+ new_site(owner: owner, domain: "consolidated.example.com", consolidated: true)+ new_site(owner: pending_owner, domain: "consolidated2.example.com", consolidated: true)+assert %{entries: [%{domain: "one.example.com", entry_type: "invitation"},@@ -581,6 +609,11 @@ defmodule Plausible.SitesTest dosite4 = new_site(domain: "four.example.com")site5 = new_site(owner: user3, domain: "five.example.com")+ # excluded+ new_site(owner: user1, domain: "consolidated1.example.com", consolidated: true)+ new_site(owner: user2, domain: "consolidated2.example.com", consolidated: true)+ new_site(owner: user3, domain: "consolidated3.example.com", consolidated: true)+invite_guest(site2, user1, role: :editor, inviter: user2)add_guest(site3, user: user1, role: :viewer)add_guest(site4, user: user1, role: :editor)@@ -671,6 +704,7 @@ defmodule Plausible.SitesTest dosite2 = new_site(owner: user2, domain: "first-transfer.example.com")site3 = new_site(owner: user3, domain: "first-invitation.example.com")_site4 = new_site(owner: user1, domain: "another.example.com")+ new_site(owner: user1, domain: "consolidated.example.com", consolidated: true)invite_guest(site3, user1, role: :viewer, inviter: user3)invite_transfer(site2, user1, inviter: user2)@@ -923,6 +957,35 @@ defmodule Plausible.SitesTest doendend+ describe "get_by_domain/2" do+ test "returns site when found with regular site" do+ site = new_site(domain: "example.com")++ assert %{domain: "example.com"} = Sites.get_by_domain("example.com")+ assert site.id == Sites.get_by_domain("example.com").id+ end++ test "returns nil when site not found" do+ refute Sites.get_by_domain("nonexistent.com")+ end++ test "excludes consolidated sites by default" do+ _regular_site = new_site(domain: "regular.com")+ _consolidated_site = new_site(domain: "consolidated.com", consolidated: true)++ assert Sites.get_by_domain("regular.com")+ refute Sites.get_by_domain("consolidated.com")+ end++ test "includes consolidated sites when explicitly requested" do+ _regular_site = new_site(domain: "regular.com")+ _consolidated_site = new_site(domain: "consolidated.com", consolidated: true)++ assert Sites.get_by_domain("regular.com", include_consolidated?: true)+ assert Sites.get_by_domain("consolidated.com", include_consolidated?: true)+ end+ end+describe "predicates for site.consolidated" doon_ee dotest "regular?/1" dodiff --git a/test/plausible/teams_test.exs b/test/plausible/teams_test.exsindex 7417564a9b..946c9302b3 100644--- a/test/plausible/teams_test.exs+++ b/test/plausible/teams_test.exs@@ -429,4 +429,60 @@ defmodule Plausible.TeamsTest doassert Repo.reload(team)endend++ describe "owned_sites/1" do+ setup [:create_user, :create_team]++ test "returns sites owned by a team", %{user: user, team: team} do+ %{id: site_id} = new_site(owner: user)+ new_site(owner: user, consolidated: true)++ assert [%{id: ^site_id}] = Teams.owned_sites(team)+ end++ test "limit limits number of sites returned", %{user: user, team: team} do+ %{id: site_id1} = new_site(owner: user, domain: "b")+ %{id: site_id2} = new_site(owner: user, domain: "c")+ %{id: _site_id3} = new_site(owner: user, domain: "d")+ new_site(owner: user, consolidated: true, domain: "a")++ assert [%{id: ^site_id1}, %{id: ^site_id2}] = Teams.owned_sites(team, 2)+ end++ test "returns empty list for no team" do+ assert [] = Teams.owned_sites(nil)+ end+ end++ describe "owned_sites_ids/1" do+ setup [:create_user, :create_team]++ test "returns site IDs owned by a team", %{user: user, team: team} do+ %{id: site_id2} = new_site(owner: user)+ %{id: site_id1} = new_site(owner: user)+ new_site(owner: user, consolidated: true)++ assert [^site_id1, ^site_id2] = Teams.owned_sites_ids(team)+ end++ test "returns empty list for no team" do+ assert [] = Teams.owned_sites_ids(nil)+ end+ end++ describe "owned_sites_count/1" do+ setup [:create_user, :create_team]++ test "returns site count owned by a team", %{user: user, team: team} do+ new_site(owner: user)+ new_site(owner: user)+ new_site(owner: user, consolidated: true)++ assert Teams.owned_sites_count(team) == 2+ end++ test "returns empty list for no team" do+ assert Teams.owned_sites_count(nil) == 0+ end+ endenddiff --git a/test/plausible_web/controllers/api/external_sites_controller_test.exs b/test/plausible_web/controllers/api/external_sites_controller_test.exsindex a987a086dd..d3f1f61ba6 100644--- a/test/plausible_web/controllers/api/external_sites_controller_test.exs+++ b/test/plausible_web/controllers/api/external_sites_controller_test.exs@@ -806,6 +806,7 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest dosite2 = new_site(owner: user)_unrelated_site = new_site()+ _consolidated_excluded = new_site(owner: user, consolidated: true)conn = get(conn, "/api/v1/sites")diff --git a/test/plausible_web/live/customer_support/teams_test.exs b/test/plausible_web/live/customer_support/teams_test.exsindex 22258fd69f..5322770e94 100644--- a/test/plausible_web/live/customer_support/teams_test.exs+++ b/test/plausible_web/live/customer_support/teams_test.exs@@ -26,6 +26,7 @@ defmodule PlausibleWeb.Live.CustomerSupport.TeamsTest dotest "renders", %{conn: conn, user: user} doteam = team_of(user)new_site(owner: user)+ new_site(owner: user, consolidated: true)add_member(team, role: :editor){:ok, _lv, html} = live(conn, open_team(team.id))@@ -147,6 +148,32 @@ defmodule PlausibleWeb.Live.CustomerSupport.TeamsTest doendend+ describe "sites" do+ setup [:create_user, :log_in, :create_site]++ setup %{user: user} do+ patch_env(:super_admin_user_ids, [user.id])+ end++ test "lists sites belonging to a team", %{conn: conn, user: user} do+ team = team_of(user)+ new_site(owner: user, domain: "primary.example.com")+ new_site(owner: user, domain: "consolidated.example.com", consolidated: true)+ new_site(owner: user, domain: "secondary.example.com")+ # other+ new_site(domain: "other.example.com")++ {:ok, lv, _html} = live(conn, open_team(team.id, tab: "sites"))+ html = render(lv)+ text = text(html)++ assert text =~ "primary.example.com"+ assert text =~ "secondary.example.com"+ refute text =~ "condolidated.example.com"+ refute text =~ "other.example.com"+ end+ end+describe "billing" dosetup [:create_user, :log_in, :create_site]diff --git a/test/plausible_web/live/customer_support_test.exs b/test/plausible_web/live/customer_support_test.exsindex f7939f65c4..6193758ea6 100644--- a/test/plausible_web/live/customer_support_test.exs+++ b/test/plausible_web/live/customer_support_test.exs@@ -38,9 +38,11 @@ defmodule PlausibleWeb.Live.CustomerSupportTest doconn = get(conn, @cs_index)resp = html_response(conn, 200)team = team_of(user)+ consolidated_site = new_site(owner: user, consolidated: true)assert_search_result(resp, "site", site.id)assert_search_result(resp, "team", team.id)assert_search_result(resp, "user", user.id)+ refute_search_result(resp, "site", consolidated_site.id)endtest "filters as you type", %{conn: conn, site: site, user: user} dodiff --git a/test/workers/send_check_stats_emails_test.exs b/test/workers/send_check_stats_emails_test.exsindex 6d3e915eb6..d892c825e7 100644--- a/test/workers/send_check_stats_emails_test.exs+++ b/test/workers/send_check_stats_emails_test.exs@@ -49,6 +49,25 @@ defmodule Plausible.Workers.SendCheckStatsEmailsTest do)end+ test "team members idling will get the email" do+ user = new_user(last_seen: NaiveDateTime.utc_now(:second), inserted_at: days_ago(8))+ site = new_site(owner: user)+ populate_stats(site, [build(:pageview)])++ user2 =+ add_member(team_of(user),+ user: new_user(inserted_at: days_ago(8), last_seen: days_ago(8)),+ role: :editor+ )++ perform_job(SendCheckStatsEmails, %{})++ assert_email_delivered_with(+ to: [{user2.name, user2.email}],+ subject: "Check your Plausible website stats"+ )+ end+defp days_ago(days) doNaiveDateTime.utc_now(:second)|> NaiveDateTime.shift(day: -days)diff --git a/test/workers/send_site_setup_emails_test.exs b/test/workers/send_site_setup_emails_test.exsindex 8d2d0dc690..854deb630a 100644--- a/test/workers/send_site_setup_emails_test.exs+++ b/test/workers/send_site_setup_emails_test.exs@@ -75,6 +75,37 @@ defmodule Plausible.Workers.SendSiteSetupEmailsTest dosubject: "Plausible is now tracking your website stats")end++ test "do not send the setup help email for consolidated site" do+ user = new_user()+ site = new_site(owner: user)++ populate_stats(site, [build(:pageview)])++ perform_job(SendSiteSetupEmails, %{})++ assert_email_delivered_with(+ to: [{user.name, user.email}],+ subject: "Plausible is now tracking your website stats"+ )++ new_site(owner: user, consolidated: true, inserted_at: hours_ago(49))++ perform_job(SendSiteSetupEmails, %{})++ assert_no_emails_delivered()+ end++ test "do not send the setup success email for consolidated website" do+ user = new_user()++ # for test purposes, set stats_start_date for a consolidated site+ new_site(owner: user, consolidated: true, stats_start_date: Date.utc_today())++ perform_job(SendSiteSetupEmails, %{})++ assert_no_emails_delivered()+ endenddescribe "trial user who has not set up a website" do