From 0b154af1d5e99446121f9a2824b41dc737f5667c Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Wed, 27 Apr 2022 12:12:36 +0200 Subject: [PATCH] #126 - fix --- app/Domain/Actions/VacationRequest/CreateAction.php | 4 ++-- app/Domain/Validation/Rules/DoesNotExceedLimitRule.php | 4 ++-- app/Domain/Validation/Rules/MinimumOneVacationDayRule.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Domain/Actions/VacationRequest/CreateAction.php b/app/Domain/Actions/VacationRequest/CreateAction.php index 43d9736..b569954 100644 --- a/app/Domain/Actions/VacationRequest/CreateAction.php +++ b/app/Domain/Actions/VacationRequest/CreateAction.php @@ -19,7 +19,7 @@ class CreateAction protected VacationRequestStateManager $stateManager, protected VacationRequestValidator $vacationRequestValidator, protected VacationTypeConfigRetriever $configRetriever, - protected WorkDaysCalculator $vacationDaysCalculator, + protected WorkDaysCalculator $workDaysCalculator, protected WaitForTechApprovalAction $waitForTechApprovalAction, protected WaitForAdminApprovalAction $waitForAdminApprovalAction, protected ApproveAction $approveAction, @@ -52,7 +52,7 @@ class CreateAction $vacationRequest->save(); - $days = $this->vacationDaysCalculator->calculateDays($vacationRequest->from, $vacationRequest->to); + $days = $this->workDaysCalculator->calculateDays($vacationRequest->from, $vacationRequest->to); foreach ($days as $day) { $vacationRequest->vacations()->create([ diff --git a/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php b/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php index 780b749..c0ec8df 100644 --- a/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php +++ b/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php @@ -18,7 +18,7 @@ class DoesNotExceedLimitRule implements VacationRequestRule { public function __construct( protected VacationTypeConfigRetriever $configRetriever, - protected WorkDaysCalculator $vacationDaysCalculator, + protected WorkDaysCalculator $workDaysCalculator, ) {} public function check(VacationRequest $vacationRequest): bool @@ -29,7 +29,7 @@ class DoesNotExceedLimitRule implements VacationRequestRule $limit = $this->getUserVacationLimit($vacationRequest->user, $vacationRequest->yearPeriod); $vacationDays = $this->getVacationDaysWithLimit($vacationRequest->user, $vacationRequest->yearPeriod); - $estimatedDays = $this->vacationDaysCalculator + $estimatedDays = $this->workDaysCalculator ->calculateDays($vacationRequest->from, $vacationRequest->to) ->count(); diff --git a/app/Domain/Validation/Rules/MinimumOneVacationDayRule.php b/app/Domain/Validation/Rules/MinimumOneVacationDayRule.php index f32a6a3..5e78a75 100644 --- a/app/Domain/Validation/Rules/MinimumOneVacationDayRule.php +++ b/app/Domain/Validation/Rules/MinimumOneVacationDayRule.php @@ -10,12 +10,12 @@ use Toby\Eloquent\Models\VacationRequest; class MinimumOneVacationDayRule implements VacationRequestRule { public function __construct( - protected WorkDaysCalculator $vacationDaysCalculator, + protected WorkDaysCalculator $workDaysCalculator, ) {} public function check(VacationRequest $vacationRequest): bool { - return $this->vacationDaysCalculator + return $this->workDaysCalculator ->calculateDays($vacationRequest->from, $vacationRequest->to) ->isNotEmpty(); }