diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex index d3d9240c7..b94f95e8c 100644 --- a/lib/plausible/stats/clickhouse.ex +++ b/lib/plausible/stats/clickhouse.ex @@ -226,12 +226,32 @@ defmodule Plausible.Stats.Clickhouse do {site.domain, %{ intervals: empty_24h_intervals(now), - visitors: 0 + visitors: 0, + change: 0 }} end) |> Map.new() - query = + previous_query = + from(e in "events_v2", + hints: [sample: 20_000_000], + where: e.site_id in ^Map.keys(site_id_to_domain_mapping), + where: e.timestamp >= ^NaiveDateTime.add(now, -48, :hour), + where: e.timestamp <= ^NaiveDateTime.add(now, -24, :hour), + select: { + e.site_id, + fragment("toUInt64(round(uniq(user_id) * any(_sample_factor)))") + }, + group_by: [e.site_id], + order_by: [e.site_id] + ) + + previous_result = + previous_query + |> ClickhouseRepo.all() + |> Map.new() + + current_query = from(e in "events_v2", hints: [sample: 20_000_000], where: e.site_id in ^Map.keys(site_id_to_domain_mapping), @@ -247,7 +267,7 @@ defmodule Plausible.Stats.Clickhouse do ) result = - query + current_query |> ClickhouseRepo.all() |> Enum.group_by(& &1.site_id) |> Enum.map(fn {site_id, entries} -> @@ -261,7 +281,10 @@ defmodule Plausible.Stats.Clickhouse do |> Enum.uniq_by(& &1.interval) |> Enum.sort_by(& &1.interval, NaiveDateTime) - {site_id_to_domain_mapping[site_id], %{intervals: full_entries, visitors: visitors}} + change = Plausible.Stats.Compare.percent_change(previous_result[site_id], visitors) || 100 + + {site_id_to_domain_mapping[site_id], + %{intervals: full_entries, visitors: visitors, change: change}} end) |> Map.new() diff --git a/lib/plausible/stats/compare.ex b/lib/plausible/stats/compare.ex index 99c6fc0bd..2ae24dd4b 100644 --- a/lib/plausible/stats/compare.ex +++ b/lib/plausible/stats/compare.ex @@ -13,7 +13,15 @@ defmodule Plausible.Stats.Compare do percent_change(old_count, new_count) end - defp percent_change(old_count, new_count) do + def percent_change(nil, _new_count), do: nil + + def percent_change(%Money{} = old_count, %Money{} = new_count) do + old_count = old_count |> Money.to_decimal() |> Decimal.to_float() + new_count = new_count |> Money.to_decimal() |> Decimal.to_float() + percent_change(old_count, new_count) + end + + def percent_change(old_count, new_count) do cond do old_count == 0 and new_count > 0 -> 100 diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index c4a682455..bdd1299b7 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -454,33 +454,12 @@ defmodule PlausibleWeb.Api.StatsController do end end - defp calculate_change(:bounce_rate, old_count, new_count) do + def calculate_change(:bounce_rate, old_count, new_count) do if old_count > 0, do: new_count - old_count end - defp calculate_change(_metric, old_count, new_count) do - percent_change(old_count, new_count) - end - - defp percent_change(nil, _new_count), do: nil - - defp percent_change(%Money{} = old_count, %Money{} = new_count) do - old_count = old_count |> Money.to_decimal() |> Decimal.to_float() - new_count = new_count |> Money.to_decimal() |> Decimal.to_float() - percent_change(old_count, new_count) - end - - defp percent_change(old_count, new_count) do - cond do - old_count == 0 and new_count > 0 -> - 100 - - old_count == 0 and new_count == 0 -> - 0 - - true -> - round((new_count - old_count) / old_count * 100) - end + def calculate_change(_metric, old_count, new_count) do + Stats.Compare.percent_change(old_count, new_count) end def sources(conn, params) do @@ -1361,8 +1340,8 @@ defmodule PlausibleWeb.Api.StatsController do |> Query.put_filter(filter_name, {:member, items}) |> Query.remove_event_filters([:goal, :props]) - # Here, we're always only interested in the first page of results - # - the :member filter makes sure that the results always match with + # Here, we're always only interested in the first page of results + # - the :member filter makes sure that the results always match with # the items in the given breakdown_results list pagination = {elem(pagination, 0), 1} diff --git a/lib/plausible_web/live/components/visitors24.ex b/lib/plausible_web/live/components/visitors.ex similarity index 85% rename from lib/plausible_web/live/components/visitors24.ex rename to lib/plausible_web/live/components/visitors.ex index 7bc0fcb40..ba2db53a3 100644 --- a/lib/plausible_web/live/components/visitors24.ex +++ b/lib/plausible_web/live/components/visitors.ex @@ -19,15 +19,15 @@ defmodule PlausibleWeb.Live.Components.Visitors do assigns.intervals |> scale(assigns.height) |> Enum.with_index(fn scaled_value, index -> - "#{(index - 1) * assigns.tick},#{scaled_value}" + "#{index * assigns.tick},#{scaled_value}" end) clip_points = List.flatten([ - "-#{assigns.tick},#{assigns.height + 1}", + "0,#{assigns.height + 1}", points, - "#{(length(points) - 2) * assigns.tick},#{assigns.height + 1}", - "-#{assigns.tick},#{assigns.height + 1}" + "#{(length(points) - 1) * assigns.tick},#{assigns.height + 1}", + "0,#{assigns.height + 1}" ]) assigns = @@ -38,16 +38,16 @@ defmodule PlausibleWeb.Live.Components.Visitors do |> assign(:id, Ecto.UUID.generate()) ~H""" - + - - <%= PlausibleWeb.StatsView.large_number_format(@hourly_stats.visitors) %> - visitors in last 24h - +
+

+ + <%= PlausibleWeb.StatsView.large_number_format(@hourly_stats.visitors) %> + visitors in last 24h + +

+ + <.percentage_change change={@hourly_stats.change} /> +
""" end + attr :change, :integer, required: true + + def percentage_change(assigns) do + ~H""" +

+ 0} class="text-green-500">↑ <%= @change %>% + ↓ <%= @change %>% +

+ """ + end + attr :user, Plausible.Auth.User, required: true def invitation_modal(assigns) do diff --git a/test/plausible/stats/clickhouse_test.exs b/test/plausible/stats/clickhouse_test.exs index d91058f6f..10fc2a370 100644 --- a/test/plausible/stats/clickhouse_test.exs +++ b/test/plausible/stats/clickhouse_test.exs @@ -19,6 +19,7 @@ defmodule Plausible.Stats.ClickhouseTest do ) == %{ domain => %{ + change: 0, visitors: 0, intervals: [ %{interval: ~N[2023-10-25 11:00:00], visitors: 0}, @@ -65,6 +66,7 @@ defmodule Plausible.Stats.ClickhouseTest do ]) %{ + change: 100, visitors: 3, intervals: [ %{interval: ~N[2023-10-25 11:00:00], visitors: 0}, @@ -122,8 +124,11 @@ defmodule Plausible.Stats.ClickhouseTest do Clickhouse.last_24h_visitors_hourly_intervals([site1, site2, site3], fixed_now) assert result[site1.domain].visitors == 3 + assert result[site1.domain].change == 100 assert result[site2.domain].visitors == 3 + assert result[site2.domain].change == 100 assert result[site3.domain].visitors == 0 + assert result[site3.domain].change == 0 find_interval = fn result, domain, interval -> Enum.find(result[domain].intervals, &(&1.interval == interval)) @@ -135,4 +140,22 @@ defmodule Plausible.Stats.ClickhouseTest do assert find_interval.(result, site2.domain, ~N[2023-10-25 15:00:00]).visitors == 1 end end + + test "returns calculated change" do + fixed_now = ~N[2023-10-26 10:00:15] + site = insert(:site) + + populate_stats(site, [ + build(:pageview, timestamp: ~N[2023-10-24 11:58:00]), + build(:pageview, timestamp: ~N[2023-10-24 12:59:00]), + build(:pageview, timestamp: ~N[2023-10-25 13:59:00]), + build(:pageview, timestamp: ~N[2023-10-25 13:58:00]), + build(:pageview, timestamp: ~N[2023-10-25 13:59:00]) + ]) + + %{ + change: 50, + visitors: 3 + } = Clickhouse.last_24h_visitors_hourly_intervals([site], fixed_now)[site.domain] + end end