Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Fix conversions top stats bug when comparing (#2893)
Vini Brasilfecbc8b4553d
diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.exindex bb0c6dfa66..e820b20821 100644--- a/lib/plausible_web/controllers/api/stats_controller.ex+++ b/lib/plausible_web/controllers/api/stats_controller.ex@@ -328,36 +328,35 @@ defmodule PlausibleWeb.Api.StatsController doenddefp fetch_top_stats(site, %Query{filters: %{"event:goal" => _goal}} = query, comparison_query) do- total_q = Query.remove_event_filters(query, [:goal, :props])-- {prev_converted_visitors, prev_completions} =- if comparison_query do- %{visitors: %{value: prev_converted_visitors}, events: %{value: prev_completions}} =- Stats.aggregate(site, comparison_query, [:visitors, :events])-- {prev_converted_visitors, prev_completions}- else- {nil, nil}- end-- prev_unique_visitors =- if comparison_query do- site- |> Stats.aggregate(comparison_query, [:visitors])- |> get_in([:visitors, :value])- else- nil- end+ totals_query = Query.remove_event_filters(query, [:goal, :props])%{visitors: %{value: unique_visitors}- } = Stats.aggregate(site, total_q, [:visitors])+ } = Stats.aggregate(site, totals_query, [:visitors])%{visitors: %{value: converted_visitors},events: %{value: completions}} = Stats.aggregate(site, query, [:visitors, :events])+ {prev_unique_visitors, prev_converted_visitors, prev_completions} =+ if comparison_query do+ totals_comparison_query = Query.remove_event_filters(comparison_query, [:goal, :props])++ %{+ visitors: %{value: prev_unique_visitors}+ } = Stats.aggregate(site, totals_comparison_query, [:visitors])++ %{+ visitors: %{value: prev_converted_visitors},+ events: %{value: prev_completions}+ } = Stats.aggregate(site, comparison_query, [:visitors, :events])++ {prev_unique_visitors, prev_converted_visitors, prev_completions}+ else+ {nil, nil, nil}+ end+conversion_rate = calculate_cr(unique_visitors, converted_visitors)prev_conversion_rate = calculate_cr(prev_unique_visitors, prev_converted_visitors)diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exsindex 12f0e8efe4..b92dc09011 100644--- a/priv/repo/seeds.exs+++ b/priv/repo/seeds.exs@@ -106,7 +106,9 @@ native_stats_rangebrowser_version: to_string(Enum.random(0..50)),screen_size: Enum.random(["Mobile", "Tablet", "Desktop", "Laptop"]),operating_system: Enum.random(["Windows", "macOS", "Linux"]),- operating_system_version: to_string(Enum.random(0..15))+ operating_system_version: to_string(Enum.random(0..15)),+ pathname:+ Enum.random(["/", "/login", "/settings", "/register", "/docs", "/docs/1", "/docs/2"])]|> Keyword.merge(geolocation)|> then(&Plausible.Factory.build(:pageview, &1))diff --git a/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs b/test/plausible_web/controllers/api/stats_controller/top_stats_test.exsindex 991e6552e8..5ba3a5dbc4 100644--- a/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs@@ -826,5 +826,34 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest doassert %{"change" => 100, "comparison_value" => 0, "name" => "Total visits", "value" => 4} in top_statsend++ test "compares conversion rates", %{conn: conn, site: site} do+ populate_stats(site, [+ build(:pageview, user_id: @user_id, timestamp: ~N[2023-01-03T00:00:00]),+ build(:pageview, user_id: @user_id, timestamp: ~N[2023-01-03T00:00:00]),+ build(:pageview, timestamp: ~N[2023-01-03T00:00:00]),+ build(:event, name: "Signup", timestamp: ~N[2023-01-03T00:00:00]),+ build(:pageview, user_id: @user_id, timestamp: ~N[2023-01-02T00:00:00]),+ build(:event, name: "Signup", timestamp: ~N[2023-01-02T00:00:00]),+ build(:event, name: "Signup", timestamp: ~N[2023-01-02T00:00:00])+ ])++ filters = Jason.encode!(%{goal: "Signup"})++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/top-stats?period=day&date=2023-01-03&comparison=previous_period&filters=#{filters}"+ )++ res = json_response(conn, 200)++ assert %{+ "change" => -50,+ "comparison_value" => 66.7,+ "name" => "Conversion rate",+ "value" => 33.3+ } in res["top_stats"]+ endendend