Merge branch 'main' into #43-vacation-summary-for-employee

# Conflicts:
#	app/Infrastructure/Http/Controllers/HolidayController.php
#	app/Infrastructure/Http/Controllers/VacationLimitController.php
#	app/Infrastructure/Http/Controllers/VacationRequestController.php
#	composer.lock
#	resources/js/Pages/Holidays/Index.vue
#	resources/js/Pages/VacationRequest/Create.vue
This commit is contained in:
Adrian Hopek
2022-03-02 10:01:14 +01:00
51 changed files with 1993 additions and 1401 deletions

View File

@@ -6,9 +6,6 @@ namespace Toby\Eloquent\Observers;
use Illuminate\Contracts\Auth\Factory as Auth;
use Illuminate\Contracts\Events\Dispatcher;
use Toby\Domain\Enums\VacationRequestState;
use Toby\Domain\Events\VacationRequestStateChanged;
use Toby\Eloquent\Models\User;
use Toby\Eloquent\Models\VacationRequest;
class VacationRequestObserver
@@ -28,31 +25,4 @@ class VacationRequestObserver
$vacationRequest->name = "{$vacationRequestNumber}/${year}";
}
public function saved(VacationRequest $vacationRequest): void
{
if ($vacationRequest->isDirty("state")) {
$previousState = $vacationRequest->getOriginal("state");
$this->fireStateChangedEvent($vacationRequest, $previousState, $vacationRequest->state);
}
}
protected function fireStateChangedEvent(
VacationRequest $vacationRequest,
?VacationRequestState $from,
VacationRequestState $to,
): void {
$event = new VacationRequestStateChanged($vacationRequest, $from, $to, $this->getAuthUser());
$this->dispatcher->dispatch($event);
}
protected function getAuthUser(): ?User
{
/** @var User $user */
$user = $this->auth->guard()->user();
return $user;
}
}