Order users list in the database rather than in memory

Author: DavidBiddle

app/controllers/users_controller.rb

@@ -9,15 +9,7 @@ class UsersController < ApplicationController
   def index
     authorize current_user, :can_manage_user?
 
-    roles = User.roles.keys
-    @users = policy_scope(User).sort_by do |user|
-      [
-        user.organisation&.name || "",
-        user.has_access ? 0 : 1,
-        roles.index(user.role),
-        user.name || "",
-      ]
-    end
+    @users = policy_scope(User).for_users_list
 
     render template: "users/index", locals: { users: @users }
   end

app/models/user.rb

@@ -27,6 +27,14 @@ class UserAuthenticationException < StandardError; end
     standard: "standard",
   }
 
+  scope :for_users_list, lambda {
+    includes(:organisation)
+      .order(Arel.sql("organisation.name ASC NULLS FIRST"))
+      .order({ has_access: :desc })
+      .in_order_of(:role, roles.keys)
+      .order({ name: :asc })
+  }
+
   validates :name, presence: true, if: :requires_name?
   validates :role, presence: true
   validates :organisation_id, presence: true, if: :requires_organisation?