#126 - fix workdays

app/Domain/Actions/VacationRequest/CreateAction.php

@@ -6,10 +6,10 @@ namespace Toby\Domain\Actions\VacationRequest;
 
 use Illuminate\Validation\ValidationException;
 use Toby\Domain\Notifications\VacationRequestCreatedNotification;
-use Toby\Domain\VacationDaysCalculator;
 use Toby\Domain\VacationRequestStateManager;
 use Toby\Domain\VacationTypeConfigRetriever;
 use Toby\Domain\Validation\VacationRequestValidator;
+use Toby\Domain\WorkDaysCalculator;
 use Toby\Eloquent\Models\User;
 use Toby\Eloquent\Models\VacationRequest;
 
@@ -19,7 +19,7 @@ class CreateAction
         protected VacationRequestStateManager $stateManager,
         protected VacationRequestValidator $vacationRequestValidator,
         protected VacationTypeConfigRetriever $configRetriever,
-        protected VacationDaysCalculator $vacationDaysCalculator,
+        protected WorkDaysCalculator $vacationDaysCalculator,
         protected WaitForTechApprovalAction $waitForTechApprovalAction,
         protected WaitForAdminApprovalAction $waitForAdminApprovalAction,
         protected ApproveAction $approveAction,
@@ -52,11 +52,7 @@ class CreateAction
 
         $vacationRequest->save();
 
-        $days = $this->vacationDaysCalculator->calculateDays(
-            $vacationRequest->yearPeriod,
-            $vacationRequest->from,
-            $vacationRequest->to,
-        );
+        $days = $this->vacationDaysCalculator->calculateDays($vacationRequest->from, $vacationRequest->to);
 
         foreach ($days as $day) {
             $vacationRequest->vacations()->create([

app/Domain/Validation/Rules/DoesNotExceedLimitRule.php

@@ -7,9 +7,9 @@ namespace Toby\Domain\Validation\Rules;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Toby\Domain\Enums\VacationType;
-use Toby\Domain\VacationDaysCalculator;
 use Toby\Domain\VacationRequestStatesRetriever;
 use Toby\Domain\VacationTypeConfigRetriever;
+use Toby\Domain\WorkDaysCalculator;
 use Toby\Eloquent\Models\User;
 use Toby\Eloquent\Models\VacationRequest;
 use Toby\Eloquent\Models\YearPeriod;
@@ -18,7 +18,7 @@ class DoesNotExceedLimitRule implements VacationRequestRule
 {
     public function __construct(
         protected VacationTypeConfigRetriever $configRetriever,
-        protected VacationDaysCalculator $vacationDaysCalculator,
+        protected WorkDaysCalculator $vacationDaysCalculator,
     ) {}
 
     public function check(VacationRequest $vacationRequest): bool
@@ -29,7 +29,9 @@ class DoesNotExceedLimitRule implements VacationRequestRule
 
         $limit = $this->getUserVacationLimit($vacationRequest->user, $vacationRequest->yearPeriod);
         $vacationDays = $this->getVacationDaysWithLimit($vacationRequest->user, $vacationRequest->yearPeriod);
-        $estimatedDays = $this->vacationDaysCalculator->calculateDays($vacationRequest->yearPeriod, $vacationRequest->from, $vacationRequest->to)->count();
+        $estimatedDays = $this->vacationDaysCalculator
+            ->calculateDays($vacationRequest->from, $vacationRequest->to)
+            ->count();
 
         return $limit >= ($vacationDays + $estimatedDays);
     }

app/Domain/Validation/Rules/MinimumOneVacationDayRule.php

@@ -4,19 +4,19 @@ declare(strict_types=1);
 
 namespace Toby\Domain\Validation\Rules;
 
-use Toby\Domain\VacationDaysCalculator;
+use Toby\Domain\WorkDaysCalculator;
 use Toby\Eloquent\Models\VacationRequest;
 
 class MinimumOneVacationDayRule implements VacationRequestRule
 {
     public function __construct(
-        protected VacationDaysCalculator $vacationDaysCalculator,
+        protected WorkDaysCalculator $vacationDaysCalculator,
     ) {}
 
     public function check(VacationRequest $vacationRequest): bool
     {
         return $this->vacationDaysCalculator
-            ->calculateDays($vacationRequest->yearPeriod, $vacationRequest->from, $vacationRequest->to)
+            ->calculateDays($vacationRequest->from, $vacationRequest->to)
             ->isNotEmpty();
     }
 

app/Domain/WorkDaysCalculator.php

@@ -9,11 +9,12 @@ use Carbon\CarbonPeriod;
 use Illuminate\Support\Collection;
 use Toby\Eloquent\Models\YearPeriod;
 
-class VacationDaysCalculator
+class WorkDaysCalculator
 {
-    public function calculateDays(YearPeriod $yearPeriod, CarbonInterface $from, CarbonInterface $to): Collection
+    public function calculateDays(CarbonInterface $from, CarbonInterface $to): Collection
     {
         $period = CarbonPeriod::create($from, $to);
+        $yearPeriod = YearPeriod::findByYear($from->year);
         $holidays = $yearPeriod->holidays()->pluck("date");
 
         $validDays = new Collection();