plausible/analytics
1
1
Fork 0
mirror of https://github.com/plausible/analytics.git synced 2024-11-23 03:04:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixes goal filters for glob goals (#781)

Browse Source 
* Fixes goal filters for glob goals

* Format

* Consolidates goal application
This commit is contained in:
Vignesh Joglekar 2021-03-03 02:37:18 -06:00 committed by GitHub
parent 7753f72d82
commit 61c3959626
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/plausible/stats/clickhouse.ex
View File

@ -1162,22 +1162,7 @@ defmodule Plausible.Stats.Clickhouse do
end
defp base_query_w_sessions(site, query) do
q = base_query_w_sessions_bare(site, query)
{goal_event, path} = event_name_for_goal(query)
q =
if goal_event do
from(e in q, where: e.name == ^goal_event)
else
from(e in q, where: e.name == "pageview")
end
if path do
from(e in q, where: e.pathname == ^path)
else
q
end
base_query_w_sessions_bare(site, query) |> include_goal_conversions(query)
end
defp base_session_query(site, query) do
@ -1412,22 +1397,7 @@ defmodule Plausible.Stats.Clickhouse do
end
defp base_query(site, query) do
q = base_query_bare(site, query)
{goal_event, path} = event_name_for_goal(query)
q =
if path do
from(e in q, where: e.pathname == ^path)
else
q
end
if goal_event do
from(e in q, where: e.name == ^goal_event)
else
from(e in q, where: e.name == "pageview")
end
base_query_bare(site, query) |> include_goal_conversions(query)
end
defp utc_boundaries(%Query{period: "30m"}, _timezone) do
@ -1472,4 +1442,30 @@ defmodule Plausible.Stats.Clickhouse do
{nil, nil}
end
end
defp include_goal_conversions(db_query, query) do
{goal_event, path} = event_name_for_goal(query)
q =
if goal_event do
from(e in db_query, where: e.name == ^goal_event)
else
from(e in db_query, where: e.name == "pageview")
end
if path do
if String.match?(path, ~r/\*/) do
path_regex =
"^#{path}\/?$"
|> String.replace(~r/\*\*/, ".*")
|> String.replace(~r/(?<!\.)\*/, "[^/]*")
from(e in q, where: fragment("match(?, ?)", e.pathname, ^path_regex))
else
from(e in q, where: e.pathname == ^path)
end
else
q
end
end
end