diff --git a/app/Http/Controllers/Admin/AdminUserController.php b/app/Http/Controllers/Admin/AdminUserController.php index 653d300da..cb23105cd 100644 --- a/app/Http/Controllers/Admin/AdminUserController.php +++ b/app/Http/Controllers/Admin/AdminUserController.php @@ -367,16 +367,17 @@ class AdminUserController extends BasePageController */ private function bulkActionUsersQuery(array $userIds): Builder { + $adminRoleName = 'Admin'; $adminRoleIds = Role::query() - ->where('name', UserRole::ADMIN->label()) + ->where('name', $adminRoleName) ->pluck('id') ->all(); return User::query() ->whereIn('id', $userIds) ->when($adminRoleIds !== [], fn (Builder $query): Builder => $query->whereNotIn('roles_id', $adminRoleIds)) - ->whereDoesntHave('role', fn (Builder $query): Builder => $query->where('name', UserRole::ADMIN->label())) - ->whereDoesntHave('roles', fn (Builder $query): Builder => $query->where('name', UserRole::ADMIN->label())); + ->whereDoesntHave('role', fn (Builder $query): Builder => $query->where('name', $adminRoleName)) + ->whereDoesntHave('roles', fn (Builder $query): Builder => $query->where('name', $adminRoleName)); } public function destroy(Request $request): RedirectResponse diff --git a/tests/Feature/Admin/AdminUserControllerTest.php b/tests/Feature/Admin/AdminUserControllerTest.php index f04a5ffb7..974c928e0 100644 --- a/tests/Feature/Admin/AdminUserControllerTest.php +++ b/tests/Feature/Admin/AdminUserControllerTest.php @@ -150,8 +150,6 @@ class AdminUserControllerTest extends TestCase public function test_admin_can_bulk_resend_verification_email_to_not_verified_users(): void { - Notification::fake(); - $admin = $this->createUserWithRole('Admin', false); $unverifiedUser = $this->createUserWithRole('User', true); $alreadyVerifiedUser = $this->createUserWithRole('User', true); @@ -161,6 +159,8 @@ class AdminUserControllerTest extends TestCase 'email_verified_at' => null, ])->save(); + Notification::fake(); + $response = $this->actingAs($admin)->post(route('admin.user-list.bulk'), [ 'action' => 'resend_verification', 'user_ids' => [$unverifiedUser->id, $alreadyVerifiedUser->id],