Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Add the new `Views per Visit` metric to dashboard Top Stats and CSV export (#2728)

RobertJoonas874d664521ff
diff --git a/assets/js/dashboard/stats/graph/graph-util.js b/assets/js/dashboard/stats/graph/graph-util.js
index 8fb3d1fd75..7f438e4150 100644
--- a/assets/js/dashboard/stats/graph/graph-util.js
+++ b/assets/js/dashboard/stats/graph/graph-util.js
@@ -6,7 +6,8 @@ export const METRIC_MAPPING = {
'Unique visitors': 'visitors',
'Visit duration': 'visit_duration',
'Total pageviews': 'pageviews',
- 'Visits': 'visits',
+ 'Views per visit': 'views_per_visit',
+ 'Total visits': 'visits',
'Bounce rate': 'bounce_rate',
'Unique conversions': 'conversions',
}
@@ -14,6 +15,7 @@ export const METRIC_MAPPING = {
export const METRIC_LABELS = {
'visitors': 'Visitors',
'pageviews': 'Pageviews',
+ 'views_per_visit': 'Views per Visit',
'visits': 'Visits',
'bounce_rate': 'Bounce Rate',
'visit_duration': 'Visit Duration',
@@ -24,6 +26,7 @@ export const METRIC_FORMATTER = {
'visitors': numberFormatter,
'pageviews': numberFormatter,
'visits': numberFormatter,
+ 'views_per_visit': (number) => (number),
'bounce_rate': (number) => (`${number}%`),
'visit_duration': durationFormatter,
'conversions': numberFormatter,
diff --git a/assets/js/dashboard/stats/graph/visitor-graph.js b/assets/js/dashboard/stats/graph/visitor-graph.js
index 89f8915032..d0567485fe 100644
--- a/assets/js/dashboard/stats/graph/visitor-graph.js
+++ b/assets/js/dashboard/stats/graph/visitor-graph.js
@@ -476,7 +476,7 @@ export default class VisitorGraph extends React.Component {
fetchTopStatData() {
api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/top-stats`, this.props.query)
.then((res) => {
- res.top_stats = this.maybeRemoveVisitsMetric(res.top_stats)
+ res.top_stats = this.maybeRemoveFeatureFlaggedMetrics(res.top_stats)
this.setState({ topStatsLoadingState: LoadingState.loaded, topStatData: res }, () => {
this.storeTopStatsContainerHeight()
this.resetMetric()
@@ -485,11 +485,11 @@ export default class VisitorGraph extends React.Component {
})
}
- maybeRemoveVisitsMetric(top_stats) {
+ maybeRemoveFeatureFlaggedMetrics(top_stats) {
if (this.props.site.flags.visits_metric) {
return top_stats
} else {
- return top_stats.filter((stat) => {return stat.name !== "Visits"})
+ return top_stats.filter((stat) => {return !(["Total visits", "Views per visit"].includes(stat.name))})
}
}
diff --git a/lib/plausible/stats/aggregate.ex b/lib/plausible/stats/aggregate.ex
index 9121922546..9755523461 100644
--- a/lib/plausible/stats/aggregate.ex
+++ b/lib/plausible/stats/aggregate.ex
@@ -4,7 +4,7 @@ defmodule Plausible.Stats.Aggregate do
import Plausible.Stats.{Base, Imported}
@event_metrics [:visitors, :pageviews, :events, :sample_percent]
- @session_metrics [:visits, :bounce_rate, :visit_duration, :pages_per_visit, :sample_percent]
+ @session_metrics [:visits, :bounce_rate, :visit_duration, :views_per_visit, :sample_percent]
def aggregate(site, query, metrics) do
event_metrics = Enum.filter(metrics, &(&1 in @event_metrics))
diff --git a/lib/plausible/stats/base.ex b/lib/plausible/stats/base.ex
index 413914209a..8cbc748d12 100644
--- a/lib/plausible/stats/base.ex
+++ b/lib/plausible/stats/base.ex
@@ -359,10 +359,10 @@ defmodule Plausible.Stats.Base do
|> select_session_metrics(rest)
end
- def select_session_metrics(q, [:pages_per_visit | rest]) do
+ def select_session_metrics(q, [:views_per_visit | rest]) do
from(s in q,
select_merge: %{
- pages_per_visit:
+ views_per_visit:
fragment("ifNotFinite(round(sum(? * ?) / sum(?), 2), 0)", s.sign, s.pageviews, s.sign)
}
)
diff --git a/lib/plausible/stats/timeseries.ex b/lib/plausible/stats/timeseries.ex
index 4bbaf361ad..bfd93bac24 100644
--- a/lib/plausible/stats/timeseries.ex
+++ b/lib/plausible/stats/timeseries.ex
@@ -5,7 +5,7 @@ defmodule Plausible.Stats.Timeseries do
use Plausible.Stats.Fragments
@event_metrics [:visitors, :pageviews]
- @session_metrics [:visits, :bounce_rate, :visit_duration, :pages_per_visit]
+ @session_metrics [:visits, :bounce_rate, :visit_duration, :views_per_visit]
def timeseries(site, query, metrics) do
steps = buckets(query)
@@ -192,7 +192,7 @@ defmodule Plausible.Stats.Timeseries do
:pageviews -> Map.merge(row, %{pageviews: 0})
:visitors -> Map.merge(row, %{visitors: 0})
:visits -> Map.merge(row, %{visits: 0})
- :pages_per_visit -> Map.merge(row, %{pages_per_visit: 0.0})
+ :views_per_visit -> Map.merge(row, %{views_per_visit: 0.0})
:bounce_rate -> Map.merge(row, %{bounce_rate: nil})
:visit_duration -> Map.merge(row, %{:visit_duration => nil})
end
diff --git a/lib/plausible_web/controllers/api/external_stats_controller.ex b/lib/plausible_web/controllers/api/external_stats_controller.ex
index b656963ff0..8f462e1530 100644
--- a/lib/plausible_web/controllers/api/external_stats_controller.ex
+++ b/lib/plausible_web/controllers/api/external_stats_controller.ex
@@ -120,7 +120,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController do
defp event_only_property?(_), do: false
@event_metrics ["visitors", "pageviews", "events"]
- @session_metrics ["visits", "bounce_rate", "visit_duration", "pages_per_visit"]
+ @session_metrics ["visits", "bounce_rate", "visit_duration", "views_per_visit"]
defp parse_and_validate_metrics(params, property, query) do
metrics =
Map.get(params, "metrics", "visitors")
@@ -147,7 +147,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController do
event_only_filter = Map.keys(query.filters) |> Enum.find(&event_only_property?/1)
cond do
- metric == "pages_per_visit" && property != nil ->
+ metric == "views_per_visit" && property != nil ->
{:error, "Metric `#{metric}` is not supported in breakdown queries"}
event_only_property?(property) ->
diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex
index b51927ca3b..b2d2b96ce9 100644
--- a/lib/plausible_web/controllers/api/stats_controller.ex
+++ b/lib/plausible_web/controllers/api/stats_controller.ex
@@ -353,9 +353,25 @@ defmodule PlausibleWeb.Api.StatsController do
metrics =
if query.filters["event:page"] do
- [:visitors, :pageviews, :bounce_rate, :time_on_page, :visits, :sample_percent]
+ [
+ :visitors,
+ :visits,
+ :pageviews,
+ :views_per_visit,
+ :bounce_rate,
+ :time_on_page,
+ :sample_percent
+ ]
else
- [:visitors, :pageviews, :bounce_rate, :visit_duration, :visits, :sample_percent]
+ [
+ :visitors,
+ :visits,
+ :pageviews,
+ :views_per_visit,
+ :bounce_rate,
+ :visit_duration,
+ :sample_percent
+ ]
end
current_results = Stats.aggregate(site, query, metrics)
@@ -364,8 +380,9 @@ defmodule PlausibleWeb.Api.StatsController do
stats =
[
top_stats_entry(current_results, prev_results, "Unique visitors", :visitors),
+ top_stats_entry(current_results, prev_results, "Total visits", :visits),
top_stats_entry(current_results, prev_results, "Total pageviews", :pageviews),
- top_stats_entry(current_results, prev_results, "Visits", :visits),
+ top_stats_entry(current_results, prev_results, "Views per visit", :views_per_visit),
top_stats_entry(current_results, prev_results, "Bounce rate", :bounce_rate),
top_stats_entry(current_results, prev_results, "Visit duration", :visit_duration),
top_stats_entry(current_results, prev_results, "Time on page", :time_on_page)
diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex
index e80bff9e3c..355ae5be88 100644
--- a/lib/plausible_web/controllers/stats_controller.ex
+++ b/lib/plausible_web/controllers/stats_controller.ex
@@ -95,14 +95,16 @@ defmodule PlausibleWeb.StatsController do
site = conn.assigns[:site]
query = Query.from(site, params) |> Filters.add_prefix()
- visits_metric_enabled =
- FunWithFlags.enabled?(:visits_metric, for: conn.assigns[:current_user])
-
metrics =
- if visits_metric_enabled && !query.filters["event:goal"] do
- [:visitors, :pageviews, :visits, :bounce_rate, :visit_duration]
- else
- [:visitors, :pageviews, :bounce_rate, :visit_duration]
+ cond do
+ query.filters["event:goal"] ->
+ [:visitors, :pageviews, :bounce_rate, :visit_duration]
+
+ FunWithFlags.enabled?(:visits_metric, for: conn.assigns[:current_user]) ->
+ [:visitors, :pageviews, :visits, :views_per_visit, :bounce_rate, :visit_duration]
+
+ true ->
+ [:visitors, :pageviews, :bounce_rate, :visit_duration]
end
graph = Plausible.Stats.timeseries(site, query, metrics)
@@ -322,6 +324,7 @@ defmodule PlausibleWeb.StatsController do
%{
custom_dimension_filter: FunWithFlags.enabled?(:custom_dimension_filter, for: user),
visits_metric: FunWithFlags.enabled?(:visits_metric, for: user),
+ views_per_visit_metric: FunWithFlags.enabled?(:views_per_visit_metric, for: user),
comparisons: FunWithFlags.enabled?(:comparisons, for: user)
}
end
diff --git a/test/plausible/imported/imported_test.exs b/test/plausible/imported/imported_test.exs
index 54e36af307..aae0794fa3 100644
--- a/test/plausible/imported/imported_test.exs
+++ b/test/plausible/imported/imported_test.exs
@@ -1126,12 +1126,12 @@ defmodule Plausible.ImportedTest do
},
%{
"change" => 100,
- "name" => "Total pageviews",
+ "name" => "Total visits",
"value" => 1
},
%{
"change" => 100,
- "name" => "Visits",
+ "name" => "Total pageviews",
"value" => 1
},
%{
diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/visitors.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/visitors.csv
index b0ae494748..c835217e95 100644
--- a/test/plausible_web/controllers/CSVs/30d-filter-path/visitors.csv
+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/visitors.csv
@@ -1,32 +1,32 @@
-date,visitors,pageviews,visits,bounce_rate,visit_duration
-2021-09-20,0,0,0,,
-2021-09-21,0,0,0,,
-2021-09-22,0,0,0,,
-2021-09-23,0,0,0,,
-2021-09-24,0,0,0,,
-2021-09-25,0,0,0,,
-2021-09-26,0,0,0,,
-2021-09-27,0,0,0,,
-2021-09-28,0,0,0,,
-2021-09-29,0,0,0,,
-2021-09-30,0,0,0,,
-2021-10-01,0,0,0,,
-2021-10-02,0,0,0,,
-2021-10-03,0,0,0,,
-2021-10-04,0,0,0,,
-2021-10-05,0,0,0,,
-2021-10-06,0,0,0,,
-2021-10-07,0,0,0,,
-2021-10-08,0,0,0,,
-2021-10-09,0,0,0,,
-2021-10-10,0,0,0,,
-2021-10-11,0,0,0,,
-2021-10-12,0,0,0,,
-2021-10-13,0,0,0,,
-2021-10-14,0,0,0,,
-2021-10-15,0,0,0,,
-2021-10-16,0,0,0,,
-2021-10-17,0,0,0,,
-2021-10-18,0,0,0,,
-2021-10-19,0,0,0,,
-2021-10-20,1,1,0,,
+date,visitors,pageviews,visits,views_per_visit,bounce_rate,visit_duration
+2021-09-20,0,0,0,0.0,,
+2021-09-21,0,0,0,0.0,,
+2021-09-22,0,0,0,0.0,,
+2021-09-23,0,0,0,0.0,,
+2021-09-24,0,0,0,0.0,,
+2021-09-25,0,0,0,0.0,,
+2021-09-26,0,0,0,0.0,,
+2021-09-27,0,0,0,0.0,,
+2021-09-28,0,0,0,0.0,,
+2021-09-29,0,0,0,0.0,,
+2021-09-30,0,0,0,0.0,,
+2021-10-01,0,0,0,0.0,,
+2021-10-02,0,0,0,0.0,,
+2021-10-03,0,0,0,0.0,,
+2021-10-04,0,0,0,0.0,,
+2021-10-05,0,0,0,0.0,,
+2021-10-06,0,0,0,0.0,,
+2021-10-07,0,0,0,0.0,,
+2021-10-08,0,0,0,0.0,,
+2021-10-09,0,0,0,0.0,,
+2021-10-10,0,0,0,0.0,,
+2021-10-11,0,0,0,0.0,,
+2021-10-12,0,0,0,0.0,,
+2021-10-13,0,0,0,0.0,,
+2021-10-14,0,0,0,0.0,,
+2021-10-15,0,0,0,0.0,,
+2021-10-16,0,0,0,0.0,,
+2021-10-17,0,0,0,0.0,,
+2021-10-18,0,0,0,0.0,,
+2021-10-19,0,0,0,0.0,,
+2021-10-20,1,1,0,0.0,,
diff --git a/test/plausible_web/controllers/CSVs/30d/visitors.csv b/test/plausible_web/controllers/CSVs/30d/visitors.csv
index c23dbb7c28..fcfe6aa24d 100644
--- a/test/plausible_web/controllers/CSVs/30d/visitors.csv
+++ b/test/plausible_web/controllers/CSVs/30d/visitors.csv
@@ -1,32 +1,32 @@
-date,visitors,pageviews,visits,bounce_rate,visit_duration
-2021-09-20,1,1,1,100,0
-2021-09-21,0,0,0,,
-2021-09-22,0,0,0,,
-2021-09-23,0,0,0,,
-2021-09-24,0,0,0,,
-2021-09-25,0,0,0,,
-2021-09-26,0,0,0,,
-2021-09-27,0,0,0,,
-2021-09-28,0,0,0,,
-2021-09-29,0,0,0,,
-2021-09-30,0,0,0,,
-2021-10-01,0,0,0,,
-2021-10-02,0,0,0,,
-2021-10-03,0,0,0,,
-2021-10-04,0,0,0,,
-2021-10-05,0,0,0,,
-2021-10-06,0,0,0,,
-2021-10-07,0,0,0,,
-2021-10-08,0,0,0,,
-2021-10-09,0,0,0,,
-2021-10-10,0,0,0,,
-2021-10-11,0,0,0,,
-2021-10-12,0,0,0,,
-2021-10-13,0,0,0,,
-2021-10-14,0,0,0,,
-2021-10-15,0,0,0,,
-2021-10-16,0,0,0,,
-2021-10-17,0,0,0,,
-2021-10-18,0,0,0,,
-2021-10-19,2,1,2,100,0
-2021-10-20,1,2,1,0,60
+date,visitors,pageviews,visits,views_per_visit,bounce_rate,visit_duration
+2021-09-20,1,1,1,1.0,100,0
+2021-09-21,0,0,0,0.0,,
+2021-09-22,0,0,0,0.0,,
+2021-09-23,0,0,0,0.0,,
+2021-09-24,0,0,0,0.0,,
+2021-09-25,0,0,0,0.0,,
+2021-09-26,0,0,0,0.0,,
+2021-09-27,0,0,0,0.0,,
+2021-09-28,0,0,0,0.0,,
+2021-09-29,0,0,0,0.0,,
+2021-09-30,0,0,0,0.0,,
+2021-10-01,0,0,0,0.0,,
+2021-10-02,0,0,0,0.0,,
+2021-10-03,0,0,0,0.0,,
+2021-10-04,0,0,0,0.0,,
+2021-10-05,0,0,0,0.0,,
+2021-10-06,0,0,0,0.0,,
+2021-10-07,0,0,0,0.0,,
+2021-10-08,0,0,0,0.0,,
+2021-10-09,0,0,0,0.0,,
+2021-10-10,0,0,0,0.0,,
+2021-10-11,0,0,0,0.0,,
+2021-10-12,0,0,0,0.0,,
+2021-10-13,0,0,0,0.0,,
+2021-10-14,0,0,0,0.0,,
+2021-10-15,0,0,0,0.0,,
+2021-10-16,0,0,0,0.0,,
+2021-10-17,0,0,0,0.0,,
+2021-10-18,0,0,0,0.0,,
+2021-10-19,2,1,2,0.5,100,0
+2021-10-20,1,2,1,2.0,0,60
diff --git a/test/plausible_web/controllers/CSVs/6m/visitors.csv b/test/plausible_web/controllers/CSVs/6m/visitors.csv
index b7c61f1db7..b6881dd9e4 100644
--- a/test/plausible_web/controllers/CSVs/6m/visitors.csv
+++ b/test/plausible_web/controllers/CSVs/6m/visitors.csv
@@ -1,7 +1,7 @@
-date,visitors,pageviews,visits,bounce_rate,visit_duration
-2021-05-01,1,1,1,100,0
-2021-06-01,0,0,0,,
-2021-07-01,0,0,0,,
-2021-08-01,0,0,0,,
-2021-09-01,1,1,1,100,0
-2021-10-01,3,3,3,67,20
+date,visitors,pageviews,visits,views_per_visit,bounce_rate,visit_duration
+2021-05-01,1,1,1,1.0,100,0
+2021-06-01,0,0,0,0.0,,
+2021-07-01,0,0,0,0.0,,
+2021-08-01,0,0,0,0.0,,
+2021-09-01,1,1,1,1.0,100,0
+2021-10-01,3,3,3,1.0,67,20
diff --git a/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs b/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs
index 15456ccdd5..c0c355d482 100644
--- a/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs
+++ b/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs
@@ -116,7 +116,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.AggregateTest do
}
end
- test "rounds pages_per_visit to two decimal places", %{
+ test "rounds views_per_visit to two decimal places", %{
conn: conn,
site: site
} do
@@ -133,11 +133,11 @@ defmodule PlausibleWeb.Api.ExternalStatsController.AggregateTest do
"site_id" => site.domain,
"period" => "day",
"date" => "2021-01-01",
- "metrics" => "pages_per_visit"
+ "metrics" => "views_per_visit"
})
assert json_response(conn, 200)["results"] == %{
- "pages_per_visit" => %{"value" => 1.67}
+ "views_per_visit" => %{"value" => 1.67}
}
end
@@ -156,14 +156,14 @@ defmodule PlausibleWeb.Api.ExternalStatsController.AggregateTest do
"site_id" => site.domain,
"period" => "day",
"date" => "2021-01-01",
- "metrics" => "pageviews,visits,pages_per_visit,visitors,bounce_rate,visit_duration"
+ "metrics" => "pageviews,visits,views_per_visit,visitors,bounce_rate,visit_duration"
})
assert json_response(conn, 200)["results"] == %{
"pageviews" => %{"value" => 3},
"visitors" => %{"value" => 2},
"visits" => %{"value" => 2},
- "pages_per_visit" => %{"value" => 1.5},
+ "views_per_visit" => %{"value" => 1.5},
"bounce_rate" => %{"value" => 50},
"visit_duration" => %{"value" => 750}
}
diff --git a/test/plausible_web/controllers/api/external_stats_controller/timeseries_test.exs b/test/plausible_web/controllers/api/external_stats_controller/timeseries_test.exs
index 00dc07c86c..c1b313e8b5 100644
--- a/test/plausible_web/controllers/api/external_stats_controller/timeseries_test.exs
+++ b/test/plausible_web/controllers/api/external_stats_controller/timeseries_test.exs
@@ -799,7 +799,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.TimeseriesTest do
end
describe "metrics" do
- test "shows pageviews,visits,pages_per_visit for last 7d", %{conn: conn, site: site} do
+ test "shows pageviews,visits,views_per_visit for last 7d", %{conn: conn, site: site} do
populate_stats([
build(:pageview,
user_id: @user_id,
@@ -819,7 +819,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.TimeseriesTest do
get(conn, "/api/v1/stats/timeseries", %{
"site_id" => site.domain,
"period" => "7d",
- "metrics" => "pageviews,visits,pages_per_visit",
+ "metrics" => "pageviews,visits,views_per_visit",
"date" => "2021-01-07"
})
@@ -829,49 +829,49 @@ defmodule PlausibleWeb.Api.ExternalStatsController.TimeseriesTest do
"date" => "2021-01-01",
"pageviews" => 3,
"visits" => 2,
- "pages_per_visit" => 1.5
+ "views_per_visit" => 1.5
},
%{
"date" => "2021-01-02",
"pageviews" => 0,
"visits" => 0,
- "pages_per_visit" => 0.0
+ "views_per_visit" => 0.0
},
%{
"date" => "2021-01-03",
"pageviews" => 0,
"visits" => 0,
- "pages_per_visit" => 0.0
+ "views_per_visit" => 0.0
},
%{
"date" => "2021-01-04",
"pageviews" => 0,
"visits" => 0,
- "pages_per_visit" => 0.0
+ "views_per_visit" => 0.0
},
%{
"date" => "2021-01-05",
"pageviews" => 0,
"visits" => 0,
- "pages_per_visit" => 0.0
+ "views_per_visit" => 0.0
},
%{
"date" => "2021-01-06",
"pageviews" => 0,
"visits" => 0,
- "pages_per_visit" => 0.0
+ "views_per_visit" => 0.0
},
%{
"date" => "2021-01-07",
"pageviews" => 1,
"visits" => 1,
- "pages_per_visit" => 1.0
+ "views_per_visit" => 1.0
}
]
}
end
- test "rounds pages_per_visit to two decimal places", %{
+ test "rounds views_per_visit to two decimal places", %{
conn: conn,
site: site
} do
@@ -905,19 +905,19 @@ defmodule PlausibleWeb.Api.ExternalStatsController.TimeseriesTest do
get(conn, "/api/v1/stats/timeseries", %{
"site_id" => site.domain,
"period" => "7d",
- "metrics" => "pages_per_visit",
+ "metrics" => "views_per_visit",
"date" => "2021-01-07"
})
assert json_response(conn, 200) == %{
"results" => [
- %{"date" => "2021-01-01", "pages_per_visit" => 2.0},
- %{"date" => "2021-01-02", "pages_per_visit" => 0.0},
- %{"date" => "2021-01-03", "pages_per_visit" => 1.33},
- %{"date" => "2021-01-04", "pages_per_visit" => 0.0},
- %{"date" => "2021-01-05", "pages_per_visit" => 0.0},
- %{"date" => "2021-01-06", "pages_per_visit" => 0.0},
- %{"date" => "2021-01-07", "pages_per_visit" => 1.0}
+ %{"date" => "2021-01-01", "views_per_visit" => 2.0},
+ %{"date" => "2021-01-02", "views_per_visit" => 0.0},
+ %{"date" => "2021-01-03", "views_per_visit" => 1.33},
+ %{"date" => "2021-01-04", "views_per_visit" => 0.0},
+ %{"date" => "2021-01-05", "views_per_visit" => 0.0},
+ %{"date" => "2021-01-06", "views_per_visit" => 0.0},
+ %{"date" => "2021-01-07", "views_per_visit" => 1.0}
]
}
end
diff --git a/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs b/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs
index c19c478037..c6b295abe9 100644
--- a/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs
@@ -43,7 +43,21 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=day&date=2021-01-01")
res = json_response(conn, 200)
- assert %{"name" => "Visits", "value" => 3, "change" => 100} in res["top_stats"]
+ assert %{"name" => "Total visits", "value" => 3, "change" => 100} in res["top_stats"]
+ end
+
+ test "counts pages per visit", %{conn: conn, site: site} do
+ populate_stats(site, [
+ build(:pageview, user_id: @user_id, timestamp: ~N[2021-01-01 00:00:00]),
+ build(:pageview, user_id: @user_id, timestamp: ~N[2021-01-01 00:01:00]),
+ build(:pageview, timestamp: ~N[2021-01-01 00:02:00]),
+ build(:pageview, timestamp: ~N[2021-01-01 15:00:00])
+ ])
+
+ conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=day&date=2021-01-01")
+
+ res = json_response(conn, 200)
+ assert %{"name" => "Views per visit", "value" => 1.33, "change" => 100} in res["top_stats"]
end
test "calculates bounce rate", %{conn: conn, site: site} do
@@ -338,7 +352,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
)
res = json_response(conn, 200)
- assert %{"name" => "Visits", "value" => 2, "change" => 100} in res["top_stats"]
+ assert %{"name" => "Total visits", "value" => 2, "change" => 100} in res["top_stats"]
end
end
diff --git a/test/plausible_web/controllers/stats_controller_test.exs b/test/plausible_web/controllers/stats_controller_test.exs
index dc08d3db20..9ec925d1e7 100644
--- a/test/plausible_web/controllers/stats_controller_test.exs
+++ b/test/plausible_web/controllers/stats_controller_test.exs
@@ -119,12 +119,20 @@ defmodule PlausibleWeb.StatsControllerTest do
|> Enum.map(&String.split(&1, ","))
assert parsed_csv == [
- ["date", "visitors", "pageviews", "visits", "bounce_rate", "visit_duration"],
- ["2021-09-20", "1", "1", "1", "100", "0"],
- ["2021-09-27", "0", "0", "0", "", ""],
- ["2021-10-04", "0", "0", "0", "", ""],
- ["2021-10-11", "0", "0", "0", "", ""],
- ["2021-10-18", "3", "3", "3", "67", "20"],
+ [
+ "date",
+ "visitors",
+ "pageviews",
+ "visits",
+ "views_per_visit",
+ "bounce_rate",
+ "visit_duration"
+ ],
+ ["2021-09-20", "1", "1", "1", "1.0", "100", "0"],
+ ["2021-09-27", "0", "0", "0", "0.0", "", ""],
+ ["2021-10-04", "0", "0", "0", "0.0", "", ""],
+ ["2021-10-11", "0", "0", "0", "0.0", "", ""],
+ ["2021-10-18", "3", "3", "3", "1.0", "67", "20"],
[""]
]
end