From ce4d839a106e98738d996fe762f62bda32b60b91 Mon Sep 17 00:00:00 2001 From: cryptogopher Date: Wed, 6 Nov 2019 22:45:09 +0100 Subject: [PATCH] Simplified returning result --- app/models/ingredient.rb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/app/models/ingredient.rb b/app/models/ingredient.rb index b441797..51cbb57 100644 --- a/app/models/ingredient.rb +++ b/app/models/ingredient.rb @@ -82,15 +82,10 @@ class Ingredient < ActiveRecord::Base end all_q = nutrients.merge(completed_q) - results = [] - ingredients.each do |i| - results << [i, - requested_q.map { |q| [q.name, all_q[q.name][i.id]] }, - extra_q.map do |q_name| - [q_name, all_q[q_name][i.id]] if all_q[q_name][i.id] - end.compact - ] + ingredients.map do |i| + requested_n = requested_q.map { |q| [q.name, all_q[q.name][i.id]] } + extra_n = extra_q.map { |q_name| [q_name, all_q[q_name][i.id]] if all_q[q_name][i.id] } + [i, requested_n, extra_n.compact] end - results end end