Move search users by skills to users controller

app/controllers/skills_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class SkillsController < ApplicationController
-
   def index
     @skills = Skill.all.sort_by(&:name)
   end
@@ -18,7 +17,6 @@ def create
 
   private
 
-
   # Only allow a trusted parameter "white list" through.
   def skill_params
     params.require(:skill).permit(:name)

app/controllers/user_skills_controller.rb

@@ -13,16 +13,14 @@ def bulk_update
     ApplicationRecord.transaction do
       # Remove all existing skills for the user
       UserSkill.where(user_id: params.dig(:params, :user_id)).destroy_all
-  
+
       # Permit and process the new list of user skills
       user_skills_list_params.each do |user_skill|
         new_skill = UserSkill.new(user_skill.merge(user_id: params.dig(:params, :user_id)))
-        unless new_skill.save
-          raise ActiveRecord::Rollback
-        end
+        raise ActiveRecord::Rollback unless new_skill.save
       end
     end
-  
+
     render json: { message: 'Skills updated successfully' }, status: :ok
   end
 
@@ -34,14 +32,6 @@ def destroy
     head :not_found
   end
 
-  # GET /user_skills/search?query=:query
-  def search
-    return render json: [] if params[:query].blank?
-    query = params[:query].split(/[\s,]+/).map(&:downcase)
-    users = UserSkill.joins(:skill).where('LOWER(skills.name) IN (?)', query).pluck(:user_id).uniq
-    render json: User.where(id: users)
-  end
-
   private
 
   # Use callbacks to share common setup or constraints between actions.

app/controllers/users_controller.rb

@@ -5,11 +5,15 @@ class UsersController < ApplicationController
 
   def index
     query = params['query']&.split(',')
+    skills_filter = params['filter_by_skills']&.split(/[\s,]+/)&.map(&:downcase)
+
     @users = if query
                User.by_external_identifier(query)
              else
                User.all
              end
+
+    @users = @users.joins(:skills).where('LOWER(skills.name) IN (?)', skills_filter) if skills_filter.present?
     @users = @users.order(:first_name, :last_name)
   end
 

app/views/user_skills/_user_skill.json.jbuilder

@@ -2,4 +2,4 @@
 
 # _user_service_identifier.json.jbuilder
 
-json.extract! user_skill, :id, :last_applied_in_year, :level, :years_of_experience, :skill
+json.extract! user_skill, :id, :last_applied_in_year, :level, :years_of_experience, :skill

config/routes.rb

@@ -35,13 +35,12 @@
   resources :users
   resources :customers
   resources :professions, only: [:index]
-  resources :skills, only: [:index, :create]
+  resources :skills, only: %i[index create]
   resources :issues, only: [:index]
   resources :permissions, only: [:index]
   resources :user_skills, only: [:index] do
     collection do
       patch :bulk_update
-      get :search
     end
   end
 end

spec/controllers/user_skills_controller_spec.rb

@@ -3,9 +3,12 @@
 require 'rails_helper'
 
 RSpec.describe UserSkillsController, type: :controller do
-  let(:user) { double("User", id: 1) }
-  let(:skill) { double("Skill", id: 1, name: 'Ruby') }
-  let(:user_skill) { double("UserSkill", id: 1, user_id: user.id, skill_id: skill.id, years_of_experience: 3, last_applied_in_year: 2021, level: 'beginner') }
+  let(:user) { double('User', id: 1) }
+  let(:skill) { double('Skill', id: 1, name: 'Ruby') }
+  let(:user_skill) do
+    double('UserSkill', id: 1, user_id: user.id, skill_id: skill.id, years_of_experience: 3, last_applied_in_year: 2021,
+                        level: 'beginner')
+  end
 
   before do
     # Mocking UserSkill model interactions