diff --git a/app/controllers/api/v1/admin/users_controller.rb b/app/controllers/api/v1/admin/users_controller.rb index d429b918099be1c690d1e70b66d36cdffb3b6954..81964f53268f03cdabd96f191a957e2343bf7b23 100644 --- a/app/controllers/api/v1/admin/users_controller.rb +++ b/app/controllers/api/v1/admin/users_controller.rb @@ -29,7 +29,7 @@ module Api render_data data: pending_users, meta: pagy_metadata(pagy), serializer: UserSerializer, status: :ok end - def verified_users + def verified sort_config = config_sorting(allowed_columns: %w[name roles.name]) # TODO: Change to get verified users only @@ -44,7 +44,7 @@ module Api render_data data: users, meta: pagy_metadata(pagy), serializer: UserSerializer, status: :ok end - def banned_users + def banned # getting all the users who have a banned status users = User.includes(:role) .with_provider(current_provider) diff --git a/app/javascript/hooks/queries/admin/manage_users/useBannedUsers.jsx b/app/javascript/hooks/queries/admin/manage_users/useBannedUsers.jsx index b4d97262341ecfefbea0a19e2e3769dfc55292d0..82bbd632002b4c4f7ef4b8d816ac2dc456d79a5f 100644 --- a/app/javascript/hooks/queries/admin/manage_users/useBannedUsers.jsx +++ b/app/javascript/hooks/queries/admin/manage_users/useBannedUsers.jsx @@ -9,7 +9,7 @@ export default function useBannedUsers(input, page) { return useQuery( ['getBannedUsers', { ...params }], - () => axios.get('/admin/users/banned_users.json', { params }).then((resp) => resp.data), + () => axios.get('/admin/users/banned.json', { params }).then((resp) => resp.data), { keepPreviousData: true, }, diff --git a/app/javascript/hooks/queries/admin/manage_users/useVerifiedUsers.jsx b/app/javascript/hooks/queries/admin/manage_users/useVerifiedUsers.jsx index b4672fdc9570fed11a0b414fd57b940d37813e86..53465487f84455305013159f4017301fdc0a7e52 100644 --- a/app/javascript/hooks/queries/admin/manage_users/useVerifiedUsers.jsx +++ b/app/javascript/hooks/queries/admin/manage_users/useVerifiedUsers.jsx @@ -14,7 +14,7 @@ export default function useVerifiedUsers(input, page) { return useQuery( ['getAdminUsers', { ...params }], - () => axios.get('/admin/users/verified_users.json', { params }).then((resp) => resp.data), + () => axios.get('/admin/users/verified.json', { params }).then((resp) => resp.data), { keepPreviousData: true, }, diff --git a/config/routes.rb b/config/routes.rb index ac8937fc907e747d0f137a474c89a59373037144..e8b3acd7a3403a9ae91c953ca3d2edb437ad8f07 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -66,9 +66,9 @@ Rails.application.routes.draw do namespace :admin do resources :users, only: %i[update] do collection do - get '/verified_users', to: 'users#verified_users' + get '/verified', to: 'users#verified' get '/pending', to: 'users#pending' - get '/banned_users', to: 'users#banned_users' + get '/banned', to: 'users#banned' post '/:user_id/create_server_room', to: 'users#create_server_room' end end diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb index 1ca19925ba359a8a5d645f9fd115981dd9f1577b..e918d4a7e6aff1a3073c0658be4e11b10f897305 100644 --- a/spec/controllers/admin/users_controller_spec.rb +++ b/spec/controllers/admin/users_controller_spec.rb @@ -18,7 +18,7 @@ RSpec.describe Api::V1::Admin::UsersController, type: :controller do # TODO: Change this test to return active users and not just any users users = User.all - get :verified_users + get :verified expect(response).to have_http_status(:ok) response_user_ids = JSON.parse(response.body)['data'].map { |user| user['id'] } expect(response_user_ids).to match_array(users.pluck(:id)) @@ -30,7 +30,7 @@ RSpec.describe Api::V1::Admin::UsersController, type: :controller do role_with_provider_test = create(:role, provider: 'test') create(:user, provider: 'test', role: role_with_provider_test) - get :verified_users + get :verified expect(JSON.parse(response.body)['data'].pluck('id')).to match_array(greenlight_users.pluck(:id)) end @@ -61,7 +61,7 @@ RSpec.describe Api::V1::Admin::UsersController, type: :controller do it 'returns a list of pending users' do users = create_list(:user, 3, status: 'banned') - get :banned_users + get :banned expect(JSON.parse(response.body)['data'].pluck('id')).to match_array(users.pluck(:id)) end @@ -72,7 +72,7 @@ RSpec.describe Api::V1::Admin::UsersController, type: :controller do end it 'returns :forbidden for user without ManageUsers permission' do - get :banned_users + get :banned expect(response).to have_http_status(:forbidden) end end