From b3daf028bc06ca6821604f2d626ae323f281062c Mon Sep 17 00:00:00 2001 From: Krishna Calindi Date: Fri, 15 Nov 2024 23:11:11 -0600 Subject: [PATCH] rubocop final --- app/controllers/users_controller.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 85b28fd..6658ab9 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -5,29 +5,29 @@ class UsersController < ApplicationController def index @all_roles = Role.all @all_games = Game.where.not(id: -1).pluck(:name) - + # Base query to fetch users if params[:search].present? search_term = params[:search].downcase @users = User.left_joins(roles: :game) - .where("LOWER(users.first_name) LIKE :search - OR LOWER(users.last_name) LIKE :search + .where("LOWER(users.first_name) LIKE :search + OR LOWER(users.last_name) LIKE :search OR LOWER(roles.role) LIKE :search OR LOWER(games.name) LIKE :search", search: "%#{search_term}%") .distinct else @users = User.all end - + # Collect user IDs based on filters filtered_user_ids = Set.new - + # Apply role filters if provided if params[:roles].present? role_user_ids = Role.where(role: params[:roles]).pluck(:user_id) filtered_user_ids.merge(role_user_ids) end - + # Apply game filters if provided if params[:games].present? params[:games].each do |role, games| @@ -37,7 +37,7 @@ def index filtered_user_ids.merge(game_user_ids) end end - + # Retrieve users matching the collected user IDs if filtered_user_ids.any? @users = User.where(id: filtered_user_ids)