Skip to content

Refactor per_site_usage in Teams.Billing#6100

Merged
zoldar merged 1 commit intosanne-pageviews-site-breakdownfrom
pageviews-site-breakdown-followup
Feb 26, 2026
Merged

Refactor per_site_usage in Teams.Billing#6100
zoldar merged 1 commit intosanne-pageviews-site-breakdownfrom
pageviews-site-breakdown-followup

Conversation

@zoldar
Copy link
Copy Markdown
Contributor

@zoldar zoldar commented Feb 26, 2026

Changes

Should IMHO make the logic slightly more comprehensive 😅

@zoldar zoldar requested review from aerosol and sanne-san February 26, 2026 09:04
@zoldar zoldar merged commit 8900ea3 into sanne-pageviews-site-breakdown Feb 26, 2026
21 checks passed
@zoldar zoldar deleted the pageviews-site-breakdown-followup branch February 26, 2026 09:10
github-merge-queue Bot pushed a commit that referenced this pull request Feb 26, 2026
* Add per-site pageview breakdown to pageview usage section

- When a team has between 2 and 10 sites, the expandable pageview usage section now shows a breakdown of pageviews and custom events per site.
- Teams with a single site or more than 10 sites see the existing aggregate-only view unchanged.
- The breakdown section is expanded by default when no per-site breakdown is present. It is collapsed by default when a per-site breakdown is present, or when previous cycles are also present.

* Optimize usage per site lookup (#6098)

Instead of building a lookup map of all owned site ids,
we rely on clickhouse for sorting and limiting results,
and only if the resulting set is smaller than the predefined max,
a query to fill up inactive sites (zero events) is made.

* Refactor `per_site_usage` in `Teams.Billing` (#6100)

---------

Co-authored-by: Adam Rutkowski <hq@mtod.org>
Co-authored-by: Adrian Gruntkowski <adrian.gruntkowski@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants