Merge branch 'main' into #42-global-notifications

# Conflicts:
#	app/Domain/Enums/VacationRequestState.php
#	app/Domain/VacationRequestStateManager.php
#	app/Eloquent/Models/Vacation.php
#	app/Infrastructure/Http/Controllers/VacationCalendarController.php
#	app/Infrastructure/Http/Controllers/VacationRequestController.php
#	database/factories/VacationFactory.php
#	database/migrations/2022_02_07_133018_create_vacations_table.php
#	database/seeders/DatabaseSeeder.php
#	resources/js/Pages/Calendar.vue
#	resources/js/Shared/Activity.vue
#	resources/js/Shared/MainMenu.vue
#	resources/js/Shared/Status.vue
#	tailwind.config.js
#	tests/Feature/VacationRequestTest.php
#	tests/Unit/VacationRequestStatesTest.php

app/Infrastructure/Http/Controllers/VacationCalendarController.php

@@ -4,81 +4,35 @@ declare(strict_types=1);
 
 namespace Toby\Infrastructure\Http\Controllers;
 
-use Carbon\CarbonImmutable;
-use Carbon\CarbonInterface;
-use Carbon\CarbonPeriod;
 use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Str;
 use Inertia\Response;
-use Toby\Domain\Enums\VacationRequestState;
+use Toby\Domain\CalendarGenerator;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
 use Toby\Eloquent\Models\User;
-use Toby\Eloquent\Models\Vacation;
 use Toby\Infrastructure\Http\Resources\UserResource;
 
 class VacationCalendarController extends Controller
 {
-    public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response
-    {
-        $month = $request->query("month", "february");
+    public function index(
+        Request $request,
+        YearPeriodRetriever $yearPeriodRetriever,
+        CalendarGenerator $calendarGenerator,
+    ): Response {
+        $month = Str::lower($request->query("month", Carbon::now()->englishMonth));
         $yearPeriod = $yearPeriodRetriever->selected();
-        $date = CarbonImmutable::create($yearPeriod->year, $this->monthNameToNumber($month));
-        $period = CarbonPeriod::create($date->startOfMonth(), $date->endOfMonth());
-        $holidays = $yearPeriod->holidays()->pluck("date");
         $users = User::query()
-            ->with([
-                "vacations" => fn($query) => $query
-                    ->whereBetween("date", [$period->start, $period->end])
-                    ->whereRelation("vacationRequest", "state", VacationRequestState::APPROVED->value),
-            ])
             ->orderBy("last_name")
             ->orderBy("first_name")
             ->get();
 
-        $calendar = [];
-
-        foreach ($period as $day) {
-            $calendar[] = [
-                "date" => $day->toDateString(),
-                "dayOfMonth" => $day->translatedFormat("j"),
-                "dayOfWeek" => $day->translatedFormat("D"),
-                "isToday" => $day->isToday(),
-                "isWeekend" => $day->isWeekend(),
-                "isHoliday" => $holidays->contains($day),
-            ];
-        }
-
-        $userVacations = [];
-
-        /** @var User $user */
-        foreach ($users as $user) {
-            $userVacations[] = [
-                "user" => new UserResource($user),
-                "vacations" => $user->vacations->map(fn(Vacation $vacation) => $vacation->date->toDateString()),
-            ];
-        }
+        $calendar = $calendarGenerator->generate($yearPeriod, $month);
 
         return inertia("Calendar", [
             "calendar" => $calendar,
             "currentMonth" => $month,
-            "userVacations" => $userVacations,
+            "users" => UserResource::collection($users),
         ]);
     }
-
-    protected function monthNameToNumber(?string $name): int
-    {
-        return match ($name) {
-            default => CarbonInterface::JANUARY,
-            "february" => CarbonInterface::FEBRUARY,
-            "march" => CarbonInterface::MARCH,
-            "april" => CarbonInterface::APRIL,
-            "may" => CarbonInterface::MAY,
-            "june" => CarbonInterface::JUNE,
-            "july" => CarbonInterface::JULY,
-            "august" => CarbonInterface::AUGUST,
-            "september" => CarbonInterface::SEPTEMBER,
-            "october" => CarbonInterface::OCTOBER,
-            "november" => CarbonInterface::NOVEMBER,
-            "december" => CarbonInterface::DECEMBER,
-        };
-    }
 }

app/Infrastructure/Http/Controllers/VacationRequestController.php

@@ -75,6 +75,7 @@ class VacationRequestController extends Controller
         /** @var VacationRequest $vacationRequest */
         $vacationRequest = $request->user()->vacationRequests()->make($request->data());
         $vacationRequestValidator->validate($vacationRequest);
+
         $vacationRequest->save();
 
         $days = $vacationDaysCalculator->calculateDays(
@@ -86,7 +87,8 @@ class VacationRequestController extends Controller
         foreach ($days as $day) {
             $vacationRequest->vacations()->create([
                 "date" => $day,
-                "user_id" => $vacationRequest->user_id,
+                "user_id" => $vacationRequest->user->id,
+                "year_period_id" => $vacationRequest->yearPeriod->id,
             ]);
         }