From bd8fcffcf2cb35135a8d4d73362384d172beb3ec Mon Sep 17 00:00:00 2001 From: Robert Joonas Date: Tue, 11 Apr 2023 12:24:37 +0100 Subject: [PATCH] fix bug: returning prop names for goal :member filter --- lib/plausible/stats/props.ex | 34 ++++++++++++------- .../api/stats_controller/conversions_test.exs | 31 +++++++++++++++++ 2 files changed, 53 insertions(+), 12 deletions(-) diff --git a/lib/plausible/stats/props.ex b/lib/plausible/stats/props.ex index c7081ff73..3f4f9f2c6 100644 --- a/lib/plausible/stats/props.ex +++ b/lib/plausible/stats/props.ex @@ -1,4 +1,5 @@ defmodule Plausible.Stats.Props do + alias Plausible.Stats.Query use Plausible.ClickhouseRepo import Plausible.Stats.Base @event_props ["event:page", "event:page_match", "event:name", "event:goal"] @@ -30,21 +31,30 @@ defmodule Plausible.Stats.Props do def valid_prop?(_), do: false def props(site, query) do - case Plausible.Stats.Query.get_filter_by_prefix(query, "event:props:") do - {"event:props:" <> key, _} -> - {_, {_, goal_name}} = query.filters["event:goal"] + prop_filter = Query.get_filter_by_prefix(query, "event:props:") + goal_filter = query.filters["event:goal"] + + case {goal_filter, prop_filter} do + {{_, {_, goal_name}}, {"event:props:" <> key, _}} when is_binary(goal_name) -> %{goal_name => [key]} - nil -> - ClickhouseRepo.all( - from e in base_event_query(site, query), - inner_lateral_join: meta in fragment("meta"), - select: {e.name, meta.key}, - distinct: true + {{_, values}, {"event:props:" <> _, _}} when is_list(values)-> + nil + + _ -> + from(e in base_event_query(site, query), + inner_lateral_join: meta in fragment("meta"), + select: {e.name, meta.key}, + distinct: true ) - |> Enum.reduce(%{}, fn {goal_name, meta_key}, acc -> - Map.update(acc, goal_name, [meta_key], fn list -> [meta_key | list] end) - end) + |> ClickhouseRepo.all() + |> group_by_goal_name() end end + + defp group_by_goal_name(results_list) do + Enum.reduce(results_list, %{}, fn {goal_name, meta_key}, acc -> + Map.update(acc, goal_name, [meta_key], fn list -> [meta_key | list] end) + end) + end 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 3aa3ceb2a..62d0c23c8 100644 --- a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs @@ -287,6 +287,37 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do ] end + test "returns prop_names=nil when goal :member + property filter are applied at the same time", %{ + conn: conn, + site: site + } do + populate_stats(site, [ + build(:event, + name: "Payment", + "meta.key": ["logged_in"], + "meta.value": ["true"] + ), + build(:event, + name: "Payment", + "meta.key": ["logged_in"], + "meta.value": ["false"] + ), + build(:event, + name: "Payment", + "meta.key": ["author"], + "meta.value": ["John"] + ), + ]) + + insert(:goal, %{site: site, event_name: "Payment"}) + insert(:goal, %{site: site, event_name: "Signup"}) + + filters = Jason.encode!(%{goal: "Payment|Signup", props: %{"logged_in" => "true|(none)"}}) + conn = get(conn, "/api/stats/#{site.domain}/conversions?period=day&filters=#{filters}") + + assert [%{"prop_names" => nil}] = json_response(conn, 200) + end + test "can filter by multiple mixed goals", %{conn: conn, site: site} do populate_stats(site, [ build(:pageview, pathname: "/"),