Unify UA and GA4 import flow into one (#3888)
* Unify GA4 and UA import flow into one * Clean up property and view data retrieval via Google HTTP APIs * Turn `Map.get` into `Map.fetch!` in API response processing code * Bump list account summaries page size limit to max of 200 * Show only views in legacy flow and fix legacy redirect after import start * Move google analytics import actions tests to a separate module * Extend Google Analytics controller tests * DRY up `property?` predicate (h/t @RobertJoonas)pull/3926/head r2024.03.21-404
parent
5f9465614b
commit
d6e81670e4
@ -0,0 +1,12 @@
|
||||
{
|
||||
"account": "accounts/28425555",
|
||||
"createTime": "2024-02-22T10:50:15.462Z",
|
||||
"currencyCode": "USD",
|
||||
"displayName": "account.one - GA4",
|
||||
"name": "properties/428685444",
|
||||
"parent": "accounts/28425555",
|
||||
"propertyType": "PROPERTY_TYPE_ORDINARY",
|
||||
"serviceLevel": "GOOGLE_ANALYTICS_STANDARD",
|
||||
"timeZone": "Europe/Warsaw",
|
||||
"updateTime": "2024-02-22T10:50:15.462Z"
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
{
|
||||
"reports": [
|
||||
{
|
||||
"columnHeader": {
|
||||
"dimensions": [
|
||||
"ga:date"
|
||||
],
|
||||
"metricHeader": {
|
||||
"metricHeaderEntries": [
|
||||
{
|
||||
"name": "ga:pageviews",
|
||||
"type": "INTEGER"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"data": {
|
||||
"isDataGolden": true,
|
||||
"rowCount": 849,
|
||||
"rows": [
|
||||
{
|
||||
"dimensions": [
|
||||
"20120118"
|
||||
],
|
||||
"metrics": [
|
||||
{
|
||||
"values": [
|
||||
"37"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"nextPageToken": "1"
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -1,143 +0,0 @@
|
||||
defmodule PlausibleWeb.GoogleAnalytics4Controller do
|
||||
use PlausibleWeb, :controller
|
||||
|
||||
plug(PlausibleWeb.RequireAccountPlug)
|
||||
|
||||
plug(PlausibleWeb.AuthorizeSiteAccess, [:owner, :admin, :super_admin])
|
||||
|
||||
def property_form(conn, %{
|
||||
"access_token" => access_token,
|
||||
"refresh_token" => refresh_token,
|
||||
"expires_at" => expires_at
|
||||
}) do
|
||||
redirect_route = Routes.site_path(conn, :settings_imports_exports, conn.assigns.site.domain)
|
||||
|
||||
case Plausible.Google.GA4.API.list_properties(access_token) do
|
||||
{:ok, properties} ->
|
||||
conn
|
||||
|> assign(:skip_plausible_tracking, true)
|
||||
|> render("property_form.html",
|
||||
access_token: access_token,
|
||||
refresh_token: refresh_token,
|
||||
expires_at: expires_at,
|
||||
site: conn.assigns.site,
|
||||
properties: properties,
|
||||
layout: {PlausibleWeb.LayoutView, "focus.html"}
|
||||
)
|
||||
|
||||
{:error, :authentication_failed} ->
|
||||
conn
|
||||
|> put_flash(
|
||||
:error,
|
||||
"We were unable to authenticate your Google Analytics account. Please check that you have granted us permission to 'See and download your Google Analytics data' and try again."
|
||||
)
|
||||
|> redirect(external: redirect_route)
|
||||
|
||||
{:error, _any} ->
|
||||
conn
|
||||
|> put_flash(
|
||||
:error,
|
||||
"We were unable to list your Google Analytics properties. If the problem persists, please contact support for assistance."
|
||||
)
|
||||
|> redirect(external: redirect_route)
|
||||
end
|
||||
end
|
||||
|
||||
def property(conn, %{
|
||||
"property" => property,
|
||||
"access_token" => access_token,
|
||||
"refresh_token" => refresh_token,
|
||||
"expires_at" => expires_at
|
||||
}) do
|
||||
site = conn.assigns.site
|
||||
start_date = Plausible.Google.GA4.API.get_analytics_start_date(access_token, property)
|
||||
|
||||
case start_date do
|
||||
{:ok, nil} ->
|
||||
{:ok, properties} = Plausible.Google.GA4.API.list_properties(access_token)
|
||||
|
||||
conn
|
||||
|> assign(:skip_plausible_tracking, true)
|
||||
|> render("property_form.html",
|
||||
access_token: access_token,
|
||||
refresh_token: refresh_token,
|
||||
expires_at: expires_at,
|
||||
site: site,
|
||||
properties: properties,
|
||||
selected_property_error: "No data found. Nothing to import",
|
||||
layout: {PlausibleWeb.LayoutView, "focus.html"}
|
||||
)
|
||||
|
||||
{:ok, _date} ->
|
||||
redirect(conn,
|
||||
to:
|
||||
Routes.google_analytics4_path(conn, :confirm, site.domain,
|
||||
property: property,
|
||||
access_token: access_token,
|
||||
refresh_token: refresh_token,
|
||||
expires_at: expires_at
|
||||
)
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
def confirm(conn, %{
|
||||
"property" => property,
|
||||
"access_token" => access_token,
|
||||
"refresh_token" => refresh_token,
|
||||
"expires_at" => expires_at
|
||||
}) do
|
||||
site = conn.assigns.site
|
||||
|
||||
start_date = Plausible.Google.GA4.API.get_analytics_start_date(access_token, property)
|
||||
|
||||
end_date = Plausible.Sites.native_stats_start_date(site) || Timex.today(site.timezone)
|
||||
|
||||
{:ok, {property_name, property}} =
|
||||
Plausible.Google.GA4.API.get_property(access_token, property)
|
||||
|
||||
conn
|
||||
|> assign(:skip_plausible_tracking, true)
|
||||
|> render("confirm.html",
|
||||
access_token: access_token,
|
||||
refresh_token: refresh_token,
|
||||
expires_at: expires_at,
|
||||
site: site,
|
||||
selected_property: property,
|
||||
selected_property_name: property_name,
|
||||
start_date: start_date,
|
||||
end_date: end_date,
|
||||
layout: {PlausibleWeb.LayoutView, "focus.html"}
|
||||
)
|
||||
end
|
||||
|
||||
def import(conn, %{
|
||||
"property" => property,
|
||||
"start_date" => start_date,
|
||||
"end_date" => end_date,
|
||||
"access_token" => access_token,
|
||||
"refresh_token" => refresh_token,
|
||||
"expires_at" => expires_at
|
||||
}) do
|
||||
site = conn.assigns.site
|
||||
current_user = conn.assigns.current_user
|
||||
|
||||
redirect_route = Routes.site_path(conn, :settings_imports_exports, site.domain)
|
||||
|
||||
{:ok, _} =
|
||||
Plausible.Imported.GoogleAnalytics4.new_import(
|
||||
site,
|
||||
current_user,
|
||||
property: property,
|
||||
start_date: start_date,
|
||||
end_date: end_date,
|
||||
access_token: access_token,
|
||||
refresh_token: refresh_token,
|
||||
token_expires_at: expires_at
|
||||
)
|
||||
|
||||
conn
|
||||
|> put_flash(:success, "Import scheduled. An email will be sent when it completes.")
|
||||
|> redirect(external: redirect_route)
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,23 @@
|
||||
<%= form_for @conn, Routes.google_analytics_path(@conn, :property_or_view, @site.domain), [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>
|
||||
|
||||
<%= hidden_input(f, :access_token, value: @access_token) %>
|
||||
<%= hidden_input(f, :refresh_token, value: @refresh_token) %>
|
||||
<%= hidden_input(f, :expires_at, value: @expires_at) %>
|
||||
<%= hidden_input(f, :legacy, value: @legacy) %>
|
||||
|
||||
<div class="mt-6 text-sm text-gray-500 dark:text-gray-200">
|
||||
Choose the property or view in your Google Analytics account that will be imported to the <%= @site.domain %> dashboard.
|
||||
</div>
|
||||
|
||||
<div class="mt-3">
|
||||
<%= styled_label(f, :property_or_view, "Google Analytics property or view") %>
|
||||
<%= styled_select(f, :property_or_view, @properties_and_views,
|
||||
prompt: "(Choose property or view)",
|
||||
required: "true"
|
||||
) %>
|
||||
<%= styled_error(@conn.assigns[:selected_property_or_view_error]) %>
|
||||
</div>
|
||||
|
||||
<%= submit("Continue ->", class: "button mt-6") %>
|
||||
<% end %>
|
||||
@ -1,46 +0,0 @@
|
||||
<%= form_for @conn, Routes.google_analytics4_path(@conn, :import, @site.domain), [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>
|
||||
|
||||
<%= hidden_input(f, :access_token, value: @access_token) %>
|
||||
<%= hidden_input(f, :refresh_token, value: @refresh_token) %>
|
||||
<%= hidden_input(f, :expires_at, value: @expires_at) %>
|
||||
|
||||
<%= case @start_date do %>
|
||||
<% {:ok, start_date} -> %>
|
||||
<div class="mt-6 text-sm text-gray-500 dark:text-gray-200">
|
||||
Stats from this property and time period will be imported from your Google Analytics 4 account to your Plausible dashboard
|
||||
</div>
|
||||
|
||||
<div class="mt-6">
|
||||
<%= styled_label(f, :property, "Google Analytics 4 property") %>
|
||||
<span class="block w-full text-base dark:text-gray-100 sm:text-sm dark:bg-gray-800">
|
||||
<%= @selected_property_name %>
|
||||
</span>
|
||||
<%= hidden_input(f, :property, readonly: "true", value: @selected_property) %>
|
||||
</div>
|
||||
<div class="flex justify-between mt-3">
|
||||
<div class="w-36">
|
||||
<%= styled_label(f, :start_date, "From") %>
|
||||
<span class="block w-full text-base dark:text-gray-100 sm:text-sm dark:bg-gray-800">
|
||||
<%= PlausibleWeb.EmailView.date_format(start_date) %>
|
||||
</span>
|
||||
<%= hidden_input(f, :start_date, value: start_date, readonly: "true") %>
|
||||
</div>
|
||||
<div class="align-middle pt-4 dark:text-gray-100">→</div>
|
||||
<div class="w-36">
|
||||
<%= styled_label(f, :end_date, "To") %>
|
||||
<span class="block w-full text-base dark:text-gray-100 sm:text-sm dark:bg-gray-800">
|
||||
<%= PlausibleWeb.EmailView.date_format(@end_date) %>
|
||||
</span>
|
||||
<%= hidden_input(f, :end_date, value: @end_date, readonly: "true") %>
|
||||
</div>
|
||||
</div>
|
||||
<% {:error, error} -> %>
|
||||
<p class="text-gray-700 dark:text-gray-300 mt-6">
|
||||
The following error occurred when fetching your Google Analytics 4 data.
|
||||
</p>
|
||||
<p class="text-red-700 font-medium mt-3"><%= error %></p>
|
||||
<% end %>
|
||||
|
||||
<%= submit("Confirm import", class: "button mt-6") %>
|
||||
<% end %>
|
||||
@ -1,19 +0,0 @@
|
||||
<%= form_for @conn, Routes.google_analytics4_path(@conn, :property, @site.domain), [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 4</h2>
|
||||
|
||||
<%= hidden_input(f, :access_token, value: @access_token) %>
|
||||
<%= hidden_input(f, :refresh_token, value: @refresh_token) %>
|
||||
<%= hidden_input(f, :expires_at, value: @expires_at) %>
|
||||
|
||||
<div class="mt-6 text-sm text-gray-500 dark:text-gray-200">
|
||||
Choose the property in your Google Analytics 4 account that will be imported to the <%= @site.domain %> dashboard.
|
||||
</div>
|
||||
|
||||
<div class="mt-3">
|
||||
<%= styled_label(f, :property, "Google Analytics 4 property") %>
|
||||
<%= styled_select(f, :property, @properties, prompt: "(Choose property)", required: "true") %>
|
||||
<%= styled_error(@conn.assigns[:selected_property_error]) %>
|
||||
</div>
|
||||
|
||||
<%= submit("Continue ->", class: "button mt-6") %>
|
||||
<% end %>
|
||||
@ -1,20 +0,0 @@
|
||||
<%= form_for @conn, Routes.universal_analytics_path(@conn, :view_id, @site.domain), [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>
|
||||
|
||||
<%= hidden_input(f, :access_token, value: @access_token) %>
|
||||
<%= hidden_input(f, :refresh_token, value: @refresh_token) %>
|
||||
<%= hidden_input(f, :expires_at, value: @expires_at) %>
|
||||
<%= hidden_input(f, :legacy, value: @legacy) %>
|
||||
|
||||
<div class="mt-6 text-sm text-gray-500 dark:text-gray-200">
|
||||
Choose the view in your Google Analytics account that will be imported to the <%= @site.domain %> dashboard.
|
||||
</div>
|
||||
|
||||
<div class="mt-3">
|
||||
<%= styled_label(f, :view_id, "Google Analytics view") %>
|
||||
<%= styled_select(f, :view_id, @view_ids, prompt: "(Choose view)", required: "true") %>
|
||||
<%= styled_error(@conn.assigns[:selected_view_id_error]) %>
|
||||
</div>
|
||||
|
||||
<%= submit("Continue ->", class: "button mt-6") %>
|
||||
<% end %>
|
||||
@ -1,4 +0,0 @@
|
||||
defmodule PlausibleWeb.GoogleAnalytics4View do
|
||||
use PlausibleWeb, :view
|
||||
use Plausible
|
||||
end
|
||||
@ -0,0 +1,4 @@
|
||||
defmodule PlausibleWeb.GoogleAnalyticsView do
|
||||
use PlausibleWeb, :view
|
||||
use Plausible
|
||||
end
|
||||
@ -1,4 +0,0 @@
|
||||
defmodule PlausibleWeb.UniversalAnalyticsView do
|
||||
use PlausibleWeb, :view
|
||||
use Plausible
|
||||
end
|
||||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.2 KiB |
@ -0,0 +1,336 @@
|
||||
defmodule PlausibleWeb.GoogleAnalyticsControllerTest do
|
||||
use PlausibleWeb.ConnCase, async: false
|
||||
use Oban.Testing, repo: Plausible.Repo
|
||||
|
||||
import Mox
|
||||
import Plausible.Test.Support.HTML
|
||||
|
||||
alias Plausible.Imported.SiteImport
|
||||
|
||||
require Plausible.Imported.SiteImport
|
||||
|
||||
setup :verify_on_exit!
|
||||
|
||||
describe "GET /:website/import/google-analytics/user-metric" do
|
||||
setup [:create_user, :log_in, :create_new_site]
|
||||
|
||||
test "renders with link to confirmation page", %{conn: conn, site: site} do
|
||||
response =
|
||||
conn
|
||||
|> get("/#{site.domain}/import/google-analytics/user-metric", %{
|
||||
"property_or_view" => "123456",
|
||||
"access_token" => "token",
|
||||
"refresh_token" => "foo",
|
||||
"expires_at" => "2022-09-22T20:01:37.112777",
|
||||
"legacy" => "true"
|
||||
})
|
||||
|> html_response(200)
|
||||
|
||||
assert response =~
|
||||
PlausibleWeb.Router.Helpers.google_analytics_path(conn, :confirm, site.domain,
|
||||
property_or_view: "123456",
|
||||
access_token: "token",
|
||||
refresh_token: "foo",
|
||||
expires_at: "2022-09-22T20:01:37.112777",
|
||||
legacy: "true"
|
||||
)
|
||||
|> String.replace("&", "&")
|
||||
end
|
||||
end
|
||||
|
||||
describe "GET /:website/import/google-analytics/property-or-view" do
|
||||
setup [:create_user, :log_in, :create_new_site]
|
||||
|
||||
test "lists Google Analytics views (legacy)", %{conn: conn, site: site} do
|
||||
expect(
|
||||
Plausible.HTTPClient.Mock,
|
||||
:get,
|
||||
fn _url, _opts ->
|
||||
body = "fixture/ga_list_views.json" |> File.read!() |> Jason.decode!()
|
||||
{:ok, %Finch.Response{body: body, status: 200}}
|
||||
end
|
||||
)
|
||||
|
||||
response =
|
||||
conn
|
||||
|> get("/#{site.domain}/import/google-analytics/property-or-view", %{
|
||||
"access_token" => "token",
|
||||
"refresh_token" => "foo",
|
||||
"expires_at" => "2022-09-22T20:01:37.112777",
|
||||
"legacy" => "true"
|
||||
})
|
||||
|> html_response(200)
|
||||
|
||||
assert response =~ "57238190 - one.test"
|
||||
assert response =~ "54460083 - two.test"
|
||||
end
|
||||
|
||||
test "lists Google Analytics views and properties", %{conn: conn, site: site} do
|
||||
expect(
|
||||
Plausible.HTTPClient.Mock,
|
||||
:get,
|
||||
fn _url, _opts ->
|
||||
body = "fixture/ga4_list_properties.json" |> File.read!() |> Jason.decode!()
|
||||
{:ok, %Finch.Response{body: body, status: 200}}
|
||||
end
|
||||
)
|
||||
|
||||
expect(
|
||||
Plausible.HTTPClient.Mock,
|
||||
:get,
|
||||
fn _url, _opts ->
|
||||
body = "fixture/ga_list_views.json" |> File.read!() |> Jason.decode!()
|
||||
{:ok, %Finch.Response{body: body, status: 200}}
|
||||
end
|
||||
)
|
||||
|
||||
response =
|
||||
conn
|
||||
|> get("/#{site.domain}/import/google-analytics/property-or-view", %{
|
||||
"access_token" => "token",
|
||||
"refresh_token" => "foo",
|
||||
"expires_at" => "2022-09-22T20:01:37.112777",
|
||||
"legacy" => "false"
|
||||
})
|
||||
|> html_response(200)
|
||||
|
||||
assert response =~ "57238190 - one.test"
|
||||
assert response =~ "54460083 - two.test"
|
||||
assert response =~ "account.one - GA4 (properties/428685906)"
|
||||
assert response =~ "GA4 - Flood-It! (properties/153293282)"
|
||||
assert response =~ "GA4 - Google Merch Shop (properties/213025502)"
|
||||
end
|
||||
end
|
||||
|
||||
describe "GET /:website/import/google-analytics/confirm" do
|
||||
setup [:create_user, :log_in, :create_new_site]
|
||||
|
||||
test "renders confirmation form for Universal Analytics import", %{conn: conn, site: site} do
|
||||
expect(
|
||||
Plausible.HTTPClient.Mock,
|
||||
:post,
|
||||
fn _url, _headers, _params ->
|
||||
body = "fixture/ga_start_date.json" |> File.read!() |> Jason.decode!()
|
||||
{:ok, %Finch.Response{body: body, status: 200}}
|
||||
end
|
||||
)
|
||||
|
||||
expect(
|
||||
Plausible.HTTPClient.Mock,
|
||||
:get,
|
||||
fn _url, _headers ->
|
||||
body = "fixture/ga_list_views.json" |> File.read!() |> Jason.decode!()
|
||||
{:ok, %Finch.Response{body: body, status: 200}}
|
||||
end
|
||||
)
|
||||
|
||||
response =
|
||||
conn
|
||||
|> get("/#{site.domain}/import/google-analytics/confirm", %{
|
||||
"property_or_view" => "57238190",
|
||||
"access_token" => "token",
|
||||
"refresh_token" => "foo",
|
||||
"expires_at" => "2022-09-22T20:01:37.112777",
|
||||
"legacy" => "true"
|
||||
})
|
||||
|> html_response(200)
|
||||
|
||||
action_url = PlausibleWeb.Router.Helpers.google_analytics_path(conn, :import, site.domain)
|
||||
|
||||
assert text_of_attr(response, "form", "action") == action_url
|
||||
|
||||
assert text_of_attr(response, ~s|input[name=access_token]|, "value") == "token"
|
||||
assert text_of_attr(response, ~s|input[name=refresh_token]|, "value") == "foo"
|
||||
|
||||
assert text_of_attr(response, ~s|input[name=expires_at]|, "value") ==
|
||||
"2022-09-22T20:01:37.112777"
|
||||
|
||||
assert text_of_attr(response, ~s|input[name=legacy]|, "value") == "true"
|
||||
|
||||
assert text_of_attr(response, ~s|input[name=property_or_view]|, "value") == "57238190"
|
||||
|
||||
assert text_of_attr(response, ~s|input[name=start_date]|, "value") == "2012-01-18"
|
||||
|
||||
assert text_of_attr(response, ~s|input[name=end_date]|, "value") ==
|
||||
Date.to_iso8601(Date.utc_today())
|
||||
end
|
||||
|
||||
test "renders confirmation form for Google Analytics 4 import", %{conn: conn, site: site} do
|
||||
expect(
|
||||
Plausible.HTTPClient.Mock,
|
||||
:post,
|
||||
fn _url, _headers, _params ->
|
||||
body = "fixture/ga4_start_date.json" |> File.read!() |> Jason.decode!()
|
||||
{:ok, %Finch.Response{body: body, status: 200}}
|
||||
end
|
||||
)
|
||||
|
||||
expect(
|
||||
Plausible.HTTPClient.Mock,
|
||||
:get,
|
||||
fn _url, _headers ->
|
||||
body = "fixture/ga4_get_property.json" |> File.read!() |> Jason.decode!()
|
||||
{:ok, %Finch.Response{body: body, status: 200}}
|
||||
end
|
||||
)
|
||||
|
||||
response =
|
||||
conn
|
||||
|> get("/#{site.domain}/import/google-analytics/confirm", %{
|
||||
"property_or_view" => "properties/428685444",
|
||||
"access_token" => "token",
|
||||
"refresh_token" => "foo",
|
||||
"expires_at" => "2022-09-22T20:01:37.112777",
|
||||
"legacy" => "true"
|
||||
})
|
||||
|> html_response(200)
|
||||
|
||||
action_url = PlausibleWeb.Router.Helpers.google_analytics_path(conn, :import, site.domain)
|
||||
|
||||
assert text_of_attr(response, "form", "action") == action_url
|
||||
|
||||
assert text_of_attr(response, ~s|input[name=access_token]|, "value") == "token"
|
||||
assert text_of_attr(response, ~s|input[name=refresh_token]|, "value") == "foo"
|
||||
|
||||
assert text_of_attr(response, ~s|input[name=expires_at]|, "value") ==
|
||||
"2022-09-22T20:01:37.112777"
|
||||
|
||||
assert text_of_attr(response, ~s|input[name=legacy]|, "value") == "true"
|
||||
|
||||
assert text_of_attr(response, ~s|input[name=property_or_view]|, "value") ==
|
||||
"properties/428685444"
|
||||
|
||||
assert text_of_attr(response, ~s|input[name=start_date]|, "value") == "2024-02-22"
|
||||
|
||||
assert text_of_attr(response, ~s|input[name=end_date]|, "value") ==
|
||||
Date.to_iso8601(Date.utc_today())
|
||||
end
|
||||
end
|
||||
|
||||
describe "POST /:website/settings/google-import" do
|
||||
setup [:create_user, :log_in, :create_new_site]
|
||||
|
||||
test "creates Google Analytics 4 site import instance", %{conn: conn, site: site} do
|
||||
conn =
|
||||
post(conn, "/#{site.domain}/settings/google-import", %{
|
||||
"property_or_view" => "properties/123456",
|
||||
"start_date" => "2018-03-01",
|
||||
"end_date" => "2022-03-01",
|
||||
"access_token" => "token",
|
||||
"refresh_token" => "foo",
|
||||
"expires_at" => "2022-09-22T20:01:37.112777",
|
||||
"legacy" => "false"
|
||||
})
|
||||
|
||||
assert redirected_to(conn, 302) ==
|
||||
PlausibleWeb.Router.Helpers.site_path(conn, :settings_imports_exports, site.domain)
|
||||
|
||||
[site_import] = Plausible.Imported.list_all_imports(site)
|
||||
|
||||
assert site_import.source == :google_analytics_4
|
||||
assert site_import.end_date == ~D[2022-03-01]
|
||||
assert site_import.status == SiteImport.pending()
|
||||
end
|
||||
|
||||
test "creates Universal Analytics site import instance", %{conn: conn, site: site} do
|
||||
conn =
|
||||
post(conn, "/#{site.domain}/settings/google-import", %{
|
||||
"property_or_view" => "123456",
|
||||
"start_date" => "2018-03-01",
|
||||
"end_date" => "2022-03-01",
|
||||
"access_token" => "token",
|
||||
"refresh_token" => "foo",
|
||||
"expires_at" => "2022-09-22T20:01:37.112777",
|
||||
"legacy" => "true"
|
||||
})
|
||||
|
||||
assert redirected_to(conn, 302) ==
|
||||
PlausibleWeb.Router.Helpers.site_path(conn, :settings_integrations, site.domain)
|
||||
|
||||
[site_import] = Plausible.Imported.list_all_imports(site)
|
||||
|
||||
assert site_import.source == :universal_analytics
|
||||
assert site_import.end_date == ~D[2022-03-01]
|
||||
assert site_import.status == SiteImport.pending()
|
||||
end
|
||||
|
||||
test "redirects to imports and exports when creating UA job with legacy set to false", %{
|
||||
conn: conn,
|
||||
site: site
|
||||
} do
|
||||
conn =
|
||||
post(conn, "/#{site.domain}/settings/google-import", %{
|
||||
"property_or_view" => "123456",
|
||||
"start_date" => "2018-03-01",
|
||||
"end_date" => "2022-03-01",
|
||||
"access_token" => "token",
|
||||
"refresh_token" => "foo",
|
||||
"expires_at" => "2022-09-22T20:01:37.112777",
|
||||
"legacy" => "false"
|
||||
})
|
||||
|
||||
assert redirected_to(conn, 302) ==
|
||||
PlausibleWeb.Router.Helpers.site_path(conn, :settings_imports_exports, site.domain)
|
||||
|
||||
[site_import] = Plausible.Imported.list_all_imports(site)
|
||||
|
||||
assert site_import.source == :universal_analytics
|
||||
assert site_import.end_date == ~D[2022-03-01]
|
||||
assert site_import.status == SiteImport.pending()
|
||||
end
|
||||
|
||||
test "schedules a Google Analytics 4 import job in Oban", %{conn: conn, site: site} do
|
||||
post(conn, "/#{site.domain}/settings/google-import", %{
|
||||
"property_or_view" => "properties/123456",
|
||||
"start_date" => "2018-03-01",
|
||||
"end_date" => "2022-03-01",
|
||||
"access_token" => "token",
|
||||
"refresh_token" => "foo",
|
||||
"expires_at" => "2022-09-22T20:01:37.112777",
|
||||
"legacy" => "false"
|
||||
})
|
||||
|
||||
assert [%{id: import_id, legacy: false}] = Plausible.Imported.list_all_imports(site)
|
||||
|
||||
assert_enqueued(
|
||||
worker: Plausible.Workers.ImportAnalytics,
|
||||
args: %{
|
||||
"import_id" => import_id,
|
||||
"property" => "properties/123456",
|
||||
"start_date" => "2018-03-01",
|
||||
"end_date" => "2022-03-01",
|
||||
"access_token" => "token",
|
||||
"refresh_token" => "foo",
|
||||
"token_expires_at" => "2022-09-22T20:01:37.112777"
|
||||
}
|
||||
)
|
||||
end
|
||||
|
||||
test "schedules a Universal Analytics import job in Oban", %{conn: conn, site: site} do
|
||||
post(conn, "/#{site.domain}/settings/google-import", %{
|
||||
"property_or_view" => "123456",
|
||||
"start_date" => "2018-03-01",
|
||||
"end_date" => "2022-03-01",
|
||||
"access_token" => "token",
|
||||
"refresh_token" => "foo",
|
||||
"expires_at" => "2022-09-22T20:01:37.112777",
|
||||
"legacy" => "true"
|
||||
})
|
||||
|
||||
assert [%{id: import_id, legacy: true}] = Plausible.Imported.list_all_imports(site)
|
||||
|
||||
assert_enqueued(
|
||||
worker: Plausible.Workers.ImportAnalytics,
|
||||
args: %{
|
||||
"import_id" => import_id,
|
||||
"view_id" => "123456",
|
||||
"start_date" => "2018-03-01",
|
||||
"end_date" => "2022-03-01",
|
||||
"access_token" => "token",
|
||||
"refresh_token" => "foo",
|
||||
"token_expires_at" => "2022-09-22T20:01:37.112777"
|
||||
}
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
Loading…
Reference in New Issue