From c4dcd87c08b6bb372b8a9ece1500e943ac7de7db Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Mon, 15 Nov 2021 17:06:39 +0200 Subject: [PATCH] Export fixes --- lib/plausible_web/controllers/api/stats_controller.ex | 2 ++ lib/plausible_web/controllers/stats_controller.ex | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index 40eb8840f..ccec4592a 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -616,6 +616,8 @@ defmodule PlausibleWeb.Api.StatsController do end end + defp calculate_cr(nil, converted_visitors), do: 100.0 + defp calculate_cr(unique_visitors, converted_visitors) do if unique_visitors > 0, do: Float.round(converted_visitors / unique_visitors * 100, 1), diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex index 0b1c213c2..10058c50d 100644 --- a/lib/plausible_web/controllers/stats_controller.ex +++ b/lib/plausible_web/controllers/stats_controller.ex @@ -40,6 +40,11 @@ defmodule PlausibleWeb.StatsController do end end + @doc """ + The export is limited to 300 entries for other reports and 100 entries for pages because bigger result sets + start causing failures. Since we request data like time on page or bounce_rate for pages in a separate query + using the IN filter, it causes the requests to balloon in payload size. + """ def csv_export(conn, params) do site = conn.assigns[:site] query = Query.from(site.timezone, params) |> Filters.add_prefix() @@ -58,15 +63,16 @@ defmodule PlausibleWeb.StatsController do "Plausible export #{params["domain"]} #{Timex.format!(query.date_range.first, "{ISOdate} ")} to #{Timex.format!(query.date_range.last, "{ISOdate} ")}.zip" params = Map.merge(params, %{"limit" => "300", "csv" => "True", "detailed" => "True"}) + limited_params = Map.merge(params, %{"limit" => "100"}) csvs = [ {'sources.csv', fn -> Api.StatsController.sources(conn, params) end}, {'utm_mediums.csv', fn -> Api.StatsController.utm_mediums(conn, params) end}, {'utm_sources.csv', fn -> Api.StatsController.utm_sources(conn, params) end}, {'utm_campaigns.csv', fn -> Api.StatsController.utm_campaigns(conn, params) end}, - {'pages.csv', fn -> Api.StatsController.pages(conn, params) end}, + {'pages.csv', fn -> Api.StatsController.pages(conn, limited_params) end}, {'entry_pages.csv', fn -> Api.StatsController.entry_pages(conn, params) end}, - {'exit_pages.csv', fn -> Api.StatsController.exit_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}, {'browsers.csv', fn -> Api.StatsController.browsers(conn, params) end}, {'operating_systems.csv', fn -> Api.StatsController.operating_systems(conn, params) end},