diff --git a/lib/plausible/billing/billing.ex b/lib/plausible/billing/billing.ex index 97c65de5c..c637d65ca 100644 --- a/lib/plausible/billing/billing.ex +++ b/lib/plausible/billing/billing.ex @@ -129,16 +129,19 @@ defmodule Plausible.Billing do end def usage(user) do + {pageviews, custom_events} = usage_breakdown(user) + pageviews + custom_events + end + + def usage_breakdown(user) do user = Repo.preload(user, :sites) - Enum.reduce(user.sites, 0, fn site, total -> - total + site_usage(site) - end) - end + Enum.reduce(user.sites, {0, 0}, fn site, {pageviews, custom_events} -> + usage = Plausible.Stats.Clickhouse.usage(site) - defp site_usage(site) do - q = Plausible.Stats.Query.from(site.timezone, %{"period" => "30d"}) - Plausible.Stats.Clickhouse.total_events(site, q) + {pageviews + Map.get(usage, :pageviews, 0), + custom_events + Map.get(usage, :custom_events, 0)} + end) end defp format_subscription(params) do diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex index d1acdcf7a..fcb76d475 100644 --- a/lib/plausible/stats/clickhouse.ex +++ b/lib/plausible/stats/clickhouse.ex @@ -158,6 +158,24 @@ defmodule Plausible.Stats.Clickhouse do ) end + def usage(site) do + q = Plausible.Stats.Query.from(site.timezone, %{"period" => "30d"}) + {first_datetime, last_datetime} = utc_boundaries(q, site.timezone) + + ClickhouseRepo.all( + from e in "events", + where: e.domain == ^site.domain, + where: e.timestamp >= ^first_datetime and e.timestamp < ^last_datetime, + group_by: e.name, + select: {e.name, fragment("count(*)")} + ) + |> Enum.map(fn {ev_name, count} -> + ev_name = if ev_name == "pageview", do: :pageviews, else: :custom_events + {ev_name, count} + end) + |> Enum.into(%{}) + end + def pageviews_and_visitors(site, query) do ClickhouseRepo.one( from e in base_query_w_sessions(site, query), diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex index 2194049e5..44dbedacf 100644 --- a/lib/plausible_web/controllers/auth_controller.ex +++ b/lib/plausible_web/controllers/auth_controller.ex @@ -289,10 +289,15 @@ defmodule PlausibleWeb.AuthController do def user_settings(conn, _params) do changeset = Auth.User.changeset(conn.assigns[:current_user]) + {usage_pageviews, usage_custom_events} = + Plausible.Billing.usage_breakdown(conn.assigns[:current_user]) + render(conn, "user_settings.html", changeset: changeset, subscription: conn.assigns[:current_user].subscription, - theme: conn.assigns[:current_user].theme || "system" + theme: conn.assigns[:current_user].theme || "system", + usage_pageviews: usage_pageviews, + usage_custom_events: usage_custom_events ) end diff --git a/lib/plausible_web/email.ex b/lib/plausible_web/email.ex index 4557d3ae7..1f002f2a7 100644 --- a/lib/plausible_web/email.ex +++ b/lib/plausible_web/email.ex @@ -70,12 +70,17 @@ defmodule PlausibleWeb.Email do |> render("trial_one_week_reminder.html", user: user) end - def trial_upgrade_email(user, day, pageviews) do + def trial_upgrade_email(user, day, {pageviews, custom_events}) do base_email() |> to(user) |> tag("trial-upgrade-email") |> subject("Your Plausible trial ends #{day}") - |> render("trial_upgrade_email.html", user: user, day: day, pageviews: pageviews) + |> render("trial_upgrade_email.html", + user: user, + day: day, + custom_events: custom_events, + usage: pageviews + custom_events + ) end def trial_over_email(user) do diff --git a/lib/plausible_web/templates/auth/user_settings.html.eex b/lib/plausible_web/templates/auth/user_settings.html.eex index 5d04a2fdf..335b72bbe 100644 --- a/lib/plausible_web/templates/auth/user_settings.html.eex +++ b/lib/plausible_web/templates/auth/user_settings.html.eex @@ -71,10 +71,45 @@
Last 30 days total usage across all of your sites
+| + Pageviews + | ++ <%= delimit_integer(@usage_pageviews) %> + | +
| + Custom events + | ++ <%= delimit_integer(@usage_custom_events) %> + | +
| + Total billable pageviews + | ++ <%= delimit_integer(@usage_pageviews + @usage_custom_events) %> + | +