Fix bug to track active hours across templates#72
Merged
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #72 +/- ##
=======================================
Coverage 90.62% 90.62%
=======================================
Files 10 10
Lines 1408 1408
=======================================
Hits 1276 1276
Misses 132 132 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request introduces improvements to how active hours are calculated and displayed per team for each template in the analytics system. The changes ensure that active hours are accurately attributed to the correct template and team, avoiding the inclusion of historical activity from other templates. The frontend and backend are updated to support and display these refined metrics.
Backend metrics calculation improvements:
coder/analytics/collect.py, when initializing new usage records,total_active_hoursnow starts at 0.0 to prevent inheriting cross-template hours, ensuring only incremental activity is counted for each template.coder/analytics/aggregate.py, per-team active hours specific to each template are now calculated and included in the metrics output as a newteam_active_hoursfield. [1] [2]Frontend and types update:
services/analytics/lib/types.ts, theTemplateMetricsinterface is updated to include the newteam_active_hoursfield, enabling type-safe usage throughout the frontend.services/analytics/app/template/[templateName]/template-teams-content.tsx, the display of active hours per team is updated to use the new per-template, per-teamteam_active_hoursmetric, defaulting to 0 if not present. (services/analytics/app/template/[templateName]/template-teams-content.tsxL389-R389)