#36 - wip

app/Domain/Validation/VacationRequestValidator.php

@@ -4,12 +4,14 @@ declare(strict_types=1);
 
 namespace Toby\Domain\Validation;
 
-use Illuminate\Pipeline\Pipeline;
-use Toby\Domain\Validation\Rules\NoApprovedVacationRequestsInRange;
+use Illuminate\Contracts\Container\Container;
+use Illuminate\Validation\ValidationException;
 use Toby\Domain\Validation\Rules\DoesNotExceedLimitRule;
 use Toby\Domain\Validation\Rules\MinimumOneVacationDayRule;
+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\Eloquent\Models\VacationRequest;
 
 class VacationRequestValidator
@@ -23,14 +25,28 @@ class VacationRequestValidator
     ];
 
     public function __construct(
-        protected Pipeline $pipeline,
+        protected Container $container,
     ) {
     }
 
+    /**
+     * @throws ValidationException
+     */
     public function validate(VacationRequest $vacationRequest): void
     {
         foreach ($this->rules as $rule) {
-            app($rule)->check($vacationRequest);
+            $rule = $this->makeRule($rule);
+
+            if (!$rule->check($vacationRequest)) {
+                throw ValidationException::withMessages([
+                    "vacationRequest" => $rule->errorMessage(),
+                ]);
+            }
         }
     }
+
+    protected function makeRule(string $class): VacationRequestRule
+    {
+        return $this->container->make($class);
+    }
 }