Add cities and regions to exported CSV data (#1485)

pull/1587/head
Matt Colligan 5 years ago committed by GitHub
parent 1ab28875c3
commit 8148d41e42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -585,7 +585,7 @@ defmodule PlausibleWeb.Api.StatsController do
query = Query.from(site.timezone, params) |> Filters.add_prefix()
pagination = parse_pagination(params)
countries =
regions =
Stats.breakdown(site, query, "visit:region", ["visitors"], pagination)
|> transform_keys(%{"region" => "code"})
|> Enum.map(fn region ->
@ -594,7 +594,17 @@ defmodule PlausibleWeb.Api.StatsController do
Map.merge(region, %{"name" => region_entry.name, "country_flag" => country_entry.flag})
end)
json(conn, countries)
if params["csv"] do
if Map.has_key?(query.filters, "event:goal") do
regions
|> transform_keys(%{"visitors" => "conversions"})
|> to_csv(["name", "conversions", "conversion_rate"])
else
regions |> to_csv(["name", "visitors"])
end
else
json(conn, regions)
end
end
def cities(conn, params) do
@ -620,7 +630,17 @@ defmodule PlausibleWeb.Api.StatsController do
end
end)
json(conn, cities)
if params["csv"] do
if Map.has_key?(query.filters, "event:goal") do
cities
|> transform_keys(%{"visitors" => "conversions"})
|> to_csv(["name", "conversions", "conversion_rate"])
else
cities |> to_csv(["name", "visitors"])
end
else
json(conn, cities)
end
end
def browsers(conn, params) do

@ -76,6 +76,8 @@ defmodule PlausibleWeb.StatsController do
{'entry_pages.csv', fn -> Api.StatsController.entry_pages(conn, params) end},
{'exit_pages.csv', fn -> Api.StatsController.exit_pages(conn, limited_params) end},
{'countries.csv', fn -> Api.StatsController.countries(conn, params) end},
{'regions.csv', fn -> Api.StatsController.regions(conn, params) end},
{'cities.csv', fn -> Api.StatsController.cities(conn, params) end},
{'browsers.csv', fn -> Api.StatsController.browsers(conn, params) end},
{'operating_systems.csv', fn -> Api.StatsController.operating_systems(conn, params) end},
{'devices.csv', fn -> Api.StatsController.screen_sizes(conn, params) end},

@ -0,0 +1 @@
name,conversions,conversion_rate
1 name conversions conversion_rate

@ -0,0 +1 @@
name,conversions,conversion_rate
1 name conversions conversion_rate

@ -0,0 +1,2 @@
name,visitors
Tallinn,1
1 name visitors
2 Tallinn 1

@ -0,0 +1,2 @@
name,visitors
Harjumaa,1
1 name visitors
2 Harjumaa 1

@ -0,0 +1,2 @@
name,visitors
Tallinn,1
1 name visitors
2 Tallinn 1

@ -0,0 +1,2 @@
name,visitors
Harjumaa,1
1 name visitors
2 Harjumaa 1

@ -0,0 +1,2 @@
name,visitors
Tallinn,1
1 name visitors
2 Tallinn 1

@ -0,0 +1,2 @@
name,visitors
Harjumaa,1
1 name visitors
2 Harjumaa 1

@ -112,6 +112,8 @@ defmodule PlausibleWeb.StatsControllerTest do
populate_stats(site, [
build(:pageview,
country_code: "EE",
subdivision1_code: "EE-37",
city_geoname_id: 588_409,
pathname: "/",
timestamp: Timex.shift(~N[2021-10-20 12:00:00], minutes: -1),
referrer_source: "Google",
@ -119,6 +121,8 @@ defmodule PlausibleWeb.StatsControllerTest do
),
build(:pageview,
country_code: "EE",
subdivision1_code: "EE-37",
city_geoname_id: 588_409,
pathname: "/some-other-page",
timestamp: Timex.shift(~N[2021-10-20 12:00:00], minutes: -2),
referrer_source: "Google",

Loading…
Cancel
Save