#22 - wip

app/Eloquent/Models/Vacation.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Eloquent\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Support\Carbon;
+
+/**
+ * @property int $id
+ * @property Carbon $date
+ * @property User $user
+ * @property VacationRequest $vacationRequest
+ */
+class Vacation extends Model
+{
+    use HasFactory;
+
+    public $timestamps = false;
+    protected $guarded = [];
+    protected $casts = [
+        "date" => "date",
+    ];
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function vacationRequest(): BelongsTo
+    {
+        return $this->belongsTo(VacationRequest::class);
+    }
+}

app/Eloquent/Models/VacationRequest.php

@@ -26,6 +26,7 @@ use Toby\Domain\Enums\VacationType;
  * @property User $user
  * @property YearPeriod $yearPeriod
  * @property Collection $activities
+ * @property Collection $vacations
  * @property Carbon $created_at
  * @property Carbon $updated_at
  */
@@ -57,6 +58,11 @@ class VacationRequest extends Model
         return $this->hasMany(VacationRequestActivity::class);
     }
 
+    public function vacations(): HasMany
+    {
+        return $this->hasMany(Vacation::class);
+    }
+
     public function changeStateTo(VacationRequestState $state): void
     {
         $this->state = $state;

app/Infrastructure/Http/Controllers/HolidayController.php

@@ -7,11 +7,9 @@ namespace Toby\Infrastructure\Http\Controllers;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Response;
 use Toby\Eloquent\Models\Holiday;
-use Toby\Eloquent\Models\User;
 use Toby\Infrastructure\Http\Requests\HolidayRequest;
 use Toby\Infrastructure\Http\Resources\HolidayFormDataResource;
 use Toby\Infrastructure\Http\Resources\HolidayResource;
-use Toby\Infrastructure\Http\Resources\UserResource;
 
 class HolidayController extends Controller
 {

app/Infrastructure/Http/Controllers/VacationRequestController.php

@@ -28,6 +28,7 @@ class VacationRequestController extends Controller
 
         $vacationRequests = $request->user()
             ->vacationRequests()
+            ->with("vacations")
             ->where("year_period_id", $yearPeriodRetriever->selected()->id)
             ->latest()
             ->states(VacationRequestState::filterByStatus($status))
@@ -73,15 +74,11 @@ class VacationRequestController extends Controller
     ): RedirectResponse {
         /** @var VacationRequest $vacationRequest */
         $vacationRequest = $request->user()->vacationRequests()->make($request->data());
-        $vacationRequest->estimated_days = $vacationDaysCalculator->calculateDays(
-            $vacationRequest->yearPeriod,
-            $vacationRequest->from,
-            $vacationRequest->to,
-        )->count();
 
         $vacationRequestValidator->validate($vacationRequest);
 
         $vacationRequest->save();
+
         $stateManager->markAsCreated($vacationRequest);
 
         return redirect()

app/Infrastructure/Http/Resources/VacationRequestResource.php

@@ -20,8 +20,8 @@ class VacationRequestResource extends JsonResource
             "state" => $this->state->label(),
             "from" => $this->from->toDisplayString(),
             "to" => $this->to->toDisplayString(),
-            "estimatedDays" => $this->estimated_days,
             "comment" => $this->comment,
+            "days" => VacationResource::collection($this->vacations),
         ];
     }
 }

app/Infrastructure/Http/Resources/VacationResource.php

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