diff --git a/lib/plausible/stats/breakdown.ex b/lib/plausible/stats/breakdown.ex index 70b434c60..1274a4be1 100644 --- a/lib/plausible/stats/breakdown.ex +++ b/lib/plausible/stats/breakdown.ex @@ -6,7 +6,7 @@ defmodule Plausible.Stats.Breakdown do import Plausible.Stats.{Base, Imported} import Ecto.Query require OpenTelemetry.Tracer, as: Tracer - alias Plausible.Stats.{Query, Util} + alias Plausible.Stats.{Query, Util, TableDecider} @no_ref "Direct / None" @not_set "(not set)" @@ -199,9 +199,30 @@ defmodule Plausible.Stats.Breakdown do metrics_to_select = Util.maybe_add_visitors_metric(metrics) -- @computed_metrics - breakdown_sessions(site, query, property, metrics_to_select) - |> maybe_add_group_conversion_rate(&breakdown_sessions/4, site, query, property, metrics) - |> paginate_and_execute(metrics, pagination) + case breakdown_table(query, metrics, property) do + :session -> + breakdown_sessions(site, query, property, metrics_to_select) + |> maybe_add_group_conversion_rate(&breakdown_sessions/4, site, query, property, metrics) + |> paginate_and_execute(metrics, pagination) + + :event -> + breakdown_events(site, query, property, metrics_to_select) + |> maybe_add_group_conversion_rate(&breakdown_events/4, site, query, property, metrics) + |> paginate_and_execute(metrics, pagination) + end + end + + defp breakdown_table(_query, _metrics, "visit:entry_page"), do: :session + defp breakdown_table(_query, _metrics, "visit:exit_page"), do: :session + + defp breakdown_table(query, metrics, property) do + {_, session_metrics, _} = TableDecider.partition_metrics(metrics, query, property) + + if not Enum.empty?(session_metrics) do + :session + else + :event + end end defp zip_results(event_result, session_result, property, metrics) do diff --git a/lib/plausible/stats/table_decider.ex b/lib/plausible/stats/table_decider.ex index d14bc593f..8a3a5d22d 100644 --- a/lib/plausible/stats/table_decider.ex +++ b/lib/plausible/stats/table_decider.ex @@ -7,7 +7,7 @@ defmodule Plausible.Stats.TableDecider do Enum.any?(query.filters, &(filters_partitioner(query, &1) == :session)) end - def partition_metrics(metrics, query) do + def partition_metrics(metrics, query, breakdown_property \\ nil) do %{ event: event_metrics, session: session_metrics, @@ -17,8 +17,16 @@ defmodule Plausible.Stats.TableDecider do } = partition(metrics, query, &metric_partitioner/2) + # Treat breakdown property as yet another filter + filters = + if breakdown_property do + Map.put(query.filters, breakdown_property, nil) + else + query.filters + end + %{event: event_filters, session: session_filters} = - partition(query.filters, query, &filters_partitioner/2) + partition(filters, query, &filters_partitioner/2) cond do # Only one table needs to be queried