Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Exclude selected wilcard pattern matches from subsequent step suggestions (#6317)
Adrian Gruntkowskib5b890c0e6b3
diff --git a/extra/lib/plausible/stats/exploration.ex b/extra/lib/plausible/stats/exploration.exindex 1bf0a54373..5dc9296e67 100644--- a/extra/lib/plausible/stats/exploration.ex+++ b/extra/lib/plausible/stats/exploration.ex@@ -298,6 +298,7 @@ defmodule Plausible.Stats.Exploration dofrom(s in q, where: ^step_condition)end)+ |> maybe_exclude_step_matches(List.last(steps))# Fan out each q_combined row into up to two output rows (exact + wildcard)# using ARRAY JOIN over a small boolean array.@@ -399,6 +400,30 @@ defmodule Plausible.Stats.Exploration do)end+ defp maybe_exclude_step_matches(query, %{includes_subpaths: true} = step) do+ pattern = wildcard_pattern(step.pathname)++ from m in query,+ where:+ selected_as(:name) != ^step.name or+ not fragment("match(?, ?)", selected_as(:pathname), ^pattern)+ end++ defp maybe_exclude_step_matches(query, %{is_goal: true, name: "pageview"} = step) do+ if String.contains?(step.pathname, "*") do+ pattern = Filters.Utils.page_regex(step.pathname)++ from m in query,+ where:+ selected_as(:name) != ^step.name or+ not fragment("match(?, ?)", selected_as(:pathname), ^pattern)+ else+ query+ end+ end++ defp maybe_exclude_step_matches(query, _), do: query+defp exclude_goal_matches(query, goals) doto_exclude =goals@@ -410,12 +435,16 @@ defmodule Plausible.Stats.Exploration do}end)- types = %{name: :string, pathname: :string}+ if to_exclude != [] do+ types = %{name: :string, pathname: :string}- from m in subquery(query),- left_join: g in values(to_exclude, types),- on: g.name == m.name and g.pathname == m.pathname,- where: g.name == "" or m.includes_subpaths+ from m in subquery(query),+ left_join: g in values(to_exclude, types),+ on: g.name == m.name and g.pathname == m.pathname,+ where: g.name == "" or m.includes_subpaths+ else+ query+ endend# Expand each (name, pathname, user_id) row into all prefix paths via@@ -647,9 +676,7 @@ defmodule Plausible.Stats.Exploration dodefp step_condition(step, count) when count <= @max_steps docond dostep.includes_subpaths ->- escaped = Regex.escape(step.pathname)-- pattern = "^#{escaped}(/.+)?$"+ pattern = wildcard_pattern(step.pathname)dynamic([s],@@ -675,6 +702,12 @@ defmodule Plausible.Stats.Exploration doendend+ defp wildcard_pattern(pathname) when is_binary(pathname) do+ escaped = Regex.escape(pathname)++ "^#{escaped}(/.+)?$"+ end+defp maybe_search(query, search_term) docase String.trim(search_term) doterm when byte_size(term) > 2 ->diff --git a/test/plausible/stats/exploration_test.exs b/test/plausible/stats/exploration_test.exsindex 4cb916f594..79d18b7f44 100644--- a/test/plausible/stats/exploration_test.exs+++ b/test/plausible/stats/exploration_test.exs@@ -1056,6 +1056,124 @@ defmodule Plausible.Stats.ExplorationTest doassert next_step7.step.is_goalassert next_step7.visitors == 1end++ test "suggestions matching implicit wildcard from previous step are excluded" do+ now = DateTime.utc_now()+ site = new_site()++ populate_stats(site, [+ build(:pageview,+ user_id: 123,+ pathname: "/a",+ timestamp: DateTime.shift(now, minute: -300)+ ),+ build(:pageview,+ user_id: 123,+ pathname: "/a/b",+ timestamp: DateTime.shift(now, minute: -290)+ ),+ build(:pageview,+ user_id: 124,+ pathname: "/a/b",+ timestamp: DateTime.shift(now, minute: -300)+ ),+ build(:pageview,+ user_id: 124,+ pathname: "/a",+ timestamp: DateTime.shift(now, minute: -290)+ ),+ build(:pageview,+ user_id: 125,+ pathname: "/a/b",+ timestamp: DateTime.shift(now, minute: -300)+ ),+ build(:pageview,+ user_id: 125,+ pathname: "/a-blog",+ timestamp: DateTime.shift(now, minute: -290)+ )+ ])++ query = QueryBuilder.build!(site, input_date_range: :all)++ journey = [+ %Exploration.Journey.Step{+ name: "pageview",+ pathname: "/a",+ includes_subpaths: true,+ subpaths_count: 2+ }+ ]++ assert {:ok, [next_step]} = Exploration.next_steps(site, query, journey)++ assert next_step.step.label == "/a-blog"+ end++ test "suggestions matching goal pattern from previous step are excluded" do+ now = DateTime.utc_now()+ site = new_site()++ Plausible.Goals.create(site, %{"page_path" => "/a*"})++ populate_stats(site, [+ build(:pageview,+ user_id: 123,+ pathname: "/a",+ timestamp: DateTime.shift(now, minute: -300)+ ),+ build(:pageview,+ user_id: 123,+ pathname: "/a/b",+ timestamp: DateTime.shift(now, minute: -290)+ ),+ build(:pageview,+ user_id: 124,+ pathname: "/a/b",+ timestamp: DateTime.shift(now, minute: -300)+ ),+ build(:pageview,+ user_id: 124,+ pathname: "/a",+ timestamp: DateTime.shift(now, minute: -290)+ ),+ build(:pageview,+ user_id: 125,+ pathname: "/a/b",+ timestamp: DateTime.shift(now, minute: -300)+ ),+ build(:pageview,+ user_id: 125,+ pathname: "/a-blog",+ timestamp: DateTime.shift(now, minute: -290)+ ),+ build(:pageview,+ user_id: 126,+ pathname: "/a",+ timestamp: DateTime.shift(now, minute: -300)+ ),+ build(:pageview,+ user_id: 126,+ pathname: "/blog",+ timestamp: DateTime.shift(now, minute: -290)+ )+ ])++ query = QueryBuilder.build!(site, input_date_range: :all)++ journey = [+ %Exploration.Journey.Step{+ label: "Visit /a*",+ name: "pageview",+ pathname: "/a*",+ is_goal: true+ }+ ]++ assert {:ok, [next_step]} = Exploration.next_steps(site, query, journey)++ assert next_step.step.label == "/blog"+ endenddescribe "implicit wildcard pathnames" do