2019-09-02 14:29:19 +03:00
|
|
|
defmodule PlausibleWeb.SiteControllerTest do
|
|
|
|
use PlausibleWeb.ConnCase
|
|
|
|
use Plausible.Repo
|
2020-12-15 13:09:03 +03:00
|
|
|
use Bamboo.Test
|
[Continued] Google Analytics import (#1753)
* Add has_imported_stats boolean to Site
* Add Google Analytics import panel to general settings
* Get GA profiles to display in import settings panel
* Add import_from_google method as entrypoint to import data
* Add imported_visitors table
* Remove conflicting code from migration
* Import visitors data into clickhouse database
* Pass another dataset to main graph for rendering in red
This adds another entry to the JSON data returned via the main graph API
called `imported_plot`, which is similar to `plot` in form but will be
completed with previously imported data. Currently it simply returns
the values from `plot` / 2. The data is rendered in the main graph in
red without fill, and without an indicator for the present. Rationale:
imported data will not continue to grow so there is no projection
forward, only backwards.
* Hook imported GA data to dashboard timeseries plot
* Add settings option to forget imported data
* Import sources from google analytics
* Merge imported sources when queried
* Merge imported source data native data when querying sources
* Start converting metrics to atoms so they can be subqueried
This changes "visitors" and in some places "sources" to atoms. This does
not change the behaviour of the functions - the tests all pass unchanged
following this commit. This is necessary as joining subqueries requires
that the keys in `select` statements be atoms and not strings.
* Convery GA (direct) source to empty string
* Import utm campaign and utm medium from GA
* format
* Import all data types from GA into new tables
* Handle large amounts of more data more safely
* Fix some mistakes in tables
* Make GA requests in chunks of 5 queries
* Only display imported timeseries when there is no filter
* Correctly show last 30 minutes timeseries when 'realtime'
* Add with_imported key to Query struct
* Account for injected :is_not filter on sources from dashboard
* Also add tentative imported_utm_sources table
This needs a bit more work on the google import side, as GA do not
report sources and utm sources as distinct things.
* Return imported data to dashboard for rest of Sources panel
This extends the merge_imported function definition for sources to
utm_sources, utm_mediums and utm_campaigns too. This appears to be
working on the DB side but something is incomplete on the client side.
* Clear imported stats from all tables when requested
* Merge entry pages and exit pages from imported data into unfiltered dashboard view
This requires converting the `"visits"` and `"visit_duration"` metrics
to atoms so that they can be used in ecto subqueries.
* Display imported devices, browsers and OSs on dashboard
* Display imported country data on dashboard
* Add more metrics to entries/exits for modals
* make sure data is returned via API with correct keys
* Import regions and cities from GA
* Capitalize device upon import to match native data
* Leave query limits/offsets until after possibly joining with imported data
* Also import timeOnPage and pageviews for pages from GA
* imported_countries -> imported_locations
* Get timeOnPage and pageviews for pages from GA
These are needed for the pages modal, and for calculating exit rates for
exit pages.
* Add indicator to dashboard when imported data is being used
* Don't show imported data as separately line on main graph
* "bounce_rate" -> :bounce_rate, so it works in subqueries
* Drop imported browser and OS versions
These are not needed.
* Toggle displaying imported data by clicking indicator
* Parse referrers with RefInspector
- Use 'ga:fullReferrer' instead of 'ga:source'. This provides the actual
referrer host + path, whereas 'ga:source' includes utm_mediums and
other values when relevant.
- 'ga:fullReferror' does however include search engine names directly,
so they are manually checked for as RefInspector won't pick up on
these.
* Keep imported data indicator on dashboard and strikethrough when hidden
* Add unlink google button to import panel
* Rename some GA browsers and OSes to plausible versions
* Get main top pages and exit pages panels working correctly with imported data
* mix format
* Fetch time_on_pages for imported data when needed
* entry pages need to fetch bounces from GA
* "sample_percent" -> :sample_percent as only atoms can be used in subqueries
* Calculate bounce_rate for joined native and imported data for top pages modal
* Flip some query bindings around to be less misleading
* Fixup entry page modal visit durations
* mix format
* Fetch bounces and visit_duration for sources from GA
* add more source metrics used for data in modals
* Make sources modals display correct values
* imported_visitors: bounce_rate -> bounces, avg_visit_duration -> visit_duration
* Merge imported data into aggregate stats
* Reformat top graph side icons
* Ensure sample_percent is yielded from aggregate data
* filter event_props should be strings
* Hide imported data from frontend when using filter
* Fix existing tests
* fix tests
* Fix imported indicator appearing when filtering
* comma needed, lost when rebasing
* Import utm_terms and utm_content from GA
* Merge imported utm_term and utm_content
* Rename imported Countries data as Locations
* Set imported city schema field to int
* Remove utm_terms and utm_content when clearing imported
* Clean locations import from Google Analytics
- Country and region should be set to "" when GA provides "(not set)"
- City should be set to 0 for "unknown", as we cannot reliably import
city data from GA.
* Display imported region and city in dashboard
* os -> operating_system in some parts of code
The inconsistency of using os in some places and operating_system in
others causes trouble with subqueries and joins for the native and
imported data, which would require additional logic to account for. The
simplest solution is the just use a consistent word for all uses. This
doesn't make any user-facing or database changes.
* to_atom -> to_existing_atom
* format
* "events" metric -> :events
* ignore imported data when "events" in metrics
* update "bounce_rate"
* atomise some more metrics from new city and region api
* atomise some more metrics for email handlers
* "conversion_rate" -> :conversion_rate during csv export
* Move imported data stats code to own module
* Move imported timeseries function to Stats.Imported
* Use Timex.parse to import dates from GA
* has_imported_stats -> imported_source
* "time_on_page" -> :time_on_page
* Convert imported GA data to UTC
* Clean up GA request code a bit
There was some weird logic here with two separate lists that really
ought to be together, so this merges those.
* Fail sooner if GA timezone can't be identified
* Link imported tables to site by id
* imported_utm_content -> imported_utm_contents
* Imported GA from all of time
* Reorganise GA data fetch logic
- Fetch data from the start of time (2005)
- Check whether no data was fetched, and if so, inform user and don't
consider data to be imported.
* Clarify removal of "visits" data when it isn't in metrics
* Apply location filters from API
This makes it consistent with the sources etc which filter out 'Direct /
None' on the API side. These filters are used by both the native and
imported data handling code, which would otherwise both duplicate the
filters in their `where` clauses.
* Do not use changeset for setting site.imported_source
* Add all metrics to all dimensions
* Run GA import in the background
* Send email when GA import completes
* Add handler to insert imported data into tests and imported_browsers_factory
* Add remaining import data test factories
* Add imported location data to test
* Test main graph with imported data
* Add imported data to operating systems tests
* Add imported data to pages tests
* Add imported data to entry pages tests
* Add imported data to exit pages tests
* Add imported data to devices tests
* Add imported data to sources tests
* Add imported data to UTM tests
* Add new test module for the data import step
* Test import of sources GA data
* Test import of utm_mediums GA data
* Test import of utm_campaigns GA data
* Add tests for UTM terms
* Add tests for UTM contents
* Add test for importing pages and entry pages data from GA
* Add test for importing exit page data
* Fix module file name typo
* Add test for importing location data from GA
* Add test for importing devices data from GA
* Add test for importing browsers data from GA
* Add test for importing OS data from GA
* Paginate GA requests to download all data
* Bump clickhouse_ecto version
* Move RefInspector wrapper function into module
* Drop timezone transform on import
* Order imported by side_id then date
* More strings -> atoms
Also changes a conditional to be a bit nicer
* Remove parallelisation of data import
* Split sources and UTM sources from fetched GA data
GA has only a "source" dimension and no "UTM source" dimension. Instead
it returns these combined. The logic herein to tease these apart is:
1. "(direct)" -> it's a direct source
2. if the source is a domain -> it's a source
3. "google" -> it's from adwords; let's make this a UTM source "adwords"
4. else -> just a UTM source
* Keep prop names in queries as strings
* fix typo
* Fix import
* Insert data to clickhouse in batches
* Fix link when removing imported data
* Merge source tables
* Import hostname as well as pathname
* Record start and end time of imported data
* Track import progress
* Fix month interval with imported data
* Do not JOIN when imported date range has no overlap
* Fix time on page using exits
Co-authored-by: mcol <mcol@posteo.net>
2022-03-11 00:04:59 +03:00
|
|
|
use Oban.Testing, repo: Plausible.Repo
|
2019-09-02 14:29:19 +03:00
|
|
|
import Plausible.TestUtils
|
|
|
|
|
|
|
|
describe "GET /sites/new" do
|
|
|
|
setup [:create_user, :log_in]
|
|
|
|
|
|
|
|
test "shows the site form", %{conn: conn} do
|
|
|
|
conn = get(conn, "/sites/new")
|
2021-05-04 15:37:58 +03:00
|
|
|
|
2019-09-02 14:29:19 +03:00
|
|
|
assert html_response(conn, 200) =~ "Your website details"
|
|
|
|
end
|
2021-05-04 15:37:58 +03:00
|
|
|
|
|
|
|
test "shows onboarding steps if it's the first site for the user", %{conn: conn} do
|
|
|
|
conn = get(conn, "/sites/new")
|
|
|
|
|
|
|
|
assert html_response(conn, 200) =~ "Add site info"
|
|
|
|
end
|
|
|
|
|
|
|
|
test "does not show onboarding steps if user has a site already", %{conn: conn, user: user} do
|
|
|
|
insert(:site, members: [user], domain: "test-site.com")
|
|
|
|
|
|
|
|
conn = get(conn, "/sites/new")
|
|
|
|
|
|
|
|
refute html_response(conn, 200) =~ "Add site info"
|
|
|
|
end
|
2019-09-02 14:29:19 +03:00
|
|
|
end
|
|
|
|
|
2020-11-27 11:27:47 +03:00
|
|
|
describe "GET /sites" do
|
|
|
|
setup [:create_user, :log_in]
|
|
|
|
|
|
|
|
test "shows empty screen if no sites", %{conn: conn} do
|
|
|
|
conn = get(conn, "/sites")
|
|
|
|
assert html_response(conn, 200) =~ "You don't have any sites yet"
|
|
|
|
end
|
|
|
|
|
|
|
|
test "lists all of your sites with last 24h visitors", %{conn: conn, user: user} do
|
|
|
|
insert(:site, members: [user], domain: "test-site.com")
|
|
|
|
conn = get(conn, "/sites")
|
|
|
|
|
|
|
|
assert html_response(conn, 200) =~ "test-site.com"
|
|
|
|
assert html_response(conn, 200) =~ "<b>3</b> visitors in last 24h"
|
|
|
|
end
|
2021-05-05 16:17:59 +03:00
|
|
|
|
2021-07-26 12:08:35 +03:00
|
|
|
test "shows invitations for user by email address", %{conn: conn, user: user} do
|
|
|
|
site = insert(:site)
|
|
|
|
insert(:invitation, email: user.email, site_id: site.id, inviter: build(:user))
|
|
|
|
conn = get(conn, "/sites")
|
|
|
|
|
|
|
|
assert html_response(conn, 200) =~ site.domain
|
|
|
|
end
|
|
|
|
|
|
|
|
test "invitations are case insensitive", %{conn: conn, user: user} do
|
|
|
|
site = insert(:site)
|
2021-07-27 11:41:04 +03:00
|
|
|
|
|
|
|
insert(:invitation,
|
|
|
|
email: String.upcase(user.email),
|
|
|
|
site_id: site.id,
|
|
|
|
inviter: build(:user)
|
|
|
|
)
|
|
|
|
|
2021-07-26 12:08:35 +03:00
|
|
|
conn = get(conn, "/sites")
|
|
|
|
|
|
|
|
assert html_response(conn, 200) =~ site.domain
|
|
|
|
end
|
|
|
|
|
2021-05-05 16:17:59 +03:00
|
|
|
test "paginates sites", %{conn: conn, user: user} do
|
|
|
|
insert(:site, members: [user], domain: "test-site1.com")
|
|
|
|
insert(:site, members: [user], domain: "test-site2.com")
|
|
|
|
insert(:site, members: [user], domain: "test-site3.com")
|
|
|
|
insert(:site, members: [user], domain: "test-site4.com")
|
|
|
|
|
|
|
|
conn = get(conn, "/sites?per_page=2")
|
|
|
|
|
|
|
|
assert html_response(conn, 200) =~ "test-site1.com"
|
|
|
|
assert html_response(conn, 200) =~ "test-site2.com"
|
|
|
|
refute html_response(conn, 200) =~ "test-site3.com"
|
|
|
|
refute html_response(conn, 200) =~ "test-site4.com"
|
|
|
|
|
|
|
|
conn = get(conn, "/sites?per_page=2&page=2")
|
|
|
|
|
|
|
|
refute html_response(conn, 200) =~ "test-site1.com"
|
|
|
|
refute html_response(conn, 200) =~ "test-site2.com"
|
|
|
|
assert html_response(conn, 200) =~ "test-site3.com"
|
|
|
|
assert html_response(conn, 200) =~ "test-site4.com"
|
|
|
|
end
|
2020-11-27 11:27:47 +03:00
|
|
|
end
|
|
|
|
|
2019-09-02 14:29:19 +03:00
|
|
|
describe "POST /sites" do
|
|
|
|
setup [:create_user, :log_in]
|
|
|
|
|
|
|
|
test "creates the site with valid params", %{conn: conn} do
|
2020-06-08 10:35:13 +03:00
|
|
|
conn =
|
|
|
|
post(conn, "/sites", %{
|
|
|
|
"site" => %{
|
|
|
|
"domain" => "example.com",
|
|
|
|
"timezone" => "Europe/London"
|
|
|
|
}
|
|
|
|
})
|
2019-09-02 14:29:19 +03:00
|
|
|
|
|
|
|
assert redirected_to(conn) == "/example.com/snippet"
|
|
|
|
assert Repo.exists?(Plausible.Site, domain: "example.com")
|
|
|
|
end
|
|
|
|
|
2021-09-08 15:15:37 +03:00
|
|
|
test "starts trial if user does not have trial yet", %{conn: conn, user: user} do
|
|
|
|
Plausible.Auth.User.remove_trial_expiry(user) |> Repo.update!()
|
|
|
|
|
|
|
|
post(conn, "/sites", %{
|
|
|
|
"site" => %{
|
|
|
|
"domain" => "example.com",
|
|
|
|
"timezone" => "Europe/London"
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
assert Repo.reload!(user).trial_expiry_date
|
|
|
|
end
|
|
|
|
|
2020-12-15 13:09:03 +03:00
|
|
|
test "sends welcome email if this is the user's first site", %{conn: conn} do
|
|
|
|
post(conn, "/sites", %{
|
|
|
|
"site" => %{
|
|
|
|
"domain" => "example.com",
|
|
|
|
"timezone" => "Europe/London"
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
assert_email_delivered_with(subject: "Welcome to Plausible")
|
|
|
|
end
|
|
|
|
|
2020-12-29 16:17:27 +03:00
|
|
|
test "does not send welcome email if user already has a previous site", %{
|
|
|
|
conn: conn,
|
|
|
|
user: user
|
|
|
|
} do
|
2020-12-15 13:09:03 +03:00
|
|
|
insert(:site, members: [user])
|
|
|
|
|
|
|
|
post(conn, "/sites", %{
|
|
|
|
"site" => %{
|
|
|
|
"domain" => "example.com",
|
|
|
|
"timezone" => "Europe/London"
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
assert_no_emails_delivered()
|
|
|
|
end
|
|
|
|
|
2021-05-04 15:37:58 +03:00
|
|
|
test "does not allow site creation when the user is at their site limit", %{
|
|
|
|
conn: conn,
|
|
|
|
user: user
|
|
|
|
} do
|
2021-10-22 12:38:47 +03:00
|
|
|
# default site limit defined in config/.test.env
|
2021-05-04 15:37:58 +03:00
|
|
|
insert(:site, members: [user])
|
|
|
|
insert(:site, members: [user])
|
|
|
|
insert(:site, members: [user])
|
|
|
|
|
|
|
|
conn =
|
|
|
|
post(conn, "/sites", %{
|
|
|
|
"site" => %{
|
|
|
|
"domain" => "example.com",
|
|
|
|
"timezone" => "Europe/London"
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
assert conn.status == 400
|
|
|
|
end
|
|
|
|
|
2021-05-05 10:48:42 +03:00
|
|
|
test "allows accounts registered before 2021-05-05 to go over the limit", %{
|
|
|
|
conn: conn,
|
|
|
|
user: user
|
|
|
|
} do
|
|
|
|
Repo.update_all(from(u in "users", where: u.id == ^user.id),
|
|
|
|
set: [inserted_at: ~N[2020-01-01 00:00:00]]
|
|
|
|
)
|
|
|
|
|
|
|
|
insert(:site, members: [user])
|
|
|
|
insert(:site, members: [user])
|
|
|
|
insert(:site, members: [user])
|
|
|
|
insert(:site, members: [user])
|
|
|
|
|
2021-10-22 12:38:47 +03:00
|
|
|
conn =
|
|
|
|
post(conn, "/sites", %{
|
|
|
|
"site" => %{
|
|
|
|
"domain" => "example.com",
|
|
|
|
"timezone" => "Europe/London"
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
assert redirected_to(conn) == "/example.com/snippet"
|
|
|
|
assert Repo.exists?(Plausible.Site, domain: "example.com")
|
|
|
|
end
|
|
|
|
|
|
|
|
test "allows enterprise accounts to create unlimited sites", %{
|
|
|
|
conn: conn,
|
|
|
|
user: user
|
|
|
|
} do
|
|
|
|
insert(:enterprise_plan, user: user)
|
|
|
|
|
|
|
|
insert(:site, members: [user])
|
|
|
|
insert(:site, members: [user])
|
|
|
|
insert(:site, members: [user])
|
|
|
|
|
2021-05-05 10:48:42 +03:00
|
|
|
conn =
|
|
|
|
post(conn, "/sites", %{
|
|
|
|
"site" => %{
|
|
|
|
"domain" => "example.com",
|
|
|
|
"timezone" => "Europe/London"
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
assert redirected_to(conn) == "/example.com/snippet"
|
|
|
|
assert Repo.exists?(Plausible.Site, domain: "example.com")
|
|
|
|
end
|
|
|
|
|
2019-09-02 14:29:19 +03:00
|
|
|
test "cleans up the url", %{conn: conn} do
|
2020-06-08 10:35:13 +03:00
|
|
|
conn =
|
|
|
|
post(conn, "/sites", %{
|
|
|
|
"site" => %{
|
|
|
|
"domain" => "https://www.Example.com/",
|
|
|
|
"timezone" => "Europe/London"
|
|
|
|
}
|
|
|
|
})
|
2019-09-02 14:29:19 +03:00
|
|
|
|
|
|
|
assert redirected_to(conn) == "/example.com/snippet"
|
|
|
|
assert Repo.exists?(Plausible.Site, domain: "example.com")
|
|
|
|
end
|
|
|
|
|
|
|
|
test "renders form again when domain is missing", %{conn: conn} do
|
2020-06-08 10:35:13 +03:00
|
|
|
conn =
|
|
|
|
post(conn, "/sites", %{
|
|
|
|
"site" => %{
|
|
|
|
"timezone" => "Europe/London"
|
|
|
|
}
|
|
|
|
})
|
2019-09-02 14:29:19 +03:00
|
|
|
|
|
|
|
assert html_response(conn, 200) =~ "can't be blank"
|
|
|
|
end
|
|
|
|
|
2020-11-18 11:33:53 +03:00
|
|
|
test "only alphanumeric characters and slash allowed in domain", %{conn: conn} do
|
|
|
|
conn =
|
|
|
|
post(conn, "/sites", %{
|
|
|
|
"site" => %{
|
|
|
|
"timezone" => "Europe/London",
|
|
|
|
"domain" => "!@£.com"
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
assert html_response(conn, 200) =~ "only letters, numbers, slashes and period allowed"
|
|
|
|
end
|
|
|
|
|
2019-09-02 14:29:19 +03:00
|
|
|
test "renders form again when it is a duplicate domain", %{conn: conn} do
|
|
|
|
insert(:site, domain: "example.com")
|
|
|
|
|
2020-06-08 10:35:13 +03:00
|
|
|
conn =
|
|
|
|
post(conn, "/sites", %{
|
|
|
|
"site" => %{
|
|
|
|
"domain" => "example.com",
|
|
|
|
"timezone" => "Europe/London"
|
|
|
|
}
|
|
|
|
})
|
2019-09-02 14:29:19 +03:00
|
|
|
|
2022-03-11 00:11:19 +03:00
|
|
|
assert html_response(conn, 200) =~
|
|
|
|
"This domain has already been taken. Perhaps one of your team members registered it? If that's not the case, please contact support@plausible.io"
|
2019-09-02 14:29:19 +03:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-02-26 12:46:28 +03:00
|
|
|
describe "GET /:website/snippet" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "shows snippet", %{conn: conn, site: site} do
|
|
|
|
conn = get(conn, "/#{site.domain}/snippet")
|
|
|
|
|
|
|
|
assert html_response(conn, 200) =~ "Add javascript snippet"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-11-26 11:59:32 +03:00
|
|
|
describe "GET /:website/settings/general" do
|
2019-09-02 14:29:19 +03:00
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "shows settings form", %{conn: conn, site: site} do
|
2020-11-26 11:59:32 +03:00
|
|
|
conn = get(conn, "/#{site.domain}/settings/general")
|
2019-09-02 14:29:19 +03:00
|
|
|
|
2020-11-26 11:59:32 +03:00
|
|
|
assert html_response(conn, 200) =~ "General information"
|
2019-09-02 14:29:19 +03:00
|
|
|
end
|
2020-11-26 11:59:32 +03:00
|
|
|
end
|
|
|
|
|
|
|
|
describe "GET /:website/settings/goals" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
2019-11-28 07:01:07 +03:00
|
|
|
|
|
|
|
test "lists goals for the site", %{conn: conn, site: site} do
|
|
|
|
insert(:goal, domain: site.domain, event_name: "Custom event")
|
|
|
|
insert(:goal, domain: site.domain, page_path: "/register")
|
|
|
|
|
2020-11-26 11:59:32 +03:00
|
|
|
conn = get(conn, "/#{site.domain}/settings/goals")
|
2019-11-28 07:01:07 +03:00
|
|
|
|
|
|
|
assert html_response(conn, 200) =~ "Custom event"
|
|
|
|
assert html_response(conn, 200) =~ "Visit /register"
|
|
|
|
end
|
2019-09-02 14:29:19 +03:00
|
|
|
end
|
|
|
|
|
|
|
|
describe "PUT /:website/settings" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "updates the timezone", %{conn: conn, site: site} do
|
2021-10-26 11:59:14 +03:00
|
|
|
conn =
|
|
|
|
put(conn, "/#{site.domain}/settings", %{
|
|
|
|
"site" => %{
|
|
|
|
"timezone" => "Europe/London"
|
|
|
|
}
|
|
|
|
})
|
2019-09-02 14:29:19 +03:00
|
|
|
|
|
|
|
updated = Repo.get(Plausible.Site, site.id)
|
|
|
|
assert updated.timezone == "Europe/London"
|
2021-10-26 11:59:14 +03:00
|
|
|
assert redirected_to(conn, 302) == "/#{site.domain}/settings/general"
|
2019-09-02 14:29:19 +03:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "POST /sites/:website/make-public" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "makes the site public", %{conn: conn, site: site} do
|
2021-10-26 11:59:14 +03:00
|
|
|
conn = post(conn, "/sites/#{site.domain}/make-public")
|
2019-09-02 14:29:19 +03:00
|
|
|
|
|
|
|
updated = Repo.get(Plausible.Site, site.id)
|
|
|
|
assert updated.public
|
2021-10-26 11:59:14 +03:00
|
|
|
assert redirected_to(conn, 302) == "/#{site.domain}/settings/visibility"
|
2019-09-02 14:29:19 +03:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "POST /sites/:website/make-private" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "makes the site private", %{conn: conn, site: site} do
|
2021-10-26 11:59:14 +03:00
|
|
|
conn = post(conn, "/sites/#{site.domain}/make-private")
|
2019-09-02 14:29:19 +03:00
|
|
|
|
|
|
|
updated = Repo.get(Plausible.Site, site.id)
|
|
|
|
refute updated.public
|
2021-10-26 11:59:14 +03:00
|
|
|
assert redirected_to(conn, 302) == "/#{site.domain}/settings/visibility"
|
2019-09-02 14:29:19 +03:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "DELETE /:website" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
2020-07-16 13:07:45 +03:00
|
|
|
test "deletes the site", %{conn: conn, user: user} do
|
|
|
|
site = insert(:site, members: [user])
|
2019-09-02 14:29:19 +03:00
|
|
|
insert(:google_auth, user: user, site: site)
|
2020-04-06 14:53:31 +03:00
|
|
|
insert(:custom_domain, site: site)
|
2021-01-15 12:24:28 +03:00
|
|
|
insert(:spike_notification, site: site)
|
2019-09-02 14:29:19 +03:00
|
|
|
|
|
|
|
delete(conn, "/#{site.domain}")
|
|
|
|
|
|
|
|
refute Repo.exists?(from s in Plausible.Site, where: s.id == ^site.id)
|
|
|
|
end
|
|
|
|
end
|
2019-10-31 08:39:51 +03:00
|
|
|
|
2020-06-30 11:11:47 +03:00
|
|
|
describe "PUT /:website/settings/google" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "updates google auth property", %{conn: conn, user: user, site: site} do
|
|
|
|
insert(:google_auth, user: user, site: site)
|
2020-07-21 09:58:00 +03:00
|
|
|
|
2021-10-26 11:59:14 +03:00
|
|
|
conn =
|
|
|
|
put(conn, "/#{site.domain}/settings/google", %{
|
|
|
|
"google_auth" => %{"property" => "some-new-property.com"}
|
|
|
|
})
|
2020-06-30 11:11:47 +03:00
|
|
|
|
|
|
|
updated_auth = Repo.one(Plausible.Site.GoogleAuth)
|
|
|
|
assert updated_auth.property == "some-new-property.com"
|
2021-10-26 11:59:14 +03:00
|
|
|
assert redirected_to(conn, 302) == "/#{site.domain}/settings/search-console"
|
2020-06-30 11:11:47 +03:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "DELETE /:website/settings/google" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "deletes associated google auth", %{conn: conn, user: user, site: site} do
|
|
|
|
insert(:google_auth, user: user, site: site)
|
[Continued] Google Analytics import (#1753)
* Add has_imported_stats boolean to Site
* Add Google Analytics import panel to general settings
* Get GA profiles to display in import settings panel
* Add import_from_google method as entrypoint to import data
* Add imported_visitors table
* Remove conflicting code from migration
* Import visitors data into clickhouse database
* Pass another dataset to main graph for rendering in red
This adds another entry to the JSON data returned via the main graph API
called `imported_plot`, which is similar to `plot` in form but will be
completed with previously imported data. Currently it simply returns
the values from `plot` / 2. The data is rendered in the main graph in
red without fill, and without an indicator for the present. Rationale:
imported data will not continue to grow so there is no projection
forward, only backwards.
* Hook imported GA data to dashboard timeseries plot
* Add settings option to forget imported data
* Import sources from google analytics
* Merge imported sources when queried
* Merge imported source data native data when querying sources
* Start converting metrics to atoms so they can be subqueried
This changes "visitors" and in some places "sources" to atoms. This does
not change the behaviour of the functions - the tests all pass unchanged
following this commit. This is necessary as joining subqueries requires
that the keys in `select` statements be atoms and not strings.
* Convery GA (direct) source to empty string
* Import utm campaign and utm medium from GA
* format
* Import all data types from GA into new tables
* Handle large amounts of more data more safely
* Fix some mistakes in tables
* Make GA requests in chunks of 5 queries
* Only display imported timeseries when there is no filter
* Correctly show last 30 minutes timeseries when 'realtime'
* Add with_imported key to Query struct
* Account for injected :is_not filter on sources from dashboard
* Also add tentative imported_utm_sources table
This needs a bit more work on the google import side, as GA do not
report sources and utm sources as distinct things.
* Return imported data to dashboard for rest of Sources panel
This extends the merge_imported function definition for sources to
utm_sources, utm_mediums and utm_campaigns too. This appears to be
working on the DB side but something is incomplete on the client side.
* Clear imported stats from all tables when requested
* Merge entry pages and exit pages from imported data into unfiltered dashboard view
This requires converting the `"visits"` and `"visit_duration"` metrics
to atoms so that they can be used in ecto subqueries.
* Display imported devices, browsers and OSs on dashboard
* Display imported country data on dashboard
* Add more metrics to entries/exits for modals
* make sure data is returned via API with correct keys
* Import regions and cities from GA
* Capitalize device upon import to match native data
* Leave query limits/offsets until after possibly joining with imported data
* Also import timeOnPage and pageviews for pages from GA
* imported_countries -> imported_locations
* Get timeOnPage and pageviews for pages from GA
These are needed for the pages modal, and for calculating exit rates for
exit pages.
* Add indicator to dashboard when imported data is being used
* Don't show imported data as separately line on main graph
* "bounce_rate" -> :bounce_rate, so it works in subqueries
* Drop imported browser and OS versions
These are not needed.
* Toggle displaying imported data by clicking indicator
* Parse referrers with RefInspector
- Use 'ga:fullReferrer' instead of 'ga:source'. This provides the actual
referrer host + path, whereas 'ga:source' includes utm_mediums and
other values when relevant.
- 'ga:fullReferror' does however include search engine names directly,
so they are manually checked for as RefInspector won't pick up on
these.
* Keep imported data indicator on dashboard and strikethrough when hidden
* Add unlink google button to import panel
* Rename some GA browsers and OSes to plausible versions
* Get main top pages and exit pages panels working correctly with imported data
* mix format
* Fetch time_on_pages for imported data when needed
* entry pages need to fetch bounces from GA
* "sample_percent" -> :sample_percent as only atoms can be used in subqueries
* Calculate bounce_rate for joined native and imported data for top pages modal
* Flip some query bindings around to be less misleading
* Fixup entry page modal visit durations
* mix format
* Fetch bounces and visit_duration for sources from GA
* add more source metrics used for data in modals
* Make sources modals display correct values
* imported_visitors: bounce_rate -> bounces, avg_visit_duration -> visit_duration
* Merge imported data into aggregate stats
* Reformat top graph side icons
* Ensure sample_percent is yielded from aggregate data
* filter event_props should be strings
* Hide imported data from frontend when using filter
* Fix existing tests
* fix tests
* Fix imported indicator appearing when filtering
* comma needed, lost when rebasing
* Import utm_terms and utm_content from GA
* Merge imported utm_term and utm_content
* Rename imported Countries data as Locations
* Set imported city schema field to int
* Remove utm_terms and utm_content when clearing imported
* Clean locations import from Google Analytics
- Country and region should be set to "" when GA provides "(not set)"
- City should be set to 0 for "unknown", as we cannot reliably import
city data from GA.
* Display imported region and city in dashboard
* os -> operating_system in some parts of code
The inconsistency of using os in some places and operating_system in
others causes trouble with subqueries and joins for the native and
imported data, which would require additional logic to account for. The
simplest solution is the just use a consistent word for all uses. This
doesn't make any user-facing or database changes.
* to_atom -> to_existing_atom
* format
* "events" metric -> :events
* ignore imported data when "events" in metrics
* update "bounce_rate"
* atomise some more metrics from new city and region api
* atomise some more metrics for email handlers
* "conversion_rate" -> :conversion_rate during csv export
* Move imported data stats code to own module
* Move imported timeseries function to Stats.Imported
* Use Timex.parse to import dates from GA
* has_imported_stats -> imported_source
* "time_on_page" -> :time_on_page
* Convert imported GA data to UTC
* Clean up GA request code a bit
There was some weird logic here with two separate lists that really
ought to be together, so this merges those.
* Fail sooner if GA timezone can't be identified
* Link imported tables to site by id
* imported_utm_content -> imported_utm_contents
* Imported GA from all of time
* Reorganise GA data fetch logic
- Fetch data from the start of time (2005)
- Check whether no data was fetched, and if so, inform user and don't
consider data to be imported.
* Clarify removal of "visits" data when it isn't in metrics
* Apply location filters from API
This makes it consistent with the sources etc which filter out 'Direct /
None' on the API side. These filters are used by both the native and
imported data handling code, which would otherwise both duplicate the
filters in their `where` clauses.
* Do not use changeset for setting site.imported_source
* Add all metrics to all dimensions
* Run GA import in the background
* Send email when GA import completes
* Add handler to insert imported data into tests and imported_browsers_factory
* Add remaining import data test factories
* Add imported location data to test
* Test main graph with imported data
* Add imported data to operating systems tests
* Add imported data to pages tests
* Add imported data to entry pages tests
* Add imported data to exit pages tests
* Add imported data to devices tests
* Add imported data to sources tests
* Add imported data to UTM tests
* Add new test module for the data import step
* Test import of sources GA data
* Test import of utm_mediums GA data
* Test import of utm_campaigns GA data
* Add tests for UTM terms
* Add tests for UTM contents
* Add test for importing pages and entry pages data from GA
* Add test for importing exit page data
* Fix module file name typo
* Add test for importing location data from GA
* Add test for importing devices data from GA
* Add test for importing browsers data from GA
* Add test for importing OS data from GA
* Paginate GA requests to download all data
* Bump clickhouse_ecto version
* Move RefInspector wrapper function into module
* Drop timezone transform on import
* Order imported by side_id then date
* More strings -> atoms
Also changes a conditional to be a bit nicer
* Remove parallelisation of data import
* Split sources and UTM sources from fetched GA data
GA has only a "source" dimension and no "UTM source" dimension. Instead
it returns these combined. The logic herein to tease these apart is:
1. "(direct)" -> it's a direct source
2. if the source is a domain -> it's a source
3. "google" -> it's from adwords; let's make this a UTM source "adwords"
4. else -> just a UTM source
* Keep prop names in queries as strings
* fix typo
* Fix import
* Insert data to clickhouse in batches
* Fix link when removing imported data
* Merge source tables
* Import hostname as well as pathname
* Record start and end time of imported data
* Track import progress
* Fix month interval with imported data
* Do not JOIN when imported date range has no overlap
* Fix time on page using exits
Co-authored-by: mcol <mcol@posteo.net>
2022-03-11 00:04:59 +03:00
|
|
|
conn = delete(conn, "/#{site.domain}/settings/google-search")
|
2020-06-30 11:11:47 +03:00
|
|
|
|
|
|
|
refute Repo.exists?(Plausible.Site.GoogleAuth)
|
2021-10-26 11:59:14 +03:00
|
|
|
assert redirected_to(conn, 302) == "/#{site.domain}/settings/search-console"
|
2020-06-30 11:11:47 +03:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2019-10-31 09:20:45 +03:00
|
|
|
describe "GET /:website/goals/new" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "shows form to create a new goal", %{conn: conn, site: site} do
|
|
|
|
conn = get(conn, "/#{site.domain}/goals/new")
|
|
|
|
|
|
|
|
assert html_response(conn, 200) =~ "Add goal"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2019-10-31 08:39:51 +03:00
|
|
|
describe "POST /:website/goals" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "creates a pageview goal for the website", %{conn: conn, site: site} do
|
2021-10-26 11:59:14 +03:00
|
|
|
conn =
|
|
|
|
post(conn, "/#{site.domain}/goals", %{
|
|
|
|
goal: %{
|
|
|
|
page_path: "/success",
|
|
|
|
event_name: ""
|
|
|
|
}
|
|
|
|
})
|
2019-10-31 08:39:51 +03:00
|
|
|
|
|
|
|
goal = Repo.one(Plausible.Goal)
|
|
|
|
|
2019-10-31 09:36:16 +03:00
|
|
|
assert goal.page_path == "/success"
|
2019-10-31 08:39:51 +03:00
|
|
|
assert goal.event_name == nil
|
2021-10-26 11:59:14 +03:00
|
|
|
assert redirected_to(conn, 302) == "/#{site.domain}/settings/goals"
|
2019-10-31 08:39:51 +03:00
|
|
|
end
|
|
|
|
|
|
|
|
test "creates a custom event goal for the website", %{conn: conn, site: site} do
|
2021-10-26 11:59:14 +03:00
|
|
|
conn =
|
|
|
|
post(conn, "/#{site.domain}/goals", %{
|
|
|
|
goal: %{
|
|
|
|
page_path: "",
|
|
|
|
event_name: "Signup"
|
|
|
|
}
|
|
|
|
})
|
2019-10-31 08:39:51 +03:00
|
|
|
|
|
|
|
goal = Repo.one(Plausible.Goal)
|
|
|
|
|
2019-10-31 09:36:16 +03:00
|
|
|
assert goal.event_name == "Signup"
|
2019-10-31 08:39:51 +03:00
|
|
|
assert goal.page_path == nil
|
2021-10-26 11:59:14 +03:00
|
|
|
assert redirected_to(conn, 302) == "/#{site.domain}/settings/goals"
|
2019-10-31 08:39:51 +03:00
|
|
|
end
|
|
|
|
end
|
2019-10-31 09:20:45 +03:00
|
|
|
|
|
|
|
describe "DELETE /:website/goals/:id" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "lists goals for the site", %{conn: conn, site: site} do
|
2019-10-31 09:36:16 +03:00
|
|
|
goal = insert(:goal, domain: site.domain, event_name: "Custom event")
|
2019-10-31 09:20:45 +03:00
|
|
|
|
2021-10-26 11:59:14 +03:00
|
|
|
conn = delete(conn, "/#{site.domain}/goals/#{goal.id}")
|
2019-10-31 09:20:45 +03:00
|
|
|
|
|
|
|
assert Repo.aggregate(Plausible.Goal, :count, :id) == 0
|
2021-10-26 11:59:14 +03:00
|
|
|
assert redirected_to(conn, 302) == "/#{site.domain}/settings/goals"
|
2019-10-31 09:20:45 +03:00
|
|
|
end
|
|
|
|
end
|
2020-01-22 12:16:53 +03:00
|
|
|
|
|
|
|
describe "POST /sites/:website/weekly-report/enable" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
2020-06-08 10:35:13 +03:00
|
|
|
test "creates a weekly report record with the user email", %{
|
|
|
|
conn: conn,
|
|
|
|
site: site,
|
|
|
|
user: user
|
|
|
|
} do
|
2020-01-22 12:16:53 +03:00
|
|
|
post(conn, "/sites/#{site.domain}/weekly-report/enable")
|
|
|
|
|
|
|
|
report = Repo.get_by(Plausible.Site.WeeklyReport, site_id: site.id)
|
|
|
|
assert report.recipients == [user.email]
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "POST /sites/:website/weekly-report/disable" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "deletes the weekly report record", %{conn: conn, site: site} do
|
|
|
|
insert(:weekly_report, site: site)
|
|
|
|
|
|
|
|
post(conn, "/sites/#{site.domain}/weekly-report/disable")
|
|
|
|
|
|
|
|
refute Repo.get_by(Plausible.Site.WeeklyReport, site_id: site.id)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "POST /sites/:website/weekly-report/recipients" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "adds a recipient to the weekly report", %{conn: conn, site: site} do
|
|
|
|
insert(:weekly_report, site: site)
|
|
|
|
|
|
|
|
post(conn, "/sites/#{site.domain}/weekly-report/recipients", recipient: "user@email.com")
|
|
|
|
|
|
|
|
report = Repo.get_by(Plausible.Site.WeeklyReport, site_id: site.id)
|
|
|
|
assert report.recipients == ["user@email.com"]
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "DELETE /sites/:website/weekly-report/recipients/:recipient" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "removes a recipient from the weekly report", %{conn: conn, site: site} do
|
|
|
|
insert(:weekly_report, site: site, recipients: ["recipient@email.com"])
|
|
|
|
|
|
|
|
delete(conn, "/sites/#{site.domain}/weekly-report/recipients/recipient@email.com")
|
|
|
|
|
|
|
|
report = Repo.get_by(Plausible.Site.WeeklyReport, site_id: site.id)
|
|
|
|
assert report.recipients == []
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "POST /sites/:website/monthly-report/enable" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
2020-06-08 10:35:13 +03:00
|
|
|
test "creates a monthly report record with the user email", %{
|
|
|
|
conn: conn,
|
|
|
|
site: site,
|
|
|
|
user: user
|
|
|
|
} do
|
2020-01-22 12:16:53 +03:00
|
|
|
post(conn, "/sites/#{site.domain}/monthly-report/enable")
|
|
|
|
|
|
|
|
report = Repo.get_by(Plausible.Site.MonthlyReport, site_id: site.id)
|
|
|
|
assert report.recipients == [user.email]
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "POST /sites/:website/monthly-report/disable" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "deletes the monthly report record", %{conn: conn, site: site} do
|
|
|
|
insert(:monthly_report, site: site)
|
|
|
|
|
|
|
|
post(conn, "/sites/#{site.domain}/monthly-report/disable")
|
|
|
|
|
|
|
|
refute Repo.get_by(Plausible.Site.MonthlyReport, site_id: site.id)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "POST /sites/:website/monthly-report/recipients" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "adds a recipient to the monthly report", %{conn: conn, site: site} do
|
|
|
|
insert(:monthly_report, site: site)
|
|
|
|
|
|
|
|
post(conn, "/sites/#{site.domain}/monthly-report/recipients", recipient: "user@email.com")
|
|
|
|
|
|
|
|
report = Repo.get_by(Plausible.Site.MonthlyReport, site_id: site.id)
|
|
|
|
assert report.recipients == ["user@email.com"]
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "DELETE /sites/:website/monthly-report/recipients/:recipient" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "removes a recipient from the monthly report", %{conn: conn, site: site} do
|
|
|
|
insert(:monthly_report, site: site, recipients: ["recipient@email.com"])
|
|
|
|
|
|
|
|
delete(conn, "/sites/#{site.domain}/monthly-report/recipients/recipient@email.com")
|
|
|
|
|
|
|
|
report = Repo.get_by(Plausible.Site.MonthlyReport, site_id: site.id)
|
|
|
|
assert report.recipients == []
|
|
|
|
end
|
|
|
|
end
|
2020-01-29 12:29:11 +03:00
|
|
|
|
2020-12-09 16:59:41 +03:00
|
|
|
describe "POST /sites/:website/spike-notification/enable" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
2020-12-29 16:17:27 +03:00
|
|
|
test "creates a spike notification record with the user email", %{
|
|
|
|
conn: conn,
|
|
|
|
site: site,
|
|
|
|
user: user
|
|
|
|
} do
|
2020-12-09 16:59:41 +03:00
|
|
|
post(conn, "/sites/#{site.domain}/spike-notification/enable")
|
|
|
|
|
|
|
|
notification = Repo.get_by(Plausible.Site.SpikeNotification, site_id: site.id)
|
|
|
|
assert notification.recipients == [user.email]
|
|
|
|
end
|
2021-01-19 12:41:15 +03:00
|
|
|
|
|
|
|
test "does not allow duplicate spike notification to be created", %{
|
|
|
|
conn: conn,
|
|
|
|
site: site
|
|
|
|
} do
|
|
|
|
post(conn, "/sites/#{site.domain}/spike-notification/enable")
|
|
|
|
post(conn, "/sites/#{site.domain}/spike-notification/enable")
|
|
|
|
|
|
|
|
assert Repo.aggregate(
|
|
|
|
from(s in Plausible.Site.SpikeNotification, where: s.site_id == ^site.id),
|
|
|
|
:count
|
|
|
|
) == 1
|
|
|
|
end
|
2020-12-09 16:59:41 +03:00
|
|
|
end
|
|
|
|
|
|
|
|
describe "POST /sites/:website/spike-notification/disable" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "deletes the spike notification record", %{conn: conn, site: site} do
|
|
|
|
insert(:spike_notification, site: site)
|
|
|
|
|
|
|
|
post(conn, "/sites/#{site.domain}/spike-notification/disable")
|
|
|
|
|
|
|
|
refute Repo.get_by(Plausible.Site.SpikeNotification, site_id: site.id)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "PUT /sites/:website/spike-notification" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
2020-12-11 12:50:44 +03:00
|
|
|
test "updates spike notification threshold", %{conn: conn, site: site} do
|
2020-12-09 16:59:41 +03:00
|
|
|
insert(:spike_notification, site: site, threshold: 10)
|
2020-12-29 16:17:27 +03:00
|
|
|
|
|
|
|
put(conn, "/sites/#{site.domain}/spike-notification", %{
|
|
|
|
"spike_notification" => %{"threshold" => "15"}
|
|
|
|
})
|
2020-12-09 16:59:41 +03:00
|
|
|
|
|
|
|
notification = Repo.get_by(Plausible.Site.SpikeNotification, site_id: site.id)
|
|
|
|
assert notification.threshold == 15
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "POST /sites/:website/spike-notification/recipients" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "adds a recipient to the spike notification", %{conn: conn, site: site} do
|
|
|
|
insert(:spike_notification, site: site)
|
|
|
|
|
2020-12-29 16:17:27 +03:00
|
|
|
post(conn, "/sites/#{site.domain}/spike-notification/recipients",
|
|
|
|
recipient: "user@email.com"
|
|
|
|
)
|
2020-12-09 16:59:41 +03:00
|
|
|
|
|
|
|
report = Repo.get_by(Plausible.Site.SpikeNotification, site_id: site.id)
|
|
|
|
assert report.recipients == ["user@email.com"]
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "DELETE /sites/:website/spike-notification/recipients/:recipient" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "removes a recipient from the spike notification", %{conn: conn, site: site} do
|
|
|
|
insert(:spike_notification, site: site, recipients: ["recipient@email.com"])
|
|
|
|
|
|
|
|
delete(conn, "/sites/#{site.domain}/spike-notification/recipients/recipient@email.com")
|
|
|
|
|
|
|
|
report = Repo.get_by(Plausible.Site.SpikeNotification, site_id: site.id)
|
|
|
|
assert report.recipients == []
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-01-29 12:29:11 +03:00
|
|
|
describe "GET /sites/:website/shared-links/new" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "shows form for new shared link", %{conn: conn, site: site} do
|
|
|
|
conn = get(conn, "/sites/#{site.domain}/shared-links/new")
|
|
|
|
|
|
|
|
assert html_response(conn, 200) =~ "New shared link"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-02-26 11:54:21 +03:00
|
|
|
describe "POST /sites/:website/shared-links" do
|
2020-01-29 12:29:11 +03:00
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "creates shared link without password", %{conn: conn, site: site} do
|
2021-04-06 14:32:38 +03:00
|
|
|
post(conn, "/sites/#{site.domain}/shared-links", %{
|
|
|
|
"shared_link" => %{"name" => "Link name"}
|
|
|
|
})
|
2020-01-29 12:29:11 +03:00
|
|
|
|
|
|
|
link = Repo.one(Plausible.Site.SharedLink)
|
|
|
|
|
|
|
|
refute is_nil(link.slug)
|
|
|
|
assert is_nil(link.password_hash)
|
2021-04-06 14:32:38 +03:00
|
|
|
assert link.name == "Link name"
|
2020-01-29 12:29:11 +03:00
|
|
|
end
|
|
|
|
|
|
|
|
test "creates shared link with password", %{conn: conn, site: site} do
|
|
|
|
post(conn, "/sites/#{site.domain}/shared-links", %{
|
2021-04-06 14:32:38 +03:00
|
|
|
"shared_link" => %{"password" => "password", "name" => "New name"}
|
2020-01-29 12:29:11 +03:00
|
|
|
})
|
|
|
|
|
|
|
|
link = Repo.one(Plausible.Site.SharedLink)
|
|
|
|
|
|
|
|
refute is_nil(link.slug)
|
|
|
|
refute is_nil(link.password_hash)
|
2021-04-06 14:32:38 +03:00
|
|
|
assert link.name == "New name"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "GET /sites/:website/shared-links/edit" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "shows form to edit shared link", %{conn: conn, site: site} do
|
|
|
|
link = insert(:shared_link, site: site)
|
|
|
|
conn = get(conn, "/sites/#{site.domain}/shared-links/#{link.slug}/edit")
|
|
|
|
|
|
|
|
assert html_response(conn, 200) =~ "Edit shared link"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "PUT /sites/:website/shared-links/:slug" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "can update link name", %{conn: conn, site: site} do
|
|
|
|
link = insert(:shared_link, site: site)
|
|
|
|
|
|
|
|
put(conn, "/sites/#{site.domain}/shared-links/#{link.slug}", %{
|
|
|
|
"shared_link" => %{"name" => "Updated link name"}
|
|
|
|
})
|
|
|
|
|
|
|
|
link = Repo.one(Plausible.Site.SharedLink)
|
|
|
|
|
|
|
|
assert link.name == "Updated link name"
|
2020-01-29 12:29:11 +03:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "DELETE /sites/:website/shared-links/:slug" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "shows form for new shared link", %{conn: conn, site: site} do
|
|
|
|
link = insert(:shared_link, site: site)
|
|
|
|
|
|
|
|
conn = delete(conn, "/sites/#{site.domain}/shared-links/#{link.slug}")
|
|
|
|
|
|
|
|
refute Repo.one(Plausible.Site.SharedLink)
|
|
|
|
assert redirected_to(conn, 302) =~ "/#{site.domain}/settings"
|
|
|
|
end
|
|
|
|
end
|
2020-02-26 11:54:21 +03:00
|
|
|
|
2020-06-30 11:00:19 +03:00
|
|
|
describe "DELETE sites/:website/custom-domains/:id" do
|
|
|
|
setup [:create_user, :log_in, :create_site]
|
|
|
|
|
|
|
|
test "lists goals for the site", %{conn: conn, site: site} do
|
|
|
|
domain = insert(:custom_domain, site: site)
|
|
|
|
|
|
|
|
delete(conn, "/sites/#{site.domain}/custom-domains/#{domain.id}")
|
|
|
|
|
|
|
|
assert Repo.aggregate(Plausible.Site.CustomDomain, :count, :id) == 0
|
|
|
|
end
|
|
|
|
end
|
[Continued] Google Analytics import (#1753)
* Add has_imported_stats boolean to Site
* Add Google Analytics import panel to general settings
* Get GA profiles to display in import settings panel
* Add import_from_google method as entrypoint to import data
* Add imported_visitors table
* Remove conflicting code from migration
* Import visitors data into clickhouse database
* Pass another dataset to main graph for rendering in red
This adds another entry to the JSON data returned via the main graph API
called `imported_plot`, which is similar to `plot` in form but will be
completed with previously imported data. Currently it simply returns
the values from `plot` / 2. The data is rendered in the main graph in
red without fill, and without an indicator for the present. Rationale:
imported data will not continue to grow so there is no projection
forward, only backwards.
* Hook imported GA data to dashboard timeseries plot
* Add settings option to forget imported data
* Import sources from google analytics
* Merge imported sources when queried
* Merge imported source data native data when querying sources
* Start converting metrics to atoms so they can be subqueried
This changes "visitors" and in some places "sources" to atoms. This does
not change the behaviour of the functions - the tests all pass unchanged
following this commit. This is necessary as joining subqueries requires
that the keys in `select` statements be atoms and not strings.
* Convery GA (direct) source to empty string
* Import utm campaign and utm medium from GA
* format
* Import all data types from GA into new tables
* Handle large amounts of more data more safely
* Fix some mistakes in tables
* Make GA requests in chunks of 5 queries
* Only display imported timeseries when there is no filter
* Correctly show last 30 minutes timeseries when 'realtime'
* Add with_imported key to Query struct
* Account for injected :is_not filter on sources from dashboard
* Also add tentative imported_utm_sources table
This needs a bit more work on the google import side, as GA do not
report sources and utm sources as distinct things.
* Return imported data to dashboard for rest of Sources panel
This extends the merge_imported function definition for sources to
utm_sources, utm_mediums and utm_campaigns too. This appears to be
working on the DB side but something is incomplete on the client side.
* Clear imported stats from all tables when requested
* Merge entry pages and exit pages from imported data into unfiltered dashboard view
This requires converting the `"visits"` and `"visit_duration"` metrics
to atoms so that they can be used in ecto subqueries.
* Display imported devices, browsers and OSs on dashboard
* Display imported country data on dashboard
* Add more metrics to entries/exits for modals
* make sure data is returned via API with correct keys
* Import regions and cities from GA
* Capitalize device upon import to match native data
* Leave query limits/offsets until after possibly joining with imported data
* Also import timeOnPage and pageviews for pages from GA
* imported_countries -> imported_locations
* Get timeOnPage and pageviews for pages from GA
These are needed for the pages modal, and for calculating exit rates for
exit pages.
* Add indicator to dashboard when imported data is being used
* Don't show imported data as separately line on main graph
* "bounce_rate" -> :bounce_rate, so it works in subqueries
* Drop imported browser and OS versions
These are not needed.
* Toggle displaying imported data by clicking indicator
* Parse referrers with RefInspector
- Use 'ga:fullReferrer' instead of 'ga:source'. This provides the actual
referrer host + path, whereas 'ga:source' includes utm_mediums and
other values when relevant.
- 'ga:fullReferror' does however include search engine names directly,
so they are manually checked for as RefInspector won't pick up on
these.
* Keep imported data indicator on dashboard and strikethrough when hidden
* Add unlink google button to import panel
* Rename some GA browsers and OSes to plausible versions
* Get main top pages and exit pages panels working correctly with imported data
* mix format
* Fetch time_on_pages for imported data when needed
* entry pages need to fetch bounces from GA
* "sample_percent" -> :sample_percent as only atoms can be used in subqueries
* Calculate bounce_rate for joined native and imported data for top pages modal
* Flip some query bindings around to be less misleading
* Fixup entry page modal visit durations
* mix format
* Fetch bounces and visit_duration for sources from GA
* add more source metrics used for data in modals
* Make sources modals display correct values
* imported_visitors: bounce_rate -> bounces, avg_visit_duration -> visit_duration
* Merge imported data into aggregate stats
* Reformat top graph side icons
* Ensure sample_percent is yielded from aggregate data
* filter event_props should be strings
* Hide imported data from frontend when using filter
* Fix existing tests
* fix tests
* Fix imported indicator appearing when filtering
* comma needed, lost when rebasing
* Import utm_terms and utm_content from GA
* Merge imported utm_term and utm_content
* Rename imported Countries data as Locations
* Set imported city schema field to int
* Remove utm_terms and utm_content when clearing imported
* Clean locations import from Google Analytics
- Country and region should be set to "" when GA provides "(not set)"
- City should be set to 0 for "unknown", as we cannot reliably import
city data from GA.
* Display imported region and city in dashboard
* os -> operating_system in some parts of code
The inconsistency of using os in some places and operating_system in
others causes trouble with subqueries and joins for the native and
imported data, which would require additional logic to account for. The
simplest solution is the just use a consistent word for all uses. This
doesn't make any user-facing or database changes.
* to_atom -> to_existing_atom
* format
* "events" metric -> :events
* ignore imported data when "events" in metrics
* update "bounce_rate"
* atomise some more metrics from new city and region api
* atomise some more metrics for email handlers
* "conversion_rate" -> :conversion_rate during csv export
* Move imported data stats code to own module
* Move imported timeseries function to Stats.Imported
* Use Timex.parse to import dates from GA
* has_imported_stats -> imported_source
* "time_on_page" -> :time_on_page
* Convert imported GA data to UTC
* Clean up GA request code a bit
There was some weird logic here with two separate lists that really
ought to be together, so this merges those.
* Fail sooner if GA timezone can't be identified
* Link imported tables to site by id
* imported_utm_content -> imported_utm_contents
* Imported GA from all of time
* Reorganise GA data fetch logic
- Fetch data from the start of time (2005)
- Check whether no data was fetched, and if so, inform user and don't
consider data to be imported.
* Clarify removal of "visits" data when it isn't in metrics
* Apply location filters from API
This makes it consistent with the sources etc which filter out 'Direct /
None' on the API side. These filters are used by both the native and
imported data handling code, which would otherwise both duplicate the
filters in their `where` clauses.
* Do not use changeset for setting site.imported_source
* Add all metrics to all dimensions
* Run GA import in the background
* Send email when GA import completes
* Add handler to insert imported data into tests and imported_browsers_factory
* Add remaining import data test factories
* Add imported location data to test
* Test main graph with imported data
* Add imported data to operating systems tests
* Add imported data to pages tests
* Add imported data to entry pages tests
* Add imported data to exit pages tests
* Add imported data to devices tests
* Add imported data to sources tests
* Add imported data to UTM tests
* Add new test module for the data import step
* Test import of sources GA data
* Test import of utm_mediums GA data
* Test import of utm_campaigns GA data
* Add tests for UTM terms
* Add tests for UTM contents
* Add test for importing pages and entry pages data from GA
* Add test for importing exit page data
* Fix module file name typo
* Add test for importing location data from GA
* Add test for importing devices data from GA
* Add test for importing browsers data from GA
* Add test for importing OS data from GA
* Paginate GA requests to download all data
* Bump clickhouse_ecto version
* Move RefInspector wrapper function into module
* Drop timezone transform on import
* Order imported by side_id then date
* More strings -> atoms
Also changes a conditional to be a bit nicer
* Remove parallelisation of data import
* Split sources and UTM sources from fetched GA data
GA has only a "source" dimension and no "UTM source" dimension. Instead
it returns these combined. The logic herein to tease these apart is:
1. "(direct)" -> it's a direct source
2. if the source is a domain -> it's a source
3. "google" -> it's from adwords; let's make this a UTM source "adwords"
4. else -> just a UTM source
* Keep prop names in queries as strings
* fix typo
* Fix import
* Insert data to clickhouse in batches
* Fix link when removing imported data
* Merge source tables
* Import hostname as well as pathname
* Record start and end time of imported data
* Track import progress
* Fix month interval with imported data
* Do not JOIN when imported date range has no overlap
* Fix time on page using exits
Co-authored-by: mcol <mcol@posteo.net>
2022-03-11 00:04:59 +03:00
|
|
|
|
|
|
|
describe "POST /:website/settings/google-import" do
|
|
|
|
setup [:create_user, :log_in, :create_new_site]
|
|
|
|
|
|
|
|
test "adds in-progress imported tag to site", %{conn: conn, site: site} do
|
2022-03-21 13:47:27 +03:00
|
|
|
post(conn, "/#{site.domain}/settings/google-import", %{
|
2022-03-21 13:55:20 +03:00
|
|
|
"view_id" => "123",
|
2022-03-21 13:47:27 +03:00
|
|
|
"end_date" => "2022-03-01"
|
|
|
|
})
|
[Continued] Google Analytics import (#1753)
* Add has_imported_stats boolean to Site
* Add Google Analytics import panel to general settings
* Get GA profiles to display in import settings panel
* Add import_from_google method as entrypoint to import data
* Add imported_visitors table
* Remove conflicting code from migration
* Import visitors data into clickhouse database
* Pass another dataset to main graph for rendering in red
This adds another entry to the JSON data returned via the main graph API
called `imported_plot`, which is similar to `plot` in form but will be
completed with previously imported data. Currently it simply returns
the values from `plot` / 2. The data is rendered in the main graph in
red without fill, and without an indicator for the present. Rationale:
imported data will not continue to grow so there is no projection
forward, only backwards.
* Hook imported GA data to dashboard timeseries plot
* Add settings option to forget imported data
* Import sources from google analytics
* Merge imported sources when queried
* Merge imported source data native data when querying sources
* Start converting metrics to atoms so they can be subqueried
This changes "visitors" and in some places "sources" to atoms. This does
not change the behaviour of the functions - the tests all pass unchanged
following this commit. This is necessary as joining subqueries requires
that the keys in `select` statements be atoms and not strings.
* Convery GA (direct) source to empty string
* Import utm campaign and utm medium from GA
* format
* Import all data types from GA into new tables
* Handle large amounts of more data more safely
* Fix some mistakes in tables
* Make GA requests in chunks of 5 queries
* Only display imported timeseries when there is no filter
* Correctly show last 30 minutes timeseries when 'realtime'
* Add with_imported key to Query struct
* Account for injected :is_not filter on sources from dashboard
* Also add tentative imported_utm_sources table
This needs a bit more work on the google import side, as GA do not
report sources and utm sources as distinct things.
* Return imported data to dashboard for rest of Sources panel
This extends the merge_imported function definition for sources to
utm_sources, utm_mediums and utm_campaigns too. This appears to be
working on the DB side but something is incomplete on the client side.
* Clear imported stats from all tables when requested
* Merge entry pages and exit pages from imported data into unfiltered dashboard view
This requires converting the `"visits"` and `"visit_duration"` metrics
to atoms so that they can be used in ecto subqueries.
* Display imported devices, browsers and OSs on dashboard
* Display imported country data on dashboard
* Add more metrics to entries/exits for modals
* make sure data is returned via API with correct keys
* Import regions and cities from GA
* Capitalize device upon import to match native data
* Leave query limits/offsets until after possibly joining with imported data
* Also import timeOnPage and pageviews for pages from GA
* imported_countries -> imported_locations
* Get timeOnPage and pageviews for pages from GA
These are needed for the pages modal, and for calculating exit rates for
exit pages.
* Add indicator to dashboard when imported data is being used
* Don't show imported data as separately line on main graph
* "bounce_rate" -> :bounce_rate, so it works in subqueries
* Drop imported browser and OS versions
These are not needed.
* Toggle displaying imported data by clicking indicator
* Parse referrers with RefInspector
- Use 'ga:fullReferrer' instead of 'ga:source'. This provides the actual
referrer host + path, whereas 'ga:source' includes utm_mediums and
other values when relevant.
- 'ga:fullReferror' does however include search engine names directly,
so they are manually checked for as RefInspector won't pick up on
these.
* Keep imported data indicator on dashboard and strikethrough when hidden
* Add unlink google button to import panel
* Rename some GA browsers and OSes to plausible versions
* Get main top pages and exit pages panels working correctly with imported data
* mix format
* Fetch time_on_pages for imported data when needed
* entry pages need to fetch bounces from GA
* "sample_percent" -> :sample_percent as only atoms can be used in subqueries
* Calculate bounce_rate for joined native and imported data for top pages modal
* Flip some query bindings around to be less misleading
* Fixup entry page modal visit durations
* mix format
* Fetch bounces and visit_duration for sources from GA
* add more source metrics used for data in modals
* Make sources modals display correct values
* imported_visitors: bounce_rate -> bounces, avg_visit_duration -> visit_duration
* Merge imported data into aggregate stats
* Reformat top graph side icons
* Ensure sample_percent is yielded from aggregate data
* filter event_props should be strings
* Hide imported data from frontend when using filter
* Fix existing tests
* fix tests
* Fix imported indicator appearing when filtering
* comma needed, lost when rebasing
* Import utm_terms and utm_content from GA
* Merge imported utm_term and utm_content
* Rename imported Countries data as Locations
* Set imported city schema field to int
* Remove utm_terms and utm_content when clearing imported
* Clean locations import from Google Analytics
- Country and region should be set to "" when GA provides "(not set)"
- City should be set to 0 for "unknown", as we cannot reliably import
city data from GA.
* Display imported region and city in dashboard
* os -> operating_system in some parts of code
The inconsistency of using os in some places and operating_system in
others causes trouble with subqueries and joins for the native and
imported data, which would require additional logic to account for. The
simplest solution is the just use a consistent word for all uses. This
doesn't make any user-facing or database changes.
* to_atom -> to_existing_atom
* format
* "events" metric -> :events
* ignore imported data when "events" in metrics
* update "bounce_rate"
* atomise some more metrics from new city and region api
* atomise some more metrics for email handlers
* "conversion_rate" -> :conversion_rate during csv export
* Move imported data stats code to own module
* Move imported timeseries function to Stats.Imported
* Use Timex.parse to import dates from GA
* has_imported_stats -> imported_source
* "time_on_page" -> :time_on_page
* Convert imported GA data to UTC
* Clean up GA request code a bit
There was some weird logic here with two separate lists that really
ought to be together, so this merges those.
* Fail sooner if GA timezone can't be identified
* Link imported tables to site by id
* imported_utm_content -> imported_utm_contents
* Imported GA from all of time
* Reorganise GA data fetch logic
- Fetch data from the start of time (2005)
- Check whether no data was fetched, and if so, inform user and don't
consider data to be imported.
* Clarify removal of "visits" data when it isn't in metrics
* Apply location filters from API
This makes it consistent with the sources etc which filter out 'Direct /
None' on the API side. These filters are used by both the native and
imported data handling code, which would otherwise both duplicate the
filters in their `where` clauses.
* Do not use changeset for setting site.imported_source
* Add all metrics to all dimensions
* Run GA import in the background
* Send email when GA import completes
* Add handler to insert imported data into tests and imported_browsers_factory
* Add remaining import data test factories
* Add imported location data to test
* Test main graph with imported data
* Add imported data to operating systems tests
* Add imported data to pages tests
* Add imported data to entry pages tests
* Add imported data to exit pages tests
* Add imported data to devices tests
* Add imported data to sources tests
* Add imported data to UTM tests
* Add new test module for the data import step
* Test import of sources GA data
* Test import of utm_mediums GA data
* Test import of utm_campaigns GA data
* Add tests for UTM terms
* Add tests for UTM contents
* Add test for importing pages and entry pages data from GA
* Add test for importing exit page data
* Fix module file name typo
* Add test for importing location data from GA
* Add test for importing devices data from GA
* Add test for importing browsers data from GA
* Add test for importing OS data from GA
* Paginate GA requests to download all data
* Bump clickhouse_ecto version
* Move RefInspector wrapper function into module
* Drop timezone transform on import
* Order imported by side_id then date
* More strings -> atoms
Also changes a conditional to be a bit nicer
* Remove parallelisation of data import
* Split sources and UTM sources from fetched GA data
GA has only a "source" dimension and no "UTM source" dimension. Instead
it returns these combined. The logic herein to tease these apart is:
1. "(direct)" -> it's a direct source
2. if the source is a domain -> it's a source
3. "google" -> it's from adwords; let's make this a UTM source "adwords"
4. else -> just a UTM source
* Keep prop names in queries as strings
* fix typo
* Fix import
* Insert data to clickhouse in batches
* Fix link when removing imported data
* Merge source tables
* Import hostname as well as pathname
* Record start and end time of imported data
* Track import progress
* Fix month interval with imported data
* Do not JOIN when imported date range has no overlap
* Fix time on page using exits
Co-authored-by: mcol <mcol@posteo.net>
2022-03-11 00:04:59 +03:00
|
|
|
|
|
|
|
imported_data = Repo.reload(site).imported_data
|
|
|
|
|
|
|
|
assert imported_data
|
|
|
|
assert imported_data.source == "Google Analytics"
|
|
|
|
assert imported_data.end_date == Timex.today()
|
|
|
|
assert imported_data.status == "importing"
|
|
|
|
end
|
|
|
|
|
|
|
|
test "schedules an import job in Oban", %{conn: conn, site: site} do
|
2022-03-21 13:47:27 +03:00
|
|
|
post(conn, "/#{site.domain}/settings/google-import", %{
|
|
|
|
"view_id" => "123",
|
|
|
|
"end_date" => "2022-03-01"
|
|
|
|
})
|
[Continued] Google Analytics import (#1753)
* Add has_imported_stats boolean to Site
* Add Google Analytics import panel to general settings
* Get GA profiles to display in import settings panel
* Add import_from_google method as entrypoint to import data
* Add imported_visitors table
* Remove conflicting code from migration
* Import visitors data into clickhouse database
* Pass another dataset to main graph for rendering in red
This adds another entry to the JSON data returned via the main graph API
called `imported_plot`, which is similar to `plot` in form but will be
completed with previously imported data. Currently it simply returns
the values from `plot` / 2. The data is rendered in the main graph in
red without fill, and without an indicator for the present. Rationale:
imported data will not continue to grow so there is no projection
forward, only backwards.
* Hook imported GA data to dashboard timeseries plot
* Add settings option to forget imported data
* Import sources from google analytics
* Merge imported sources when queried
* Merge imported source data native data when querying sources
* Start converting metrics to atoms so they can be subqueried
This changes "visitors" and in some places "sources" to atoms. This does
not change the behaviour of the functions - the tests all pass unchanged
following this commit. This is necessary as joining subqueries requires
that the keys in `select` statements be atoms and not strings.
* Convery GA (direct) source to empty string
* Import utm campaign and utm medium from GA
* format
* Import all data types from GA into new tables
* Handle large amounts of more data more safely
* Fix some mistakes in tables
* Make GA requests in chunks of 5 queries
* Only display imported timeseries when there is no filter
* Correctly show last 30 minutes timeseries when 'realtime'
* Add with_imported key to Query struct
* Account for injected :is_not filter on sources from dashboard
* Also add tentative imported_utm_sources table
This needs a bit more work on the google import side, as GA do not
report sources and utm sources as distinct things.
* Return imported data to dashboard for rest of Sources panel
This extends the merge_imported function definition for sources to
utm_sources, utm_mediums and utm_campaigns too. This appears to be
working on the DB side but something is incomplete on the client side.
* Clear imported stats from all tables when requested
* Merge entry pages and exit pages from imported data into unfiltered dashboard view
This requires converting the `"visits"` and `"visit_duration"` metrics
to atoms so that they can be used in ecto subqueries.
* Display imported devices, browsers and OSs on dashboard
* Display imported country data on dashboard
* Add more metrics to entries/exits for modals
* make sure data is returned via API with correct keys
* Import regions and cities from GA
* Capitalize device upon import to match native data
* Leave query limits/offsets until after possibly joining with imported data
* Also import timeOnPage and pageviews for pages from GA
* imported_countries -> imported_locations
* Get timeOnPage and pageviews for pages from GA
These are needed for the pages modal, and for calculating exit rates for
exit pages.
* Add indicator to dashboard when imported data is being used
* Don't show imported data as separately line on main graph
* "bounce_rate" -> :bounce_rate, so it works in subqueries
* Drop imported browser and OS versions
These are not needed.
* Toggle displaying imported data by clicking indicator
* Parse referrers with RefInspector
- Use 'ga:fullReferrer' instead of 'ga:source'. This provides the actual
referrer host + path, whereas 'ga:source' includes utm_mediums and
other values when relevant.
- 'ga:fullReferror' does however include search engine names directly,
so they are manually checked for as RefInspector won't pick up on
these.
* Keep imported data indicator on dashboard and strikethrough when hidden
* Add unlink google button to import panel
* Rename some GA browsers and OSes to plausible versions
* Get main top pages and exit pages panels working correctly with imported data
* mix format
* Fetch time_on_pages for imported data when needed
* entry pages need to fetch bounces from GA
* "sample_percent" -> :sample_percent as only atoms can be used in subqueries
* Calculate bounce_rate for joined native and imported data for top pages modal
* Flip some query bindings around to be less misleading
* Fixup entry page modal visit durations
* mix format
* Fetch bounces and visit_duration for sources from GA
* add more source metrics used for data in modals
* Make sources modals display correct values
* imported_visitors: bounce_rate -> bounces, avg_visit_duration -> visit_duration
* Merge imported data into aggregate stats
* Reformat top graph side icons
* Ensure sample_percent is yielded from aggregate data
* filter event_props should be strings
* Hide imported data from frontend when using filter
* Fix existing tests
* fix tests
* Fix imported indicator appearing when filtering
* comma needed, lost when rebasing
* Import utm_terms and utm_content from GA
* Merge imported utm_term and utm_content
* Rename imported Countries data as Locations
* Set imported city schema field to int
* Remove utm_terms and utm_content when clearing imported
* Clean locations import from Google Analytics
- Country and region should be set to "" when GA provides "(not set)"
- City should be set to 0 for "unknown", as we cannot reliably import
city data from GA.
* Display imported region and city in dashboard
* os -> operating_system in some parts of code
The inconsistency of using os in some places and operating_system in
others causes trouble with subqueries and joins for the native and
imported data, which would require additional logic to account for. The
simplest solution is the just use a consistent word for all uses. This
doesn't make any user-facing or database changes.
* to_atom -> to_existing_atom
* format
* "events" metric -> :events
* ignore imported data when "events" in metrics
* update "bounce_rate"
* atomise some more metrics from new city and region api
* atomise some more metrics for email handlers
* "conversion_rate" -> :conversion_rate during csv export
* Move imported data stats code to own module
* Move imported timeseries function to Stats.Imported
* Use Timex.parse to import dates from GA
* has_imported_stats -> imported_source
* "time_on_page" -> :time_on_page
* Convert imported GA data to UTC
* Clean up GA request code a bit
There was some weird logic here with two separate lists that really
ought to be together, so this merges those.
* Fail sooner if GA timezone can't be identified
* Link imported tables to site by id
* imported_utm_content -> imported_utm_contents
* Imported GA from all of time
* Reorganise GA data fetch logic
- Fetch data from the start of time (2005)
- Check whether no data was fetched, and if so, inform user and don't
consider data to be imported.
* Clarify removal of "visits" data when it isn't in metrics
* Apply location filters from API
This makes it consistent with the sources etc which filter out 'Direct /
None' on the API side. These filters are used by both the native and
imported data handling code, which would otherwise both duplicate the
filters in their `where` clauses.
* Do not use changeset for setting site.imported_source
* Add all metrics to all dimensions
* Run GA import in the background
* Send email when GA import completes
* Add handler to insert imported data into tests and imported_browsers_factory
* Add remaining import data test factories
* Add imported location data to test
* Test main graph with imported data
* Add imported data to operating systems tests
* Add imported data to pages tests
* Add imported data to entry pages tests
* Add imported data to exit pages tests
* Add imported data to devices tests
* Add imported data to sources tests
* Add imported data to UTM tests
* Add new test module for the data import step
* Test import of sources GA data
* Test import of utm_mediums GA data
* Test import of utm_campaigns GA data
* Add tests for UTM terms
* Add tests for UTM contents
* Add test for importing pages and entry pages data from GA
* Add test for importing exit page data
* Fix module file name typo
* Add test for importing location data from GA
* Add test for importing devices data from GA
* Add test for importing browsers data from GA
* Add test for importing OS data from GA
* Paginate GA requests to download all data
* Bump clickhouse_ecto version
* Move RefInspector wrapper function into module
* Drop timezone transform on import
* Order imported by side_id then date
* More strings -> atoms
Also changes a conditional to be a bit nicer
* Remove parallelisation of data import
* Split sources and UTM sources from fetched GA data
GA has only a "source" dimension and no "UTM source" dimension. Instead
it returns these combined. The logic herein to tease these apart is:
1. "(direct)" -> it's a direct source
2. if the source is a domain -> it's a source
3. "google" -> it's from adwords; let's make this a UTM source "adwords"
4. else -> just a UTM source
* Keep prop names in queries as strings
* fix typo
* Fix import
* Insert data to clickhouse in batches
* Fix link when removing imported data
* Merge source tables
* Import hostname as well as pathname
* Record start and end time of imported data
* Track import progress
* Fix month interval with imported data
* Do not JOIN when imported date range has no overlap
* Fix time on page using exits
Co-authored-by: mcol <mcol@posteo.net>
2022-03-11 00:04:59 +03:00
|
|
|
|
|
|
|
assert_enqueued(
|
|
|
|
worker: Plausible.Workers.ImportGoogleAnalytics,
|
2022-03-21 13:47:27 +03:00
|
|
|
args: %{"site_id" => site.id, "view_id" => "123", "end_date" => "2022-03-01"}
|
[Continued] Google Analytics import (#1753)
* Add has_imported_stats boolean to Site
* Add Google Analytics import panel to general settings
* Get GA profiles to display in import settings panel
* Add import_from_google method as entrypoint to import data
* Add imported_visitors table
* Remove conflicting code from migration
* Import visitors data into clickhouse database
* Pass another dataset to main graph for rendering in red
This adds another entry to the JSON data returned via the main graph API
called `imported_plot`, which is similar to `plot` in form but will be
completed with previously imported data. Currently it simply returns
the values from `plot` / 2. The data is rendered in the main graph in
red without fill, and without an indicator for the present. Rationale:
imported data will not continue to grow so there is no projection
forward, only backwards.
* Hook imported GA data to dashboard timeseries plot
* Add settings option to forget imported data
* Import sources from google analytics
* Merge imported sources when queried
* Merge imported source data native data when querying sources
* Start converting metrics to atoms so they can be subqueried
This changes "visitors" and in some places "sources" to atoms. This does
not change the behaviour of the functions - the tests all pass unchanged
following this commit. This is necessary as joining subqueries requires
that the keys in `select` statements be atoms and not strings.
* Convery GA (direct) source to empty string
* Import utm campaign and utm medium from GA
* format
* Import all data types from GA into new tables
* Handle large amounts of more data more safely
* Fix some mistakes in tables
* Make GA requests in chunks of 5 queries
* Only display imported timeseries when there is no filter
* Correctly show last 30 minutes timeseries when 'realtime'
* Add with_imported key to Query struct
* Account for injected :is_not filter on sources from dashboard
* Also add tentative imported_utm_sources table
This needs a bit more work on the google import side, as GA do not
report sources and utm sources as distinct things.
* Return imported data to dashboard for rest of Sources panel
This extends the merge_imported function definition for sources to
utm_sources, utm_mediums and utm_campaigns too. This appears to be
working on the DB side but something is incomplete on the client side.
* Clear imported stats from all tables when requested
* Merge entry pages and exit pages from imported data into unfiltered dashboard view
This requires converting the `"visits"` and `"visit_duration"` metrics
to atoms so that they can be used in ecto subqueries.
* Display imported devices, browsers and OSs on dashboard
* Display imported country data on dashboard
* Add more metrics to entries/exits for modals
* make sure data is returned via API with correct keys
* Import regions and cities from GA
* Capitalize device upon import to match native data
* Leave query limits/offsets until after possibly joining with imported data
* Also import timeOnPage and pageviews for pages from GA
* imported_countries -> imported_locations
* Get timeOnPage and pageviews for pages from GA
These are needed for the pages modal, and for calculating exit rates for
exit pages.
* Add indicator to dashboard when imported data is being used
* Don't show imported data as separately line on main graph
* "bounce_rate" -> :bounce_rate, so it works in subqueries
* Drop imported browser and OS versions
These are not needed.
* Toggle displaying imported data by clicking indicator
* Parse referrers with RefInspector
- Use 'ga:fullReferrer' instead of 'ga:source'. This provides the actual
referrer host + path, whereas 'ga:source' includes utm_mediums and
other values when relevant.
- 'ga:fullReferror' does however include search engine names directly,
so they are manually checked for as RefInspector won't pick up on
these.
* Keep imported data indicator on dashboard and strikethrough when hidden
* Add unlink google button to import panel
* Rename some GA browsers and OSes to plausible versions
* Get main top pages and exit pages panels working correctly with imported data
* mix format
* Fetch time_on_pages for imported data when needed
* entry pages need to fetch bounces from GA
* "sample_percent" -> :sample_percent as only atoms can be used in subqueries
* Calculate bounce_rate for joined native and imported data for top pages modal
* Flip some query bindings around to be less misleading
* Fixup entry page modal visit durations
* mix format
* Fetch bounces and visit_duration for sources from GA
* add more source metrics used for data in modals
* Make sources modals display correct values
* imported_visitors: bounce_rate -> bounces, avg_visit_duration -> visit_duration
* Merge imported data into aggregate stats
* Reformat top graph side icons
* Ensure sample_percent is yielded from aggregate data
* filter event_props should be strings
* Hide imported data from frontend when using filter
* Fix existing tests
* fix tests
* Fix imported indicator appearing when filtering
* comma needed, lost when rebasing
* Import utm_terms and utm_content from GA
* Merge imported utm_term and utm_content
* Rename imported Countries data as Locations
* Set imported city schema field to int
* Remove utm_terms and utm_content when clearing imported
* Clean locations import from Google Analytics
- Country and region should be set to "" when GA provides "(not set)"
- City should be set to 0 for "unknown", as we cannot reliably import
city data from GA.
* Display imported region and city in dashboard
* os -> operating_system in some parts of code
The inconsistency of using os in some places and operating_system in
others causes trouble with subqueries and joins for the native and
imported data, which would require additional logic to account for. The
simplest solution is the just use a consistent word for all uses. This
doesn't make any user-facing or database changes.
* to_atom -> to_existing_atom
* format
* "events" metric -> :events
* ignore imported data when "events" in metrics
* update "bounce_rate"
* atomise some more metrics from new city and region api
* atomise some more metrics for email handlers
* "conversion_rate" -> :conversion_rate during csv export
* Move imported data stats code to own module
* Move imported timeseries function to Stats.Imported
* Use Timex.parse to import dates from GA
* has_imported_stats -> imported_source
* "time_on_page" -> :time_on_page
* Convert imported GA data to UTC
* Clean up GA request code a bit
There was some weird logic here with two separate lists that really
ought to be together, so this merges those.
* Fail sooner if GA timezone can't be identified
* Link imported tables to site by id
* imported_utm_content -> imported_utm_contents
* Imported GA from all of time
* Reorganise GA data fetch logic
- Fetch data from the start of time (2005)
- Check whether no data was fetched, and if so, inform user and don't
consider data to be imported.
* Clarify removal of "visits" data when it isn't in metrics
* Apply location filters from API
This makes it consistent with the sources etc which filter out 'Direct /
None' on the API side. These filters are used by both the native and
imported data handling code, which would otherwise both duplicate the
filters in their `where` clauses.
* Do not use changeset for setting site.imported_source
* Add all metrics to all dimensions
* Run GA import in the background
* Send email when GA import completes
* Add handler to insert imported data into tests and imported_browsers_factory
* Add remaining import data test factories
* Add imported location data to test
* Test main graph with imported data
* Add imported data to operating systems tests
* Add imported data to pages tests
* Add imported data to entry pages tests
* Add imported data to exit pages tests
* Add imported data to devices tests
* Add imported data to sources tests
* Add imported data to UTM tests
* Add new test module for the data import step
* Test import of sources GA data
* Test import of utm_mediums GA data
* Test import of utm_campaigns GA data
* Add tests for UTM terms
* Add tests for UTM contents
* Add test for importing pages and entry pages data from GA
* Add test for importing exit page data
* Fix module file name typo
* Add test for importing location data from GA
* Add test for importing devices data from GA
* Add test for importing browsers data from GA
* Add test for importing OS data from GA
* Paginate GA requests to download all data
* Bump clickhouse_ecto version
* Move RefInspector wrapper function into module
* Drop timezone transform on import
* Order imported by side_id then date
* More strings -> atoms
Also changes a conditional to be a bit nicer
* Remove parallelisation of data import
* Split sources and UTM sources from fetched GA data
GA has only a "source" dimension and no "UTM source" dimension. Instead
it returns these combined. The logic herein to tease these apart is:
1. "(direct)" -> it's a direct source
2. if the source is a domain -> it's a source
3. "google" -> it's from adwords; let's make this a UTM source "adwords"
4. else -> just a UTM source
* Keep prop names in queries as strings
* fix typo
* Fix import
* Insert data to clickhouse in batches
* Fix link when removing imported data
* Merge source tables
* Import hostname as well as pathname
* Record start and end time of imported data
* Track import progress
* Fix month interval with imported data
* Do not JOIN when imported date range has no overlap
* Fix time on page using exits
Co-authored-by: mcol <mcol@posteo.net>
2022-03-11 00:04:59 +03:00
|
|
|
)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "DELETE /:website/settings/:forget_imported" do
|
|
|
|
setup [:create_user, :log_in, :create_new_site]
|
|
|
|
|
|
|
|
test "removes imported_data field from site", %{conn: conn, site: site} do
|
|
|
|
delete(conn, "/#{site.domain}/settings/forget-imported")
|
|
|
|
|
|
|
|
assert Repo.reload(site).imported_data == nil
|
|
|
|
end
|
|
|
|
end
|
2019-09-02 14:29:19 +03:00
|
|
|
end
|