-
-
Notifications
You must be signed in to change notification settings - Fork 512
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Improve product drive index page performance #4881
Open
coalest
wants to merge
9
commits into
rubyforgood:main
Choose a base branch
from
coalest:improve-product-drive-index-page-performance
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+51
−6
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
596f5a6
Perf: Refactor ProductDrive#index with service
coalest 1bf1b63
Fix summary calculations by applying date range filter to donations
coalest d8f1f4e
Refactory service call to be class method
coalest b927a12
Refactor hash into Data object
coalest 3c68ccb
Merge remote-tracking branch 'upstream/main' into improve-product-dri…
coalest c69ba55
Refactor service class
coalest 6eadfea
Remove unneeded class instance variable
coalest fed367f
Merge remote-tracking branch 'upstream/main' into improve-product-dri…
coalest 185fbbf
Remove two tags queries for csv export
coalest File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
# Calculates the quantity, unique item count, and value for product | ||
# drives from donations (filtered by items donated in a given date range | ||
# and within a given item category if provided). | ||
class ProductDriveSummaryService | ||
class << self | ||
ProductDriveSummary = Data.define(:quantity, :unique_item_count, :value) | ||
NULL_PRODUCT_DRIVE_TOTALS = ProductDriveSummary.new(quantity: 0, unique_item_count: 0, value: 0) | ||
|
||
def call(product_drives:, within_date_range:, item_category_id: nil) | ||
calculate_totals(product_drives, within_date_range, item_category_id) | ||
end | ||
|
||
private | ||
|
||
# @return [Hash<Integer, ProductDriveSummary>] | ||
def calculate_totals(product_drives, within_date_range, item_category_id) | ||
query = ProductDrive | ||
.left_joins(donations: {line_items: [:item]}) | ||
.where(id: product_drives.ids) | ||
.where(donations: {issued_at: within_date_range[0]..within_date_range[1]}) | ||
.group("product_drives.id") | ||
.distinct | ||
|
||
query = query.where(items: {item_category_id: item_category_id}) if item_category_id.present? | ||
|
||
totals = query.pluck(Arel.sql( | ||
"product_drives.id AS id, | ||
COALESCE(SUM(line_items.quantity), 0) AS quantity, | ||
COUNT(DISTINCT line_items.item_id) AS unique_item_count, | ||
COALESCE(SUM(COALESCE(items.value_in_cents, 0) * line_items.quantity), 0) AS value" | ||
)).to_h do |(id, quantity, unique_item_count, value)| | ||
[id, ProductDriveSummary.new(quantity:, unique_item_count:, value:)] | ||
end | ||
|
||
# If a product drive has no matching donations/items, set totals to | ||
# default values (zeroes). | ||
product_drives.ids.to_h { |id| [id, NULL_PRODUCT_DRIVE_TOTALS] }.merge(totals) | ||
end | ||
end | ||
end |
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a YARD comment mentioning the types of the inputs and outputs?