Refactored to scope

app/controllers/organisations_controller.rb

@@ -17,7 +17,7 @@ class OrganisationsController < ApplicationController
   end
 
   def users
-    @pagy, @users = pagy(filtered_users)
+    @pagy, @users = pagy(User.filter_by_name(params["user-search-field"]).filter_by_active)
     render "users/index"
   end
 
@@ -58,15 +58,6 @@ class OrganisationsController < ApplicationController
 
 private
 
-  def filtered_users
-    search_param = params["user-search-field"]
-    if search_param
-      User.where("name ILIKE ?", "%#{search_param}%").where(active: true)
-    else
-      User.all.where(active: true)
-    end
-  end
-
   def org_params
     params.require(:organisation).permit(:name, :address_line1, :address_line2, :postcode, :phone)
   end

app/controllers/users_controller.rb

@@ -9,7 +9,7 @@ class UsersController < ApplicationController
   def index
     redirect_to users_organisation_path(current_user.organisation) unless current_user.support?
 
-    @pagy, @users = pagy(filtered_users)
+    @pagy, @users = pagy(User.filter_by_name(params["user-search-field"]).filter_by_active)
 
     respond_to do |format|
       format.html
@@ -77,15 +77,6 @@ class UsersController < ApplicationController
 
 private
 
-  def filtered_users
-    search_param = params["user-search-field"]
-    if search_param
-      User.where("name ILIKE ?", "%#{search_param}%").where(active: true).includes(:organisation)
-    else
-      User.all.where(active: true).includes(:organisation)
-    end
-  end
-
   def format_error_messages
     errors = @user.errors.to_hash
     @user.errors.clear

app/models/user.rb

@@ -32,6 +32,9 @@ class User < ApplicationRecord
 
   enum role: ROLES
 
+  scope :filter_by_name, ->(name) { name.present? ? where("name ILIKE ?", "%#{name}%") : User.all }
+  scope :filter_by_active, ->() { where(active: true) }
+
   def case_logs
     if support?
       CaseLog.all