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
Filter out empty entries when listing stats for UTM props (#3339)
Adrian Gruntkowski27a11fc5b7cb
diff --git a/lib/plausible/stats/breakdown.ex b/lib/plausible/stats/breakdown.exindex ab8add15c7..8287456bf4 100644--- a/lib/plausible/stats/breakdown.ex+++ b/lib/plausible/stats/breakdown.ex@@ -443,9 +443,10 @@ defmodule Plausible.Stats.Breakdown dodefp do_group_by(q, "visit:utm_medium") dofrom(s in q,+ where: fragment("not empty(?)", s.utm_medium),group_by: s.utm_medium,select_merge: %{- utm_medium: fragment("if(empty(?), ?, ?)", s.utm_medium, @no_ref, s.utm_medium)+ utm_medium: s.utm_medium})end@@ -453,9 +454,10 @@ defmodule Plausible.Stats.Breakdown dodefp do_group_by(q, "visit:utm_source") dofrom(s in q,+ where: fragment("not empty(?)", s.utm_source),group_by: s.utm_source,select_merge: %{- utm_source: fragment("if(empty(?), ?, ?)", s.utm_source, @no_ref, s.utm_source)+ utm_source: s.utm_source})end@@ -463,9 +465,10 @@ defmodule Plausible.Stats.Breakdown dodefp do_group_by(q, "visit:utm_campaign") dofrom(s in q,+ where: fragment("not empty(?)", s.utm_campaign),group_by: s.utm_campaign,select_merge: %{- utm_campaign: fragment("if(empty(?), ?, ?)", s.utm_campaign, @no_ref, s.utm_campaign)+ utm_campaign: s.utm_campaign})end@@ -473,9 +476,10 @@ defmodule Plausible.Stats.Breakdown dodefp do_group_by(q, "visit:utm_content") dofrom(s in q,+ where: fragment("not empty(?)", s.utm_content),group_by: s.utm_content,select_merge: %{- utm_content: fragment("if(empty(?), ?, ?)", s.utm_content, @no_ref, s.utm_content)+ utm_content: s.utm_content})end@@ -483,9 +487,10 @@ defmodule Plausible.Stats.Breakdown dodefp do_group_by(q, "visit:utm_term") dofrom(s in q,+ where: fragment("not empty(?)", s.utm_term),group_by: s.utm_term,select_merge: %{- utm_term: fragment("if(empty(?), ?, ?)", s.utm_term, @no_ref, s.utm_term)+ utm_term: s.utm_term})enddiff --git a/lib/plausible/stats/imported.ex b/lib/plausible/stats/imported.exindex ef7d70eaa0..77521d7959 100644--- a/lib/plausible/stats/imported.ex+++ b/lib/plausible/stats/imported.ex@@ -142,32 +142,30 @@ defmodule Plausible.Stats.Imported do:utm_medium ->imported_q+ |> where([i], fragment("not empty(?)", i.utm_medium))|> select_merge([i], %{- utm_medium: fragment("if(empty(?), ?, ?)", i.utm_medium, @no_ref, i.utm_medium)- })-- :utm_source ->- imported_q- |> select_merge([i], %{- utm_source: fragment("if(empty(?), ?, ?)", i.utm_source, @no_ref, i.utm_source)+ utm_medium: i.utm_medium}):utm_campaign ->imported_q+ |> where([i], fragment("not empty(?)", i.utm_campaign))|> select_merge([i], %{- utm_campaign: fragment("if(empty(?), ?, ?)", i.utm_campaign, @no_ref, i.utm_campaign)+ utm_campaign: i.utm_campaign}):utm_term ->imported_q+ |> where([i], fragment("not empty(?)", i.utm_term))|> select_merge([i], %{- utm_term: fragment("if(empty(?), ?, ?)", i.utm_term, @no_ref, i.utm_term)+ utm_term: i.utm_term}):utm_content ->imported_q+ |> where([i], fragment("not empty(?)", i.utm_content))|> select_merge([i], %{- utm_content: fragment("if(empty(?), ?, ?)", i.utm_content, @no_ref, i.utm_content)+ utm_content: i.utm_content}):page ->diff --git a/test/plausible/imported/imported_test.exs b/test/plausible/imported/imported_test.exsindex 681f1f8a98..d0961c7bba 100644--- a/test/plausible/imported/imported_test.exs+++ b/test/plausible/imported/imported_test.exs@@ -306,12 +306,6 @@ defmodule Plausible.ImportedTest do"name" => "social","visit_duration" => 20,"visitors" => 3- },- %{- "bounce_rate" => 100.0,- "name" => "Direct / None",- "visit_duration" => 60.0,- "visitors" => 1}]end@@ -395,12 +389,6 @@ defmodule Plausible.ImportedTest do"visitors" => 2,"bounce_rate" => 100.0,"visit_duration" => 50.0- },- %{- "bounce_rate" => 0.0,- "name" => "Direct / None",- "visit_duration" => 100.0,- "visitors" => 1}]end@@ -485,12 +473,6 @@ defmodule Plausible.ImportedTest do"visitors" => 2,"bounce_rate" => 100.0,"visit_duration" => 50.0- },- %{- "bounce_rate" => 0.0,- "name" => "Direct / None",- "visit_duration" => 100.0,- "visitors" => 1}]end@@ -574,12 +556,6 @@ defmodule Plausible.ImportedTest do"visitors" => 2,"bounce_rate" => 100.0,"visit_duration" => 50.0- },- %{- "bounce_rate" => 0.0,- "name" => "Direct / None",- "visit_duration" => 100.0,- "visitors" => 1}]enddiff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_campaigns.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_campaigns.csvindex 101320e063..854a70d52f 100644--- a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_campaigns.csv+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_campaigns.csv@@ -1,2 +1 @@name,conversions,conversion_rate-Direct / None,1,33.3diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_contents.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_contents.csvindex 101320e063..854a70d52f 100644--- a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_contents.csv+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_contents.csv@@ -1,2 +1 @@name,conversions,conversion_rate-Direct / None,1,33.3diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_mediums.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_mediums.csvindex 101320e063..854a70d52f 100644--- a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_mediums.csv+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_mediums.csv@@ -1,2 +1 @@name,conversions,conversion_rate-Direct / None,1,33.3diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_sources.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_sources.csvindex 101320e063..854a70d52f 100644--- a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_sources.csv+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_sources.csv@@ -1,2 +1 @@name,conversions,conversion_rate-Direct / None,1,33.3diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_terms.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_terms.csvindex 101320e063..854a70d52f 100644--- a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_terms.csv+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_terms.csv@@ -1,2 +1 @@name,conversions,conversion_rate-Direct / None,1,33.3diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/utm_campaigns.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_campaigns.csvindex 324c36e7f4..773a58cf75 100644--- a/test/plausible_web/controllers/CSVs/30d-filter-path/utm_campaigns.csv+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_campaigns.csv@@ -1,2 +1 @@name,visitors,bounce_rate,visit_duration-Direct / None,1,0,60diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/utm_contents.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_contents.csvindex 324c36e7f4..773a58cf75 100644--- a/test/plausible_web/controllers/CSVs/30d-filter-path/utm_contents.csv+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_contents.csv@@ -1,2 +1 @@name,visitors,bounce_rate,visit_duration-Direct / None,1,0,60diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/utm_mediums.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_mediums.csvindex 324c36e7f4..773a58cf75 100644--- a/test/plausible_web/controllers/CSVs/30d-filter-path/utm_mediums.csv+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_mediums.csv@@ -1,2 +1 @@name,visitors,bounce_rate,visit_duration-Direct / None,1,0,60diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/utm_sources.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_sources.csvindex 324c36e7f4..773a58cf75 100644--- a/test/plausible_web/controllers/CSVs/30d-filter-path/utm_sources.csv+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_sources.csv@@ -1,2 +1 @@name,visitors,bounce_rate,visit_duration-Direct / None,1,0,60diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/utm_terms.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_terms.csvindex 324c36e7f4..773a58cf75 100644--- a/test/plausible_web/controllers/CSVs/30d-filter-path/utm_terms.csv+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/utm_terms.csv@@ -1,2 +1 @@name,visitors,bounce_rate,visit_duration-Direct / None,1,0,60diff --git a/test/plausible_web/controllers/CSVs/30d/utm_campaigns.csv b/test/plausible_web/controllers/CSVs/30d/utm_campaigns.csvindex 2279e13f7a..934651b6b9 100644--- a/test/plausible_web/controllers/CSVs/30d/utm_campaigns.csv+++ b/test/plausible_web/controllers/CSVs/30d/utm_campaigns.csv@@ -1,3 +1,2 @@name,visitors,bounce_rate,visit_duration-Direct / None,3,67,20ads,1,100,0diff --git a/test/plausible_web/controllers/CSVs/30d/utm_contents.csv b/test/plausible_web/controllers/CSVs/30d/utm_contents.csvindex b0af67fdd1..6f8d1ba255 100644--- a/test/plausible_web/controllers/CSVs/30d/utm_contents.csv+++ b/test/plausible_web/controllers/CSVs/30d/utm_contents.csv@@ -1,3 +1,2 @@name,visitors,bounce_rate,visit_duration-Direct / None,3,67,20content,1,100,0diff --git a/test/plausible_web/controllers/CSVs/30d/utm_mediums.csv b/test/plausible_web/controllers/CSVs/30d/utm_mediums.csvindex 1a338d71e0..1fe1c21a28 100644--- a/test/plausible_web/controllers/CSVs/30d/utm_mediums.csv+++ b/test/plausible_web/controllers/CSVs/30d/utm_mediums.csv@@ -1,3 +1,2 @@name,visitors,bounce_rate,visit_duration-Direct / None,3,67,20search,1,100,0diff --git a/test/plausible_web/controllers/CSVs/30d/utm_sources.csv b/test/plausible_web/controllers/CSVs/30d/utm_sources.csvindex f055bafab7..b32c9660a0 100644--- a/test/plausible_web/controllers/CSVs/30d/utm_sources.csv+++ b/test/plausible_web/controllers/CSVs/30d/utm_sources.csv@@ -1,3 +1,2 @@name,visitors,bounce_rate,visit_duration-Direct / None,3,67,20google,1,100,0diff --git a/test/plausible_web/controllers/CSVs/30d/utm_terms.csv b/test/plausible_web/controllers/CSVs/30d/utm_terms.csvindex 6a09a2ea47..cbd3a7ce40 100644--- a/test/plausible_web/controllers/CSVs/30d/utm_terms.csv+++ b/test/plausible_web/controllers/CSVs/30d/utm_terms.csv@@ -1,3 +1,2 @@name,visitors,bounce_rate,visit_duration-Direct / None,3,67,20term,1,100,0diff --git a/test/plausible_web/controllers/CSVs/6m/utm_campaigns.csv b/test/plausible_web/controllers/CSVs/6m/utm_campaigns.csvindex 86cfe278b1..13779d3f0d 100644--- a/test/plausible_web/controllers/CSVs/6m/utm_campaigns.csv+++ b/test/plausible_web/controllers/CSVs/6m/utm_campaigns.csv@@ -1,3 +1,2 @@name,visitors,bounce_rate,visit_duration-Direct / None,3,67,20ads,2,100,0diff --git a/test/plausible_web/controllers/CSVs/6m/utm_contents.csv b/test/plausible_web/controllers/CSVs/6m/utm_contents.csvindex a91b4d80eb..6f8d1ba255 100644--- a/test/plausible_web/controllers/CSVs/6m/utm_contents.csv+++ b/test/plausible_web/controllers/CSVs/6m/utm_contents.csv@@ -1,3 +1,2 @@name,visitors,bounce_rate,visit_duration-Direct / None,4,75,15content,1,100,0diff --git a/test/plausible_web/controllers/CSVs/6m/utm_mediums.csv b/test/plausible_web/controllers/CSVs/6m/utm_mediums.csvindex e48dee7f9f..1fe1c21a28 100644--- a/test/plausible_web/controllers/CSVs/6m/utm_mediums.csv+++ b/test/plausible_web/controllers/CSVs/6m/utm_mediums.csv@@ -1,3 +1,2 @@name,visitors,bounce_rate,visit_duration-Direct / None,4,75,15search,1,100,0diff --git a/test/plausible_web/controllers/CSVs/6m/utm_sources.csv b/test/plausible_web/controllers/CSVs/6m/utm_sources.csvindex eb1ef6a75d..b32c9660a0 100644--- a/test/plausible_web/controllers/CSVs/6m/utm_sources.csv+++ b/test/plausible_web/controllers/CSVs/6m/utm_sources.csv@@ -1,3 +1,2 @@name,visitors,bounce_rate,visit_duration-Direct / None,4,75,15google,1,100,0diff --git a/test/plausible_web/controllers/CSVs/6m/utm_terms.csv b/test/plausible_web/controllers/CSVs/6m/utm_terms.csvindex 0cbaac9a0c..cbd3a7ce40 100644--- a/test/plausible_web/controllers/CSVs/6m/utm_terms.csv+++ b/test/plausible_web/controllers/CSVs/6m/utm_terms.csv@@ -1,3 +1,2 @@name,visitors,bounce_rate,visit_duration-Direct / None,4,75,15term,1,100,0diff --git a/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs b/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exsindex 8d2b052ced..9fc516fe24 100644--- a/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs+++ b/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs@@ -243,8 +243,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest doassert json_response(conn, 200) == %{"results" => [- %{"utm_medium" => "Search", "visitors" => 2},- %{"utm_medium" => "Direct / None", "visitors" => 1}+ %{"utm_medium" => "Search", "visitors" => 2}]}end@@ -275,8 +274,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest doassert json_response(conn, 200) == %{"results" => [- %{"utm_source" => "Google", "visitors" => 2},- %{"utm_source" => "Direct / None", "visitors" => 1}+ %{"utm_source" => "Google", "visitors" => 2}]}end@@ -307,8 +305,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest doassert json_response(conn, 200) == %{"results" => [- %{"utm_campaign" => "ads", "visitors" => 2},- %{"utm_campaign" => "Direct / None", "visitors" => 1}+ %{"utm_campaign" => "ads", "visitors" => 2}]}end@@ -339,8 +336,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest doassert json_response(conn, 200) == %{"results" => [- %{"utm_content" => "Content1", "visitors" => 2},- %{"utm_content" => "Direct / None", "visitors" => 1}+ %{"utm_content" => "Content1", "visitors" => 2}]}end@@ -371,8 +367,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest doassert json_response(conn, 200) == %{"results" => [- %{"utm_term" => "Term1", "visitors" => 2},- %{"utm_term" => "Direct / None", "visitors" => 1}+ %{"utm_term" => "Term1", "visitors" => 2}]}enddiff --git a/test/plausible_web/controllers/api/stats_controller/sources_test.exs b/test/plausible_web/controllers/api/stats_controller/sources_test.exsindex aa87c207cb..7a6f2a1009 100644--- a/test/plausible_web/controllers/api/stats_controller/sources_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/sources_test.exs@@ -568,36 +568,472 @@ defmodule PlausibleWeb.Api.StatsController.SourcesTest do}]end++ test "filters out entries without utm_medium present", %{conn: conn, site: site} do+ populate_stats(site, [+ build(:pageview,+ utm_medium: "social",+ user_id: @user_id,+ timestamp: ~N[2021-01-01 00:00:00]+ ),+ build(:pageview,+ utm_medium: "social",+ user_id: @user_id,+ timestamp: ~N[2021-01-01 00:15:00]+ ),+ build(:pageview,+ utm_medium: "",+ timestamp: ~N[2021-01-01 00:00:00]+ )+ ])++ populate_stats(site, [+ build(:imported_sources,+ utm_medium: "social",+ date: ~D[2021-01-01],+ visit_duration: 700,+ bounces: 1,+ visits: 1,+ visitors: 1+ ),+ build(:imported_sources,+ utm_medium: "",+ date: ~D[2021-01-01],+ bounces: 0,+ visits: 1,+ visitors: 1,+ visit_duration: 100+ )+ ])++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/utm_mediums?period=day&date=2021-01-01"+ )++ assert json_response(conn, 200) == [+ %{+ "name" => "social",+ "visitors" => 1,+ "bounce_rate" => 0,+ "visit_duration" => 900+ }+ ]++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/utm_mediums?period=day&date=2021-01-01&with_imported=true"+ )++ assert json_response(conn, 200) == [+ %{+ "name" => "social",+ "visitors" => 2,+ "bounce_rate" => 50,+ "visit_duration" => 800.0+ }+ ]+ endenddescribe "GET /api/stats/:domain/utm_campaigns" dosetup [:create_user, :log_in, :create_new_site, :add_imported_data]- test "returns top utm_campaigns by unique user ids", %{conn: conn, site: site} do+ test "returns top utm_campaigns by unique user ids", %{conn: conn, site: site} do+ populate_stats(site, [+ build(:pageview,+ utm_campaign: "profile",+ user_id: @user_id,+ timestamp: ~N[2021-01-01 00:00:00]+ ),+ build(:pageview,+ utm_campaign: "profile",+ user_id: @user_id,+ timestamp: ~N[2021-01-01 00:15:00]+ ),+ build(:pageview,+ utm_campaign: "august",+ timestamp: ~N[2021-01-01 00:00:00]+ ),+ build(:pageview,+ utm_campaign: "august",+ timestamp: ~N[2021-01-01 00:00:00]+ )+ ])++ populate_stats(site, [+ build(:imported_sources,+ utm_campaign: "profile",+ date: ~D[2021-01-01],+ visit_duration: 700,+ bounces: 1,+ visits: 1,+ visitors: 1+ ),+ build(:imported_sources,+ utm_campaign: "august",+ date: ~D[2021-01-01],+ bounces: 0,+ visits: 1,+ visitors: 1,+ visit_duration: 900+ )+ ])++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/utm_campaigns?period=day&date=2021-01-01"+ )++ assert json_response(conn, 200) == [+ %{+ "name" => "august",+ "visitors" => 2,+ "bounce_rate" => 100,+ "visit_duration" => 0+ },+ %{+ "name" => "profile",+ "visitors" => 1,+ "bounce_rate" => 0,+ "visit_duration" => 900+ }+ ]++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/utm_campaigns?period=day&date=2021-01-01&with_imported=true"+ )++ assert json_response(conn, 200) == [+ %{+ "name" => "august",+ "visitors" => 3,+ "bounce_rate" => 67,+ "visit_duration" => 300+ },+ %{+ "name" => "profile",+ "visitors" => 2,+ "bounce_rate" => 50,+ "visit_duration" => 800.0+ }+ ]+ end++ test "filters out entries without utm_campaign present", %{conn: conn, site: site} do+ populate_stats(site, [+ build(:pageview,+ utm_campaign: "profile",+ user_id: @user_id,+ timestamp: ~N[2021-01-01 00:00:00]+ ),+ build(:pageview,+ utm_campaign: "profile",+ user_id: @user_id,+ timestamp: ~N[2021-01-01 00:15:00]+ ),+ build(:pageview,+ utm_campaign: "",+ timestamp: ~N[2021-01-01 00:00:00]+ ),+ build(:pageview,+ utm_campaign: "",+ timestamp: ~N[2021-01-01 00:00:00]+ )+ ])++ populate_stats(site, [+ build(:imported_sources,+ utm_campaign: "profile",+ date: ~D[2021-01-01],+ visit_duration: 700,+ bounces: 1,+ visits: 1,+ visitors: 1+ ),+ build(:imported_sources,+ utm_campaign: "",+ date: ~D[2021-01-01],+ bounces: 0,+ visits: 1,+ visitors: 1,+ visit_duration: 900+ )+ ])++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/utm_campaigns?period=day&date=2021-01-01"+ )++ assert json_response(conn, 200) == [+ %{+ "name" => "profile",+ "visitors" => 1,+ "bounce_rate" => 0,+ "visit_duration" => 900+ }+ ]++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/utm_campaigns?period=day&date=2021-01-01&with_imported=true"+ )++ assert json_response(conn, 200) == [+ %{+ "name" => "profile",+ "visitors" => 2,+ "bounce_rate" => 50,+ "visit_duration" => 800.0+ }+ ]+ end+ end++ describe "GET /api/stats/:domain/utm_sources" do+ setup [:create_user, :log_in, :create_new_site, :add_imported_data]++ test "returns top utm_sources by unique user ids", %{conn: conn, site: site} do+ populate_stats(site, [+ build(:pageview,+ utm_source: "Twitter",+ user_id: @user_id,+ timestamp: ~N[2021-01-01 00:00:00]+ ),+ build(:pageview,+ utm_source: "Twitter",+ user_id: @user_id,+ timestamp: ~N[2021-01-01 00:15:00]+ ),+ build(:pageview,+ utm_source: "newsletter",+ timestamp: ~N[2021-01-01 00:00:00]+ ),+ build(:pageview,+ utm_source: "newsletter",+ timestamp: ~N[2021-01-01 00:00:00]+ )+ ])++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/utm_sources?period=day&date=2021-01-01"+ )++ assert json_response(conn, 200) == [+ %{+ "name" => "newsletter",+ "visitors" => 2,+ "bounce_rate" => 100,+ "visit_duration" => 0+ },+ %{+ "name" => "Twitter",+ "visitors" => 1,+ "bounce_rate" => 0,+ "visit_duration" => 900+ }+ ]+ end+ end++ describe "GET /api/stats/:domain/utm_terms" do+ setup [:create_user, :log_in, :create_new_site, :add_imported_data]++ test "returns top utm_terms by unique user ids", %{conn: conn, site: site} do+ populate_stats(site, [+ build(:pageview,+ utm_term: "oat milk",+ user_id: @user_id,+ timestamp: ~N[2021-01-01 00:00:00]+ ),+ build(:pageview,+ utm_term: "oat milk",+ user_id: @user_id,+ timestamp: ~N[2021-01-01 00:15:00]+ ),+ build(:pageview,+ utm_term: "Sweden",+ timestamp: ~N[2021-01-01 00:00:00]+ ),+ build(:pageview,+ utm_term: "Sweden",+ timestamp: ~N[2021-01-01 00:00:00]+ )+ ])++ populate_stats(site, [+ build(:imported_sources,+ utm_term: "oat milk",+ date: ~D[2021-01-01],+ visit_duration: 700,+ bounces: 1,+ visits: 1,+ visitors: 1+ ),+ build(:imported_sources,+ utm_term: "Sweden",+ date: ~D[2021-01-01],+ bounces: 0,+ visits: 1,+ visitors: 1,+ visit_duration: 900+ )+ ])++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/utm_terms?period=day&date=2021-01-01"+ )++ assert json_response(conn, 200) == [+ %{+ "name" => "Sweden",+ "visitors" => 2,+ "bounce_rate" => 100,+ "visit_duration" => 0+ },+ %{+ "name" => "oat milk",+ "visitors" => 1,+ "bounce_rate" => 0,+ "visit_duration" => 900+ }+ ]++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/utm_terms?period=day&date=2021-01-01&with_imported=true"+ )++ assert json_response(conn, 200) == [+ %{+ "name" => "Sweden",+ "visitors" => 3,+ "bounce_rate" => 67,+ "visit_duration" => 300+ },+ %{+ "name" => "oat milk",+ "visitors" => 2,+ "bounce_rate" => 50,+ "visit_duration" => 800.0+ }+ ]+ end++ test "filters out entries without utm_term present", %{conn: conn, site: site} do+ populate_stats(site, [+ build(:pageview,+ utm_term: "oat milk",+ user_id: @user_id,+ timestamp: ~N[2021-01-01 00:00:00]+ ),+ build(:pageview,+ utm_term: "oat milk",+ user_id: @user_id,+ timestamp: ~N[2021-01-01 00:15:00]+ ),+ build(:pageview,+ utm_term: "",+ timestamp: ~N[2021-01-01 00:00:00]+ ),+ build(:pageview,+ utm_term: "",+ timestamp: ~N[2021-01-01 00:00:00]+ )+ ])++ populate_stats(site, [+ build(:imported_sources,+ utm_term: "oat milk",+ date: ~D[2021-01-01],+ visit_duration: 700,+ bounces: 1,+ visits: 1,+ visitors: 1+ ),+ build(:imported_sources,+ utm_term: "",+ date: ~D[2021-01-01],+ bounces: 0,+ visits: 1,+ visitors: 1,+ visit_duration: 900+ )+ ])++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/utm_terms?period=day&date=2021-01-01"+ )++ assert json_response(conn, 200) == [+ %{+ "name" => "oat milk",+ "visitors" => 1,+ "bounce_rate" => 0,+ "visit_duration" => 900+ }+ ]++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/utm_terms?period=day&date=2021-01-01&with_imported=true"+ )++ assert json_response(conn, 200) == [+ %{+ "name" => "oat milk",+ "visitors" => 2,+ "bounce_rate" => 50,+ "visit_duration" => 800.0+ }+ ]+ end+ end++ describe "GET /api/stats/:domain/utm_contents" do+ setup [:create_user, :log_in, :create_new_site, :add_imported_data]++ test "returns top utm_contents by unique user ids", %{conn: conn, site: site} dopopulate_stats(site, [build(:pageview,- utm_campaign: "profile",+ utm_content: "ad",user_id: @user_id,timestamp: ~N[2021-01-01 00:00:00]),build(:pageview,- utm_campaign: "profile",+ utm_content: "ad",user_id: @user_id,timestamp: ~N[2021-01-01 00:15:00]),build(:pageview,- utm_campaign: "august",+ utm_content: "blog",timestamp: ~N[2021-01-01 00:00:00]),build(:pageview,- utm_campaign: "august",+ utm_content: "blog",timestamp: ~N[2021-01-01 00:00:00])])populate_stats(site, [build(:imported_sources,- utm_campaign: "profile",+ utm_content: "ad",date: ~D[2021-01-01],visit_duration: 700,bounces: 1,@@ -605,7 +1041,7 @@ defmodule PlausibleWeb.Api.StatsController.SourcesTest dovisitors: 1),build(:imported_sources,- utm_campaign: "august",+ utm_content: "blog",date: ~D[2021-01-01],bounces: 0,visits: 1,@@ -617,18 +1053,18 @@ defmodule PlausibleWeb.Api.StatsController.SourcesTest doconn =get(conn,- "/api/stats/#{site.domain}/utm_campaigns?period=day&date=2021-01-01"+ "/api/stats/#{site.domain}/utm_contents?period=day&date=2021-01-01")assert json_response(conn, 200) == [%{- "name" => "august",+ "name" => "blog","visitors" => 2,"bounce_rate" => 100,"visit_duration" => 0},%{- "name" => "profile",+ "name" => "ad","visitors" => 1,"bounce_rate" => 0,"visit_duration" => 900@@ -638,71 +1074,95 @@ defmodule PlausibleWeb.Api.StatsController.SourcesTest doconn =get(conn,- "/api/stats/#{site.domain}/utm_campaigns?period=day&date=2021-01-01&with_imported=true"+ "/api/stats/#{site.domain}/utm_contents?period=day&date=2021-01-01&with_imported=true")assert json_response(conn, 200) == [%{- "name" => "august",+ "name" => "blog","visitors" => 3,"bounce_rate" => 67,"visit_duration" => 300},%{- "name" => "profile",+ "name" => "ad","visitors" => 2,"bounce_rate" => 50,"visit_duration" => 800.0}]end- end-- describe "GET /api/stats/:domain/utm_sources" do- setup [:create_user, :log_in, :create_new_site]- test "returns top utm_sources by unique user ids", %{conn: conn, site: site} do+ test "filters out entries without utm_content present", %{conn: conn, site: site} dopopulate_stats(site, [build(:pageview,- utm_source: "Twitter",+ utm_content: "ad",user_id: @user_id,timestamp: ~N[2021-01-01 00:00:00]),build(:pageview,- utm_source: "Twitter",+ utm_content: "ad",user_id: @user_id,timestamp: ~N[2021-01-01 00:15:00]),build(:pageview,- utm_source: "newsletter",+ utm_content: "",timestamp: ~N[2021-01-01 00:00:00]),build(:pageview,- utm_source: "newsletter",+ utm_content: "",timestamp: ~N[2021-01-01 00:00:00])])+ populate_stats(site, [+ build(:imported_sources,+ utm_content: "ad",+ date: ~D[2021-01-01],+ visit_duration: 700,+ bounces: 1,+ visits: 1,+ visitors: 1+ ),+ build(:imported_sources,+ utm_content: "",+ date: ~D[2021-01-01],+ bounces: 0,+ visits: 1,+ visitors: 1,+ visit_duration: 900+ )+ ])+conn =get(conn,- "/api/stats/#{site.domain}/utm_sources?period=day&date=2021-01-01"+ "/api/stats/#{site.domain}/utm_contents?period=day&date=2021-01-01")assert json_response(conn, 200) == [%{- "name" => "newsletter",- "visitors" => 2,- "bounce_rate" => 100,- "visit_duration" => 0- },- %{- "name" => "Twitter",+ "name" => "ad","visitors" => 1,"bounce_rate" => 0,"visit_duration" => 900}]++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/utm_contents?period=day&date=2021-01-01&with_imported=true"+ )++ assert json_response(conn, 200) == [+ %{+ "name" => "ad",+ "visitors" => 2,+ "bounce_rate" => 50,+ "visit_duration" => 800.0+ }+ ]endend@@ -1074,180 +1534,4 @@ defmodule PlausibleWeb.Api.StatsController.SourcesTest do]endend-- describe "GET /api/stats/:domain/utm_terms" do- setup [:create_user, :log_in, :create_new_site, :add_imported_data]-- test "returns top utm_terms by unique user ids", %{conn: conn, site: site} do- populate_stats(site, [- build(:pageview,- utm_term: "oat milk",- user_id: @user_id,- timestamp: ~N[2021-01-01 00:00:00]- ),- build(:pageview,- utm_term: "oat milk",- user_id: @user_id,- timestamp: ~N[2021-01-01 00:15:00]- ),- build(:pageview,- utm_term: "Sweden",- timestamp: ~N[2021-01-01 00:00:00]- ),- build(:pageview,- utm_term: "Sweden",- timestamp: ~N[2021-01-01 00:00:00]- )- ])-- populate_stats(site, [- build(:imported_sources,- utm_term: "oat milk",- date: ~D[2021-01-01],- visit_duration: 700,- bounces: 1,- visits: 1,- visitors: 1- ),- build(:imported_sources,- utm_term: "Sweden",- date: ~D[2021-01-01],- bounces: 0,- visits: 1,- visitors: 1,- visit_duration: 900- )- ])-- conn =- get(- conn,- "/api/stats/#{site.domain}/utm_terms?period=day&date=2021-01-01"- )-- assert json_response(conn, 200) == [- %{- "name" => "Sweden",- "visitors" => 2,- "bounce_rate" => 100,- "visit_duration" => 0- },- %{- "name" => "oat milk",- "visitors" => 1,- "bounce_rate" => 0,- "visit_duration" => 900- }- ]-- conn =- get(- conn,- "/api/stats/#{site.domain}/utm_terms?period=day&date=2021-01-01&with_imported=true"- )-- assert json_response(conn, 200) == [- %{- "name" => "Sweden",- "visitors" => 3,- "bounce_rate" => 67,- "visit_duration" => 300- },- %{- "name" => "oat milk",- "visitors" => 2,- "bounce_rate" => 50,- "visit_duration" => 800.0- }- ]- end- end-- describe "GET /api/stats/:domain/utm_contents" do- setup [:create_user, :log_in, :create_new_site, :add_imported_data]-- test "returns top utm_contents by unique user ids", %{conn: conn, site: site} do- populate_stats(site, [- build(:pageview,- utm_content: "ad",- user_id: @user_id,- timestamp: ~N[2021-01-01 00:00:00]- ),- build(:pageview,- utm_content: "ad",- user_id: @user_id,- timestamp: ~N[2021-01-01 00:15:00]- ),- build(:pageview,- utm_content: "blog",- timestamp: ~N[2021-01-01 00:00:00]- ),- build(:pageview,- utm_content: "blog",- timestamp: ~N[2021-01-01 00:00:00]- )- ])-- populate_stats(site, [- build(:imported_sources,- utm_content: "ad",- date: ~D[2021-01-01],- visit_duration: 700,- bounces: 1,- visits: 1,- visitors: 1- ),- build(:imported_sources,- utm_content: "blog",- date: ~D[2021-01-01],- bounces: 0,- visits: 1,- visitors: 1,- visit_duration: 900- )- ])-- conn =- get(- conn,- "/api/stats/#{site.domain}/utm_contents?period=day&date=2021-01-01"- )-- assert json_response(conn, 200) == [- %{- "name" => "blog",- "visitors" => 2,- "bounce_rate" => 100,- "visit_duration" => 0- },- %{- "name" => "ad",- "visitors" => 1,- "bounce_rate" => 0,- "visit_duration" => 900- }- ]-- conn =- get(- conn,- "/api/stats/#{site.domain}/utm_contents?period=day&date=2021-01-01&with_imported=true"- )-- assert json_response(conn, 200) == [- %{- "name" => "blog",- "visitors" => 3,- "bounce_rate" => 67,- "visit_duration" => 300- },- %{- "name" => "ad",- "visitors" => 2,- "bounce_rate" => 50,- "visit_duration" => 800.0- }- ]- end- endend