From 76896f7ceefc1e1b06ee20c2907ad3c7de39dcf9 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 20 Aug 2020 14:57:49 +0300 Subject: [PATCH] Show total conversions in addition to uniques (#294) --- assets/js/dashboard/stats/conversions.js | 12 +++++++++--- lib/plausible/stats/clickhouse.ex | 8 ++++---- .../controllers/api/stats_controller.ex | 9 ++++++++- .../api/stats_controller/conversions_test.exs | 6 +++--- .../api/stats_controller/main_graph_test.exs | 2 +- 5 files changed, 25 insertions(+), 12 deletions(-) diff --git a/assets/js/dashboard/stats/conversions.js b/assets/js/dashboard/stats/conversions.js index 789deb38b..6cbca8a5e 100644 --- a/assets/js/dashboard/stats/conversions.js +++ b/assets/js/dashboard/stats/conversions.js @@ -46,11 +46,14 @@ export default class Conversions extends React.Component { renderGoal(goal) { return (
-
+
{this.renderGoalText(goal.name)}
- {numberFormatter(goal.count)} +
+ {numberFormatter(goal.count)} + {numberFormatter(goal.total_count)} +
) } @@ -68,7 +71,10 @@ export default class Conversions extends React.Component {

{this.props.title || "Goal Conversions"}

Goal - Conversions +
+ Uniques + Total conversions +
{ this.state.goals.map(this.renderGoal.bind(this)) } diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex index 82e0f5835..aaceef857 100644 --- a/lib/plausible/stats/clickhouse.ex +++ b/lib/plausible/stats/clickhouse.ex @@ -530,11 +530,10 @@ defmodule Plausible.Stats.Clickhouse do def goal_conversions(site, %Query{filters: %{"goal" => goal}} = query) when is_binary(goal) do Clickhouse.all( from e in base_query(site, query), - select: {e.name, fragment("uniq(user_id) as count")}, + select: {e.name, fragment("uniq(user_id) as count"), fragment("count(*) as total_count")}, group_by: e.name, order_by: [desc: fragment("count")] ) - |> Enum.map(fn row -> %{"name" => goal, "count" => row["count"]} end) end def goal_conversions(site, query) do @@ -560,7 +559,7 @@ defmodule Plausible.Stats.Clickhouse do where: e.domain == ^site.domain, where: e.timestamp >= ^first_datetime and e.timestamp < ^last_datetime, where: fragment("? IN tuple(?)", e.name, ^events), - select: {e.name, fragment("uniq(user_id) as count")}, + select: {e.name, fragment("uniq(user_id) as count"), fragment("count(*) as total_count")}, group_by: e.name ) @@ -609,7 +608,8 @@ defmodule Plausible.Stats.Clickhouse do group_by: e.pathname, select: {fragment("concat('Visit ', ?) as name", e.pathname), - fragment("uniq(user_id) as count")} + fragment("uniq(user_id) as count"), + fragment("count(*) as total_count") } ) q = diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index 0573e9ded..ccefef313 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -41,6 +41,8 @@ defmodule PlausibleWeb.Api.StatsController do prev_unique_visitors = Stats.unique_visitors(site, %{prev_query | filters: %{}}) converted_visitors = Stats.unique_visitors(site, query) prev_converted_visitors = Stats.unique_visitors(site, prev_query) + completions = Stats.total_events(site, query) + prev_completions = Stats.total_events(site, prev_query) conversion_rate = if unique_visitors > 0, @@ -59,10 +61,15 @@ defmodule PlausibleWeb.Api.StatsController do change: percent_change(prev_unique_visitors, unique_visitors) }, %{ - name: "Converted visitors", + name: "Unique conversions", count: converted_visitors, change: percent_change(prev_converted_visitors, converted_visitors) }, + %{ + name: "Total conversions", + count: completions, + change: percent_change(prev_completions, completions) + }, %{ name: "Conversion rate", percentage: conversion_rate, diff --git a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs index e0547023a..b25309ce9 100644 --- a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs @@ -12,8 +12,8 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do conn = get(conn, "/api/stats/#{site.domain}/conversions?period=day&date=2019-01-01") assert json_response(conn, 200) == [ - %{"name" => "Signup", "count" => 3}, - %{"name" => "Visit /register", "count" => 2} + %{"name" => "Signup", "count" => 3, "total_count" => 3}, + %{"name" => "Visit /register", "count" => 2, "total_count" => 2} ] end end @@ -34,7 +34,7 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do ) assert json_response(conn, 200) == [ - %{"name" => "Signup", "count" => 3} + %{"name" => "Signup", "count" => 3, "total_count" => 3} ] end end diff --git a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs index e6289143d..2da5f0d55 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 @@ -134,7 +134,7 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest do ) res = json_response(conn, 200) - assert %{"name" => "Converted visitors", "count" => 3, "change" => 100} in res["top_stats"] + assert %{"name" => "Unique conversions", "count" => 3, "change" => 100} in res["top_stats"] end test "returns conversion rate", %{conn: conn, site: site} do