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: Calculate revenue metrics correctly when including imports (#4335)
Karl-Aksel Puulmann4d196036934a
diff --git a/lib/plausible/stats/imported/sql/builder.ex b/lib/plausible/stats/imported/sql/builder.exindex cf81959d3f..557b95b27b 100644--- a/lib/plausible/stats/imported/sql/builder.ex+++ b/lib/plausible/stats/imported/sql/builder.ex@@ -435,14 +435,16 @@ defmodule Plausible.Stats.Imported.SQL.Builder do|> select_joined_metrics(rest)end- def select_joined_metrics(q, [:sample_percent | rest]) do+ # Ignored as it's calculated separately+ def select_joined_metrics(q, [metric | rest])+ when metric in [:conversion_rate, :group_conversion_rate, :percentage] doq- |> select_merge_as([s, i], %{sample_percent: s.sample_percent})|> select_joined_metrics(rest)end- def select_joined_metrics(q, [_ | rest]) do+ def select_joined_metrics(q, [metric | rest]) doq+ |> select_merge_as([s, i], %{metric => field(s, ^metric)})|> select_joined_metrics(rest)enddiff --git a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs b/test/plausible_web/controllers/api/stats_controller/conversions_test.exsindex a5bcdb38b2..63484907c4 100644--- a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs@@ -272,7 +272,9 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest doconn: conn,site: site} do- populate_stats(site, [+ site_import = insert(:site_import, site: site)++ populate_stats(site, site_import.id, [build(:event,name: "Payment",revenue_reporting_amount: Decimal.new("200100300.123"),@@ -294,7 +296,7 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest doinsert(:goal, %{site: site, event_name: "Payment", currency: :EUR})- conn = get(conn, "/api/stats/#{site.domain}/conversions?period=day")+ conn = get(conn, "/api/stats/#{site.domain}/conversions?period=day&with_imported=true")assert json_response(conn, 200)["results"] == [%{