diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index bb0c6dfa6..e820b2082 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 do end defp 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.exs index 12f0e8efe..b92dc0901 100644 --- a/priv/repo/seeds.exs +++ b/priv/repo/seeds.exs @@ -106,7 +106,9 @@ native_stats_range browser_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.exs index 991e6552e..5ba3a5dbc 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 do assert %{"change" => 100, "comparison_value" => 0, "name" => "Total visits", "value" => 4} in top_stats end + + 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"] + end end end