Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Fix issue with name clash (#3925)

Karl-Aksel Puulmann32ab138301db
diff --git a/lib/plausible/stats/breakdown.ex b/lib/plausible/stats/breakdown.ex
index 9e06dcda6d..190d4cc4f1 100644
--- a/lib/plausible/stats/breakdown.ex
+++ b/lib/plausible/stats/breakdown.ex
@@ -136,7 +136,7 @@ defmodule Plausible.Stats.Breakdown do
breakdown_events(site, query, "event:props:" <> custom_prop, metrics_to_select)
|> maybe_add_conversion_rate(site, query, metrics, include_imported: false)
|> paginate_and_execute(metrics, pagination)
- |> transform_keys(%{name: custom_prop})
+ |> transform_keys(%{breakdown_prop_value: custom_prop})
|> Enum.map(&cast_revenue_metrics_to_money(&1, currency))
end
@@ -446,18 +446,18 @@ defmodule Plausible.Stats.Breakdown do
from(
e in q,
select_merge: %{
- name:
+ breakdown_prop_value:
selected_as(
fragment(
"if(not empty(?), ?, '(none)')",
get_by_key(e, :meta, ^prop),
get_by_key(e, :meta, ^prop)
),
- :name
+ :breakdown_prop_value
)
},
- group_by: selected_as(:name),
- order_by: {:asc, selected_as(:name)}
+ group_by: selected_as(:breakdown_prop_value),
+ order_by: {:asc, selected_as(:breakdown_prop_value)}
)
end
diff --git a/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs b/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs
index 4fa89a078d..0907e4df4a 100644
--- a/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs
+++ b/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs
@@ -1058,6 +1058,42 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest do
}
end
+ test "breakdown by custom event property, with pageviews metric", %{conn: conn, site: site} do
+ populate_stats(site, [
+ build(:pageview,
+ "meta.key": ["package"],
+ "meta.value": ["business"],
+ timestamp: ~N[2021-01-01 00:00:00]
+ ),
+ build(:pageview,
+ "meta.key": ["package"],
+ "meta.value": ["personal"],
+ timestamp: ~N[2021-01-01 00:00:00]
+ ),
+ build(:pageview,
+ "meta.key": ["package"],
+ "meta.value": ["business"],
+ timestamp: ~N[2021-01-01 00:25:00]
+ )
+ ])
+
+ conn =
+ get(conn, "/api/v1/stats/breakdown", %{
+ "site_id" => site.domain,
+ "period" => "day",
+ "date" => "2021-01-01",
+ "property" => "event:props:package",
+ "metrics" => "pageviews"
+ })
+
+ assert json_response(conn, 200) == %{
+ "results" => [
+ %{"package" => "business", "pageviews" => 2},
+ %{"package" => "personal", "pageviews" => 1}
+ ]
+ }
+ end
+
test "breakdown by custom event property, with (none)", %{conn: conn, site: site} do
populate_stats(site, [
build(:event,