Handle entry/exit page visit props separately from props stored in events table

pull/3966/head
Karl-Aksel Puulmann 3 years ago
parent 3cb85d6b8f
commit 7b61eaf047

@ -122,7 +122,7 @@ defmodule Plausible.Stats.Base do
# :TODO: Maybe check if joined
q =
if query.experimental_reduced_joins? do
filter_by_visit_props(q, query)
filter_by_visit_props(q, Filters.event_table_visit_props(), query)
else
q
end
@ -148,7 +148,7 @@ defmodule Plausible.Stats.Base do
end
filter_by_entry_props(sessions_q, query)
|> filter_by_visit_props(query)
|> filter_by_visit_props(Filters.visit_props(), query)
end
@api_prop_name_to_db %{
@ -162,9 +162,8 @@ defmodule Plausible.Stats.Base do
"city" => "city_geoname_id"
}
# :TODO: handle entry/exit page conditionally
defp filter_by_visit_props(q, query) do
Enum.reduce(Filters.visit_props(), q, fn prop_name, sessions_q ->
defp filter_by_visit_props(q, visit_props, query) do
Enum.reduce(visit_props, q, fn prop_name, sessions_q ->
filter_key = "visit:" <> prop_name
db_field =

@ -27,11 +27,12 @@ defmodule Plausible.Stats.Filters do
]
def visit_props(), do: @visit_props |> Enum.map(&to_string/1)
@sessions_only_visit_props [
:entry_page,
:exit_page
]
def sessions_only_visit_props(), do: @sessions_only_visit_props |> Enum.map(&to_string/1)
@event_table_visit_props @visit_props --
[
:entry_page,
:exit_page
]
def event_table_visit_props(), do: @event_table_visit_props |> Enum.map(&to_string/1)
@event_props [:name, :page, :goal]

Loading…
Cancel
Save