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
Remove virtual rollups in favour of persisted consolidated sites (#5749)
RobertJoonascc06a351bd52
diff --git a/extra/lib/plausible/consolidated_view.ex b/extra/lib/plausible/consolidated_view.exindex f4ec372d47..1df8fb83d7 100644--- a/extra/lib/plausible/consolidated_view.ex+++ b/extra/lib/plausible/consolidated_view.ex@@ -20,13 +20,9 @@ defmodule Plausible.ConsolidatedView dofrom s in q, where: s.consolidated == trueend- @spec enable(Team.t()) :: {:ok, Site.t()} | {:error, :upgrade_required}+ @spec enable(Team.t()) :: {:ok, Site.t()} | {:error, :no_sites}def enable(%Team{} = team) do- if eligible?(team) do- do_enable(team)- else- {:error, :upgrade_required}- end+ with :ok <- ensure_eligible(team), do: do_enable(team)end@spec disable(Team.t()) :: :ok@@ -60,11 +56,26 @@ defmodule Plausible.ConsolidatedView do)end+ @spec native_stats_start_at(Team.t()) :: NaiveDateTime.t() | nil+ def native_stats_start_at(%Team{} = team) do+ q =+ from(sr in Site.regular(),+ group_by: sr.team_id,+ where: sr.team_id == ^team.id,+ select: min(sr.native_stats_start_at)+ )++ Repo.one(q)+ end+defp do_enable(%Team{} = team) docase get(team) donil ->+ native_stats_start_at = native_stats_start_at(team)+team|> Site.new_for_team(%{consolidated: true, domain: make_id(team)})+ |> Site.set_native_stats_start_at(native_stats_start_at)|> Repo.insert()consolidated_view ->@@ -77,6 +88,12 @@ defmodule Plausible.ConsolidatedView doend# 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)+ # This function should also call a new underlying feature module.+ defp ensure_eligible(%Team{} = team) do+ if Plausible.Teams.owned_sites_count(team) == 0 do+ {:error, :no_sites}+ else+ :ok+ end+ endenddiff --git a/lib/plausible/application.ex b/lib/plausible/application.exindex c177698393..d04dec8cfe 100644--- a/lib/plausible/application.ex+++ b/lib/plausible/application.ex@@ -58,12 +58,6 @@ defmodule Plausible.Application don_lock_partitions: 1,ets_options: [read_concurrency: true, write_concurrency: true]),- Plausible.Cache.Adapter.child_specs(:site_ids, :cache_site_ids,- ttl_check_interval: :timer.seconds(10),- global_ttl: :timer.minutes(30),- n_lock_partitions: 1,- ets_options: [read_concurrency: true, write_concurrency: true]- ),{Plausible.Session.Transfer,base_path: Application.get_env(:plausible, :session_transfer_dir)},warmed_cache(Plausible.Site.Cache,diff --git a/lib/plausible/site.ex b/lib/plausible/site.exindex 5ab58e9781..9a3d9729d7 100644--- a/lib/plausible/site.ex+++ b/lib/plausible/site.ex@@ -65,8 +65,6 @@ defmodule Plausible.Site dohas_many :completed_imports, Plausible.Imported.SiteImport, where: [status: :completed]- field :rollup, :boolean, virtual: true, default: false-timestamps()end@@ -74,18 +72,6 @@ defmodule Plausible.Site dofrom s in q, where: not s.consolidatedend- def rollup(team) do- %Plausible.Site{- id: 0,- native_stats_start_at: ~N[2018-01-01 00:00:00],- stats_start_date: ~D[2018-01-01],- rollup: true,- domain: "rollup:#{team.identifier}",- team: team,- team_id: team.id- }- end-def new_for_team(team, params) doparams|> new()diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.exindex 3b0ed17a68..005d19947c 100644--- a/lib/plausible/sites.ex+++ b/lib/plausible/sites.ex@@ -352,6 +352,23 @@ defmodule Plausible.Sites dodateend+ on_ee do+ def stats_start_date(%Site{consolidated: true} = site) do+ native_stats_start_at = Plausible.ConsolidatedView.native_stats_start_at(site.team)++ if native_stats_start_at do+ start_date = NaiveDateTime.to_date(native_stats_start_at)++ site+ |> Site.set_native_stats_start_at(native_stats_start_at)+ |> Site.set_stats_start_date(start_date)+ |> Repo.update!()++ start_date+ end+ end+ end+def stats_start_date(%Site{} = site) dostart_date =[diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.exindex c8895378e0..74f9578fc2 100644--- a/lib/plausible/stats/clickhouse.ex+++ b/lib/plausible/stats/clickhouse.ex@@ -84,6 +84,10 @@ defmodule Plausible.Stats.Clickhouse doenddef has_pageviews?(site) do+ # This function is currently only used in installation verification+ # which is not accessible for consolidated views.+ true = Plausible.Sites.regular?(site)+ClickhouseRepo.exists?(from(e in "events_v2",where:diff --git a/lib/plausible/stats/filters/query_parser.ex b/lib/plausible/stats/filters/query_parser.exindex c21cadba90..9cb6e257fa 100644--- a/lib/plausible/stats/filters/query_parser.ex+++ b/lib/plausible/stats/filters/query_parser.ex@@ -47,10 +47,10 @@ defmodule Plausible.Stats.Filters.QueryParser do{:ok, pagination} <- parse_pagination(Map.get(params, "pagination", %{})),{preloaded_goals, revenue_warning, revenue_currencies} <-preload_goals_and_revenue(site, metrics, filters, dimensions),- rollup_site_ids = get_rollup_site_ids(site),+ consolidated_site_ids = get_consolidated_site_ids(site),query = %{now: now,- rollup_site_ids: rollup_site_ids,+ consolidated_site_ids: consolidated_site_ids,input_date_range: Map.get(params, "date_range"),metrics: metrics,filters: filters,@@ -77,14 +77,16 @@ defmodule Plausible.Stats.Filters.QueryParser doendend- def get_rollup_site_ids(%Plausible.Site{rollup: true} = site) do- Plausible.Cache.Adapter.get(:site_ids, site.team_id, fn ->- Plausible.Teams.owned_sites_ids(site.team)- end)+ on_ee do+ def get_consolidated_site_ids(%Plausible.Site{} = site) do+ if Plausible.Sites.consolidated?(site) do+ Plausible.ConsolidatedView.Cache.get(site.team.identifier)+ end+ end+ else+ def get_consolidated_site_ids(_site), do: nilend- def get_rollup_site_ids(_site), do: nil-def parse_date_range_pair(site, [from, to]) when is_binary(from) and is_binary(to) dowith {:ok, date_range} <- date_range_from_date_strings(site, from, to) do{:ok, date_range |> DateTimeRange.to_timezone("Etc/UTC")}diff --git a/lib/plausible/stats/legacy/legacy_query_builder.ex b/lib/plausible/stats/legacy/legacy_query_builder.exindex 89c6437483..b5972d141e 100644--- a/lib/plausible/stats/legacy/legacy_query_builder.ex+++ b/lib/plausible/stats/legacy/legacy_query_builder.ex@@ -28,7 +28,7 @@ defmodule Plausible.Stats.Legacy.QueryBuilder do|> put_parsed_filters(params)|> resolve_segments(site)|> preload_goals_and_revenue(site)- |> put_rollup_site_ids(site)+ |> put_consolidated_site_ids(site)|> put_order_by(params)|> put_include(site, params)|> Query.put_comparison_utc_time_range()@@ -42,17 +42,19 @@ defmodule Plausible.Stats.Legacy.QueryBuilder doqueryend- defp put_rollup_site_ids(query, %Plausible.Site{rollup: true} = site) do- site_ids =- Plausible.Cache.Adapter.get(:site_ids, site.team_id, fn ->- Plausible.Teams.owned_sites_ids(site.team)- end)-- struct!(query, rollup_site_ids: site_ids)+ on_ee do+ defp put_consolidated_site_ids(query, %Plausible.Site{} = site) do+ if Plausible.Sites.consolidated?(site) do+ site_ids = Plausible.ConsolidatedView.Cache.get(site.team.identifier)+ struct!(query, consolidated_site_ids: site_ids)+ else+ query+ end+ end+ else+ defp put_consolidated_site_ids(query, _site), do: queryend- defp put_rollup_site_ids(query, _site), do: query-defp resolve_segments(query, site) dowith {:ok, preloaded_segments} <-Plausible.Segments.Filters.preload_needed_segments(site, query.filters),diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.exindex 5bbf7f4484..1be5be6831 100644--- a/lib/plausible/stats/query.ex+++ b/lib/plausible/stats/query.ex@@ -26,7 +26,7 @@ defmodule Plausible.Stats.Query dorevenue_warning: nil,remove_unavailable_revenue_metrics: false,site_id: nil,- rollup_site_ids: nil,+ consolidated_site_ids: nil,site_native_stats_start_at: nil,# Contains information to determine how to combine legacy and new time on page metricstime_on_page_data: %{},diff --git a/lib/plausible/stats/sql/where_builder.ex b/lib/plausible/stats/sql/where_builder.exindex 33201e42ad..b6f90fc5d9 100644--- a/lib/plausible/stats/sql/where_builder.ex+++ b/lib/plausible/stats/sql/where_builder.ex@@ -41,46 +41,23 @@ defmodule Plausible.Stats.SQL.WhereBuilder doendend- defp filter_site_time_range(- :events,- %Plausible.Stats.Query{rollup_site_ids: [_ | _] = site_ids} = query- ) do- {first_datetime, last_datetime} = utc_boundaries(query)-- dynamic(- [e],- fragment("? in ?", e.site_id, ^site_ids) and- e.timestamp >= ^first_datetime and- e.timestamp <= ^last_datetime- )+ defp filter_site_time_range(table, query) do+ dynamic([], ^filter_site_id(query) and ^filter_time_range(table, query))end- defp filter_site_time_range(:events, query) do- {first_datetime, last_datetime} = utc_boundaries(query)-- dynamic(- [e],- e.site_id == ^query.site_id and e.timestamp >= ^first_datetime and- e.timestamp <= ^last_datetime- )+ defp filter_site_id(query) do+ case query.consolidated_site_ids do+ nil -> dynamic([x], x.site_id == ^query.site_id)+ [_ | _] = ids -> dynamic([x], fragment("? in ?", x.site_id, ^ids))+ endend- defp filter_site_time_range(- :sessions,- %Plausible.Stats.Query{rollup_site_ids: [_ | _] = site_ids} = query- ) do+ defp filter_time_range(:events, query) do{first_datetime, last_datetime} = utc_boundaries(query)-- dynamic(- [s],- fragment("? in ?", s.site_id, ^site_ids) and- s.start >= ^NaiveDateTime.add(first_datetime, -7, :day) and- s.timestamp >= ^first_datetime and- s.start <= ^last_datetime- )+ dynamic([e], e.timestamp >= ^first_datetime and e.timestamp <= ^last_datetime)end- defp filter_site_time_range(:sessions, query) do+ defp filter_time_range(:sessions, query) do{first_datetime, last_datetime} = utc_boundaries(query)# Counts each _active_ session in time range even if they started before@@ -96,8 +73,7 @@ defmodule Plausible.Stats.SQL.WhereBuilder do# Without it, the sample factor would be greatly overestimated for large sites,# as query would be estimated to return _all_ rows matching other conditions# before `start == last_datetime`.- s.site_id == ^query.site_id and- s.start >= ^NaiveDateTime.add(first_datetime, -7, :day) and+ s.start >= ^NaiveDateTime.add(first_datetime, -7, :day) ands.timestamp >= ^first_datetime ands.start <= ^last_datetime)diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.exindex bde27f820f..6dfc6d86d8 100644--- a/lib/plausible_web/controllers/stats_controller.ex+++ b/lib/plausible_web/controllers/stats_controller.ex@@ -60,7 +60,9 @@ defmodule PlausibleWeb.StatsController docan_see_stats? = not Teams.locked?(site.team) or site_role == :super_admindemo = site.domain == "plausible.io"dogfood_page_path = if demo, do: "/#{site.domain}", else: "/:dashboard"- skip_to_dashboard? = conn.params["skip_to_dashboard"] == "true"++ skip_to_dashboard? =+ conn.params["skip_to_dashboard"] == "true" or Plausible.Sites.consolidated?(site){:ok, segments} = Plausible.Segments.get_all_for_site(site, site_role)diff --git a/lib/plausible_web/live/verification.ex b/lib/plausible_web/live/verification.exindex 0e674d93b4..8cfe7e9d74 100644--- a/lib/plausible_web/live/verification.ex+++ b/lib/plausible_web/live/verification.ex@@ -32,6 +32,8 @@ defmodule PlausibleWeb.Live.Verification do])+ true = Plausible.Sites.regular?(site)+private = Map.get(socket.private.connect_info, :private, %{})super_admin? = Plausible.Auth.is_super_admin?(current_user)diff --git a/lib/plausible_web/plugs/authorize_public_api.ex b/lib/plausible_web/plugs/authorize_public_api.exindex 8604bb60a0..ead3fc6fd7 100644--- a/lib/plausible_web/plugs/authorize_public_api.ex+++ b/lib/plausible_web/plugs/authorize_public_api.ex@@ -121,7 +121,7 @@ defmodule PlausibleWeb.Plugs.AuthorizePublicAPI dodefp verify_by_scope(conn, api_key, "stats:read:" <> _ = scope) dowith :ok <- check_scope(api_key, scope),- {:ok, site} <- find_site(conn.params["site_id"], api_key),+ {:ok, site} <- find_site(conn.params["site_id"]),:ok <- verify_site_access(api_key, site, Plausible.Billing.Feature.StatsAPI) doPlausible.OpenTelemetry.add_site_attributes(site)site = Plausible.Repo.preload(site, :completed_imports)@@ -191,7 +191,7 @@ defmodule PlausibleWeb.Plugs.AuthorizePublicAPI doenddefp maybe_verify_site_access(conn, api_key, feature) do- case find_site(conn.params["site_id"], api_key) do+ case find_site(conn.params["site_id"]) do{:ok, site} ->verify_site_access(api_key, site, feature)@@ -210,20 +210,11 @@ defmodule PlausibleWeb.Plugs.AuthorizePublicAPI doendend- defp find_site(nil, _api_key), do: {:error, :missing_site_id}+ defp find_site(nil), do: {:error, :missing_site_id}- defp find_site("rollup:" <> team_identifier, api_key) do- with true <- Plausible.Auth.is_super_admin?(api_key.user),- %Plausible.Teams.Team{} = team <- Plausible.Teams.get(team_identifier) do- {:ok, Plausible.Site.rollup(team)}- else- _ -> {:error, :invalid_api_key}- end- end-- defp find_site(site_id, _api_key) do+ defp find_site(site_id) dodomain_based_search =- from s in Plausible.Site.regular(),+ from s in Plausible.Site,where: s.domain == ^site_id or s.domain_changed_from == ^site_idcase Repo.one(domain_based_search) dodiff --git a/lib/plausible_web/plugs/authorize_site_access.ex b/lib/plausible_web/plugs/authorize_site_access.exindex 8c8924976c..589cac5ff7 100644--- a/lib/plausible_web/plugs/authorize_site_access.ex+++ b/lib/plausible_web/plugs/authorize_site_access.ex@@ -172,15 +172,6 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccess doendend- defp get_site_with_role(conn, current_user, "rollup:" <> team_identifier) do- with true <- Plausible.Auth.is_super_admin?(current_user),- %Plausible.Teams.Team{} = team <- Plausible.Teams.get(team_identifier) do- {:ok, %{site: Plausible.Site.rollup(team), role: nil, member_type: nil}}- else- _ -> error_not_found(conn)- end- end-defp get_site_with_role(conn, current_user, domain) dosite = Repo.get_by(Plausible.Site, domain: domain)diff --git a/test/plausible/consolidated_view_test.exs b/test/plausible/consolidated_view_test.exsindex 3fa5153009..1f1c163d73 100644--- a/test/plausible/consolidated_view_test.exs+++ b/test/plausible/consolidated_view_test.exs@@ -5,32 +5,39 @@ defmodule Plausible.ConsolidatedViewTest douse Plausible.DataCase, async: trueimport Ecto.Queryalias Plausible.ConsolidatedView+ import Plausible.Teams.Testdescribe "enable/1" dosetup [:create_user, :create_team]test "creates and persists a new consolidated site instance", %{team: team} do+ new_site(team: team)assert {:ok, %Plausible.Site{consolidated: true}} = ConsolidatedView.enable(team)assert ConsolidatedView.get(team)endtest "is idempotent", %{team: team} do+ new_site(team: team)assert {:ok, s1} = ConsolidatedView.enable(team)assert {:ok, s2} = ConsolidatedView.enable(team)assert 1 =- from(s in Plausible.Site, where: s.team_id == ^team.id)+ from(s in Plausible.ConsolidatedView.sites(), where: s.team_id == ^team.id)|> Plausible.Repo.aggregate(:count)assert s1.domain == s2.domainend+ test "returns {:error, :no_sites} when the team does not have any sites", %{team: team} do+ assert {:error, :no_sites} = ConsolidatedView.enable(team)+ end+@tag :skiptest "returns {:error, :upgrade_required} when team ineligible for this feature"enddescribe "disable/1" do- setup [:create_user, :create_team]+ setup [:create_user, :create_team, :create_site]setup %{team: team} doConsolidatedView.enable(team)@@ -70,7 +77,7 @@ defmodule Plausible.ConsolidatedViewTest doenddescribe "get/1" do- setup [:create_user, :create_team]+ setup [:create_user, :create_team, :create_site]test "can get by team", %{team: team} doassert is_nil(ConsolidatedView.get(team))@@ -84,5 +91,28 @@ defmodule Plausible.ConsolidatedViewTest doassert %Plausible.Site{} = ConsolidatedView.get(team.identifier)endend++ describe "native_stats_start_at/1" do+ setup [:create_user, :create_team]++ test "returns nil if no included sites", %{team: team} do+ ConsolidatedView.enable(team)+ assert is_nil(ConsolidatedView.native_stats_start_at(team))+ end++ test "returns earliest native_stats_start_at from included sites", %{team: team} do+ ConsolidatedView.enable(team)++ datetimes = [+ ~N[2024-01-01 12:00:00],+ ~N[2024-01-01 11:00:00],+ ~N[2024-02-01 12:00:00]+ ]++ for dt <- datetimes, do: new_site(team: team, native_stats_start_at: dt)++ assert ConsolidatedView.native_stats_start_at(team) == Enum.min(datetimes)+ end+ endendenddiff --git a/test/plausible/stats/query_parser_test.exs b/test/plausible/stats/query_parser_test.exsindex 6d67c65075..f3187c13a4 100644--- a/test/plausible/stats/query_parser_test.exs+++ b/test/plausible/stats/query_parser_test.exs@@ -78,7 +78,7 @@ defmodule Plausible.Stats.Filters.QueryParserTest do:preloaded_goals,:revenue_warning,:revenue_currencies,- :rollup_site_ids+ :consolidated_site_ids])assert result == expected_result@@ -2703,4 +2703,34 @@ defmodule Plausible.Stats.Filters.QueryParserTest do)endend++ on_ee do+ describe "query.consolidated_site_ids" do+ test "is set to nil when site is regular", %{site: site} do+ params = %{+ "site_id" => site.domain,+ "metrics" => ["visitors"],+ "date_range" => "all"+ }++ {:ok, %{consolidated_site_ids: nil}} = parse(site, :public, params)+ {:ok, %{consolidated_site_ids: nil}} = parse(site, :internal, params)+ end++ test "is set to a list of site_ids when site is consolidated", %{site: site} do+ cv = new_consolidated_view(site.team)++ params = %{+ "site_id" => site.domain,+ "metrics" => ["visitors"],+ "date_range" => "all"+ }++ site_id = site.id++ assert {:ok, %{consolidated_site_ids: [^site_id]}} = parse(cv, :public, params)+ assert {:ok, %{consolidated_site_ids: [^site_id]}} = parse(cv, :internal, params)+ end+ end+ endenddiff --git a/test/plausible/stats/query_test.exs b/test/plausible/stats/query_test.exsindex bc700fb481..6d8252c0c6 100644--- a/test/plausible/stats/query_test.exs+++ b/test/plausible/stats/query_test.exs@@ -484,4 +484,19 @@ defmodule Plausible.Stats.QueryTest do})endend++ on_ee do+ describe "query.consolidated_site_ids" do+ test "is set to nil when site is regular", %{site: site} do+ assert %{consolidated_site_ids: nil} = Query.from(site, %{"period" => "day"})+ end++ test "is set to a list of site_ids when site is consolidated", %{site: site} do+ cv = new_consolidated_view(site.team)++ site_id = site.id+ assert %{consolidated_site_ids: [^site_id]} = Query.from(cv, %{"period" => "day"})+ end+ end+ endenddiff --git a/test/plausible_web/controllers/api/external_stats_controller/query_consolidated_view_test.exs b/test/plausible_web/controllers/api/external_stats_controller/query_consolidated_view_test.exsnew file mode 100644index 0000000000..86a53dade9--- /dev/null+++ b/test/plausible_web/controllers/api/external_stats_controller/query_consolidated_view_test.exs@@ -0,0 +1,30 @@+defmodule PlausibleWeb.Api.ExternalStatsController.QueryConsolidatedViewTest do+ use PlausibleWeb.ConnCase++ on_ee do+ use Plausible.Teams.Test++ setup [:create_user, :create_team, :create_site, :create_api_key, :use_api_key]++ test "simple aggregate query across all consolidated site_ids", %{+ team: team,+ site: site,+ conn: conn+ } do+ another_site = new_site(team: team)+ cv = new_consolidated_view(team)++ populate_stats(site, [build(:pageview)])+ populate_stats(another_site, [build(:pageview)])++ conn =+ post(conn, "/api/v2/query", %{+ "site_id" => cv.domain,+ "date_range" => "all",+ "metrics" => ["visitors"]+ })++ assert %{"results" => [%{"metrics" => [2]}]} = json_response(conn, 200)+ end+ end+enddiff --git a/test/plausible_web/controllers/api/stats_controller/pages_test.exs b/test/plausible_web/controllers/api/stats_controller/pages_test.exsindex f595a30395..066a3eadbc 100644--- a/test/plausible_web/controllers/api/stats_controller/pages_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/pages_test.exs@@ -2143,6 +2143,58 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do}]end++ on_ee do+ test "returns pages across all sites on a consolidated view", %{conn: conn, site: site} do+ another_site = new_site(team: site.team)+ cv = new_consolidated_view(site.team)++ populate_stats(site, [+ build(:pageview, pathname: "/a1", timestamp: ~N[2021-01-01 00:00:00]),+ build(:pageview, pathname: "/a2", timestamp: ~N[2021-01-01 00:00:00]),+ build(:pageview, pathname: "/a2", timestamp: ~N[2021-01-01 00:00:00])+ ])++ populate_stats(another_site, [+ build(:pageview, pathname: "/b1", timestamp: ~N[2021-01-01 00:00:00]),+ build(:pageview, pathname: "/b1", timestamp: ~N[2021-01-01 00:00:00]),+ build(:pageview, pathname: "/b1", timestamp: ~N[2021-01-01 00:00:00])+ ])++ conn =+ get(+ conn,+ "/api/stats/#{cv.domain}/pages?period=day&date=2021-01-01&detailed=true"+ )++ assert json_response(conn, 200)["results"] == [+ %{+ "bounce_rate" => 100,+ "name" => "/b1",+ "pageviews" => 3,+ "time_on_page" => nil,+ "visitors" => 3,+ "scroll_depth" => nil+ },+ %{+ "bounce_rate" => 100,+ "name" => "/a2",+ "pageviews" => 2,+ "time_on_page" => nil,+ "visitors" => 2,+ "scroll_depth" => nil+ },+ %{+ "bounce_rate" => 100,+ "name" => "/a1",+ "pageviews" => 1,+ "time_on_page" => nil,+ "visitors" => 1,+ "scroll_depth" => nil+ }+ ]+ end+ endenddescribe "GET /api/stats/:domain/entry-pages" dodiff --git a/test/plausible_web/controllers/stats_controller_test.exs b/test/plausible_web/controllers/stats_controller_test.exsindex 90c3273bde..790bbdee6b 100644--- a/test/plausible_web/controllers/stats_controller_test.exs+++ b/test/plausible_web/controllers/stats_controller_test.exs@@ -149,6 +149,54 @@ defmodule PlausibleWeb.StatsControllerTest doassert text_of_attr(resp, @react_container, "data-logged-in") == "true"end+ on_ee do+ test "first view of a consolidated dashboard sets stats_start_date and native_stats_start_at according to native_stats_start_at of the earliest team site",+ %{+ conn: conn,+ site: site,+ user: user+ } do+ team = team_of(user)+ now = NaiveDateTime.utc_now(:second)+ ten_days_ago = NaiveDateTime.add(now, -10, :day)+ twenty_days_ago = NaiveDateTime.add(now, -20, :day)++ site+ |> Plausible.Site.set_native_stats_start_at(ten_days_ago)+ |> Plausible.Repo.update!()++ new_site(team: team, native_stats_start_at: twenty_days_ago)+ cv = new_consolidated_view(team)++ conn = get(conn, "/" <> cv.domain)+ resp = html_response(conn, 200)++ assert text_of_attr(resp, @react_container, "data-domain") == cv.domain+ assert text_of_attr(resp, @react_container, "data-logged-in") == "true"+ assert text_of_attr(resp, @react_container, "data-current-user-role") == "owner"+ assert text_of_attr(resp, @react_container, "data-current-user-id") == "#{user.id}"++ cv = Plausible.Repo.reload(cv)+ assert cv.stats_start_date == NaiveDateTime.to_date(twenty_days_ago)+ assert cv.native_stats_start_at == twenty_days_ago+ end++ test "does not redirect consolidated views to verification", %{+ conn: conn,+ user: user+ } do+ cv = user |> team_of() |> new_consolidated_view()++ conn = get(conn, "/" <> cv.domain)+ resp = html_response(conn, 200)++ assert text_of_attr(resp, @react_container, "data-domain") == cv.domain+ assert text_of_attr(resp, @react_container, "data-logged-in") == "true"+ assert text_of_attr(resp, @react_container, "data-current-user-role") == "owner"+ assert text_of_attr(resp, @react_container, "data-current-user-id") == "#{user.id}"+ end+ end+@tag :ee_onlytest "header, stats are shown; footer is not shown", %{conn: conn, site: site, user: user} dopopulate_stats(site, [build(:pageview)])diff --git a/test/support/teams/test.ex b/test/support/teams/test.exindex 7873019489..625a94b022 100644--- a/test/support/teams/test.ex+++ b/test/support/teams/test.ex@@ -23,6 +23,13 @@ defmodule Plausible.Teams.Test doPlug.Conn.put_session(conn, :current_team_id, team.identifier)end+ on_ee do+ def new_consolidated_view(team) do+ {:ok, site} = Plausible.ConsolidatedView.enable(team)+ site+ end+ end+def new_site(args \\ []) doargs =cond do