From 6eb4700b7edf2169544961a2f3dd4783b1b8f4cd Mon Sep 17 00:00:00 2001
From: Hadi Cheaito <38328371+hadicheaito1@users.noreply.github.com>
Date: Fri, 25 Nov 2022 03:10:50 -0500
Subject: [PATCH] Changing user admin endpoint names (#4213)
---
app/controllers/api/v1/admin/users_controller.rb | 4 ++--
.../hooks/queries/admin/manage_users/useBannedUsers.jsx | 2 +-
.../hooks/queries/admin/manage_users/useVerifiedUsers.jsx | 2 +-
config/routes.rb | 4 ++--
spec/controllers/admin/users_controller_spec.rb | 8 ++++----
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/app/controllers/api/v1/admin/users_controller.rb b/app/controllers/api/v1/admin/users_controller.rb
index d429b918..81964f53 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 b4d97262..82bbd632 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 b4672fdc..53465487 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 ac8937fc..e8b3acd7 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 1ca19925..e918d4a7 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
--
GitLab