From f53dcbc64f14cf000a6287e5b3e24f790390657d Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 18 Dec 2025 13:37:56 -0800 Subject: [PATCH] Only pull needed fields from database --- app/Http/Controllers/GroupsController.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/GroupsController.php b/app/Http/Controllers/GroupsController.php index e06788eab981..05cdc59fa2ca 100755 --- a/app/Http/Controllers/GroupsController.php +++ b/app/Http/Controllers/GroupsController.php @@ -44,7 +44,11 @@ public function create(Request $request) : View $permissions = config('permissions'); $groupPermissions = Helper::selectedPermissionsArray($permissions, $permissions); $selectedPermissions = $request->old('permissions', $groupPermissions); - $users_query = User::where('show_in_list', 1)->whereNull('deleted_at'); + $users_query = User::query() + ->select(['users.id', 'users.first_name', 'users.last_name', 'users.username']) + ->where('show_in_list', 1) + ->whereNull('deleted_at'); + $users_count = $users_query->count(); $users = collect(); @@ -114,8 +118,11 @@ public function edit(Group $group) : View | RedirectResponse $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions); + $users_query = User::query() + ->select(['users.id', 'users.first_name', 'users.last_name', 'users.username']) + ->where('show_in_list', 1) + ->whereNull('deleted_at'); - $users_query = User::where('show_in_list', 1)->whereNull('deleted_at'); $users_count = $users_query->count(); $associated_users = collect(); @@ -124,7 +131,13 @@ public function edit(Group $group) : View | RedirectResponse if ($users_count <= config('app.max_unpaginated_records')) { $associated_users = $group->users()->where('show_in_list', 1)->orderBy('first_name', 'asc')->orderBy('last_name', 'asc')->get(); // Get the unselected users - $unselected_users = User::where('show_in_list', 1)->whereNotIn('id', $associated_users->pluck('id')->toArray())->orderBy('first_name', 'asc')->orderBy('last_name', 'asc')->get(); + $unselected_users = User::query() + ->select(['users.id', 'users.first_name', 'users.last_name', 'users.username']) + ->where('show_in_list', 1) + ->whereNotIn('id', $associated_users->pluck('id')->toArray()) + ->orderBy('first_name', 'asc') + ->orderBy('last_name', 'asc') + ->get(); } return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'))