From c004a5edfa5c16c48bcee1d0fdf544ede08f68f6 Mon Sep 17 00:00:00 2001 From: Karl-Aksel Puulmann Date: Sat, 2 Mar 2024 14:51:02 +0200 Subject: [PATCH] Remove zip_columns logic --- lib/plausible/stats/breakdown.ex | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/plausible/stats/breakdown.ex b/lib/plausible/stats/breakdown.ex index f3d588201..514f855b1 100644 --- a/lib/plausible/stats/breakdown.ex +++ b/lib/plausible/stats/breakdown.ex @@ -87,12 +87,14 @@ defmodule Plausible.Stats.Breakdown do } ) |> select_event_metrics(metrics_to_select -- @revenue_metrics) + |> add_revenue_as_nil_selects(metrics_to_select) |> ClickhouseRepo.all() else [] end - zip_results(event_results, page_results, :goal, metrics_to_select) + (event_results ++ page_results) + |> Enum.sort_by(& &1[sorting_key(metrics)], :desc) |> maybe_add_cr(site, query, nil, metrics) |> Util.keep_requested_metrics(metrics) end @@ -797,6 +799,16 @@ defmodule Plausible.Stats.Breakdown do if Enum.member?(metrics, :visitors), do: :visitors, else: List.first(metrics) end + defp add_revenue_as_nil_selects(q, metrics) do + columns_with_nils = + @revenue_metrics + |> Enum.filter(&Enum.member?(metrics, &1)) + |> Enum.map(&{&1, nil}) + |> Enum.into(%{}) + + from(e in q, select_merge: ^columns_with_nils) + end + defp transform_keys(results, keys_to_replace) do Enum.map(results, fn map -> Enum.map(map, fn {key, val} ->