diff --git a/lib/plausible/site/schema.ex b/lib/plausible/site/schema.ex index 1a4afe8d6..63b508a9d 100644 --- a/lib/plausible/site/schema.ex +++ b/lib/plausible/site/schema.ex @@ -21,7 +21,6 @@ defmodule Plausible.Site do field :timezone, :string, default: "Etc/UTC" field :public, :boolean field :locked, :boolean - field :has_stats, :boolean field :stats_start_date, :date embeds_one :imported_data, Plausible.Site.ImportedData, on_replace: :update @@ -60,10 +59,6 @@ defmodule Plausible.Site do change(site, public: false) end - def set_has_stats(site, has_stats_val) do - change(site, has_stats: has_stats_val) - end - def set_stats_start_date(site, val) do change(site, stats_start_date: val) end diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex index 48bef5671..00d32a204 100644 --- a/lib/plausible/sites.ex +++ b/lib/plausible/sites.ex @@ -54,20 +54,7 @@ defmodule Plausible.Sites do end def has_stats?(site) do - if site.has_stats do - true - else - has_stats = Plausible.Stats.Clickhouse.has_pageviews?(site) - - if has_stats do - Plausible.Site.set_has_stats(site, true) - |> Repo.update() - - true - else - false - end - end + !!stats_start_date(site) end def create_shared_link(site, name, password \\ nil) do diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex index e925904e6..02acbf434 100644 --- a/lib/plausible_web/controllers/stats_controller.ex +++ b/lib/plausible_web/controllers/stats_controller.ex @@ -7,11 +7,11 @@ defmodule PlausibleWeb.StatsController do plug PlausibleWeb.AuthorizeSiteAccess when action in [:stats, :csv_export] def stats(%{assigns: %{site: site}} = conn, _params) do - has_stats = Plausible.Sites.has_stats?(site) + stats_start_date = Plausible.Sites.stats_start_date(site) can_see_stats = !site.locked || conn.assigns[:current_user_role] == :super_admin cond do - has_stats && can_see_stats -> + stats_start_date && can_see_stats -> demo = site.domain == PlausibleWeb.Endpoint.host() offer_email_report = get_session(conn, site.domain <> "_offer_email_report") @@ -22,12 +22,13 @@ defmodule PlausibleWeb.StatsController do |> render("stats.html", site: site, has_goals: Plausible.Sites.has_goals?(site), + stats_start_date: stats_start_date, title: "Plausible · " <> site.domain, offer_email_report: offer_email_report, demo: demo ) - !has_stats && can_see_stats -> + !stats_start_date && can_see_stats -> conn |> assign(:skip_plausible_tracking, true) |> render("waiting_first_pageview.html", site: site) @@ -177,6 +178,7 @@ defmodule PlausibleWeb.StatsController do |> render("stats.html", site: shared_link.site, has_goals: Plausible.Sites.has_goals?(shared_link.site), + stats_start_date: shared_link.site.stats_start_date, title: "Plausible · " <> shared_link.site.domain, offer_email_report: false, demo: false, diff --git a/lib/plausible_web/templates/stats/stats.html.eex b/lib/plausible_web/templates/stats/stats.html.eex index 2bf46a964..76fb8bb7f 100644 --- a/lib/plausible_web/templates/stats/stats.html.eex +++ b/lib/plausible_web/templates/stats/stats.html.eex @@ -12,7 +12,7 @@ <% end %>
-
+
<%= if !@conn.assigns[:current_user] && @conn.assigns[:demo] do %>
diff --git a/test/plausible/site/sites_test.exs b/test/plausible/site/sites_test.exs index 492bfa44a..0c37aea0f 100644 --- a/test/plausible/site/sites_test.exs +++ b/test/plausible/site/sites_test.exs @@ -66,18 +66,5 @@ defmodule Plausible.SitesTest do assert Sites.has_stats?(site) end - - test "memoizes has_stats value" do - site = insert(:site) - - populate_stats(site, [ - build(:pageview) - ]) - - refute site.has_stats - - assert Sites.has_stats?(site) - assert Repo.reload!(site).has_stats - end end end