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/Administrator/AdministratorUserSearchService.php
+17 -17
View File
@@ -38,23 +38,23 @@ class AdministratorUserSearchService
$v[] = sprintf('(%s)-%s-%s', substr($digits, 0, 3), substr($digits, 3, 3), substr($digits, 6));
$v[] = sprintf('%s-%s-%s', substr($digits, 0, 3), substr($digits, 3, 3), substr($digits, 6));
$v[] = sprintf('%s %s %s', substr($digits, 0, 3), substr($digits, 3, 3), substr($digits, 6));
$v[] = '1' . $digits;
$v[] = '+1' . $digits;
$v[] = '+1 ' . sprintf('(%s) %s-%s', substr($digits, 0, 3), substr($digits, 3, 3), substr($digits, 6));
$v[] = '+1-' . sprintf('%s-%s-%s', substr($digits, 0, 3), substr($digits, 3, 3), substr($digits, 6));
$v[] = '1'.$digits;
$v[] = '+1'.$digits;
$v[] = '+1 '.sprintf('(%s) %s-%s', substr($digits, 0, 3), substr($digits, 3, 3), substr($digits, 6));
$v[] = '+1-'.sprintf('%s-%s-%s', substr($digits, 0, 3), substr($digits, 3, 3), substr($digits, 6));
} elseif (strlen($digits) === 11 && str_starts_with($digits, '1')) {
$ten = substr($digits, 1);
$v[] = $ten;
$v[] = sprintf('(%s)-%s-%s', substr($ten, 0, 3), substr($ten, 3, 3), substr($ten, 6));
$v[] = sprintf('%s-%s-%s', substr($ten, 0, 3), substr($ten, 3, 3), substr($ten, 6));
$v[] = sprintf('%s %s %s', substr($ten, 0, 3), substr($ten, 3, 3), substr($ten, 6));
$v[] = '+1' . $ten;
$v[] = '+1 ' . sprintf('(%s) %s-%s', substr($ten, 0, 3), substr($ten, 3, 3), substr($ten, 6));
$v[] = '+1-' . sprintf('%s-%s-%s', substr($ten, 0, 3), substr($ten, 3, 3), substr($ten, 6));
$v[] = '+1'.$ten;
$v[] = '+1 '.sprintf('(%s) %s-%s', substr($ten, 0, 3), substr($ten, 3, 3), substr($ten, 6));
$v[] = '+1-'.sprintf('%s-%s-%s', substr($ten, 0, 3), substr($ten, 3, 3), substr($ten, 6));
}
}
if (!empty($v)) {
if (! empty($v)) {
$phoneMap[$t] = array_values(array_unique($v));
}
}
@@ -63,13 +63,13 @@ class AdministratorUserSearchService
foreach ($tokens as $t) {
$qb->where(function ($sub) use ($columns, $phoneCols, $phoneMap, $t) {
foreach ($columns as $col) {
$sub->orWhere($col, 'like', '%' . $t . '%');
$sub->orWhere($col, 'like', '%'.$t.'%');
}
if (!empty($phoneMap[$t]) && !empty($phoneCols)) {
if (! empty($phoneMap[$t]) && ! empty($phoneCols)) {
foreach ($phoneMap[$t] as $pv) {
foreach ($phoneCols as $pcol) {
$sub->orWhere($pcol, 'like', '%' . $pv . '%');
$sub->orWhere($pcol, 'like', '%'.$pv.'%');
}
}
}
@@ -82,12 +82,12 @@ class AdministratorUserSearchService
$uQB = DB::table('users')
->select('id', 'firstname', 'lastname', 'email', 'cellphone', 'school_id', 'city', 'state', 'school_year', 'semester');
$applyMultiTokenLike($uQB, ['firstname', 'lastname', 'email', 'cellphone', 'school_id', 'city', 'state'], $tokens, ['cellphone']);
$users = $uQB->limit(150)->get()->map(fn($r) => (array) $r)->all();
$users = $uQB->limit(150)->get()->map(fn ($r) => (array) $r)->all();
$sQB = DB::table('students')
->select('id', 'parent_id', 'school_id', 'firstname', 'lastname', 'dob', 'gender', 'school_year', 'semester', 'rfid_tag');
$applyMultiTokenLike($sQB, ['firstname', 'lastname', 'school_id', 'rfid_tag', 'dob', 'gender'], $tokens);
$students = $sQB->limit(150)->get()->map(fn($r) => (array) $r)->all();
$students = $sQB->limit(150)->get()->map(fn ($r) => (array) $r)->all();
$pQB = DB::table('parents')
->select('id', 'firstparent_id', 'secondparent_firstname', 'secondparent_lastname', 'secondparent_email', 'secondparent_phone', 'school_year', 'semester');
@@ -99,17 +99,17 @@ class AdministratorUserSearchService
}
}
$parents = $pQB->limit(150)->get()->map(fn($r) => (array) $r)->all();
$parents = $pQB->limit(150)->get()->map(fn ($r) => (array) $r)->all();
$stQB = DB::table('staff')
->select('id', 'user_id', 'firstname', 'lastname', 'email', 'phone', 'role_name', 'school_year', 'active_role');
$applyMultiTokenLike($stQB, ['firstname', 'lastname', 'email', 'role_name', 'phone'], $tokens, ['phone']);
$staff = $stQB->limit(150)->get()->map(fn($r) => (array) $r)->all();
$staff = $stQB->limit(150)->get()->map(fn ($r) => (array) $r)->all();
$ecQB = DB::table('emergency_contacts')
->select('id', 'parent_id', 'emergency_contact_name', 'relation', 'cellphone', 'email', 'school_year', 'semester');
$applyMultiTokenLike($ecQB, ['emergency_contact_name', 'relation', 'email', 'cellphone'], $tokens, ['cellphone']);
$emergency = $ecQB->limit(150)->get()->map(fn($r) => (array) $r)->all();
$emergency = $ecQB->limit(150)->get()->map(fn ($r) => (array) $r)->all();
return [
'query' => $q,
@@ -125,4 +125,4 @@ class AdministratorUserSearchService
'total_found' => count($users) + count($students) + count($parents) + count($staff) + count($emergency),
];
}
}
}