melabidi/alrahma_sunday_school_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
root
2026-06-11 11:46:12 -04:00
parent c91fa2ce4d
commit 5ead80fdc7
1489 changed files with 11349 additions and 10305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Roles/RoleQueryService.php
+12 -12
View File
@@ -40,19 +40,19 @@ class RoleQueryService
'roles.updated_at',
]);
if (!empty($filters['search'])) {
if (! empty($filters['search'])) {
$search = trim((string) $filters['search']);
$query->where(function (Builder $q) use ($search) {
$q->where('roles.name', 'like', '%' . $search . '%')
->orWhere('roles.slug', 'like', '%' . $search . '%')
->orWhere('roles.description', 'like', '%' . $search . '%');
$q->where('roles.name', 'like', '%'.$search.'%')
->orWhere('roles.slug', 'like', '%'.$search.'%')
->orWhere('roles.description', 'like', '%'.$search.'%');
});
}
$sortBy = (string) ($filters['sort_by'] ?? 'name');
$sortDir = strtolower((string) ($filters['sort_dir'] ?? 'asc')) === 'desc' ? 'desc' : 'asc';
$allowed = ['name', 'slug', 'priority', 'is_active', 'created_at'];
if (!in_array($sortBy, $allowed, true)) {
if (! in_array($sortBy, $allowed, true)) {
$sortBy = 'name';
}
@@ -80,26 +80,26 @@ class RoleQueryService
)
->groupBy('users.id', 'users.firstname', 'users.lastname', 'users.email', 'users.account_id');
if (!empty($filters['search'])) {
if (! empty($filters['search'])) {
$search = trim((string) $filters['search']);
$query->where(function ($q) use ($search) {
$q->where('users.firstname', 'like', '%' . $search . '%')
->orWhere('users.lastname', 'like', '%' . $search . '%')
->orWhere('users.email', 'like', '%' . $search . '%')
->orWhere('users.account_id', 'like', '%' . $search . '%');
$q->where('users.firstname', 'like', '%'.$search.'%')
->orWhere('users.lastname', 'like', '%'.$search.'%')
->orWhere('users.email', 'like', '%'.$search.'%')
->orWhere('users.account_id', 'like', '%'.$search.'%');
});
}
$sortBy = (string) ($filters['sort_by'] ?? 'lastname');
$sortDir = strtolower((string) ($filters['sort_dir'] ?? 'asc')) === 'desc' ? 'desc' : 'asc';
$allowed = ['firstname', 'lastname', 'email', 'account_id'];
if (!in_array($sortBy, $allowed, true)) {
if (! in_array($sortBy, $allowed, true)) {
$sortBy = 'lastname';
}
$perPage = (int) ($filters['per_page'] ?? 20);
$perPage = $perPage > 0 ? $perPage : 20;
return $query->orderBy('users.' . $sortBy, $sortDir)->paginate($perPage);
return $query->orderBy('users.'.$sortBy, $sortDir)->paginate($perPage);
}
}