Forget has_stats

pull/1822/head
Uku Taht 5 years ago
parent a359271af2
commit 7c755d7c6d

@ -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

@ -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

@ -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,

@ -12,7 +12,7 @@
<% end %>
<div class="pt-6"></div>
<div id="stats-react-container" style="overflow-anchor: none;" data-domain="<%= @site.domain %>" data-offset="<%= Timex.Timezone.total_offset(Timex.Timezone.get(@site.timezone)) %>" data-has-goals="<%= @has_goals %>" data-logged-in="<%= !!@conn.assigns[:current_user] %>" data-stats-begin="<%= @site.stats_start_date %>" data-shared-link-auth="<%= assigns[:shared_link_auth] %>" data-embedded="<%= @conn.assigns[:embedded] %>" data-background="<%= @conn.assigns[:background] %>" data-selfhosted="<%= Application.get_env(:plausible, :is_selfhost) %>" data-current-user-role="<%= @conn.assigns[:current_user_role] %>"></div>
<div id="stats-react-container" style="overflow-anchor: none;" data-domain="<%= @site.domain %>" data-offset="<%= Timex.Timezone.total_offset(Timex.Timezone.get(@site.timezone)) %>" data-has-goals="<%= @has_goals %>" data-logged-in="<%= !!@conn.assigns[:current_user] %>" data-stats-begin="<%= @stats_start_date %>" data-shared-link-auth="<%= assigns[:shared_link_auth] %>" data-embedded="<%= @conn.assigns[:embedded] %>" data-background="<%= @conn.assigns[:background] %>" data-selfhosted="<%= Application.get_env(:plausible, :is_selfhost) %>" data-current-user-role="<%= @conn.assigns[:current_user_role] %>"></div>
<div id="modal_root"></div>
<%= if !@conn.assigns[:current_user] && @conn.assigns[:demo] do %>
<div class="bg-gray-50 dark:bg-gray-850">

@ -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

Loading…
Cancel
Save