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
Add end date to GA import
Uku Tahte1d6d119b087
diff --git a/lib/mix/tasks/call_google.ex b/lib/mix/tasks/call_google.exnew file mode 100644index 0000000000..32fdad2033--- /dev/null+++ b/lib/mix/tasks/call_google.ex@@ -0,0 +1,48 @@+defmodule Mix.Tasks.CallGoogle do+ use Mix.Task+ use Plausible.Repo+ require Logger++ @token "ya29.A0ARrdaM-GC-C38oUNmoUlica3v2IGT1eACtvreAFcM4zCYrpQxHdTFfhpmWQfiYAblnKPVRkt_fW-jTTwJ_ScXtkaqq6P_XiBbPIa3g9yJ_F6bP2tEOeHgq07aPlPwHvqXaK8I8gmwtO86VvJLvmhXolHtlXN0g"+ @view_id "204615196"+ @dimensions ["ga:date"]+ @metrics ["ga:users", "ga:pageviews", "ga:bounces", "ga:sessions", "ga:sessionDuration"]++ def run(_) do+ Mix.Task.run("app.start")++ report = %{+ viewId: @view_id,+ dateRanges: [+ %{+ # The earliest valid date+ startDate: "2005-01-01",+ endDate: "2019-12-05"+ }+ ],+ dimensions: Enum.map(@dimensions, &%{name: &1, histogramBuckets: []}),+ metrics: Enum.map(@metrics, &%{expression: &1}),+ hideTotals: true,+ hideValueRanges: true,+ orderBys: [+ %{+ fieldName: "ga:date",+ sortOrder: "DESCENDING"+ }+ ],+ pageSize: 100_00,+ pageToken: ""+ }++ Logger.debug(report)++ res =+ HTTPoison.post!(+ "https://analyticsreporting.googleapis.com/v4/reports:batchGet",+ Jason.encode!(%{reportRequests: [report]}),+ Authorization: "Bearer #{@token}"+ )++ Logger.debug(res.body)+ end+enddiff --git a/lib/plausible/google/api.ex b/lib/plausible/google/api.exindex be1544bc9c..d57d226596 100644--- a/lib/plausible/google/api.ex+++ b/lib/plausible/google/api.ex@@ -153,9 +153,9 @@ defmodule Plausible.Google.Api doendend- def import_analytics(site, profile) do+ def import_analytics(site, view_id, end_date) dowith {:ok, auth} <- refresh_if_needed(site.google_auth) do- do_import_analytics(site, auth, profile)+ do_import_analytics(site, auth, view_id, end_date)endend@@ -165,22 +165,11 @@ defmodule Plausible.Google.Api doDimensions reference: https://ga-dev-tools.web.app/dimensions-metrics-explorer"""- def do_import_analytics(site, auth, profile) do- end_date =- Plausible.Stats.Clickhouse.pageviews_begin(site)- |> NaiveDateTime.to_date()-- end_date =- if end_date == ~D[1970-01-01] do- Timex.today()- else- end_date- end-+ def do_import_analytics(site, auth, view_id, end_date) dorequest = %{auth: auth,- profile: profile,- end_date: Date.to_iso8601(end_date)+ profile: view_id,+ end_date: end_date}# Each element is: {dataset, dimensions, metrics}diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.exindex 76dd9eb700..545f66ce44 100644--- a/lib/plausible/stats/clickhouse.ex+++ b/lib/plausible/stats/clickhouse.ex@@ -560,12 +560,4 @@ defmodule Plausible.Stats.Clickhouse dodb_queryendend-- def pageviews_begin(site) do- ClickhouseRepo.one(- from e in "events",- where: e.domain == ^site.domain and e.name == "pageview",- select: min(e.timestamp)- )- endenddiff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.exindex 7ec776fddd..c53cabb489 100644--- a/lib/plausible_web/controllers/site_controller.ex+++ b/lib/plausible_web/controllers/site_controller.ex@@ -643,7 +643,21 @@ defmodule PlausibleWeb.SiteController do|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/general")end- def import_from_google(conn, %{"profile" => profile}) do+ def import_from_google_form(conn, _params) do+ site = conn.assigns[:site] |> Repo.preload(:google_auth)++ view_ids = Plausible.Google.Api.get_analytics_view_ids(site)++ conn+ |> assign(:skip_plausible_tracking, true)+ |> render("import_from_google.html",+ site: site,+ view_ids: view_ids,+ layout: {PlausibleWeb.LayoutView, "focus.html"}+ )+ end++ def import_from_google(conn, %{"view_id" => view_id, "end_date" => end_date}) dosite =conn.assigns[:site]|> Repo.preload(:google_auth)@@ -654,16 +668,12 @@ defmodule PlausibleWeb.SiteController do|> put_flash(:error, "Data already imported from: #{site.imported_data.source}")|> redirect(to: Routes.site_path(conn, :settings_general, site.domain))- profile == "" ->- conn- |> put_flash(:error, "A Google Analytics profile must be selected")- |> redirect(to: Routes.site_path(conn, :settings_general, site.domain))-true ->job =Plausible.Workers.ImportGoogleAnalytics.new(%{"site_id" => site.id,- "profile" => profile+ "view_id" => view_id,+ "end_date" => end_date})Ecto.Multi.new()diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.exindex c118d053da..1ef1e9b252 100644--- a/lib/plausible_web/router.ex+++ b/lib/plausible_web/router.ex@@ -238,10 +238,11 @@ defmodule PlausibleWeb.Router dodelete "/:website", SiteController, :delete_sitedelete "/:website/stats", SiteController, :reset_stats- get "/:domain/export", StatsController, :csv_export- get "/:domain/*path", StatsController, :stats-+ get "/:website/import/google-analytics", SiteController, :import_from_google_formpost "/:website/settings/google-import", SiteController, :import_from_googledelete "/:website/settings/forget-imported", SiteController, :forget_imported++ get "/:domain/export", StatsController, :csv_export+ get "/:domain/*path", StatsController, :statsendenddiff --git a/lib/plausible_web/templates/site/import_from_google.html.eex b/lib/plausible_web/templates/site/import_from_google.html.eexnew file mode 100644index 0000000000..441670302f--- /dev/null+++ b/lib/plausible_web/templates/site/import_from_google.html.eex@@ -0,0 +1,27 @@+<%= form_for @conn, "/#{URI.encode_www_form(@site.domain)}/settings/google-import", [class: "max-w-md w-full mx-auto bg-white dark:bg-gray-800 shadow-md rounded px-8 pt-6 pb-8 mb-4 mt-8"], fn f -> %>+ <h2 class="text-xl font-black dark:text-gray-100">Import from Google Analytics</h2>++ <%= case @view_ids do %>+ <% {:ok, view_ids} -> %>++ <div class="mt-6 text-sm text-gray-500">+ You can choose the view ID that will be imported to the <%= @site.domain %> dashboard.+ </div>++ <div class="my-6">+ <%= label f, :view_id, "Google Analytics view id", class: "block text-sm font-medium text-gray-700" %>+ <%= select f, :view_id, view_ids, prompt: "(Choose view id)", required: "true", class: "mt-1 block w-full pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md" %>+ </div>++ <div class="my-6">+ <%= label f, :end_date, "Import end date", class: "block text-sm font-medium text-gray-700" %>+ <div class="mt-1">+ <%= date_input f, :end_date, value: Timex.today() |> Date.to_iso8601(), required: "true", class: "shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 rounded-md" %>+ </div>+ </div>+ <% {:error, error} -> %>+ <p class="text-gray-700 dark:text-gray-300 mt-6">The following error occurred when fetching your Google Analytics view ids.</p>+ <p class="text-red-700 font-medium mt-3"><%= error %></p>+ <% end %>+ <%= submit "Import", class: "button" %>+<% end %>diff --git a/lib/plausible_web/templates/site/settings_general.html.eex b/lib/plausible_web/templates/site/settings_general.html.eexindex d0aed180d4..6daad6dd29 100644--- a/lib/plausible_web/templates/site/settings_general.html.eex+++ b/lib/plausible_web/templates/site/settings_general.html.eex@@ -86,15 +86,22 @@<%= case @google_profiles do %><% {:ok, profiles} -> %><p class="text-gray-700 dark:text-gray-300 mt-6">- Select the Google Analytics profile you would like to import data from.+ Select the Google Analytics view id you would like to import data from.</p><%= form_for @conn, "/#{URI.encode_www_form(@site.domain)}/settings/google-import", [class: "max-w-xs"], fn f -> %><div class="my-6">- <div class="inline-block relative w-full">- <%= select f, :profile, profiles, prompt: "(Choose profile)", class: "dark:bg-gray-800 mt-1 block w-full pl-3 pr-10 py-2 text-base border-gray-300 dark:border-gray-500 outline-none focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md dark:text-gray-100" %>+ <%= label f, :view_id, "Google Analytics view id", class: "block text-sm font-medium text-gray-700" %>+ <%= select f, :view_id, profiles, prompt: "(Choose view id)", required: "true", class: "mt-1 block w-full pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md" %>+ </div>++ <div class="my-6">+ <%= label f, :end_date, "Import end date", class: "block text-sm font-medium text-gray-700" %>+ <div class="mt-1">+ <%= date_input f, :end_date, value: Timex.today() |> Date.to_iso8601(), required: "true", class: "shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 rounded-md" %></div></div>+<%= submit "Import", class: "button" %><% end %>diff --git a/lib/workers/import_google_analytics.ex b/lib/workers/import_google_analytics.exindex 0e32b8c109..1387018a93 100644--- a/lib/workers/import_google_analytics.ex+++ b/lib/workers/import_google_analytics.ex@@ -8,14 +8,14 @@ defmodule Plausible.Workers.ImportGoogleAnalytics do@impl Oban.Workerdef perform(- %Oban.Job{args: %{"site_id" => site_id, "profile" => profile}},+ %Oban.Job{args: %{"site_id" => site_id, "view_id" => view_id, "end_date" => end_date}},google_api \\ Plausible.Google.Api) dosite =Repo.get(Plausible.Site, site_id)|> Repo.preload([:google_auth, [memberships: :user]])- case google_api.import_analytics(site, profile) do+ case google_api.import_analytics(site, view_id, end_date) do{:ok, _} ->Plausible.Site.import_success(site)|> Repo.update!()diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exsindex eace504eeb..1c7903838c 100644--- a/test/plausible_web/controllers/site_controller_test.exs+++ b/test/plausible_web/controllers/site_controller_test.exs@@ -725,7 +725,10 @@ defmodule PlausibleWeb.SiteControllerTest dosetup [:create_user, :log_in, :create_new_site]test "adds in-progress imported tag to site", %{conn: conn, site: site} do- post(conn, "/#{site.domain}/settings/google-import", %{"profile" => "123"})+ post(conn, "/#{site.domain}/settings/google-import", %{+ "profile" => "123",+ "end_date" => "2022-03-01"+ })imported_data = Repo.reload(site).imported_data@@ -736,11 +739,14 @@ defmodule PlausibleWeb.SiteControllerTest doendtest "schedules an import job in Oban", %{conn: conn, site: site} do- post(conn, "/#{site.domain}/settings/google-import", %{"profile" => "123"})+ post(conn, "/#{site.domain}/settings/google-import", %{+ "view_id" => "123",+ "end_date" => "2022-03-01"+ })assert_enqueued(worker: Plausible.Workers.ImportGoogleAnalytics,- args: %{"site_id" => site.id, "profile" => "123"}+ args: %{"site_id" => site.id, "view_id" => "123", "end_date" => "2022-03-01"})endend