* #120 - wip * #120 - add icon to home office * #120 - wip * #120 - wip * #120 - wip * #120 - wip * #120 - wip * #120 - ui fixes * #120 - fix * #120 - fix * #120 - fix * #120 - fix * #120 - translation fix * #120 - fix Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
This commit is contained in:
@@ -7,6 +7,7 @@ namespace Toby\Domain\Actions\VacationRequest;
|
||||
use Toby\Domain\Enums\Role;
|
||||
use Toby\Domain\Notifications\VacationRequestStatusChangedNotification;
|
||||
use Toby\Domain\VacationRequestStateManager;
|
||||
use Toby\Domain\VacationTypeConfigRetriever;
|
||||
use Toby\Eloquent\Models\User;
|
||||
use Toby\Eloquent\Models\VacationRequest;
|
||||
use Toby\Infrastructure\Jobs\SendVacationRequestDaysToGoogleCalendar;
|
||||
@@ -15,15 +16,18 @@ class ApproveAction
|
||||
{
|
||||
public function __construct(
|
||||
protected VacationRequestStateManager $stateManager,
|
||||
protected VacationTypeConfigRetriever $configRetriever,
|
||||
) {}
|
||||
|
||||
public function execute(VacationRequest $vacationRequest, ?User $user = null): void
|
||||
{
|
||||
$this->stateManager->approve($vacationRequest, $user);
|
||||
|
||||
SendVacationRequestDaysToGoogleCalendar::dispatch($vacationRequest);
|
||||
if ($this->configRetriever->isVacation($vacationRequest->type)) {
|
||||
SendVacationRequestDaysToGoogleCalendar::dispatch($vacationRequest);
|
||||
|
||||
$this->notify($vacationRequest);
|
||||
$this->notify($vacationRequest);
|
||||
}
|
||||
}
|
||||
|
||||
protected function notify(VacationRequest $vacationRequest): void
|
||||
|
@@ -7,6 +7,7 @@ namespace Toby\Domain\Actions\VacationRequest;
|
||||
use Toby\Domain\Enums\Role;
|
||||
use Toby\Domain\Notifications\VacationRequestStatusChangedNotification;
|
||||
use Toby\Domain\VacationRequestStateManager;
|
||||
use Toby\Domain\VacationTypeConfigRetriever;
|
||||
use Toby\Eloquent\Models\User;
|
||||
use Toby\Eloquent\Models\VacationRequest;
|
||||
use Toby\Infrastructure\Jobs\ClearVacationRequestDaysInGoogleCalendar;
|
||||
@@ -15,6 +16,7 @@ class CancelAction
|
||||
{
|
||||
public function __construct(
|
||||
protected VacationRequestStateManager $stateManager,
|
||||
protected VacationTypeConfigRetriever $configRetriever,
|
||||
) {}
|
||||
|
||||
public function execute(VacationRequest $vacationRequest, User $user): void
|
||||
@@ -23,7 +25,9 @@ class CancelAction
|
||||
|
||||
ClearVacationRequestDaysInGoogleCalendar::dispatch($vacationRequest);
|
||||
|
||||
$this->notify($vacationRequest);
|
||||
if ($this->configRetriever->isVacation($vacationRequest->type)) {
|
||||
$this->notify($vacationRequest);
|
||||
}
|
||||
}
|
||||
|
||||
protected function notify(VacationRequest $vacationRequest): void
|
||||
|
@@ -32,7 +32,10 @@ class CreateAction
|
||||
{
|
||||
$vacationRequest = $this->createVacationRequest($data, $creator);
|
||||
$this->handleCreatedVacationRequest($vacationRequest);
|
||||
$this->notify($vacationRequest);
|
||||
|
||||
if ($this->configRetriever->isVacation($vacationRequest->type)) {
|
||||
$this->notify($vacationRequest);
|
||||
}
|
||||
|
||||
return $vacationRequest;
|
||||
}
|
||||
|
@@ -23,10 +23,12 @@ class WaitForAdminApprovalAction
|
||||
{
|
||||
$this->stateManager->waitForAdministrative($vacationRequest);
|
||||
|
||||
$this->waitForAdminApprovers($vacationRequest);
|
||||
if ($this->configRetriever->isVacation($vacationRequest->type)) {
|
||||
$this->notifyAdminApprovers($vacationRequest);
|
||||
}
|
||||
}
|
||||
|
||||
protected function waitForAdminApprovers(VacationRequest $vacationRequest): void
|
||||
protected function notifyAdminApprovers(VacationRequest $vacationRequest): void
|
||||
{
|
||||
$users = User::query()
|
||||
->whereIn("role", [Role::AdministrativeApprover, Role::Administrator])
|
||||
|
@@ -23,7 +23,9 @@ class WaitForTechApprovalAction
|
||||
{
|
||||
$this->stateManager->waitForTechnical($vacationRequest);
|
||||
|
||||
$this->notifyTechApprovers($vacationRequest);
|
||||
if ($this->configRetriever->isVacation($vacationRequest->type)) {
|
||||
$this->notifyTechApprovers($vacationRequest);
|
||||
}
|
||||
}
|
||||
|
||||
protected function notifyTechApprovers(VacationRequest $vacationRequest): void
|
||||
|
Reference in New Issue
Block a user