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
Fix how sampling is applied when filtering for a goal
Uku Tahtf42f4da44b7d
diff --git a/lib/plausible/stats/props.ex b/lib/plausible/stats/props.exindex 3926e2ad30..13ff9acca3 100644--- a/lib/plausible/stats/props.ex+++ b/lib/plausible/stats/props.ex@@ -23,7 +23,9 @@ defmodule Plausible.Stats.Props doend)endelse- query = Plausible.Stats.Query.remove_goal(query)+ query =+ Plausible.Stats.Query.remove_goal(query)+ |> Plausible.Stats.Query.put_filter("event:name", nil)ClickhouseRepo.all(from e in base_event_query(site, query),diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.exindex 03a6e0280b..272254a29c 100644--- a/lib/plausible/stats/query.ex+++ b/lib/plausible/stats/query.ex@@ -192,7 +192,7 @@ defmodule Plausible.Stats.Query doquery.filters|> Map.drop(props)|> Map.delete("event:goal")- |> Map.delete("event:name")+ |> Map.put("event:name", {:is, "pageview"})%__MODULE__{query | filters: new_filters}enddiff --git a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs b/test/plausible_web/controllers/api/stats_controller/conversions_test.exsindex 243df80262..bdeb1940a7 100644--- a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs@@ -38,14 +38,14 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do"count" => 2,"total_count" => 3,"prop_names" => ["variant"],- "conversion_rate" => 33.3+ "conversion_rate" => 50},%{"name" => "Visit /register","count" => 2,"total_count" => 2,"prop_names" => nil,- "conversion_rate" => 33.3+ "conversion_rate" => 50}]end@@ -59,7 +59,7 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest dobuild(:pageview, pathname: "/"),build(:pageview, pathname: "/"),build(:pageview, pathname: "/register"),- build(:event, name: "Signup", "meta.key": ["variant"], "meta.value": ["A"]),+ build(:pageview, pathname: "/register"),build(:event, name: "Signup", "meta.key": ["variant"], "meta.value": ["A"]),build(:event, name: "Signup", "meta.key": ["variant"], "meta.value": ["B"])])@@ -78,8 +78,8 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest doassert json_response(conn, 200) == [%{"name" => "Signup",- "count" => 3,- "total_count" => 3,+ "count" => 2,+ "total_count" => 2,"prop_names" => ["variant"],"conversion_rate" => 50}@@ -111,19 +111,19 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do)assert json_response(conn, 200) == [- %{"count" => 2, "name" => "B", "total_count" => 2, "conversion_rate" => 33.3},- %{"count" => 1, "name" => "A", "total_count" => 1, "conversion_rate" => 16.7}+ %{"count" => 2, "name" => "B", "total_count" => 2, "conversion_rate" => 66.7},+ %{"count" => 1, "name" => "A", "total_count" => 1, "conversion_rate" => 33.3}]endtest "returns (none) values in property breakdown for goal", %{conn: conn, site: site} dopopulate_stats(site, [+ build(:pageview, pathname: "/"),+ build(:pageview, pathname: "/"),+ build(:pageview, pathname: "/register"),build(:event, name: "Signup"),build(:event, name: "Signup"),- build(:event, name: "Signup", "meta.key": ["variant"], "meta.value": ["A"]),- build(:event, name: "Signup", "meta.key": ["variant"], "meta.value": ["B"]),- build(:event, name: "Signup", "meta.key": ["variant"], "meta.value": ["B"]),- build(:event, name: "Signup", "meta.key": ["variant"], "meta.value": ["B"])+ build(:event, name: "Signup", "meta.key": ["variant"], "meta.value": ["A"])])insert(:goal, %{domain: site.domain, event_name: "Signup"})@@ -137,9 +137,8 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do)assert json_response(conn, 200) == [- %{"count" => 3, "name" => "B", "total_count" => 3, "conversion_rate" => 50.0},- %{"count" => 2, "name" => "(none)", "total_count" => 2, "conversion_rate" => 33.3},- %{"count" => 1, "name" => "A", "total_count" => 1, "conversion_rate" => 16.7}+ %{"count" => 2, "name" => "(none)", "total_count" => 2, "conversion_rate" => 66.7},+ %{"count" => 1, "name" => "A", "total_count" => 1, "conversion_rate" => 33.3}]enddiff --git a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exsindex 68d44fd7c5..ad4d0bba88 100644--- a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs@@ -253,7 +253,7 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest do)res = json_response(conn, 200)- assert %{"name" => "Unique visitors", "value" => 3, "change" => 100} in res["top_stats"]+ assert %{"name" => "Unique visitors", "value" => 2, "change" => 100} in res["top_stats"]endtest "returns converted visitors", %{conn: conn, site: site} do@@ -294,7 +294,7 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest dores = json_response(conn, 200)- assert %{"name" => "Conversion rate", "value" => 33.3, "change" => 100} in res["top_stats"]+ assert %{"name" => "Conversion rate", "value" => 50.0, "change" => 100} in res["top_stats"]endend