diff --git a/lib/plausible/stats/props.ex b/lib/plausible/stats/props.ex index 3926e2ad3..13ff9acca 100644 --- a/lib/plausible/stats/props.ex +++ b/lib/plausible/stats/props.ex @@ -23,7 +23,9 @@ defmodule Plausible.Stats.Props do end) end else - query = Plausible.Stats.Query.remove_goal(query) + query = + Plausible.Stats.Query.remove_goal(query) + |> Plausible.Stats.Query.put_filter("event:name", nil) ClickhouseRepo.all( from e in base_event_query(site, query), diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.ex index 03a6e0280..272254a29 100644 --- a/lib/plausible/stats/query.ex +++ b/lib/plausible/stats/query.ex @@ -192,7 +192,7 @@ defmodule Plausible.Stats.Query do query.filters |> Map.drop(props) |> Map.delete("event:goal") - |> Map.delete("event:name") + |> Map.put("event:name", {:is, "pageview"}) %__MODULE__{query | filters: new_filters} end 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 243df8026..bdeb1940a 100644 --- a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs @@ -38,14 +38,14 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do "count" => 2, "total_count" => 3, "prop_names" => ["variant"], - "conversion_rate" => 33.3 + "conversion_rate" => 50 }, %{ "name" => "Visit /register", "count" => 2, "total_count" => 2, "prop_names" => nil, - "conversion_rate" => 33.3 + "conversion_rate" => 50 } ] end @@ -59,7 +59,7 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do build(:pageview, pathname: "/"), build(:pageview, pathname: "/"), build(:pageview, pathname: "/register"), - build(:event, name: "Signup", "meta.key": ["variant"], "meta.value": ["A"]), + build(:pageview, pathname: "/register"), build(:event, name: "Signup", "meta.key": ["variant"], "meta.value": ["A"]), build(:event, name: "Signup", "meta.key": ["variant"], "meta.value": ["B"]) ]) @@ -78,8 +78,8 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "Signup", - "count" => 3, - "total_count" => 3, + "count" => 2, + "total_count" => 2, "prop_names" => ["variant"], "conversion_rate" => 50 } @@ -111,19 +111,19 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do ) assert json_response(conn, 200) == [ - %{"count" => 2, "name" => "B", "total_count" => 2, "conversion_rate" => 33.3}, - %{"count" => 1, "name" => "A", "total_count" => 1, "conversion_rate" => 16.7} + %{"count" => 2, "name" => "B", "total_count" => 2, "conversion_rate" => 66.7}, + %{"count" => 1, "name" => "A", "total_count" => 1, "conversion_rate" => 33.3} ] end test "returns (none) values in property breakdown for goal", %{conn: conn, site: site} do populate_stats(site, [ + build(:pageview, pathname: "/"), + build(:pageview, pathname: "/"), + build(:pageview, pathname: "/register"), build(:event, name: "Signup"), build(:event, name: "Signup"), - build(:event, name: "Signup", "meta.key": ["variant"], "meta.value": ["A"]), - build(:event, name: "Signup", "meta.key": ["variant"], "meta.value": ["B"]), - build(:event, name: "Signup", "meta.key": ["variant"], "meta.value": ["B"]), - build(:event, name: "Signup", "meta.key": ["variant"], "meta.value": ["B"]) + build(:event, name: "Signup", "meta.key": ["variant"], "meta.value": ["A"]) ]) insert(:goal, %{domain: site.domain, event_name: "Signup"}) @@ -137,9 +137,8 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do ) assert json_response(conn, 200) == [ - %{"count" => 3, "name" => "B", "total_count" => 3, "conversion_rate" => 50.0}, - %{"count" => 2, "name" => "(none)", "total_count" => 2, "conversion_rate" => 33.3}, - %{"count" => 1, "name" => "A", "total_count" => 1, "conversion_rate" => 16.7} + %{"count" => 2, "name" => "(none)", "total_count" => 2, "conversion_rate" => 66.7}, + %{"count" => 1, "name" => "A", "total_count" => 1, "conversion_rate" => 33.3} ] end diff --git a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs index 68d44fd7c..ad4d0bba8 100644 --- a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs @@ -253,7 +253,7 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest do ) res = json_response(conn, 200) - assert %{"name" => "Unique visitors", "value" => 3, "change" => 100} in res["top_stats"] + assert %{"name" => "Unique visitors", "value" => 2, "change" => 100} in res["top_stats"] end test "returns converted visitors", %{conn: conn, site: site} do @@ -294,7 +294,7 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest do res = json_response(conn, 200) - assert %{"name" => "Conversion rate", "value" => 33.3, "change" => 100} in res["top_stats"] + assert %{"name" => "Conversion rate", "value" => 50.0, "change" => 100} in res["top_stats"] end end