plausible/analytics
1
1
Fork 0
mirror of https://github.com/plausible/analytics.git synced 2024-08-17 05:40:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: Calculate revenue metrics correctly when including imports (#4335)

Browse Source 
Previously, revenue metrics were reported as 0.0$ when imports were included with
APIv2. This is because the metrics were not properly included/forwarded by the
imports query.

Not sure how long this bug has persisted, but eh.
This commit is contained in:
Karl-Aksel Puulmann 2024-07-10 15:10:29 +03:00 committed by GitHub
parent ef2e277f89
commit 4d19603693
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/plausible/stats/imported/sql/builder.ex
View File

@ -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] do
q
|> 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]) do
q
|> select_merge_as([s, i], %{metric => field(s, ^metric)})
|> select_joined_metrics(rest)
end

6
test/plausible_web/controllers/api/stats_controller/conversions_test.exs
View File

@ -272,7 +272,9 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do
conn: 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 do
insert(: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"] == [
%{