Fix issue with name clash (#3925)

Unexpectedly, table.name caused a name clash after CR refactor, so using a unique name
for the output column

Sentry issue: https://sentry.plausible.io/organizations/sentry/issues/5612
pull/3926/head r2024.03.21-403
Karl-Aksel Puulmann 3 years ago committed by GitHub
parent c219652dae
commit 32ab138301
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -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

@ -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,

Loading…
Cancel
Save