Allow filtering by visit props on event queries if flag is on

pull/3966/head
Karl-Aksel Puulmann 3 years ago
parent 38880e1401
commit 6e415d118a

@ -119,20 +119,13 @@ defmodule Plausible.Stats.Base do
&filter_by_custom_prop/2
)
if query.experimental_reduced_joins? do
q = filter_by_visit_props(q, query)
end
q
end
@api_prop_name_to_db %{
"source" => "referrer_source",
"device" => "screen_size",
"screen" => "screen_size",
"os" => "operating_system",
"os_version" => "operating_system_version",
"country" => "country_code",
"region" => "subdivision1_code",
"city" => "city_geoname_id"
}
def query_sessions(site, query) do
{first_datetime, last_datetime} =
utc_boundaries(query, site)
@ -150,9 +143,23 @@ defmodule Plausible.Stats.Base do
sessions_q = Plausible.Stats.Sampling.add_query_hint(sessions_q, query)
end
sessions_q = filter_by_entry_props(sessions_q, query)
filter_by_entry_props(sessions_q, query)
|> filter_by_visit_props(query)
end
@api_prop_name_to_db %{
"source" => "referrer_source",
"device" => "screen_size",
"screen" => "screen_size",
"os" => "operating_system",
"os_version" => "operating_system_version",
"country" => "country_code",
"region" => "subdivision1_code",
"city" => "city_geoname_id"
}
Enum.reduce(Filters.visit_props(), sessions_q, fn prop_name, sessions_q ->
defp filter_by_visit_props(q, query) do
Enum.reduce(Filters.visit_props(), q, fn prop_name, sessions_q ->
filter_key = "visit:" <> prop_name
db_field =

@ -65,7 +65,10 @@ defmodule Plausible.Stats.TableDecider do
defp filters_partitioner(_, {"visit:entry_page", _}), do: :session
defp filters_partitioner(_, {"visit:exit_page", _}), do: :session
defp filters_partitioner(%Query{experimental_reduced_joins?: false}, {"visit:" <> _, _}),
defp filters_partitioner(%Query{experimental_reduced_joins?: true}, {"visit:" <> _, _}),
do: :both
defp filters_partitioner(_, {"visit:" <> _, _}),
do: :session
defp filters_partitioner(%Query{experimental_reduced_joins?: false}, {unknown, _}) do

Loading…
Cancel
Save