fix(sales-dashboard): Correct understated API usage on the organisation chart by matthewelwell · Pull Request #8468 · Flagsmith/flagsmith

matthewelwell · 2026-09-04T15:22:46Z

Thanks for submitting a PR! Please check the boxes below:

I have read the Contributing Guide.
I have added information to docs/ if required so people know about the feature.
I have filled in the "Changes" section below.
I have filled in the "How did you test this code" section below.

Changes

Contributes to #7976

The sales dashboard read usage through its own Influx entry point, get_event_list_for_organisation, the only usage reader without a group() before aggregateWindow. Influx aggregates per series, so each label combination produced its own daily records, which were then appended into a flat list per resource instead of summed per day. Chart.js plotted the leading slice of that list, so one client application's traffic was shown as the whole organisation's usage.

That function is deleted. The sales dashboard now calls get_usage_data — the entry point the customer-facing app already uses — and reshapes the result for Chart.js in map_usage_data_to_daily_totals. One shared query means the grouping cannot go missing in one caller and not the other.

Worth noting for #7976: the API usage alert emails were correct all along. The affected organisation genuinely exceeded its plan allowance; this chart is what led us to believe otherwise.

How did you test this code?

Unit tests cover the mapper against multiple label rows per day, unordered days, and empty input, plus the sales dashboard view asserting both client applications' usage appears rather than one.

Verified against production data for the affected organisation. Summing every series over its billing sub-period returned 5,030,444 API calls from both the 15m and 1h downsampled buckets, and matched the customer-facing dashboard, while the sales dashboard chart displayed roughly 1/76th of that.

Also ran make lint, make typecheck (baseline unchanged, no errors in the touched files) and the three affected test files (54 passed).

🤖 Generated with Claude Code

…on chart The sales dashboard read API usage through its own Influx entry point, `get_event_list_for_organisation`, which was the only usage reader without a `group()` before `aggregateWindow`. Influx aggregates per series, so each label combination produced its own daily records, and the Python then appended them into one flat list per resource rather than summing them per day. Chart.js plotted the leading slice of that list, so a single client application's traffic was shown as the whole organisation's usage, with the x-axis labels taken from the first series only. Delete that function and have the sales dashboard call `get_usage_data`, the same entry point the customer-facing app uses, reshaping the result for Chart.js in `map_usage_data_to_daily_totals`. Both charts now share one query, so the grouping cannot go missing in one caller and not the other. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

vercel · 2026-09-04T15:22:52Z

The latest updates on your projects. Learn more about Vercel for GitHub.

3 Skipped Deployments

Project	Deployment	Updated
docs	Ignored	Sep 4, 2026 3:22pm UTC
flagsmith-frontend-preview	Ignored	Sep 4, 2026 3:22pm UTC
flagsmith-frontend-staging	Ignored	Sep 4, 2026 3:22pm UTC

coderabbitai · 2026-09-04T15:22:54Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Team

Run ID: df45c0ed-dab5-40cd-9a0f-58986f3f50a1

📥 Commits

Reviewing files that changed from the base of the PR and between 2ce9498 and 5aabf8f.

📒 Files selected for processing (6)

api/app_analytics/influxdb_wrapper.py
api/app_analytics/mappers.py
api/sales_dashboard/views.py
api/tests/unit/app_analytics/test_unit_app_analytics_influxdb_wrapper.py
api/tests/unit/app_analytics/test_unit_app_analytics_mappers.py
api/tests/unit/sales_dashboard/test_unit_sales_dashboard_views.py

💤 Files with no reviewable changes (2)

api/app_analytics/influxdb_wrapper.py
api/tests/unit/app_analytics/test_unit_app_analytics_influxdb_wrapper.py

Included review availability: Your plan provides up to 8 included reviews per hour; 7 remain after this review.

📝 Walkthrough

Walkthrough

The change replaces organisation event-list retrieval with UsageData retrieval and daily aggregation. A new mapper sums resource values across labels, sorts dates, and returns aligned series. The sales dashboard uses these totals for its traits, identities, flags, environment documents, and labels. The previous InfluxDB function and its tests are removed. Mapper and dashboard tests cover aggregation, ordering, empty input, and the 180-day query window.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Merge Risk: ⚪ Minimal · up to 5aabf

The sales dashboard now displays daily organisation-wide usage totals rather than a single label slice. Aggregation and rendering behavior are covered for the corrected data shape, with no concrete current-head merge risk identified.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

codecov · 2026-09-04T15:30:51Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 98.81%. Comparing base (2ce9498) to head (5aabf8f).

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #8468      +/-   ##
==========================================
- Coverage   98.81%   98.81%   -0.01%     
==========================================
  Files        1621     1621              
  Lines       66299    66281      -18     
==========================================
- Hits        65514    65496      -18     
  Misses        785      785

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

github-actions · 2026-09-04T16:39:06Z

Docker builds report

Image	Build Status	Security report
`ghcr.io/flagsmith/flagsmith-e2e:pr-8468`	Finished ✅	Skipped
`ghcr.io/flagsmith/flagsmith-api-test:pr-8468`	Finished ✅	Skipped
`ghcr.io/flagsmith/flagsmith-frontend:pr-8468`	Finished ✅	Results ✅
`ghcr.io/flagsmith/flagsmith-api:pr-8468`	Finished ✅	Results ✅
`ghcr.io/flagsmith/flagsmith:pr-8468`	Finished ✅	Results ✅
`ghcr.io/flagsmith/flagsmith-private-cloud:pr-8468`	Finished ✅	Results ✅

github-actions · 2026-09-04T16:45:06Z

✅ private-cloud · depot-ubuntu-latest-arm-16 — run #20189 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

2 passed

Details

2 tests across 2 suites
36.7 seconds
5aabf8f
🔄 Run: #20189 (attempt 1)

🗂️ Previous results

✅ oss · depot-ubuntu-latest-arm-16 — run #20189 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

1 passed

Details

1 test across 1 suite
59.8 seconds
5aabf8f
🔄 Run: #20189 (attempt 1)

✅ private-cloud · depot-ubuntu-latest-16 — run #20189 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

2 passed

Details

2 tests across 2 suites
31.5 seconds
5aabf8f
🔄 Run: #20189 (attempt 1)

✅ oss · depot-ubuntu-latest-16 — run #20189 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-16)

1 passed

Details

1 test across 1 suite
40.4 seconds
5aabf8f
🔄 Run: #20189 (attempt 1)

github-actions · 2026-09-04T16:45:38Z

Visual Regression

19 screenshots compared. See report for details.
View full report

emyller

I'd appreciate a cleaner diff, but can't find a reason to block.

emyller · 2026-09-04T17:12:39Z

+
+def map_usage_data_to_daily_totals(
+    usage_data: Iterable[UsageData],
+) -> tuple[list[str], dict[str, list[int]]]:


nit: Consider defining a meaningful type. This hint looks like it only exists to appease the type checker, instead of helping the code.

emyller · 2026-09-04T17:30:51Z

+    totals_by_day: dict[str, dict[str, int]] = {}
+    for data in usage_data:
+        totals = totals_by_day.setdefault(
+            str(data.day),
+            dict.fromkeys(USAGE_DATA_RESOURCE_ATTRIBUTES, 0),
+        )
+        for resource_attr in USAGE_DATA_RESOURCE_ATTRIBUTES:
+            totals[resource_attr] += getattr(data, resource_attr)


Suggested change

totals_by_day: dict[str, dict[str, int]] = {}

for data in usage_data:

totals = totals_by_day.setdefault(

str(data.day),

dict.fromkeys(USAGE_DATA_RESOURCE_ATTRIBUTES, 0),

)

for resource_attr in USAGE_DATA_RESOURCE_ATTRIBUTES:

totals[resource_attr] += getattr(data, resource_attr)

totals_by_day = defaultdict(Counter)

for data in usage_data:

for resource_attr in USAGE_DATA_RESOURCE_ATTRIBUTES:

totals_by_day[str(data.day)][resource_attr] += getattr(data, resource_attr)

💅 nit.

emyller · 2026-09-04T17:31:34Z

+    """
+    Usage data holds a row per day and labels combination, so a day with
+    traffic from several client applications arrives as several rows. Totals
+    must sum across them, or a single client is reported as the whole
+    organisation's usage.
+    """


Suggested change

"""

Usage data holds a row per day and labels combination, so a day with

traffic from several client applications arrives as several rows. Totals

must sum across them, or a single client is reported as the whole

organisation's usage.

"""

emyller · 2026-09-04T17:34:18Z

+            labels={"client_application_name": "busy-app"},
+        ),
+    ]
    mocker.patch("sales_dashboard.views.get_events_for_organisation")


Can delete?

github-actions Bot added api Issue related to the REST API fix labels Sep 4, 2026

matthewelwell marked this pull request as ready for review September 4, 2026 16:38

matthewelwell requested a review from a team as a code owner September 4, 2026 16:38

matthewelwell requested review from emyller and removed request for a team September 4, 2026 16:38

flagsmith-engineering Bot assigned emyller Sep 4, 2026

github-actions Bot added fix and removed fix labels Sep 4, 2026

emyller approved these changes Sep 4, 2026

View reviewed changes

Uh oh!

Conversation

matthewelwell commented Sep 4, 2026

Changes

How did you test this code?

Uh oh!

vercel Bot commented Sep 4, 2026

Uh oh!

coderabbitai Bot commented Sep 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Uh oh!

codecov Bot commented Sep 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

github-actions Bot commented Sep 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Docker builds report

Uh oh!

github-actions Bot commented Sep 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

Details

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

Details

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

Details

Playwright Test Results (oss - depot-ubuntu-latest-16)

Details

Uh oh!

github-actions Bot commented Sep 4, 2026

Visual Regression

Uh oh!

emyller left a comment

Choose a reason for hiding this comment

Uh oh!

emyller Sep 4, 2026

Choose a reason for hiding this comment

Uh oh!

emyller Sep 4, 2026

Choose a reason for hiding this comment

Uh oh!

emyller Sep 4, 2026

Choose a reason for hiding this comment

Uh oh!

emyller Sep 4, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

coderabbitai Bot commented Sep 4, 2026 •

edited

Loading

codecov Bot commented Sep 4, 2026 •

edited

Loading

github-actions Bot commented Sep 4, 2026 •

edited

Loading

github-actions Bot commented Sep 4, 2026 •

edited

Loading