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

fix gitlab tests

Browse Source
This commit is contained in:
root
2026-06-09 02:32:58 -04:00
parent 20a0b6c4e5
commit 6def9993da
1489 changed files with 10449 additions and 11356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Incidents/CurrentIncidentService.php
+11 -9
View File
@@ -11,7 +11,9 @@ use Illuminate\Support\Facades\DB;
class CurrentIncidentService
{
public function __construct(private IncidentLookupService $lookup) {}
public function __construct(private IncidentLookupService $lookup)
{
}
public function listCurrent(): array
{
@@ -21,7 +23,7 @@ class CurrentIncidentService
$updaterIds = [];
foreach ($incidents as $incident) {
foreach (['updated_by_open', 'updated_by_closed', 'updated_by_canceled'] as $key) {
if (! empty($incident[$key])) {
if (!empty($incident[$key])) {
$updaterIds[] = (int) $incident[$key];
}
}
@@ -31,7 +33,7 @@ class CurrentIncidentService
foreach ($incidents as &$incident) {
foreach (['updated_by_open', 'updated_by_closed', 'updated_by_canceled'] as $key) {
$id = (int) ($incident[$key] ?? 0);
$incident[$key.'_name'] = $id > 0 ? ($updaterMap[$id] ?? null) : null;
$incident[$key . '_name'] = $id > 0 ? ($updaterMap[$id] ?? null) : null;
}
}
unset($incident);
@@ -60,7 +62,7 @@ class CurrentIncidentService
->get()
->map(fn ($student) => [
'id' => (int) $student->id,
'name' => trim((string) $student->firstname.' '.(string) $student->lastname),
'name' => trim((string) $student->firstname . ' ' . (string) $student->lastname),
])
->all();
}
@@ -75,7 +77,7 @@ class CurrentIncidentService
$grade = (string) $payload['grade'];
$student = Student::query()->find($studentId);
if (! $student) {
if (!$student) {
return [
'ok' => false,
'message' => 'Student not found.',
@@ -119,7 +121,7 @@ class CurrentIncidentService
$incident = CurrentIncident::query()->create([
'student_id' => $student->id,
'student_name' => trim((string) $student->firstname.' '.(string) $student->lastname),
'student_name' => trim((string) $student->firstname . ' ' . (string) $student->lastname),
'grade' => $grade,
'incident' => $incidentType,
'incident_datetime' => $currentDateTime,
@@ -147,7 +149,7 @@ class CurrentIncidentService
public function closeIncident(int $incidentId, string $closeDescription, ?string $actionTaken, int $userId): array
{
$incident = CurrentIncident::query()->find($incidentId);
if (! $incident) {
if (!$incident) {
return ['ok' => false, 'message' => 'Incident not found.'];
}
@@ -169,7 +171,7 @@ class CurrentIncidentService
public function cancelIncident(int $incidentId, ?string $cancelDescription, ?string $actionTaken, int $userId): array
{
$incident = CurrentIncident::query()->find($incidentId);
if (! $incident) {
if (!$incident) {
return ['ok' => false, 'message' => 'Incident not found.'];
}
@@ -226,6 +228,6 @@ class CurrentIncidentService
return $append;
}
return $existing.PHP_EOL.$append;
return $existing . PHP_EOL . $append;
}
}