kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

#126 - fix

Browse Source
This commit is contained in:
Adrian Hopek
2022-04-27 12:12:36 +02:00
parent 1f01d334ca
commit 0b154af1d5
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Domain/Actions/VacationRequest/CreateAction.php
View File

@@ -19,7 +19,7 @@ class CreateAction
protected VacationRequestStateManager $stateManager, protected VacationRequestStateManager $stateManager,
protected VacationRequestValidator $vacationRequestValidator, protected VacationRequestValidator $vacationRequestValidator,
protected VacationTypeConfigRetriever $configRetriever, protected VacationTypeConfigRetriever $configRetriever,
protected WorkDaysCalculator $vacationDaysCalculator, protected WorkDaysCalculator $workDaysCalculator,
protected WaitForTechApprovalAction $waitForTechApprovalAction, protected WaitForTechApprovalAction $waitForTechApprovalAction,
protected WaitForAdminApprovalAction $waitForAdminApprovalAction, protected WaitForAdminApprovalAction $waitForAdminApprovalAction,
protected ApproveAction $approveAction, protected ApproveAction $approveAction,
@@ -52,7 +52,7 @@ class CreateAction
$vacationRequest->save(); $vacationRequest->save();
$days = $this->vacationDaysCalculator->calculateDays($vacationRequest->from, $vacationRequest->to); $days = $this->workDaysCalculator->calculateDays($vacationRequest->from, $vacationRequest->to);
foreach ($days as $day) { foreach ($days as $day) {
$vacationRequest->vacations()->create([ $vacationRequest->vacations()->create([

4
app/Domain/Validation/Rules/DoesNotExceedLimitRule.php
View File

@@ -18,7 +18,7 @@ class DoesNotExceedLimitRule implements VacationRequestRule
{ {
public function __construct( public function __construct(
protected VacationTypeConfigRetriever $configRetriever, protected VacationTypeConfigRetriever $configRetriever,
protected WorkDaysCalculator $vacationDaysCalculator, protected WorkDaysCalculator $workDaysCalculator,
) {} ) {}
public function check(VacationRequest $vacationRequest): bool public function check(VacationRequest $vacationRequest): bool
@@ -29,7 +29,7 @@ class DoesNotExceedLimitRule implements VacationRequestRule
$limit = $this->getUserVacationLimit($vacationRequest->user, $vacationRequest->yearPeriod); $limit = $this->getUserVacationLimit($vacationRequest->user, $vacationRequest->yearPeriod);
$vacationDays = $this->getVacationDaysWithLimit($vacationRequest->user, $vacationRequest->yearPeriod); $vacationDays = $this->getVacationDaysWithLimit($vacationRequest->user, $vacationRequest->yearPeriod);
$estimatedDays = $this->vacationDaysCalculator $estimatedDays = $this->workDaysCalculator
->calculateDays($vacationRequest->from, $vacationRequest->to) ->calculateDays($vacationRequest->from, $vacationRequest->to)
->count(); ->count();

4
app/Domain/Validation/Rules/MinimumOneVacationDayRule.php
View File

@@ -10,12 +10,12 @@ use Toby\Eloquent\Models\VacationRequest;
class MinimumOneVacationDayRule implements VacationRequestRule class MinimumOneVacationDayRule implements VacationRequestRule
{ {
public function __construct( public function __construct(
protected WorkDaysCalculator $vacationDaysCalculator, protected WorkDaysCalculator $workDaysCalculator,
) {} ) {}
public function check(VacationRequest $vacationRequest): bool public function check(VacationRequest $vacationRequest): bool
{ {
return $this->vacationDaysCalculator return $this->workDaysCalculator
->calculateDays($vacationRequest->from, $vacationRequest->to) ->calculateDays($vacationRequest->from, $vacationRequest->to)
->isNotEmpty(); ->isNotEmpty();
} }