Merged
Conversation
The previous query had a bug where num_recent_cast_votes counted ALL cast votes for elections that had at least one recent vote, rather than only counting votes within the 24-hour window. This fix uses Django's conditional aggregation (filter=Q(...)) to correctly count and find the max cast_at only for votes within the cutoff period. Also adds .distinct() to prevent duplicate elections in results and improves code readability by extracting the cutoff to a variable.
Contributor
There was a problem hiding this comment.
Pull request overview
This PR optimizes the database query in the recent_votes admin view by using Django's conditional aggregation feature to ensure that aggregated values (count and max) only consider votes within the 24-hour cutoff period, rather than all votes for elections that happen to have at least one recent vote.
Changes:
- Added
Qimport fromdjango.db.modelsfor conditional filtering in aggregations - Extracted cutoff calculation into a variable for better readability and DRY principle
- Added
.distinct()to prevent duplicate election records from JOIN operations - Applied
filter=Q(...)parameter to bothMax()andCount()aggregations to ensure only recent votes are considered
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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.
Uses Django's conditional aggregation (filter=Q(...)) to correctly count and find the max cast_at only for votes within the cutoff period, and create a more efficient query.