#36 - wip

app/Domain/Validation/VacationRequestValidator.php

@@ -5,19 +5,21 @@ declare(strict_types=1);
 namespace Toby\Domain\Validation;
 
 use Illuminate\Pipeline\Pipeline;
-use Toby\Domain\Validation\Rules\ApprovedVacationDaysInSameRange;
+use Toby\Domain\Validation\Rules\NoApprovedVacationRequestsInRange;
 use Toby\Domain\Validation\Rules\DoesNotExceedLimitRule;
 use Toby\Domain\Validation\Rules\MinimumOneVacationDayRule;
-use Toby\Domain\Validation\Rules\PendingVacationRequestInSameRange;
+use Toby\Domain\Validation\Rules\NoPendingVacationRequestInRange;
+use Toby\Domain\Validation\Rules\VacationRangeIsInTheSameYearRule;
 use Toby\Eloquent\Models\VacationRequest;
 
 class VacationRequestValidator
 {
     protected array $rules = [
+        VacationRangeIsInTheSameYearRule::class,
         MinimumOneVacationDayRule::class,
         DoesNotExceedLimitRule::class,
-        PendingVacationRequestInSameRange::class,
-        ApprovedVacationDaysInSameRange::class,
+        NoPendingVacationRequestInRange::class,
+        NoApprovedVacationRequestsInRange::class,
     ];
 
     public function __construct(
@@ -27,9 +29,8 @@ class VacationRequestValidator
 
     public function validate(VacationRequest $vacationRequest): void
     {
-        $this->pipeline
-            ->send($vacationRequest)
-            ->through($this->rules)
-            ->via("check");
+        foreach ($this->rules as $rule) {
+            app($rule)->check($vacationRequest);
+        }
     }
 }