#22 - vacation calendar (#51)

* change layout

* change layout

* #22 - wip

* wip

* wip

* #22 - wip

* #22 - wip

* #22 - wip

* #22 - wip

* #22 - fix

* #22 - wip

* #22 - added some tests

* #22 - wip

* #22 - wip

* #22 - fix

* #22 - wip

* #22 - wip

* #22 - wip

* #22 - fix

* #22 - fix

* #22 - fix

* #22 - fix

* #22 - fix

* #22 - fix

* #22 - cr fixes

* #22 - cr fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>

app/Infrastructure/Http/Controllers/VacationCalendarController.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Infrastructure\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Str;
+use Inertia\Response;
+use Toby\Domain\CalendarGenerator;
+use Toby\Eloquent\Helpers\YearPeriodRetriever;
+use Toby\Eloquent\Models\User;
+use Toby\Infrastructure\Http\Resources\UserResource;
+
+class VacationCalendarController extends Controller
+{
+    public function index(
+        Request $request,
+        YearPeriodRetriever $yearPeriodRetriever,
+        CalendarGenerator $calendarGenerator,
+    ): Response {
+        $month = Str::lower($request->query("month", Carbon::now()->englishMonth));
+        $yearPeriod = $yearPeriodRetriever->selected();
+        $users = User::query()
+            ->orderBy("last_name")
+            ->orderBy("first_name")
+            ->get();
+
+        $calendar = $calendarGenerator->generate($yearPeriod, $month);
+
+        return inertia("Calendar", [
+            "calendar" => $calendar,
+            "currentMonth" => $month,
+            "users" => UserResource::collection($users),
+        ]);
+    }
+}

app/Infrastructure/Http/Controllers/VacationRequestController.php

@@ -24,16 +24,21 @@ class VacationRequestController extends Controller
 {
     public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response
     {
+        $status = $request->get("status", "all");
+
         $vacationRequests = $request->user()
             ->vacationRequests()
+            ->with("vacations")
             ->where("year_period_id", $yearPeriodRetriever->selected()->id)
             ->latest()
-            ->states(VacationRequestState::filterByStatus($request->query("status", "all")))
+            ->states(VacationRequestState::filterByStatus($status))
             ->paginate();
 
         return inertia("VacationRequest/Index", [
             "requests" => VacationRequestResource::collection($vacationRequests),
-            "filters" => $request->only("status"),
+            "filters" => [
+                "status" => $status,
+            ],
         ]);
     }
 
@@ -69,15 +74,24 @@ 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();
+
+        $days = $vacationDaysCalculator->calculateDays(
+            $vacationRequest->yearPeriod,
+            $vacationRequest->from,
+            $vacationRequest->to,
+        );
+
+        foreach ($days as $day) {
+            $vacationRequest->vacations()->create([
+                "date" => $day,
+                "user_id" => $vacationRequest->user->id,
+                "year_period_id" => $vacationRequest->yearPeriod->id,
+            ]);
+        }
+
         $stateManager->markAsCreated($vacationRequest);
 
         return redirect()

app/Infrastructure/Http/Resources/VacationRequestActivityResource.php

@@ -13,9 +13,11 @@ class VacationRequestActivityResource extends JsonResource
     public function toArray($request): array
     {
         return [
-            "date" => $this->created_at->toDisplayString(),
-            "who" => $this->user ? $this->user->fullName : __("System"),
-            "to" => $this->to->label(),
+            "date" => $this->created_at->format("d.m.Y"),
+            "time" => $this->created_at->format("H:i"),
+            "user" => $this->user ? $this->user->fullName : __("System"),
+            "state" => $this->to,
+            "text" => $this->to->label(),
         ];
     }
 }

app/Infrastructure/Http/Resources/VacationRequestResource.php

@@ -17,11 +17,11 @@ class VacationRequestResource extends JsonResource
             "name" => $this->name,
             "user" => new UserResource($this->user),
             "type" => $this->type->label(),
-            "state" => $this->state->label(),
+            "state" => $this->state,
             "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(),
+        ];
+    }
+}