Skip to content
Snippets Groups Projects
Unverified Commit 6eb4700b authored by Hadi Cheaito's avatar Hadi Cheaito Committed by GitHub
Browse files

Changing user admin endpoint names (#4213)

parent eaa98983
Branches
Tags
No related merge requests found
......@@ -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)
......
......@@ -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,
},
......
......@@ -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,
},
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment