#120 - fix

app/Domain/Validation/Rules/VacationTypeCanBeSelected.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Domain\Validation\Rules;
+
+use Toby\Domain\Enums\VacationType;
+use Toby\Domain\VacationTypeConfigRetriever;
+use Toby\Eloquent\Models\VacationRequest;
+
+class VacationTypeCanBeSelected implements VacationRequestRule
+{
+    public function __construct(
+        protected VacationTypeConfigRetriever $configRetriever,
+    ) {}
+
+    public function check(VacationRequest $vacationRequest): bool
+    {
+        $employmentForm = $vacationRequest->user->profile->employment_form;
+
+        $availableTypes = VacationType::all()
+            ->filter(fn(VacationType $type) => $this->configRetriever->isAvailableFor($type, $employmentForm));
+
+        return $availableTypes->contains($vacationRequest->type);
+    }
+
+    public function errorMessage(): string
+    {
+        return __("You cannot create vacation request of this type.");
+    }
+}

app/Domain/Validation/VacationRequestValidator.php

@@ -12,6 +12,7 @@ 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\Domain\Validation\Rules\VacationTypeCanBeSelected;
 use Toby\Eloquent\Models\VacationRequest;
 
 class VacationRequestValidator
@@ -19,6 +20,7 @@ class VacationRequestValidator
     protected array $rules = [
         VacationRangeIsInTheSameYearRule::class,
         MinimumOneVacationDayRule::class,
+        VacationTypeCanBeSelected::class,
         DoesNotExceedLimitRule::class,
         NoPendingVacationRequestInRange::class,
         NoApprovedVacationRequestsInRange::class,

app/Eloquent/Models/Vacation.php

@@ -9,6 +9,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
 use Toby\Domain\VacationRequestStatesRetriever;
 
 /**
@@ -58,4 +59,12 @@ class Vacation extends Model
             fn(Builder $query): Builder => $query->states(VacationRequestStatesRetriever::pendingStates()),
         );
     }
+
+    public function scopeWhereTypes(Builder $query, Collection $types): Builder
+    {
+        return $query->whereRelation(
+            "vacationRequest",
+            fn(Builder $query): Builder => $query->whereIn("type", $types),
+        );
+    }
 }

app/Infrastructure/Http/Controllers/DashboardController.php

@@ -7,14 +7,16 @@ namespace Toby\Infrastructure\Http\Controllers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
 use Inertia\Response;
+use Toby\Domain\Enums\VacationType;
 use Toby\Domain\UserVacationStatsRetriever;
 use Toby\Domain\VacationRequestStatesRetriever;
+use Toby\Domain\VacationTypeConfigRetriever;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
 use Toby\Eloquent\Models\Vacation;
 use Toby\Eloquent\Models\VacationRequest;
-use Toby\Infrastructure\Http\Resources\AbsenceResource;
 use Toby\Infrastructure\Http\Resources\HolidayResource;
 use Toby\Infrastructure\Http\Resources\VacationRequestResource;
+use Toby\Infrastructure\Http\Resources\VacationResource;
 
 class DashboardController extends Controller
 {
@@ -22,6 +24,7 @@ class DashboardController extends Controller
         Request $request,
         YearPeriodRetriever $yearPeriodRetriever,
         UserVacationStatsRetriever $vacationStatsRetriever,
+        VacationTypeConfigRetriever $configRetriever,
     ): Response {
         $user = $request->user();
         $now = Carbon::now();
@@ -31,6 +34,14 @@ class DashboardController extends Controller
             ->with(["user", "vacationRequest"])
             ->whereDate("date", $now)
             ->approved()
+            ->whereTypes(VacationType::all()->filter(fn(VacationType $type) => $configRetriever->isVacation($type)))
+            ->get();
+
+        $remoteDays = Vacation::query()
+            ->with(["user", "vacationRequest"])
+            ->whereDate("date", $now)
+            ->approved()
+            ->whereTypes(VacationType::all()->filter(fn(VacationType $type) => !$configRetriever->isVacation($type)))
             ->get();
 
         if ($user->can("listAll", VacationRequest::class)) {
@@ -62,7 +73,8 @@ class DashboardController extends Controller
         $remaining = $limit - $used - $pending;
 
         return inertia("Dashboard", [
-            "absences" => AbsenceResource::collection($absences),
+            "absences" => VacationResource::collection($absences),
+            "remoteDays" => VacationResource::collection($remoteDays),
             "vacationRequests" => VacationRequestResource::collection($vacationRequests),
             "holidays" => HolidayResource::collection($holidays),
             "stats" => [

app/Infrastructure/Http/Resources/AbsenceResource.php

@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Toby\Infrastructure\Http\Resources;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class AbsenceResource extends JsonResource
-{
-    public static $wrap = null;
-
-    public function toArray($request): array
-    {
-        return [
-            "id" => $this->id,
-            "user" => new SimpleUserResource($this->user),
-            "date" => $this->date->toDisplayString(),
-        ];
-    }
-}

app/Infrastructure/Http/Resources/VacationResource.php

@@ -14,6 +14,7 @@ class VacationResource extends JsonResource
     {
         return [
             "id" => $this->id,
+            "user" => new SimpleUserResource($this->user),
             "displayDate" => $this->date->toDisplayString(),
             "date" => $this->date->toDateString(),
         ];