From 17b9e36a19a00ffb0fdcbf88141de97d4e8dde8c Mon Sep 17 00:00:00 2001 From: RobertJoonas <56999674+RobertJoonas@users.noreply.github.com> Date: Mon, 31 Jul 2023 11:33:37 +0300 Subject: [PATCH] Refactor: Standardize API metrics used internally (#3208) * extract add_exit_rate function * Change internal API metric names for /entry-pages & /exit-pages * `unique_entrances` -> `visitors`, * `total_entrances` -> `visits`, * `unique_exits` -> `visitors`, * `total_exits` -> `visits`, This is just a consistency improvement - the `visitors` metric always means one thing and there's no need to call it different for entry pages internally. This commit does not change any noticable behavior. The UI labels are kept the same and the column headers in the CSV export will also remain the same. * Change internal API metric names for /conversions * `unique_conversions` -> `visitors`, * `total_conversions` -> `events`, --- .../dashboard/stats/behaviours/conversions.js | 8 +- .../js/dashboard/stats/modals/entry-pages.js | 4 +- .../js/dashboard/stats/modals/exit-pages.js | 4 +- assets/js/dashboard/stats/pages/index.js | 6 +- assets/js/dashboard/stats/reports/metrics.js | 10 -- .../controllers/api/stats_controller.ex | 116 ++++++++------- test/plausible/imported/imported_test.exs | 6 +- .../api/stats_controller/conversions_test.exs | 136 +++++++++--------- .../api/stats_controller/pages_test.exs | 68 ++++----- 9 files changed, 181 insertions(+), 177 deletions(-) diff --git a/assets/js/dashboard/stats/behaviours/conversions.js b/assets/js/dashboard/stats/behaviours/conversions.js index 9a65df9a1..19f2706a5 100644 --- a/assets/js/dashboard/stats/behaviours/conversions.js +++ b/assets/js/dashboard/stats/behaviours/conversions.js @@ -52,17 +52,17 @@ export default class Conversions extends React.Component {
{goal.name}
- {numberFormatter(goal.unique_conversions)} - {numberFormatter(goal.total_conversions)} + {numberFormatter(goal.visitors)} + {numberFormatter(goal.events)} {goal.conversion_rate}% {renderRevenueColumn && } {renderRevenueColumn && } diff --git a/assets/js/dashboard/stats/modals/entry-pages.js b/assets/js/dashboard/stats/modals/entry-pages.js index 22a298119..55c1b2b7e 100644 --- a/assets/js/dashboard/stats/modals/entry-pages.js +++ b/assets/js/dashboard/stats/modals/entry-pages.js @@ -90,8 +90,8 @@ class EntryPagesModal extends React.Component { {this.showConversionRate() && {numberFormatter(page.total_visitors)}} - {numberFormatter(page.unique_entrances)} - {this.showExtra() && {numberFormatter(page.total_entrances)}} + {numberFormatter(page.visitors)} + {this.showExtra() && {numberFormatter(page.visits)}} {this.showExtra() && {durationFormatter(page.visit_duration)}} {this.showConversionRate() && {numberFormatter(page.conversion_rate)}%} diff --git a/assets/js/dashboard/stats/modals/exit-pages.js b/assets/js/dashboard/stats/modals/exit-pages.js index dc0953692..258f9dc42 100644 --- a/assets/js/dashboard/stats/modals/exit-pages.js +++ b/assets/js/dashboard/stats/modals/exit-pages.js @@ -72,8 +72,8 @@ class ExitPagesModal extends React.Component { {page.name} {this.showConversionRate() && {numberFormatter(page.total_visitors)}} - {numberFormatter(page.unique_exits)} - {this.showExtra() && {numberFormatter(page.total_exits)}} + {numberFormatter(page.visitors)} + {this.showExtra() && {numberFormatter(page.visits)}} {this.showExtra() && {this.formatPercentage(page.exit_rate)}} {this.showConversionRate() && {numberFormatter(page.conversion_rate)}%} diff --git a/assets/js/dashboard/stats/pages/index.js b/assets/js/dashboard/stats/pages/index.js index 5ab06b634..255f0ae29 100644 --- a/assets/js/dashboard/stats/pages/index.js +++ b/assets/js/dashboard/stats/pages/index.js @@ -4,7 +4,7 @@ import * as storage from '../../util/storage' import * as url from '../../util/url' import * as api from '../../api' import ListReport from './../reports/list' -import { VISITORS_METRIC, UNIQUE_ENTRANCES_METRIC, UNIQUE_EXITS_METRIC, maybeWithCR } from './../reports/metrics'; +import { VISITORS_METRIC, maybeWithCR } from './../reports/metrics'; function EntryPages({query, site}) { function fetchData() { @@ -24,7 +24,7 @@ function EntryPages({query, site}) { fetchData={fetchData} getFilterFor={getFilterFor} keyLabel="Entry page" - metrics={maybeWithCR([UNIQUE_ENTRANCES_METRIC], query)} + metrics={maybeWithCR([{...VISITORS_METRIC, label: 'Unique Entrances'}], query)} detailsLink={url.sitePath(site, '/entry-pages')} query={query} externalLinkDest={externalLinkDest} @@ -51,7 +51,7 @@ function ExitPages({query, site}) { fetchData={fetchData} getFilterFor={getFilterFor} keyLabel="Exit page" - metrics={maybeWithCR([UNIQUE_EXITS_METRIC], query)} + metrics={maybeWithCR([{...VISITORS_METRIC, label: "Unique Exits"}], query)} detailsLink={url.sitePath(site, '/exit-pages')} query={query} externalLinkDest={externalLinkDest} diff --git a/assets/js/dashboard/stats/reports/metrics.js b/assets/js/dashboard/stats/reports/metrics.js index c69cb7b13..3f40c1498 100644 --- a/assets/js/dashboard/stats/reports/metrics.js +++ b/assets/js/dashboard/stats/reports/metrics.js @@ -7,16 +7,6 @@ export const VISITORS_METRIC = { realtimeLabel: 'Current visitors', goalFilterLabel: 'Conversions' } -export const UNIQUE_ENTRANCES_METRIC = { - ...VISITORS_METRIC, - name: 'unique_entrances', - label: 'Unique Entrances' -} -export const UNIQUE_EXITS_METRIC = { - ...VISITORS_METRIC, - name: 'unique_exits', - label: 'Unique Exits' -} export const PERCENTAGE_METRIC = { name: 'percentage', label: '%' } export const CR_METRIC = { name: 'conversion_rate', label: 'CR' } diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index 1997ae980..9b9f2f929 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -796,19 +796,22 @@ defmodule PlausibleWeb.Api.StatsController do entry_pages = Stats.breakdown(site, query, "visit:entry_page", metrics, pagination) |> add_cr(site, query, pagination, :entry_page, "visit:entry_page") - |> transform_keys(%{ - entry_page: :name, - visitors: :unique_entrances, - visits: :total_entrances - }) + |> transform_keys(%{entry_page: :name}) if params["csv"] do if Map.has_key?(query.filters, "event:goal") do - entry_pages - |> transform_keys(%{unique_entrances: :conversions}) - |> to_csv([:name, :conversions, :conversion_rate]) + to_csv(entry_pages, [:name, :visitors, :conversion_rate], [ + :name, + :conversions, + :conversion_rate + ]) else - entry_pages |> to_csv([:name, :unique_entrances, :total_entrances, :visit_duration]) + to_csv(entry_pages, [:name, :visitors, :visits, :visit_duration], [ + :name, + :unique_entrances, + :total_entrances, + :visit_duration + ]) end else json(conn, entry_pages) @@ -824,52 +827,57 @@ defmodule PlausibleWeb.Api.StatsController do exit_pages = Stats.breakdown(site, query, "visit:exit_page", metrics, {limit, page}) |> add_cr(site, query, {limit, page}, :exit_page, "visit:exit_page") - |> transform_keys(%{ - exit_page: :name, - visitors: :unique_exits, - visits: :total_exits - }) - - pages = Enum.map(exit_pages, & &1[:name]) - - total_visits_query = - Query.put_filter(query, "event:page", {:member, pages}) - |> Query.put_filter("event:name", {:is, "pageview"}) - - exit_pages = - if !Query.has_event_filters?(query) do - total_pageviews = - Stats.breakdown(site, total_visits_query, "event:page", [:pageviews], {limit, 1}) - - Enum.map(exit_pages, fn exit_page -> - exit_rate = - case Enum.find(total_pageviews, &(&1[:page] == exit_page[:name])) do - %{pageviews: pageviews} -> - Float.floor(exit_page[:total_exits] / pageviews * 100) - - nil -> - nil - end - - Map.put(exit_page, :exit_rate, exit_rate) - end) - else - exit_pages - end + |> add_exit_rate(site, query, limit) + |> transform_keys(%{exit_page: :name}) if params["csv"] do if Map.has_key?(query.filters, "event:goal") do - exit_pages - |> transform_keys(%{unique_exits: :conversions}) - |> to_csv([:name, :conversions, :conversion_rate]) + to_csv(exit_pages, [:name, :visitors, :conversion_rate], [ + :name, + :conversions, + :conversion_rate + ]) else - exit_pages |> to_csv([:name, :unique_exits, :total_exits, :exit_rate]) + to_csv(exit_pages, [:name, :visitors, :visits, :exit_rate], [ + :name, + :unique_exits, + :total_exits, + :exit_rate + ]) end else json(conn, exit_pages) end end + defp add_exit_rate(breakdown_results, site, query, limit) do + if Query.has_event_filters?(query) do + breakdown_results + else + pages = Enum.map(breakdown_results, & &1[:exit_page]) + + total_visits_query = + Query.put_filter(query, "event:page", {:member, pages}) + |> Query.put_filter("event:name", {:is, "pageview"}) + + total_pageviews = + Stats.breakdown(site, total_visits_query, "event:page", [:pageviews], {limit, 1}) + + Enum.map(breakdown_results, fn result -> + exit_rate = + case Enum.find(total_pageviews, &(&1[:page] == result[:exit_page])) do + %{pageviews: pageviews} -> + Float.floor(result[:visits] / pageviews * 100) + + nil -> + nil + end + + Map.put(result, :exit_rate, exit_rate) + end) + end + end + def countries(conn, params) do site = conn.assigns[:site] query = site |> Query.from(params) |> Filters.add_prefix() @@ -1126,17 +1134,21 @@ defmodule PlausibleWeb.Api.StatsController do conversions = site |> Stats.breakdown(query, "event:goal", metrics, {100, 1}) - |> transform_keys(%{goal: :name, visitors: :unique_conversions, events: :total_conversions}) + |> transform_keys(%{goal: :name}) |> Enum.map(fn goal -> goal |> Map.put(:prop_names, CustomProps.props_for_goal(site, query)) - |> Map.put(:conversion_rate, calculate_cr(total_visitors, goal[:unique_conversions])) + |> Map.put(:conversion_rate, calculate_cr(total_visitors, goal[:visitors])) |> Enum.map(&format_revenue_metric/1) |> Map.new() end) if params["csv"] do - to_csv(conversions, [:name, :unique_conversions, :total_conversions]) + to_csv(conversions, [:name, :visitors, :events], [ + :name, + :unique_conversions, + :total_conversions + ]) else json(conn, conversions) end @@ -1364,10 +1376,12 @@ defmodule PlausibleWeb.Api.StatsController do defp add_cr(breakdown_results, _, _, _, _, _), do: breakdown_results - defp to_csv(list, headers) do + defp to_csv(list, columns), do: to_csv(list, columns, columns) + + defp to_csv(list, columns, column_names) do list - |> Enum.map(fn row -> Enum.map(headers, &row[&1]) end) - |> (fn res -> [headers | res] end).() + |> Enum.map(fn row -> Enum.map(columns, &row[&1]) end) + |> (fn res -> [column_names | res] end).() |> CSV.encode() |> Enum.join() end diff --git a/test/plausible/imported/imported_test.exs b/test/plausible/imported/imported_test.exs index 924803add..681f1f8a9 100644 --- a/test/plausible/imported/imported_test.exs +++ b/test/plausible/imported/imported_test.exs @@ -748,11 +748,11 @@ defmodule Plausible.ImportedTest do assert json_response(conn, 200) == [ %{ "name" => "/page2", - "unique_exits" => 3, - "total_exits" => 4, + "visitors" => 3, + "visits" => 4, "exit_rate" => 80.0 }, - %{"name" => "/page1", "unique_exits" => 2, "total_exits" => 2, "exit_rate" => 66} + %{"name" => "/page1", "visitors" => 2, "visits" => 2, "exit_rate" => 66} ] end 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 5bef44691..200f222dc 100644 --- a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs @@ -35,15 +35,15 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "Signup", - "unique_conversions" => 2, - "total_conversions" => 3, + "visitors" => 2, + "events" => 3, "prop_names" => [], "conversion_rate" => 33.3 }, %{ "name" => "Visit /register", - "unique_conversions" => 2, - "total_conversions" => 2, + "visitors" => 2, + "events" => 2, "prop_names" => [], "conversion_rate" => 33.3 } @@ -84,8 +84,8 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "Payment", - "unique_conversions" => 1, - "total_conversions" => 2, + "visitors" => 1, + "events" => 2, "prop_names" => [], "conversion_rate" => 33.3 } @@ -125,8 +125,8 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "Payment", - "unique_conversions" => 2, - "total_conversions" => 2, + "visitors" => 2, + "events" => 2, "prop_names" => [], "conversion_rate" => 66.7 } @@ -164,8 +164,8 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "Payment", - "unique_conversions" => 2, - "total_conversions" => 3, + "visitors" => 2, + "events" => 3, "prop_names" => [], "conversion_rate" => 66.7 } @@ -205,8 +205,8 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "Payment", - "unique_conversions" => 2, - "total_conversions" => 3, + "visitors" => 2, + "events" => 3, "prop_names" => [], "conversion_rate" => 66.7 } @@ -256,8 +256,8 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "Payment", - "unique_conversions" => 5, - "total_conversions" => 5, + "visitors" => 5, + "events" => 5, "prop_names" => [], "conversion_rate" => 100.0, "average_revenue" => %{"short" => "€166.7M", "long" => "€166,733,566.75"}, @@ -294,27 +294,27 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do "conversion_rate" => 33.3, "name" => "Payment", "prop_names" => [], - "total_conversions" => 1, + "events" => 1, "total_revenue" => %{"long" => "€10.00", "short" => "€10.0"}, - "unique_conversions" => 1 + "visitors" => 1 }, %{ "average_revenue" => nil, "conversion_rate" => 66.7, "name" => "Signup", "prop_names" => [], - "total_conversions" => 2, + "events" => 2, "total_revenue" => nil, - "unique_conversions" => 2 + "visitors" => 2 }, %{ "average_revenue" => nil, "conversion_rate" => 33.3, "name" => "Visit /checkout", "prop_names" => [], - "total_conversions" => 1, + "events" => 1, "total_revenue" => nil, - "unique_conversions" => 1 + "visitors" => 1 } ] == Enum.sort_by(response, & &1["name"]) end @@ -334,8 +334,8 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "Signup", - "unique_conversions" => 1, - "total_conversions" => 1, + "visitors" => 1, + "events" => 1, "prop_names" => [], "conversion_rate" => 100.0 } @@ -370,8 +370,8 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "Signup", - "unique_conversions" => 2, - "total_conversions" => 2, + "visitors" => 2, + "events" => 2, "prop_names" => ["variant"], "conversion_rate" => 33.3 } @@ -408,8 +408,8 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "Payment", - "unique_conversions" => 2, - "total_conversions" => 2, + "visitors" => 2, + "events" => 2, "prop_names" => ["logged_in"], "conversion_rate" => 66.7 } @@ -573,15 +573,15 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "Signup", - "unique_conversions" => 2, - "total_conversions" => 2, + "visitors" => 2, + "events" => 2, "prop_names" => [], "conversion_rate" => 33.3 }, %{ "name" => "Visit /register", - "unique_conversions" => 1, - "total_conversions" => 1, + "visitors" => 1, + "events" => 1, "prop_names" => [], "conversion_rate" => 16.7 } @@ -614,15 +614,15 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "CTA", - "unique_conversions" => 1, - "total_conversions" => 1, + "visitors" => 1, + "events" => 1, "prop_names" => [], "conversion_rate" => 16.7 }, %{ "name" => "Visit /register", - "unique_conversions" => 1, - "total_conversions" => 1, + "visitors" => 1, + "events" => 1, "prop_names" => [], "conversion_rate" => 16.7 } @@ -650,15 +650,15 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "Visit /blog/**", - "unique_conversions" => 2, - "total_conversions" => 2, + "visitors" => 2, + "events" => 2, "prop_names" => [], "conversion_rate" => 66.7 }, %{ "name" => "Visit /billing/upgrade", - "unique_conversions" => 1, - "total_conversions" => 1, + "visitors" => 1, + "events" => 1, "prop_names" => [], "conversion_rate" => 33.3 } @@ -690,15 +690,15 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "Visit /blog**", - "unique_conversions" => 2, - "total_conversions" => 2, + "visitors" => 2, + "events" => 2, "prop_names" => [], "conversion_rate" => 33.3 }, %{ "name" => "Signup", - "unique_conversions" => 1, - "total_conversions" => 1, + "visitors" => 1, + "events" => 1, "prop_names" => [], "conversion_rate" => 16.7 } @@ -731,15 +731,15 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "Visit /ano**", - "unique_conversions" => 2, - "total_conversions" => 2, + "visitors" => 2, + "events" => 2, "prop_names" => [], "conversion_rate" => 33.3 }, %{ "name" => "CTA", - "unique_conversions" => 1, - "total_conversions" => 1, + "visitors" => 1, + "events" => 1, "prop_names" => [], "conversion_rate" => 16.7 } @@ -769,8 +769,8 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "Visit /register", - "unique_conversions" => 1, - "total_conversions" => 1, + "visitors" => 1, + "events" => 1, "prop_names" => [], "conversion_rate" => 25 } @@ -802,8 +802,8 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "name" => "Signup", - "unique_conversions" => 1, - "total_conversions" => 1, + "visitors" => 1, + "events" => 1, "prop_names" => ["variant"], "conversion_rate" => 50 } @@ -870,58 +870,58 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "conversion_rate" => 100.0, - "unique_conversions" => 8, + "visitors" => 8, "name" => "Visit /**", - "total_conversions" => 8, + "events" => 8, "prop_names" => [] }, %{ "conversion_rate" => 37.5, - "unique_conversions" => 3, + "visitors" => 3, "name" => "Visit /signup/**", - "total_conversions" => 3, + "events" => 3, "prop_names" => [] }, %{ "conversion_rate" => 37.5, - "unique_conversions" => 3, + "visitors" => 3, "name" => "Visit /*", - "total_conversions" => 3, + "events" => 3, "prop_names" => [] }, %{ "conversion_rate" => 25.0, - "unique_conversions" => 2, + "visitors" => 2, "name" => "Visit /billing**/success", - "total_conversions" => 2, + "events" => 2, "prop_names" => [] }, %{ "conversion_rate" => 25.0, - "unique_conversions" => 2, + "visitors" => 2, "name" => "Visit /reg*", - "total_conversions" => 2, + "events" => 2, "prop_names" => [] }, %{ "conversion_rate" => 12.5, - "unique_conversions" => 1, + "visitors" => 1, "name" => "Visit /signup/*", - "total_conversions" => 1, + "events" => 1, "prop_names" => [] }, %{ "conversion_rate" => 12.5, - "unique_conversions" => 1, + "visitors" => 1, "name" => "Visit /billing*/success", - "total_conversions" => 1, + "events" => 1, "prop_names" => [] }, %{ "conversion_rate" => 12.5, - "unique_conversions" => 1, + "visitors" => 1, "name" => "Visit /register", - "total_conversions" => 1, + "events" => 1, "prop_names" => [] } ] @@ -956,9 +956,9 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert json_response(conn, 200) == [ %{ "conversion_rate" => 100.0, - "unique_conversions" => 2, + "visitors" => 2, "name" => "Visit /register**", - "total_conversions" => 2, + "events" => 2, "prop_names" => ["logged_in", "author"] } ] diff --git a/test/plausible_web/controllers/api/stats_controller/pages_test.exs b/test/plausible_web/controllers/api/stats_controller/pages_test.exs index 720372edc..14fa1278b 100644 --- a/test/plausible_web/controllers/api/stats_controller/pages_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/pages_test.exs @@ -903,14 +903,14 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do assert json_response(conn, 200) == [ %{ - "unique_entrances" => 2, - "total_entrances" => 2, + "visitors" => 2, + "visits" => 2, "name" => "/page1", "visit_duration" => 0 }, %{ - "unique_entrances" => 1, - "total_entrances" => 2, + "visitors" => 1, + "visits" => 2, "name" => "/page2", "visit_duration" => 450 } @@ -959,14 +959,14 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do assert json_response(conn, 200) == [ %{ - "unique_entrances" => 1, - "total_entrances" => 1, + "visitors" => 1, + "visits" => 1, "name" => "/blog", "visit_duration" => 60 }, %{ - "unique_entrances" => 1, - "total_entrances" => 1, + "visitors" => 1, + "visits" => 1, "name" => "/blog/john-2", "visit_duration" => 0 } @@ -1014,14 +1014,14 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do assert json_response(conn, 200) == [ %{ - "unique_entrances" => 2, - "total_entrances" => 2, + "visitors" => 2, + "visits" => 2, "name" => "/page1", "visit_duration" => 0 }, %{ - "unique_entrances" => 1, - "total_entrances" => 2, + "visitors" => 1, + "visits" => 2, "name" => "/page2", "visit_duration" => 450 } @@ -1035,14 +1035,14 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do assert json_response(conn, 200) == [ %{ - "unique_entrances" => 3, - "total_entrances" => 5, + "visitors" => 3, + "visits" => 5, "name" => "/page2", "visit_duration" => 240.0 }, %{ - "unique_entrances" => 2, - "total_entrances" => 2, + "visitors" => 2, + "visits" => 2, "name" => "/page1", "visit_duration" => 0 } @@ -1094,16 +1094,16 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do assert json_response(conn, 200) == [ %{ "total_visitors" => 2, - "unique_entrances" => 1, - "total_entrances" => 1, + "visitors" => 1, + "visits" => 1, "name" => "/page1", "visit_duration" => 0, "conversion_rate" => 50.0 }, %{ "total_visitors" => 1, - "unique_entrances" => 1, - "total_entrances" => 1, + "visitors" => 1, + "visits" => 1, "name" => "/page2", "visit_duration" => 900, "conversion_rate" => 100.0 @@ -1140,8 +1140,8 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do conn = get(conn, "/api/stats/#{site.domain}/exit-pages?period=day&date=2021-01-01") assert json_response(conn, 200) == [ - %{"name" => "/page1", "unique_exits" => 2, "total_exits" => 2, "exit_rate" => 66}, - %{"name" => "/page2", "unique_exits" => 1, "total_exits" => 1, "exit_rate" => 100} + %{"name" => "/page1", "visitors" => 2, "visits" => 2, "exit_rate" => 66}, + %{"name" => "/page2", "visitors" => 1, "visits" => 1, "exit_rate" => 100} ] end @@ -1180,7 +1180,7 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do ) assert json_response(conn, 200) == [ - %{"name" => "/", "unique_exits" => 1, "total_exits" => 1} + %{"name" => "/", "visitors" => 1, "visits" => 1} ] end @@ -1224,8 +1224,8 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do conn = get(conn, "/api/stats/#{site.domain}/exit-pages?period=day&date=2021-01-01") assert json_response(conn, 200) == [ - %{"name" => "/page1", "unique_exits" => 2, "total_exits" => 2, "exit_rate" => 66}, - %{"name" => "/page2", "unique_exits" => 1, "total_exits" => 1, "exit_rate" => 100} + %{"name" => "/page1", "visitors" => 2, "visits" => 2, "exit_rate" => 66}, + %{"name" => "/page2", "visitors" => 1, "visits" => 1, "exit_rate" => 100} ] conn = @@ -1237,11 +1237,11 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do assert json_response(conn, 200) == [ %{ "name" => "/page2", - "unique_exits" => 3, - "total_exits" => 4, + "visitors" => 3, + "visits" => 4, "exit_rate" => 80.0 }, - %{"name" => "/page1", "unique_exits" => 2, "total_exits" => 2, "exit_rate" => 66} + %{"name" => "/page1", "visitors" => 2, "visits" => 2, "exit_rate" => 66} ] end @@ -1288,16 +1288,16 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do assert json_response(conn, 200) == [ %{ "name" => "/exit1", - "unique_exits" => 1, + "visitors" => 1, "total_visitors" => 1, - "total_exits" => 1, + "visits" => 1, "conversion_rate" => 100.0 }, %{ "name" => "/exit2", - "unique_exits" => 1, + "visitors" => 1, "total_visitors" => 1, - "total_exits" => 1, + "visits" => 1, "conversion_rate" => 100.0 } ] @@ -1341,8 +1341,8 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do ) assert json_response(conn, 200) == [ - %{"name" => "/exit1", "unique_exits" => 1, "total_exits" => 1}, - %{"name" => "/exit2", "unique_exits" => 1, "total_exits" => 1} + %{"name" => "/exit1", "visitors" => 1, "visits" => 1}, + %{"name" => "/exit2", "visitors" => 1, "visits" => 1} ] end end