Query optimizations
This commit is contained in:
parent
63370ccc1a
commit
08860cbfab
@ -217,7 +217,7 @@ class IngredientsController < BodyTrackingPluginController
|
||||
end
|
||||
|
||||
def prepare_nutrients
|
||||
@quantities = @project.nutrients_column_view.quantities
|
||||
@quantities = @project.nutrients_column_view.quantities.includes(:formula)
|
||||
@ingredients, @requested_n, @extra_n, @formula_q = @project.ingredients
|
||||
.filter(session[:i_filters], @quantities)
|
||||
end
|
||||
|
@ -112,7 +112,7 @@ class MeasurementsController < BodyTrackingPluginController
|
||||
|
||||
def prepare_readouts
|
||||
@scoping_measurement = @project.measurements.where(session[:m_filters][:scope]).first!
|
||||
@quantities = @scoping_measurement.column_view.quantities
|
||||
@quantities = @scoping_measurement.column_view.quantities.includes(:formula)
|
||||
@measurements, @requested_r, @extra_r, @formula_q = @project.measurements
|
||||
.includes(:source)
|
||||
.filter(session[:m_filters], @quantities)
|
||||
|
@ -43,8 +43,7 @@ class Formula < ActiveRecord::Base
|
||||
errors = parser.errors
|
||||
|
||||
quantities = Quantity.where(project: self.quantity.project, name: identifiers)
|
||||
quantities_names = quantities.pluck(:name)
|
||||
(identifiers - quantities_names).each do |q|
|
||||
(identifiers - quantities.map(&:name)).each do |q|
|
||||
errors << [:unknown_quantity, {quantity: q}]
|
||||
end
|
||||
|
||||
|
Reference in New Issue
Block a user