add custom_props.csv to CSV export (under FF)

pull/3167/head
Robert Joonas 3 years ago
parent d4fed0a094
commit d2e9b0add4

@ -34,7 +34,7 @@ defmodule Plausible.Stats.CustomProps do
end
end
defp fetch_prop_names(site, query) do
def fetch_prop_names(site, query) do
case Query.get_filter_by_prefix(query, "event:props:") do
{"event:props:" <> key, _} ->
[key]

@ -1189,7 +1189,33 @@ defmodule PlausibleWeb.Api.StatsController do
props
end
json(conn, props)
if params["csv"] do
props
else
json(conn, props)
end
end
def all_custom_prop_values(conn, params) do
site = conn.assigns[:site]
query = Query.from(site, params) |> Filters.add_prefix()
prop_names = Plausible.Stats.CustomProps.fetch_prop_names(site, query)
values =
prop_names
|> Enum.map(fn prop_key ->
custom_prop_values(conn, Map.put(params, "prop_key", prop_key))
|> Enum.map(&Map.put(&1, :property, prop_key))
|> transform_keys(%{:name => :value})
end)
|> Enum.concat()
percent_or_cr = if query.filters["event:goal"],
do: :conversion_rate,
else: :percentage
to_csv(values, [:property, :value, :visitors, :events, percent_or_cr])
end
def prop_breakdown(conn, params) do

@ -148,6 +148,15 @@ defmodule PlausibleWeb.StatsController do
'prop_breakdown.csv' => fn -> Api.StatsController.all_props_breakdown(conn, params) end
}
csvs =
if FunWithFlags.enabled?(:props) do
Map.put(csvs, 'custom_props.csv', fn ->
Api.StatsController.all_custom_prop_values(conn, params)
end)
else
csvs
end
csv_values =
Map.values(csvs)
|> Plausible.ClickhouseRepo.parallel_tasks()

@ -0,0 +1,2 @@
property,value,visitors,events,conversion_rate
variant,A,1,1,25.0
1 property value visitors events conversion_rate
2 variant A 1 1 25.0

@ -0,0 +1 @@
property,value,visitors,events,percentage
1 property value visitors events percentage

@ -0,0 +1,3 @@
property,value,visitors,events,percentage
variant,(none),3,4,75.0
variant,A,1,1,25.0
1 property value visitors events percentage
2 variant (none) 3 4 75.0
3 variant A 1 1 25.0

@ -0,0 +1,3 @@
property,value,visitors,events,percentage
variant,(none),4,5,80.0
variant,A,1,1,20.0
1 property value visitors events percentage
2 variant (none) 4 5 80.0
3 variant A 1 1 20.0

@ -139,6 +139,37 @@ defmodule PlausibleWeb.StatsControllerTest do
|> response(400)
end
test "exports allowed event props", %{conn: conn, site: site} do
site = Plausible.Sites.set_allowed_event_props(site, ["author", "logged_in"])
populate_stats(site, [
build(:pageview, "meta.key": ["author"], "meta.value": ["uku"]),
build(:pageview, "meta.key": ["author"], "meta.value": ["uku"]),
build(:event, "meta.key": ["author"], "meta.value": ["marko"], name: "Newsletter Signup"),
build(:pageview, user_id: 999, "meta.key": ["logged_in"], "meta.value": ["true"]),
build(:pageview, user_id: 999, "meta.key": ["logged_in"], "meta.value": ["true"]),
build(:pageview, "meta.key": ["disallowed"], "meta.value": ["whatever"]),
build(:pageview)
])
conn = get(conn, "/" <> site.domain <> "/export?period=day")
assert response = response(conn, 200)
{:ok, zip} = :zip.unzip(response, [:memory])
{_filename, result} =
Enum.find(zip, fn {filename, _data} -> filename == 'custom_props.csv' end)
assert parse_csv(result) == [
["property", "value", "visitors", "events", "percentage"],
["author", "(none)", "3", "4", "50.0"],
["author", "uku", "2", "2", "33.3"],
["author", "marko", "1", "1", "16.7"],
["logged_in", "(none)", "5", "5", "83.3"],
["logged_in", "true", "1", "2", "16.7"],
[""]
]
end
test "exports data grouped by interval", %{conn: conn, site: site} do
populate_exported_stats(site)
conn = get(conn, "/" <> site.domain <> "/export?date=2021-10-20&period=30d&interval=week")

@ -2,5 +2,6 @@
Mox.defmock(Plausible.HTTPClient.Mock, for: Plausible.HTTPClient.Interface)
Application.ensure_all_started(:double)
FunWithFlags.enable(:funnels)
FunWithFlags.enable(:props)
Ecto.Adapters.SQL.Sandbox.mode(Plausible.Repo, :manual)
ExUnit.configure(exclude: [:slow])

Loading…
Cancel
Save