Modificaciones a usuarios y roles (#2)

Co-authored-by: Juan Felipe Zapata Moreno <juan.zapata@golsystems.com.mx>
Reviewed-on: #2
This commit is contained in:
juan.zapata 2025-11-11 15:42:32 +00:00
parent af8749abcd
commit 91c360aa9f
3 changed files with 19 additions and 26 deletions

View File

@ -14,9 +14,9 @@
/** /**
* Roles del sistema * Roles del sistema
* *
* @author Moisés Cortés C. <moises.cortes@notsoweb.com> * @author Moisés Cortés C. <moises.cortes@notsoweb.com>
* *
* @version 1.0.0 * @version 1.0.0
*/ */
class RoleController extends Controller class RoleController extends Controller
@ -26,7 +26,8 @@ class RoleController extends Controller
*/ */
public function index() public function index()
{ {
$model = Role::orderBy('description'); $model = Role::where('name', '!=','developer')->orderBy('description');
QuerySupport::queryByKey($model, request(), 'name'); QuerySupport::queryByKey($model, request(), 'name');

View File

@ -15,11 +15,11 @@
/** /**
* Controlador de usuarios * Controlador de usuarios
* *
* Permite la administración de los usuarios en general. * Permite la administración de los usuarios en general.
* *
* @author Moisés Cortés C <moises.cortes@notsoweb.com> * @author Moisés Cortés C <moises.cortes@notsoweb.com>
* *
* @version 1.0.0 * @version 1.0.0
*/ */
class UserController extends Controller class UserController extends Controller
@ -29,7 +29,9 @@ class UserController extends Controller
*/ */
public function index() public function index()
{ {
$users = User::orderBy('name'); $users = User::whereDoesntHave('roles', function ($query) {
$query->where('name', 'developer');
})->orderBy('name');
QuerySupport::queryByKeys($users, ['name', 'email']); QuerySupport::queryByKeys($users, ['name', 'email']);
@ -152,7 +154,7 @@ public function activity(UserActivityRequest $request, User $user)
} }
return ApiResponse::OK->response([ return ApiResponse::OK->response([
'models' => 'models' =>
$model->orderBy('created_at', 'desc') $model->orderBy('created_at', 'desc')
->paginate(config('app.pagination')) ->paginate(config('app.pagination'))
]); ]);

View File

@ -9,9 +9,9 @@
/** /**
* Usuarios predeterminados del sistema * Usuarios predeterminados del sistema
* *
* @author Moisés Cortés C. <moises.cortes@notsoweb.com> * @author Moisés Cortés C. <moises.cortes@notsoweb.com>
* *
* @version 1.0.0 * @version 1.0.0
*/ */
class UserSeeder extends Seeder class UserSeeder extends Seeder
@ -21,34 +21,24 @@ class UserSeeder extends Seeder
*/ */
public function run(): void public function run(): void
{ {
$developer = UserSecureSupport::create('developer@notsoweb.com'); $developer = UserSecureSupport::create('developer@golsystems.com');
User::create([ User::create([
'name' => 'Developer', 'name' => 'Developer',
'paternal' => 'Notsoweb', 'paternal' => 'Golsystems',
'maternal' => 'Software', 'maternal' => 'SA',
'email' => $developer->email, 'email' => $developer->email,
'password' => $developer->hash, 'password' => $developer->hash,
])->assignRole(__('developer')); ])->assignRole(__('developer'));
$admin = UserSecureSupport::create('admin@notsoweb.com'); $admin = UserSecureSupport::create('admin@golsystems.com');
User::create([ User::create([
'name' => 'Admin', 'name' => 'Admin',
'paternal' => 'Notsoweb', 'paternal' => 'Golsystems',
'maternal' => 'Software', 'maternal' => 'SA',
'email' => $admin->email, 'email' => $admin->email,
'password' => $admin->hash, 'password' => $admin->hash,
])->assignRole(__('admin')); ])->assignRole(__('admin'));
$demo = UserSecureSupport::create('demo@notsoweb.com');
User::create([
'name' => 'Demo',
'paternal' => 'Notsoweb',
'maternal' => 'Software',
'email' => $demo->email,
'password' => $demo->hash,
]);
} }
} }