iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix schedule logs

This commit is contained in:
Xu 2024-04-16 22:23:52 +02:00 committed by Igor Scheller
parent 4a0f5c2e78
commit 4e2e929c7e
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Controllers/Admin/ScheduleController.php
View File

@ -6,7 +6,6 @@ namespace Engelsystem\Controllers\Admin;
use Engelsystem\Controllers\NotificationType; use Engelsystem\Controllers\NotificationType;
use Engelsystem\Helpers\Carbon; use Engelsystem\Helpers\Carbon;
use DateTimeInterface;
use Engelsystem\Controllers\BaseController; use Engelsystem\Controllers\BaseController;
use Engelsystem\Controllers\HasUserNotifications; use Engelsystem\Controllers\HasUserNotifications;
use Engelsystem\Helpers\Schedule\ConferenceTrack; use Engelsystem\Helpers\Schedule\ConferenceTrack;
@ -125,12 +124,13 @@ class ScheduleController extends BaseController
} }
$this->log->info( $this->log->info(
'Schedule {name}: Url {url}, Shift Type {shift_type}, ({need}), ' 'Schedule {name}: Url {url}, Shift Type {shift_type_name} ({shift_type_id}), ({need}), '
. 'minutes before/after {before}/{after}, for: {locations}', . 'minutes before/after {before}/{after}, for: {locations}',
[ [
'name' => $schedule->name, 'name' => $schedule->name,
'url' => $schedule->name, 'url' => $schedule->name,
'shift_type' => $schedule->shift_type, 'shift_type_name' => Shifttype::find($schedule->shift_type)->name,
'shift_type_id' => $schedule->shift_type,
'need' => $schedule->needed_from_shift_type ? 'from shift type' : 'from room', 'need' => $schedule->needed_from_shift_type ? 'from shift type' : 'from room',
'before' => $schedule->minutes_before, 'before' => $schedule->minutes_before,
'after' => $schedule->minutes_after, 'after' => $schedule->minutes_after,
@ -323,12 +323,15 @@ class ScheduleController extends BaseController
$scheduleShift->save(); $scheduleShift->save();
$this->log->info( $this->log->info(
'Created schedule shift "{shift}" in "{location}" ({from} - {to}, {guid})', 'Created schedule ({schedule}) shift: {shifttype} with title '
. '"{shift}" in "{location}" ({from} - {to}, {guid})',
[ [
'schedule' => $scheduleShift->schedule->name,
'shifttype' => $shift->shiftType->name,
'shift' => $shift->title, 'shift' => $shift->title,
'location' => $shift->location->name, 'location' => $shift->location->name,
'from' => $shift->start->format(DateTimeInterface::RFC3339), 'from' => $shift->start->format('Y-m-d H:i'),
'to' => $shift->end->format(DateTimeInterface::RFC3339), 'to' => $shift->end->format('Y-m-d H:i'),
'guid' => $scheduleShift->guid, 'guid' => $scheduleShift->guid,
] ]
); );
@ -355,12 +358,15 @@ class ScheduleController extends BaseController
$this->fireUpdateShiftUpdateEvent($oldShift, $shift); $this->fireUpdateShiftUpdateEvent($oldShift, $shift);
$this->log->info( $this->log->info(
'Updated schedule shift "{shift}" in "{location}" ({from} {to}, {guid})', 'Updated schedule ({schedule}) shift: {shifttype} with title '
. '"{shift}" in "{location}" ({from} - {to}, {guid})',
[ [
'schedule' => $scheduleShift->schedule->name,
'shifttype' => $shift->shiftType->name,
'shift' => $shift->title, 'shift' => $shift->title,
'location' => $shift->location->name, 'location' => $shift->location->name,
'from' => $shift->start->format(DateTimeInterface::RFC3339), 'from' => $shift->start->format('Y-m-d H:i'),
'to' => $shift->end->format(DateTimeInterface::RFC3339), 'to' => $shift->end->format('Y-m-d H:i'),
'guid' => $scheduleShift->guid, 'guid' => $scheduleShift->guid,
] ]
); );
@ -377,12 +383,13 @@ class ScheduleController extends BaseController
$scheduleShift->delete(); $scheduleShift->delete();
$this->log->info( $this->log->info(
'Deleted schedule shift "{shift}" in {location} ({from} {to}, {guid})', 'Deleted schedule ({schedule}) shift: "{shift}" in {location} ({from} - {to}, {guid})',
[ [
'schedule' => $scheduleShift->schedule->name,
'shift' => $shift->title, 'shift' => $shift->title,
'location' => $shift->location->name, 'location' => $shift->location->name,
'from' => $shift->start->format(DateTimeInterface::RFC3339), 'from' => $shift->start->format('Y-m-d H:i'),
'to' => $shift->end->format(DateTimeInterface::RFC3339), 'to' => $shift->end->format('Y-m-d H:i'),
'guid' => $scheduleShift->guid, 'guid' => $scheduleShift->guid,
] ]
); );

8
tests/Unit/Controllers/Admin/ScheduleControllerTest.php
View File

@ -222,7 +222,7 @@ class ScheduleControllerTest extends ControllerTest
$this->assertNull(Schedule::find($this->schedule->id)); $this->assertNull(Schedule::find($this->schedule->id));
$this->assertHasNotification('schedule.delete.success'); $this->assertHasNotification('schedule.delete.success');
$this->assertTrue($this->log->hasInfoThatContains('Deleted schedule shift')); $this->assertTrue($this->log->hasInfoThatContains('Deleted schedule ({schedule}) shift'));
$this->assertTrue($this->log->hasInfoThatContains('Schedule {name}')); $this->assertTrue($this->log->hasInfoThatContains('Schedule {name}'));
} }
@ -361,9 +361,9 @@ class ScheduleControllerTest extends ControllerTest
$this->assertTrue($this->log->hasInfoThatContains('Started schedule')); $this->assertTrue($this->log->hasInfoThatContains('Started schedule'));
$this->assertTrue($this->log->hasInfoThatContains('Created schedule location')); $this->assertTrue($this->log->hasInfoThatContains('Created schedule location'));
$this->assertTrue($this->log->hasInfoThatContains('Created schedule shift')); $this->assertTrue($this->log->hasInfoThatContains('Created schedule ({schedule}) shift'));
$this->assertTrue($this->log->hasInfoThatContains('Updated schedule shift')); $this->assertTrue($this->log->hasInfoThatContains('Updated schedule ({schedule}) shift'));
$this->assertTrue($this->log->hasInfoThatContains('Deleted schedule shift')); $this->assertTrue($this->log->hasInfoThatContains('Deleted schedule ({schedule}) shift'));
$this->assertTrue($this->log->hasInfoThatContains('Ended schedule')); $this->assertTrue($this->log->hasInfoThatContains('Ended schedule'));
$this->assertHasNotification('schedule.import.success'); $this->assertHasNotification('schedule.import.success');