From 3380685d404e3ac8a00e352d2494aa4607c26f0a Mon Sep 17 00:00:00 2001 From: Matt Colligan <44536113+m-col@users.noreply.github.com> Date: Wed, 10 Nov 2021 14:53:38 +0000 Subject: [PATCH] Fix custom property total conversions value not displayed & Export custom properties (#1456) * Fix custom property total conversions value not displayed The custom property conversion metrics are not consistent with the other metrics resulting in the total conversions not being displayed in the dashboard. This fixes that. * Export custom props of current goal when filtering dashboard for goal This makes the CSV export also output a `prop_breakdown.csv` file which, for the currently filtered goal, contains the conversion data for each of its configured properties. * Add test for goal-filtered CSV export --- .../stats/conversions/prop-breakdown.js | 7 ++-- .../controllers/api/stats_controller.ex | 42 +++++++++++++++++-- .../controllers/stats_controller.ex | 3 +- .../browsers.csv | 0 .../conversions.csv | 2 +- .../CSVs/30d-filter-goal/countries.csv | 1 + .../devices.csv | 0 .../CSVs/30d-filter-goal/entry_pages.csv | 2 + .../CSVs/30d-filter-goal/exit_pages.csv | 2 + .../operating_systems.csv | 0 .../CSVs/30d-filter-goal/pages.csv | 2 + .../CSVs/30d-filter-goal/prop_breakdown.csv | 2 + .../sources.csv | 0 .../utm_campaigns.csv | 0 .../utm_mediums.csv | 0 .../utm_sources.csv | 0 .../CSVs/30d-filter-goal/visitors.csv | 32 ++++++++++++++ .../CSVs/30d-filter-path/browsers.csv | 2 + .../CSVs/30d-filter-path/conversions.csv | 1 + .../countries.csv | 0 .../CSVs/30d-filter-path/devices.csv | 2 + .../entry_pages.csv | 0 .../exit_pages.csv | 0 .../30d-filter-path/operating_systems.csv | 2 + .../pages.csv | 0 .../CSVs/30d-filter-path/prop_breakdown.csv | 1 + .../CSVs/30d-filter-path/sources.csv | 1 + .../CSVs/30d-filter-path/utm_campaigns.csv | 1 + .../CSVs/30d-filter-path/utm_mediums.csv | 1 + .../CSVs/30d-filter-path/utm_sources.csv | 1 + .../visitors.csv | 0 .../controllers/CSVs/30d/conversions.csv | 2 +- .../controllers/CSVs/30d/prop_breakdown.csv | 1 + .../controllers/CSVs/6m/conversions.csv | 2 +- .../controllers/CSVs/6m/prop_breakdown.csv | 1 + .../controllers/CSVs/6m/visitors.csv | 2 +- .../api/stats_controller/conversions_test.exs | 10 ++--- .../controllers/stats_controller_test.exs | 21 +++++++++- 38 files changed, 128 insertions(+), 18 deletions(-) rename test/plausible_web/controllers/CSVs/{30d-filtered => 30d-filter-goal}/browsers.csv (100%) rename test/plausible_web/controllers/CSVs/{30d-filtered => 30d-filter-goal}/conversions.csv (59%) create mode 100644 test/plausible_web/controllers/CSVs/30d-filter-goal/countries.csv rename test/plausible_web/controllers/CSVs/{30d-filtered => 30d-filter-goal}/devices.csv (100%) create mode 100644 test/plausible_web/controllers/CSVs/30d-filter-goal/entry_pages.csv create mode 100644 test/plausible_web/controllers/CSVs/30d-filter-goal/exit_pages.csv rename test/plausible_web/controllers/CSVs/{30d-filtered => 30d-filter-goal}/operating_systems.csv (100%) create mode 100644 test/plausible_web/controllers/CSVs/30d-filter-goal/pages.csv create mode 100644 test/plausible_web/controllers/CSVs/30d-filter-goal/prop_breakdown.csv rename test/plausible_web/controllers/CSVs/{30d-filtered => 30d-filter-goal}/sources.csv (100%) rename test/plausible_web/controllers/CSVs/{30d-filtered => 30d-filter-goal}/utm_campaigns.csv (100%) rename test/plausible_web/controllers/CSVs/{30d-filtered => 30d-filter-goal}/utm_mediums.csv (100%) rename test/plausible_web/controllers/CSVs/{30d-filtered => 30d-filter-goal}/utm_sources.csv (100%) create mode 100644 test/plausible_web/controllers/CSVs/30d-filter-goal/visitors.csv create mode 100644 test/plausible_web/controllers/CSVs/30d-filter-path/browsers.csv create mode 100644 test/plausible_web/controllers/CSVs/30d-filter-path/conversions.csv rename test/plausible_web/controllers/CSVs/{30d-filtered => 30d-filter-path}/countries.csv (100%) create mode 100644 test/plausible_web/controllers/CSVs/30d-filter-path/devices.csv rename test/plausible_web/controllers/CSVs/{30d-filtered => 30d-filter-path}/entry_pages.csv (100%) rename test/plausible_web/controllers/CSVs/{30d-filtered => 30d-filter-path}/exit_pages.csv (100%) create mode 100644 test/plausible_web/controllers/CSVs/30d-filter-path/operating_systems.csv rename test/plausible_web/controllers/CSVs/{30d-filtered => 30d-filter-path}/pages.csv (100%) create mode 100644 test/plausible_web/controllers/CSVs/30d-filter-path/prop_breakdown.csv create mode 100644 test/plausible_web/controllers/CSVs/30d-filter-path/sources.csv create mode 100644 test/plausible_web/controllers/CSVs/30d-filter-path/utm_campaigns.csv create mode 100644 test/plausible_web/controllers/CSVs/30d-filter-path/utm_mediums.csv create mode 100644 test/plausible_web/controllers/CSVs/30d-filter-path/utm_sources.csv rename test/plausible_web/controllers/CSVs/{30d-filtered => 30d-filter-path}/visitors.csv (100%) create mode 100644 test/plausible_web/controllers/CSVs/30d/prop_breakdown.csv create mode 100644 test/plausible_web/controllers/CSVs/6m/prop_breakdown.csv diff --git a/assets/js/dashboard/stats/conversions/prop-breakdown.js b/assets/js/dashboard/stats/conversions/prop-breakdown.js index cab4e4a5a..b9e03f058 100644 --- a/assets/js/dashboard/stats/conversions/prop-breakdown.js +++ b/assets/js/dashboard/stats/conversions/prop-breakdown.js @@ -115,7 +115,8 @@ export default class PropertyBreakdown extends React.Component { return (
- {numberFormatter(value.visitors)} + {numberFormatter(value.unique_conversions)} { viewport > MOBILE_UPPER_WIDTH ? ( {numberFormatter(value.total_count)} + >{numberFormatter(value.total_conversions)} ) : null diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index 182df6715..4b80d34a7 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -611,13 +611,49 @@ defmodule PlausibleWeb.Api.StatsController do Stats.breakdown(site, query, prop_name, ["visitors", "events"], pagination) |> transform_keys(%{ params["prop_name"] => "name", - "events" => "total_conversions" + "events" => "total_conversions", + "visitors" => "unique_conversions" }) |> Enum.map(fn prop -> - Map.put(prop, "conversion_rate", calculate_cr(unique_visitors, prop["visitors"])) + Map.put( + prop, + "conversion_rate", + calculate_cr(unique_visitors, prop["unique_conversions"]) + ) + end) + + if params["csv"] do + props + else + json(conn, props) + end + end + + def all_props_breakdown(conn, params) do + site = conn.assigns[:site] + query = Query.from(site.timezone, params) |> Filters.add_prefix() + + headers = ["prop", "name", "unique_conversions", "total_conversions"] + + prop_names = + if query.filters["event:goal"] do + {_, _, goal} = query.filters["event:goal"] + + Stats.props(site, query) + |> Map.get(goal, []) + else + [] + end + + values = + prop_names + |> Enum.map(fn prop -> + prop_breakdown(conn, Map.put(params, "prop_name", prop)) + |> Enum.map(&Map.put(&1, "prop", prop)) end) + |> Enum.concat() - json(conn, props) + to_csv(values, headers) end def current_visitors(conn, _) do diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex index 4e0469e7c..0b1c213c2 100644 --- a/lib/plausible_web/controllers/stats_controller.ex +++ b/lib/plausible_web/controllers/stats_controller.ex @@ -71,7 +71,8 @@ defmodule PlausibleWeb.StatsController do {'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}, - {'conversions.csv', fn -> Api.StatsController.conversions(conn, params) end} + {'conversions.csv', fn -> Api.StatsController.conversions(conn, params) end}, + {'prop_breakdown.csv', fn -> Api.StatsController.all_props_breakdown(conn, params) end} ] csvs = diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/browsers.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/browsers.csv similarity index 100% rename from test/plausible_web/controllers/CSVs/30d-filtered/browsers.csv rename to test/plausible_web/controllers/CSVs/30d-filter-goal/browsers.csv diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/conversions.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/conversions.csv similarity index 59% rename from test/plausible_web/controllers/CSVs/30d-filtered/conversions.csv rename to test/plausible_web/controllers/CSVs/30d-filter-goal/conversions.csv index f61d3a75c..5c3bf5228 100644 --- a/test/plausible_web/controllers/CSVs/30d-filtered/conversions.csv +++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/conversions.csv @@ -1,2 +1,2 @@ name,unique_conversions,total_conversions -Visit /some-other-page,1,1 +Signup,1,1 diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/countries.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/countries.csv new file mode 100644 index 000000000..1c8339116 --- /dev/null +++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/countries.csv @@ -0,0 +1 @@ +name,visitors diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/devices.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/devices.csv similarity index 100% rename from test/plausible_web/controllers/CSVs/30d-filtered/devices.csv rename to test/plausible_web/controllers/CSVs/30d-filter-goal/devices.csv diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/entry_pages.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/entry_pages.csv new file mode 100644 index 000000000..7424efd6d --- /dev/null +++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/entry_pages.csv @@ -0,0 +1,2 @@ +name,unique_entrances,total_entrances,visit_duration +/,1,1,0 diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/exit_pages.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/exit_pages.csv new file mode 100644 index 000000000..823941f3d --- /dev/null +++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/exit_pages.csv @@ -0,0 +1,2 @@ +name,unique_exits,total_exits,exit_rate +/,1,1, diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/operating_systems.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/operating_systems.csv similarity index 100% rename from test/plausible_web/controllers/CSVs/30d-filtered/operating_systems.csv rename to test/plausible_web/controllers/CSVs/30d-filter-goal/operating_systems.csv diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/pages.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/pages.csv new file mode 100644 index 000000000..18e11559e --- /dev/null +++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/pages.csv @@ -0,0 +1,2 @@ +name,visitors,bounce_rate,time_on_page +/,1,100, diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/prop_breakdown.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/prop_breakdown.csv new file mode 100644 index 000000000..cc987c30c --- /dev/null +++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/prop_breakdown.csv @@ -0,0 +1,2 @@ +prop,name,unique_conversions,total_conversions +variant,A,1,1 diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/sources.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/sources.csv similarity index 100% rename from test/plausible_web/controllers/CSVs/30d-filtered/sources.csv rename to test/plausible_web/controllers/CSVs/30d-filter-goal/sources.csv diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/utm_campaigns.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_campaigns.csv similarity index 100% rename from test/plausible_web/controllers/CSVs/30d-filtered/utm_campaigns.csv rename to test/plausible_web/controllers/CSVs/30d-filter-goal/utm_campaigns.csv diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/utm_mediums.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_mediums.csv similarity index 100% rename from test/plausible_web/controllers/CSVs/30d-filtered/utm_mediums.csv rename to test/plausible_web/controllers/CSVs/30d-filter-goal/utm_mediums.csv diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/utm_sources.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_sources.csv similarity index 100% rename from test/plausible_web/controllers/CSVs/30d-filtered/utm_sources.csv rename to test/plausible_web/controllers/CSVs/30d-filter-goal/utm_sources.csv diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/visitors.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/visitors.csv new file mode 100644 index 000000000..f7e11600a --- /dev/null +++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/visitors.csv @@ -0,0 +1,32 @@ +date,visitors,pageviews,bounce_rate,visit_duration +2021-09-20,0,0,100,0 +2021-09-21,0,0,, +2021-09-22,0,0,, +2021-09-23,0,0,, +2021-09-24,0,0,, +2021-09-25,0,0,, +2021-09-26,0,0,, +2021-09-27,0,0,, +2021-09-28,0,0,, +2021-09-29,0,0,, +2021-09-30,0,0,, +2021-10-01,0,0,, +2021-10-02,0,0,, +2021-10-03,0,0,, +2021-10-04,0,0,, +2021-10-05,0,0,, +2021-10-06,0,0,, +2021-10-07,0,0,, +2021-10-08,0,0,, +2021-10-09,0,0,, +2021-10-10,0,0,, +2021-10-11,0,0,, +2021-10-12,0,0,, +2021-10-13,0,0,, +2021-10-14,0,0,, +2021-10-15,0,0,, +2021-10-16,0,0,, +2021-10-17,0,0,, +2021-10-18,0,0,, +2021-10-19,1,0,100,0 +2021-10-20,0,0,0,60 diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/browsers.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/browsers.csv new file mode 100644 index 000000000..7b062ae5b --- /dev/null +++ b/test/plausible_web/controllers/CSVs/30d-filter-path/browsers.csv @@ -0,0 +1,2 @@ +name,visitors +,1 diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/conversions.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/conversions.csv new file mode 100644 index 000000000..583f280ff --- /dev/null +++ b/test/plausible_web/controllers/CSVs/30d-filter-path/conversions.csv @@ -0,0 +1 @@ +name,unique_conversions,total_conversions diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/countries.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/countries.csv similarity index 100% rename from test/plausible_web/controllers/CSVs/30d-filtered/countries.csv rename to test/plausible_web/controllers/CSVs/30d-filter-path/countries.csv diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/devices.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/devices.csv new file mode 100644 index 000000000..7b062ae5b --- /dev/null +++ b/test/plausible_web/controllers/CSVs/30d-filter-path/devices.csv @@ -0,0 +1,2 @@ +name,visitors +,1 diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/entry_pages.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/entry_pages.csv similarity index 100% rename from test/plausible_web/controllers/CSVs/30d-filtered/entry_pages.csv rename to test/plausible_web/controllers/CSVs/30d-filter-path/entry_pages.csv diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/exit_pages.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/exit_pages.csv similarity index 100% rename from test/plausible_web/controllers/CSVs/30d-filtered/exit_pages.csv rename to test/plausible_web/controllers/CSVs/30d-filter-path/exit_pages.csv diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/operating_systems.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/operating_systems.csv new file mode 100644 index 000000000..7b062ae5b --- /dev/null +++ b/test/plausible_web/controllers/CSVs/30d-filter-path/operating_systems.csv @@ -0,0 +1,2 @@ +name,visitors +,1 diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/pages.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/pages.csv similarity index 100% rename from test/plausible_web/controllers/CSVs/30d-filtered/pages.csv rename to test/plausible_web/controllers/CSVs/30d-filter-path/pages.csv diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/prop_breakdown.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/prop_breakdown.csv new file mode 100644 index 000000000..c31750f13 --- /dev/null +++ b/test/plausible_web/controllers/CSVs/30d-filter-path/prop_breakdown.csv @@ -0,0 +1 @@ +prop,name,unique_conversions,total_conversions diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/sources.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/sources.csv new file mode 100644 index 000000000..773a58cf7 --- /dev/null +++ b/test/plausible_web/controllers/CSVs/30d-filter-path/sources.csv @@ -0,0 +1 @@ +name,visitors,bounce_rate,visit_duration diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/utm_campaigns.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_campaigns.csv new file mode 100644 index 000000000..773a58cf7 --- /dev/null +++ b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_campaigns.csv @@ -0,0 +1 @@ +name,visitors,bounce_rate,visit_duration diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/utm_mediums.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_mediums.csv new file mode 100644 index 000000000..773a58cf7 --- /dev/null +++ b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_mediums.csv @@ -0,0 +1 @@ +name,visitors,bounce_rate,visit_duration diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/utm_sources.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_sources.csv new file mode 100644 index 000000000..773a58cf7 --- /dev/null +++ b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_sources.csv @@ -0,0 +1 @@ +name,visitors,bounce_rate,visit_duration diff --git a/test/plausible_web/controllers/CSVs/30d-filtered/visitors.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/visitors.csv similarity index 100% rename from test/plausible_web/controllers/CSVs/30d-filtered/visitors.csv rename to test/plausible_web/controllers/CSVs/30d-filter-path/visitors.csv diff --git a/test/plausible_web/controllers/CSVs/30d/conversions.csv b/test/plausible_web/controllers/CSVs/30d/conversions.csv index f61d3a75c..5c3bf5228 100644 --- a/test/plausible_web/controllers/CSVs/30d/conversions.csv +++ b/test/plausible_web/controllers/CSVs/30d/conversions.csv @@ -1,2 +1,2 @@ name,unique_conversions,total_conversions -Visit /some-other-page,1,1 +Signup,1,1 diff --git a/test/plausible_web/controllers/CSVs/30d/prop_breakdown.csv b/test/plausible_web/controllers/CSVs/30d/prop_breakdown.csv new file mode 100644 index 000000000..c31750f13 --- /dev/null +++ b/test/plausible_web/controllers/CSVs/30d/prop_breakdown.csv @@ -0,0 +1 @@ +prop,name,unique_conversions,total_conversions diff --git a/test/plausible_web/controllers/CSVs/6m/conversions.csv b/test/plausible_web/controllers/CSVs/6m/conversions.csv index f61d3a75c..5c3bf5228 100644 --- a/test/plausible_web/controllers/CSVs/6m/conversions.csv +++ b/test/plausible_web/controllers/CSVs/6m/conversions.csv @@ -1,2 +1,2 @@ name,unique_conversions,total_conversions -Visit /some-other-page,1,1 +Signup,1,1 diff --git a/test/plausible_web/controllers/CSVs/6m/prop_breakdown.csv b/test/plausible_web/controllers/CSVs/6m/prop_breakdown.csv new file mode 100644 index 000000000..c31750f13 --- /dev/null +++ b/test/plausible_web/controllers/CSVs/6m/prop_breakdown.csv @@ -0,0 +1 @@ +prop,name,unique_conversions,total_conversions diff --git a/test/plausible_web/controllers/CSVs/6m/visitors.csv b/test/plausible_web/controllers/CSVs/6m/visitors.csv index cec87760f..f1209362c 100644 --- a/test/plausible_web/controllers/CSVs/6m/visitors.csv +++ b/test/plausible_web/controllers/CSVs/6m/visitors.csv @@ -4,4 +4,4 @@ date,visitors,pageviews,bounce_rate,visit_duration 2021-07-01,0,0,, 2021-08-01,0,0,, 2021-09-01,1,1,100,0 -2021-10-01,2,3,50,30 +2021-10-01,2,3,67,20 diff --git a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs index 4637ba64b..6c30eeb8b 100644 --- a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs @@ -112,13 +112,13 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ - "visitors" => 2, + "unique_conversions" => 2, "name" => "B", "total_conversions" => 2, "conversion_rate" => 66.7 }, %{ - "visitors" => 1, + "unique_conversions" => 1, "name" => "A", "total_conversions" => 1, "conversion_rate" => 33.3 @@ -148,13 +148,13 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ - "visitors" => 2, + "unique_conversions" => 2, "name" => "(none)", "total_conversions" => 2, "conversion_rate" => 66.7 }, %{ - "visitors" => 1, + "unique_conversions" => 1, "name" => "A", "total_conversions" => 1, "conversion_rate" => 33.3 @@ -182,7 +182,7 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ - "visitors" => 1, + "unique_conversions" => 1, "name" => "B", "total_conversions" => 1, "conversion_rate" => 50.0 diff --git a/test/plausible_web/controllers/stats_controller_test.exs b/test/plausible_web/controllers/stats_controller_test.exs index b488a4968..b7bc91be5 100644 --- a/test/plausible_web/controllers/stats_controller_test.exs +++ b/test/plausible_web/controllers/stats_controller_test.exs @@ -83,7 +83,7 @@ defmodule PlausibleWeb.StatsControllerTest do filters = Jason.encode!(%{page: "/some-other-page"}) conn = get(conn, "/#{site.domain}/export?date=2021-10-20&filters=#{filters}") - assert_zip(conn, "30d-filtered") + assert_zip(conn, "30d-filter-path") end end @@ -140,10 +140,27 @@ defmodule PlausibleWeb.StatsControllerTest do country_code: "EE", referrer_source: "Google", browser: "ABrowserName" + ), + build(:event, + timestamp: Timex.shift(~N[2021-10-20 12:00:00], days: -1), + name: "Signup", + "meta.key": ["variant"], + "meta.value": ["A"] ) ]) - insert(:goal, %{domain: site.domain, page_path: "/some-other-page"}) + insert(:goal, %{domain: site.domain, event_name: "Signup"}) + end + + describe "GET /:website/export - with goal filter" do + setup [:create_user, :create_new_site, :log_in] + + test "exports goal-filtered data in zipped csvs", %{conn: conn, site: site} do + populate_exported_stats(site) + filters = Jason.encode!(%{goal: "Signup"}) + conn = get(conn, "/#{site.domain}/export?date=2021-10-20&filters=#{filters}") + assert_zip(conn, "30d-filter-goal") + end end describe "GET /share/:slug" do