Skip to content
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

Combine stock item queries in a GROUP BY query #565

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions core/app/models/spree/stock/coordinator.rb
Original file line number Diff line number Diff line change
@@ -55,8 +55,9 @@ def build_location_configured_packages(packages = Array.new)
#
# Returns an array of Package instances
def build_packages(packages = Array.new)
stock_locations_with_requested_variants.each do |stock_location|
units_for_location = unallocated_inventory_units.select { |unit| stock_location.stock_item(unit.variant) }
requested_stock_items.group_by(&:stock_location).each do |stock_location, stock_items|
variant_ids_in_stock_location = stock_items.map(&:variant_id)
units_for_location = unallocated_inventory_units.select { |unit| variant_ids_in_stock_location.include?(unit.variant_id) }
packer = build_packer(stock_location, units_for_location)
packages += packer.packages
end
@@ -69,9 +70,8 @@ def unallocated_inventory_units
inventory_units - @preallocated_inventory_units
end

def stock_locations_with_requested_variants
Spree::StockLocation.active.joins(:stock_items).
where(spree_stock_items: { variant_id: unallocated_variant_ids }).uniq
def requested_stock_items
Spree::StockItem.where(variant_id: unallocated_variant_ids).joins(:stock_location).merge(StockLocation.active).includes(:stock_location)
end

def unallocated_variant_ids