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
Override stats_start_date in CRM (#2310)
Vinicius Brasil4a2e0af33783
diff --git a/lib/plausible/site/admin.ex b/lib/plausible/site/admin.exindex f45064377e..8cf6933c2c 100644--- a/lib/plausible/site/admin.ex+++ b/lib/plausible/site/admin.ex@@ -19,9 +19,10 @@ defmodule Plausible.SiteAdmin dodef form_fields(_) do[- domain: nil,- timezone: nil,- public: nil+ domain: %{update: :readonly},+ timezone: %{choices: Plausible.Timezones.options()},+ public: nil,+ stats_start_date: nil]end@@ -130,4 +131,7 @@ defmodule Plausible.SiteAdmin doend)|> stringify_fields()end++ def create_changeset(schema, attrs), do: Plausible.Site.crm_changeset(schema, attrs)+ def update_changeset(schema, attrs), do: Plausible.Site.crm_changeset(schema, attrs)enddiff --git a/lib/plausible/site/schema.ex b/lib/plausible/site/schema.exindex 9ebab01ce6..9cfde8f950 100644--- a/lib/plausible/site/schema.ex+++ b/lib/plausible/site/schema.ex@@ -54,6 +54,12 @@ defmodule Plausible.Site do)end+ def crm_changeset(site, attrs) do+ site+ |> cast(attrs, [:timezone, :public, :stats_start_date])+ |> validate_required([:timezone, :public])+ end+def make_public(site) dochange(site, public: true)enddiff --git a/lib/plausible/sites.ex b/lib/plausible/sites.exindex 5d96a51be6..b6874c756b 100644--- a/lib/plausible/sites.ex+++ b/lib/plausible/sites.ex@@ -39,18 +39,28 @@ defmodule Plausible.Sites doendend- def stats_start_date(site) do- if site.stats_start_date do- site.stats_start_date- else- start_date = Plausible.Stats.Clickhouse.pageview_start_date_local(site)+ @spec stats_start_date(Plausible.Site.t()) :: Date.t() | nil+ @doc """+ Returns the date of the first event of the given site, or `nil` if the site+ does not have stats yet.++ If this is the first time the function is called for the site, it queries+ Clickhouse and saves the date in the sites table.+ """+ def stats_start_date(site)++ def stats_start_date(%Site{stats_start_date: %Date{} = date}) do+ date+ end- if start_date do- Site.set_stats_start_date(site, start_date)- |> Repo.update()+ def stats_start_date(%Site{} = site) do+ if start_date = Plausible.Stats.Clickhouse.pageview_start_date_local(site) do+ updated_site =+ site+ |> Site.set_stats_start_date(start_date)+ |> Repo.update!()- start_date- end+ updated_site.stats_start_dateendenddiff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.exindex 3d8ce1d636..32077ebb43 100644--- a/lib/plausible/stats/clickhouse.ex+++ b/lib/plausible/stats/clickhouse.ex@@ -5,6 +5,7 @@ defmodule Plausible.Stats.Clickhouse douse Plausible.Stats.Fragments@no_ref "Direct / None"+ @spec pageview_start_date_local(Plausible.Site.t()) :: Date.t() | nildef pageview_start_date_local(site) dodatetime =ClickhouseRepo.one(diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.exindex d22af55b97..6a4784ae34 100644--- a/lib/plausible_web/controllers/site_controller.ex+++ b/lib/plausible_web/controllers/site_controller.ex@@ -736,9 +736,7 @@ defmodule PlausibleWeb.SiteController dosite = conn.assigns[:site]start_date = Plausible.Google.HTTP.get_analytics_start_date(view_id, access_token)-- end_date =- Plausible.Stats.Clickhouse.pageview_start_date_local(site) || Timex.today(site.timezone)+ end_date = Plausible.Sites.stats_start_date(site) || Timex.today(site.timezone){:ok, {view_name, view_id}} = Plausible.Google.Api.get_view(access_token, view_id)