* #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
|
||||
|
@@ -18,6 +18,7 @@ enum VacationType: string
|
||||
case TimeInLieu = "time_in_lieu";
|
||||
case Sick = "sick_vacation";
|
||||
case Absence = "absence";
|
||||
case HomeOffice = "home_office";
|
||||
|
||||
public function label(): string
|
||||
{
|
||||
|
@@ -34,10 +34,10 @@ class UserVacationStatsRetriever
|
||||
public function getUsedVacationDaysByMonth(User $user, YearPeriod $yearPeriod): Collection
|
||||
{
|
||||
return $user->vacations()
|
||||
->whereBelongsTo($yearPeriod)
|
||||
->whereRelation(
|
||||
"vacationRequest",
|
||||
fn(Builder $query): Builder => $query
|
||||
->whereBelongsTo($yearPeriod)
|
||||
->whereIn("type", $this->getLimitableVacationTypes())
|
||||
->states(VacationRequestStatesRetriever::successStates()),
|
||||
)
|
||||
@@ -69,11 +69,21 @@ class UserVacationStatsRetriever
|
||||
"vacationRequest",
|
||||
fn(Builder $query): Builder => $query
|
||||
->whereIn("type", $this->getNotLimitableVacationTypes())
|
||||
->whereNot("type", VacationType::HomeOffice)
|
||||
->states(VacationRequestStatesRetriever::successStates()),
|
||||
)
|
||||
->count();
|
||||
}
|
||||
|
||||
public function getHomeOfficeDays(User $user, YearPeriod $yearPeriod): int
|
||||
{
|
||||
return $user
|
||||
->vacations()
|
||||
->whereBelongsTo($yearPeriod)
|
||||
->whereRelation("vacationRequest", "type", VacationType::HomeOffice)
|
||||
->count();
|
||||
}
|
||||
|
||||
public function getRemainingVacationDays(User $user, YearPeriod $yearPeriod): int
|
||||
{
|
||||
$limit = $this->getVacationDaysLimit($user, $yearPeriod);
|
||||
|
@@ -15,6 +15,7 @@ class VacationTypeConfigRetriever
|
||||
public const KEY_BILLABLE = "billable";
|
||||
public const KEY_HAS_LIMIT = "has_limit";
|
||||
public const KEY_AVAILABLE_FOR = "available_for";
|
||||
public const KEY_IS_VACATION = "is_vacation";
|
||||
|
||||
public function __construct(
|
||||
protected Repository $config,
|
||||
@@ -40,6 +41,11 @@ class VacationTypeConfigRetriever
|
||||
return $this->getConfigFor($type)[static::KEY_HAS_LIMIT];
|
||||
}
|
||||
|
||||
public function isVacation(VacationType $type): bool
|
||||
{
|
||||
return $this->getConfigFor($type)[static::KEY_IS_VACATION];
|
||||
}
|
||||
|
||||
public function isAvailableFor(VacationType $type, EmploymentForm $employmentForm): bool
|
||||
{
|
||||
return in_array($employmentForm, $this->getConfigFor($type)[static::KEY_AVAILABLE_FOR], true);
|
||||
|
31
app/Domain/Validation/Rules/VacationTypeCanBeSelected.php
Normal file
31
app/Domain/Validation/Rules/VacationTypeCanBeSelected.php
Normal file
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Toby\Domain\Validation\Rules;
|
||||
|
||||
use Toby\Domain\Enums\VacationType;
|
||||
use Toby\Domain\VacationTypeConfigRetriever;
|
||||
use Toby\Eloquent\Models\VacationRequest;
|
||||
|
||||
class VacationTypeCanBeSelected implements VacationRequestRule
|
||||
{
|
||||
public function __construct(
|
||||
protected VacationTypeConfigRetriever $configRetriever,
|
||||
) {}
|
||||
|
||||
public function check(VacationRequest $vacationRequest): bool
|
||||
{
|
||||
$employmentForm = $vacationRequest->user->profile->employment_form;
|
||||
|
||||
$availableTypes = VacationType::all()
|
||||
->filter(fn(VacationType $type) => $this->configRetriever->isAvailableFor($type, $employmentForm));
|
||||
|
||||
return $availableTypes->contains($vacationRequest->type);
|
||||
}
|
||||
|
||||
public function errorMessage(): string
|
||||
{
|
||||
return __("You cannot create vacation request of this type.");
|
||||
}
|
||||
}
|
@@ -12,6 +12,7 @@ use Toby\Domain\Validation\Rules\NoApprovedVacationRequestsInRange;
|
||||
use Toby\Domain\Validation\Rules\NoPendingVacationRequestInRange;
|
||||
use Toby\Domain\Validation\Rules\VacationRangeIsInTheSameYearRule;
|
||||
use Toby\Domain\Validation\Rules\VacationRequestRule;
|
||||
use Toby\Domain\Validation\Rules\VacationTypeCanBeSelected;
|
||||
use Toby\Eloquent\Models\VacationRequest;
|
||||
|
||||
class VacationRequestValidator
|
||||
@@ -19,6 +20,7 @@ class VacationRequestValidator
|
||||
protected array $rules = [
|
||||
VacationRangeIsInTheSameYearRule::class,
|
||||
MinimumOneVacationDayRule::class,
|
||||
VacationTypeCanBeSelected::class,
|
||||
DoesNotExceedLimitRule::class,
|
||||
NoPendingVacationRequestInRange::class,
|
||||
NoApprovedVacationRequestsInRange::class,
|
||||
|
Reference in New Issue
Block a user