From 6e70fcbe5e683b1e9c15ae23ea0708592bd684fc Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Sat, 27 Oct 2018 10:20:58 -0500 Subject: [PATCH] Update how the sorting is done in the User model Use the `sort_by` method to do the sorting rather than converting to an array and then calling `sort` Co-Authored-By: Dan Rice --- app/models/user.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 686a045e..38838dca 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -56,13 +56,13 @@ class User < ActiveRecord::Base end def alphabetize(scope_conditions = {}) projects = where(scope_conditions) - projects.to_a.sort!{ |x,y| x.name.downcase <=> y.name.downcase } + projects = projects.sort_by { |project| project.name.downcase } self.update_positions(projects.map{ |p| p.id }) return projects end def actionize(scope_conditions = {}) todos_in_project = where(scope_conditions).includes(:todos) - todos_in_project.to_a.sort_by!{ |x| [-x.todos.active.count, -x.id] } + todos_in_project = todos_in_project.sort_by { |x| [-x.todos.active.count, -x.id] } todos_in_project.reject{ |p| p.todos.active.count > 0 } sorted_project_ids = todos_in_project.map {|p| p.id}