#36 - wip

app/Domain/Validation/Rules/DoesNotExceedLimitRule.php

@@ -7,13 +7,14 @@ namespace Toby\Domain\Validation\Rules;
 use Toby\Domain\VacationTypeConfigRetriever;
 use Toby\Eloquent\Models\VacationRequest;
 
-class DoesNotExceedLimitRule extends VacationRequestRule
+class DoesNotExceedLimitRule implements VacationRequestRule
 {
-    public function __construct(protected VacationTypeConfigRetriever $configRetriever)
+    public function __construct(
-    {
+        protected VacationTypeConfigRetriever $configRetriever,
+    ) {
     }
 
-    public function passes(VacationRequest $vacationRequest): bool
+    public function check(VacationRequest $vacationRequest): bool
     {
         return true;
     }

app/Domain/Validation/Rules/MinimumOneVacationDayRule.php

@@ -7,13 +7,14 @@ namespace Toby\Domain\Validation\Rules;
 use Toby\Domain\VacationDaysCalculator;
 use Toby\Eloquent\Models\VacationRequest;
 
-class MinimumOneVacationDayRule extends VacationRequestRule
+class MinimumOneVacationDayRule implements VacationRequestRule
 {
-    public function __construct(protected VacationDaysCalculator $vacationDaysCalculator)
+    public function __construct(
-    {
+        protected VacationDaysCalculator $vacationDaysCalculator,
+    ) {
     }
 
-    public function passes(VacationRequest $vacationRequest): bool
+    public function check(VacationRequest $vacationRequest): bool
     {
         return $this->vacationDaysCalculator
             ->calculateDays($vacationRequest->yearPeriod, $vacationRequest->from, $vacationRequest->to)

app/Domain/Validation/Rules/NoApprovedVacationRequestsInRange.php

@@ -7,11 +7,11 @@ namespace Toby\Domain\Validation\Rules;
 use Toby\Domain\Enums\VacationRequestState;
 use Toby\Eloquent\Models\VacationRequest;
 
-class NoApprovedVacationRequestsInRange extends VacationRequestRule
+class NoApprovedVacationRequestsInRange implements VacationRequestRule
 {
-    public function passes(VacationRequest $vacationRequest): bool
+    public function check(VacationRequest $vacationRequest): bool
     {
-        return $vacationRequest
+        return !$vacationRequest
             ->user
             ->vacationRequests()
             ->overlapsWith($vacationRequest)

app/Domain/Validation/Rules/NoPendingVacationRequestInRange.php

@@ -7,11 +7,11 @@ namespace Toby\Domain\Validation\Rules;
 use Toby\Domain\Enums\VacationRequestState;
 use Toby\Eloquent\Models\VacationRequest;
 
-class NoPendingVacationRequestInRange extends VacationRequestRule
+class NoPendingVacationRequestInRange implements VacationRequestRule
 {
-    public function passes(VacationRequest $vacationRequest): bool
+    public function check(VacationRequest $vacationRequest): bool
     {
-        return $vacationRequest
+        return !$vacationRequest
             ->user
             ->vacationRequests()
             ->overlapsWith($vacationRequest)

app/Domain/Validation/Rules/VacationRangeIsInTheSameYearRule.php

@@ -6,9 +6,9 @@ namespace Toby\Domain\Validation\Rules;
 
 use Toby\Eloquent\Models\VacationRequest;
 
-class VacationRangeIsInTheSameYearRule extends VacationRequestRule
+class VacationRangeIsInTheSameYearRule implements VacationRequestRule
 {
-    public function passes(VacationRequest $vacationRequest): bool
+    public function check(VacationRequest $vacationRequest): bool
     {
         return $vacationRequest->from->isSameYear($vacationRequest->to);
     }

app/Domain/Validation/Rules/VacationRequestRule.php

@@ -4,18 +4,10 @@ declare(strict_types=1);
 
 namespace Toby\Domain\Validation\Rules;
 
-use Illuminate\Validation\ValidationException;
 use Toby\Eloquent\Models\VacationRequest;
 
-abstract class VacationRequestRule
+interface VacationRequestRule
 {
-    public function check(VacationRequest $vacationRequest): void
+    public function check(VacationRequest $vacationRequest): bool;
-    {
+    public function errorMessage(): string;
-        if (! $this->passes($vacationRequest)) {
-            throw ValidationException::withMessages(["vacationRequest" => $this->errorMessage()]);
-        }
-    }
-
-    public abstract function passes(VacationRequest $vacationRequest): bool;
-    public abstract function errorMessage(): string;
 }

app/Domain/Validation/VacationRequestValidator.php

@@ -4,12 +4,14 @@ declare(strict_types=1);
 
 namespace Toby\Domain\Validation;
 
-use Illuminate\Pipeline\Pipeline;
+use Illuminate\Contracts\Container\Container;
-use Toby\Domain\Validation\Rules\NoApprovedVacationRequestsInRange;
+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);
+    }
 }

app/Eloquent/Models/VacationRequest.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Toby\Eloquent\Models;
 
-use Carbon\CarbonInterface;
 use Database\Factories\VacationRequestFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -69,10 +68,10 @@ class VacationRequest extends Model
         return $query->whereIn("state", $states);
     }
 
-    public function scopeOverlapsWith(Builder $query, VacationRequest $vacationRequest): Builder
+    public function scopeOverlapsWith(Builder $query, self $vacationRequest): Builder
     {
-        return $query->where("from", '<=', $vacationRequest->to)
+        return $query->where("from", "<=", $vacationRequest->to)
-            ->where("to", '>=', $vacationRequest->from);
+            ->where("to", ">=", $vacationRequest->from);
     }
 
     protected static function newFactory(): VacationRequestFactory

app/Infrastructure/Http/Controllers/VacationRequestController.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Toby\Infrastructure\Http\Controllers;
 
 use Barryvdh\DomPDF\Facade\Pdf;
-use Carbon\Carbon;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response as LaravelResponse;

database/factories/VacationRequestFactory.php

@@ -15,6 +15,7 @@ use Toby\Eloquent\Models\YearPeriod;
 class VacationRequestFactory extends Factory
 {
     protected $model = VacationRequest::class;
+    private static int $number = 1;
 
     public function definition(): array
     {
@@ -36,13 +37,7 @@ class VacationRequestFactory extends Factory
     protected function generateName(array $attributes): string
     {
         $year = YearPeriod::find($attributes["year_period_id"])->year;
-        $user = User::find($attributes["user_id"]);
+        $number = static::$number++;
-
-        $number = $user->vacationRequests()
-            ->whereYear("from", $year)
-            ->count() + 1;
-
-        dump($user->vacationRequests()->count());
 
         return "{$number}/{$year}";
     }

resources/js/Pages/VacationRequest/Index.vue

@@ -61,12 +61,6 @@
             >
               Do
             </th>
-            <th
-              scope="col"
-              class="px-6 py-3 text-left text-xs font-semibold text-gray-500 uppercase tracking-wider"
-            >
-              Dni urlopu
-            </th>
             <th scope="col" />
           </tr>
         </thead>
@@ -96,9 +90,6 @@
             <td class="px-4 py-4 whitespace-nowrap text-sm text-gray-500">
               {{ request.to }}
             </td>
-            <td class="px-4 py-4 whitespace-nowrap text-sm text-gray-500">
-              X
-            </td>
             <td class="px-4 py-4 whitespace-nowrap text-sm text-gray-500">
               <InertiaLink :href="`/vacation-requests/${request.id}`">
                 <ChevronRightIcon class="block w-6 h-6 fill-gray-400" />