#90 - user profile (#125)

* fix css focuses * #90 - wip * #90 - fix to generate PDF * #90 - wip * #90 - wip * #90 - wip * #90 - wip * #90 - fix to calendar * #90 - wip * #90 - fix * #90 - fix lint * #90 - fix * Apply suggestions from code review Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com> Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com> * #90 - cr fixes * #90 - fix Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl> Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com> Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
2022-04-14 11:58:45 +02:00
parent 459b62500e
commit cc981b02b4
62 changed files with 765 additions and 251 deletions
--- a/app/Infrastructure/Console/Commands/MoveUserDataToProfile.php
+++ b/app/Infrastructure/Console/Commands/MoveUserDataToProfile.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Infrastructure\Console\Commands;
+
+use Illuminate\Console\Command;
+use Toby\Eloquent\Models\User;
+
+class MoveUserDataToProfile extends Command
+{
+    protected $signature = "toby:move-user-data-to-profile";
+    protected $description = "Move user data to their profiles";
+
+    public function handle(): void
+    {
+        $users = User::all();
+
+        foreach ($users as $user) {
+            $user->profile()->updateOrCreate(["user_id" => $user->id], [
+                "first_name" => $user->first_name,
+                "last_name" => $user->last_name,
+                "position" => $user->position,
+                "employment_form" => $user->employment_form,
+                "employment_date" => $user->employment_date,
+            ]);
+        }
+    }
+}
--- a/app/Infrastructure/Http/Controllers/Api/GetAvailableVacationTypesController.php
+++ b/app/Infrastructure/Http/Controllers/Api/GetAvailableVacationTypesController.php
@@ -21,7 +21,7 @@ class GetAvailableVacationTypesController extends Controller
        $user = User::query()->find($request->get("user"));

        $types = VacationType::all()
-            ->filter(fn(VacationType $type) => $configRetriever->isAvailableFor($type, $user->employment_form))
+            ->filter(fn(VacationType $type) => $configRetriever->isAvailableFor($type, $user->profile->employment_form))
            ->map(fn(VacationType $type) => [
                "label" => $type->label(),
                "value" => $type->value,
--- a/app/Infrastructure/Http/Controllers/DashboardController.php
+++ b/app/Infrastructure/Http/Controllers/DashboardController.php
@@ -9,21 +9,23 @@ use Illuminate\Support\Carbon;
 use Inertia\Response;
 use Toby\Domain\UserVacationStatsRetriever;
 use Toby\Domain\VacationRequestStatesRetriever;
-use Toby\Eloquent\Models\Holiday;
+use Toby\Eloquent\Helpers\YearPeriodRetriever;
 use Toby\Eloquent\Models\Vacation;
 use Toby\Eloquent\Models\VacationRequest;
-use Toby\Eloquent\Models\YearPeriod;
 use Toby\Infrastructure\Http\Resources\AbsenceResource;
 use Toby\Infrastructure\Http\Resources\HolidayResource;
 use Toby\Infrastructure\Http\Resources\VacationRequestResource;

 class DashboardController extends Controller
 {
-    public function __invoke(Request $request, UserVacationStatsRetriever $vacationStatsRetriever): Response
-    {
+    public function __invoke(
+        Request $request,
+        YearPeriodRetriever $yearPeriodRetriever,
+        UserVacationStatsRetriever $vacationStatsRetriever,
+    ): Response {
        $user = $request->user();
        $now = Carbon::now();
-        $yearPeriod = YearPeriod::findByYear($now->year);
+        $yearPeriod = $yearPeriodRetriever->selected();

        $absences = Vacation::query()
            ->with(["user", "vacationRequest"])
@@ -32,19 +34,21 @@ class DashboardController extends Controller
            ->get();

        if ($user->can("listAll", VacationRequest::class)) {
-            $vacationRequests = VacationRequest::query()
+            $vacationRequests = $yearPeriod->vacationRequests()
                ->states(VacationRequestStatesRetriever::waitingForUserActionStates($user))
                ->latest("updated_at")
                ->limit(3)
                ->get();
        } else {
            $vacationRequests = $user->vacationRequests()
+                ->whereBelongsTo($yearPeriod)
                ->latest("updated_at")
                ->limit(3)
                ->get();
        }

-        $holidays = Holiday::query()
+        $holidays = $yearPeriod
+            ->holidays()
            ->whereDate("date", ">=", $now)
            ->orderBy("date")
            ->limit(3)
--- a/app/Infrastructure/Http/Controllers/MonthlyUsageController.php
+++ b/app/Infrastructure/Http/Controllers/MonthlyUsageController.php
@@ -10,7 +10,7 @@ use Toby\Domain\Enums\Month;
 use Toby\Domain\UserVacationStatsRetriever;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
 use Toby\Eloquent\Models\User;
-use Toby\Infrastructure\Http\Resources\UserResource;
+use Toby\Infrastructure\Http\Resources\SimpleUserResource;

 class MonthlyUsageController extends Controller
 {
@@ -27,8 +27,8 @@ class MonthlyUsageController extends Controller
        $users = User::query()
            ->withVacationLimitIn($currentYearPeriod)
            ->where("id", "!=", $currentUser->id)
-            ->orderBy("last_name")
-            ->orderBy("first_name")
+            ->orderByProfileField("last_name")
+            ->orderByProfileField("first_name")
            ->get();

        if ($currentUser->hasVacationLimit($currentYearPeriod)) {
@@ -45,7 +45,7 @@ class MonthlyUsageController extends Controller
            $remaining = $limit - $used - $pending;

            $monthlyUsage[] = [
-                "user" => new UserResource($user),
+                "user" => new SimpleUserResource($user),
                "months" => $vacationsByMonth,
                "stats" => [
                    "used" => $used,
--- a/app/Infrastructure/Http/Controllers/TimesheetController.php
+++ b/app/Infrastructure/Http/Controllers/TimesheetController.php
@@ -28,9 +28,9 @@ class TimesheetController extends Controller
        $carbonMonth = Carbon::create($yearPeriod->year, $month->toCarbonNumber());

        $users = User::query()
-            ->where("employment_form", EmploymentForm::EmploymentContract)
-            ->orderBy("last_name")
-            ->orderBy("first_name")
+            ->whereRelation("profile", "employment_form", EmploymentForm::EmploymentContract)
+            ->orderByProfileField("last_name")
+            ->orderByProfileField("first_name")
            ->get();

        $types = VacationType::all()
--- a/app/Infrastructure/Http/Controllers/UserController.php
+++ b/app/Infrastructure/Http/Controllers/UserController.php
@@ -9,6 +9,7 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Inertia\Response;
 use Toby\Domain\Actions\CreateUserAction;
+use Toby\Domain\Actions\UpdateUserAction;
 use Toby\Domain\Enums\EmploymentForm;
 use Toby\Domain\Enums\Role;
 use Toby\Eloquent\Models\User;
@@ -28,8 +29,8 @@ class UserController extends Controller
        $users = User::query()
            ->withTrashed()
            ->search($request->query("search"))
-            ->orderBy("last_name")
-            ->orderBy("first_name")
+            ->orderByProfileField("last_name")
+            ->orderByProfileField("first_name")
            ->paginate()
            ->withQueryString();

@@ -59,7 +60,7 @@ class UserController extends Controller
    {
        $this->authorize("manageUsers");

-        $createUserAction->execute($request->data());
+        $createUserAction->execute($request->userData(), $request->profileData());

        return redirect()
            ->route("users.index")
@@ -83,11 +84,11 @@ class UserController extends Controller
    /**
     * @throws AuthorizationException
     */
-    public function update(UserRequest $request, User $user): RedirectResponse
+    public function update(UserRequest $request, UpdateUserAction $updateUserAction, User $user): RedirectResponse
    {
        $this->authorize("manageUsers");

-        $user->update($request->data());
+        $updateUserAction->execute($user, $request->userData(), $request->profileData());

        return redirect()
            ->route("users.index")
--- a/app/Infrastructure/Http/Controllers/VacationCalendarController.php
+++ b/app/Infrastructure/Http/Controllers/VacationCalendarController.php
@@ -11,7 +11,7 @@ use Toby\Domain\CalendarGenerator;
 use Toby\Domain\Enums\Month;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
 use Toby\Eloquent\Models\User;
-use Toby\Infrastructure\Http\Resources\UserResource;
+use Toby\Infrastructure\Http\Resources\SimpleUserResource;

 class VacationCalendarController extends Controller
 {
@@ -29,8 +29,8 @@ class VacationCalendarController extends Controller

        $users = User::query()
            ->where("id", "!=", $currentUser->id)
-            ->orderBy("last_name")
-            ->orderBy("first_name")
+            ->orderByProfileField("last_name")
+            ->orderByProfileField("first_name")
            ->get();

        $users->prepend($currentUser);
@@ -41,7 +41,7 @@ class VacationCalendarController extends Controller
            "calendar" => $calendar,
            "current" => Month::current(),
            "selected" => $month->value,
-            "users" => UserResource::collection($users),
+            "users" => SimpleUserResource::collection($users),
            "can" => [
                "generateTimesheet" => $request->user()->can("generateTimesheet"),
            ],
--- a/app/Infrastructure/Http/Controllers/VacationLimitController.php
+++ b/app/Infrastructure/Http/Controllers/VacationLimitController.php
@@ -11,7 +11,7 @@ use Toby\Eloquent\Helpers\YearPeriodRetriever;
 use Toby\Eloquent\Models\VacationLimit;
 use Toby\Eloquent\Models\YearPeriod;
 use Toby\Infrastructure\Http\Requests\VacationLimitRequest;
-use Toby\Infrastructure\Http\Resources\UserResource;
+use Toby\Infrastructure\Http\Resources\SimpleUserResource;

 class VacationLimitController extends Controller
 {
@@ -24,15 +24,15 @@ class VacationLimitController extends Controller

        $limits = $yearPeriod
            ->vacationLimits()
-            ->with("user")
+            ->with("user.profile")
            ->has("user")
-            ->orderByUserField("last_name")
-            ->orderByUserField("first_name")
-            ->get();
+            ->get()
+            ->sortBy(fn(VacationLimit $limit): string => "{$limit->user->profile->last_name} {$limit->user->profile->first_name}")
+            ->values();

        $limitsResource = $limits->map(fn(VacationLimit $limit) => [
            "id" => $limit->id,
-            "user" => new UserResource($limit->user),
+            "user" => new SimpleUserResource($limit->user),
            "hasVacation" => $limit->hasVacation(),
            "days" => $limit->days,
            "remainingLastYear" => $previousYearPeriod
--- a/app/Infrastructure/Http/Controllers/VacationRequestController.php
+++ b/app/Infrastructure/Http/Controllers/VacationRequestController.php
@@ -27,14 +27,18 @@ use Toby\Eloquent\Helpers\YearPeriodRetriever;
 use Toby\Eloquent\Models\User;
 use Toby\Eloquent\Models\VacationRequest;
 use Toby\Infrastructure\Http\Requests\VacationRequestRequest;
-use Toby\Infrastructure\Http\Resources\UserResource;
+use Toby\Infrastructure\Http\Resources\SimpleUserResource;
 use Toby\Infrastructure\Http\Resources\VacationRequestActivityResource;
 use Toby\Infrastructure\Http\Resources\VacationRequestResource;

 class VacationRequestController extends Controller
 {
-    public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response
+    public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response|RedirectResponse
    {
+        if ($request->user()->can("listAll", VacationRequest::class)) {
+            return redirect()->route("vacation.requests.indexForApprovers");
+        }
+
        $status = $request->get("status", "all");

        $vacationRequests = $request->user()
@@ -103,13 +107,13 @@ class VacationRequestController extends Controller
            ->paginate();

        $users = User::query()
-            ->orderBy("last_name")
-            ->orderBy("first_name")
+            ->orderByProfileField("last_name")
+            ->orderByProfileField("first_name")
            ->get();

        return inertia("VacationRequest/IndexForApprovers", [
            "requests" => VacationRequestResource::collection($vacationRequests),
-            "users" => UserResource::collection($users),
+            "users" => SimpleUserResource::collection($users),
            "filters" => [
                "status" => $status,
                "user" => (int)$user,
@@ -158,13 +162,13 @@ class VacationRequestController extends Controller
    public function create(Request $request): Response
    {
        $users = User::query()
-            ->orderBy("last_name")
-            ->orderBy("first_name")
+            ->orderByProfileField("last_name")
+            ->orderByProfileField("first_name")
            ->get();

        return inertia("VacationRequest/Create", [
            "vacationTypes" => VacationType::casesToSelect(),
-            "users" => UserResource::collection($users),
+            "users" => SimpleUserResource::collection($users),
            "can" => [
                "createOnBehalfOfEmployee" => $request->user()->can("createOnBehalfOfEmployee", VacationRequest::class),
                "skipFlow" => $request->user()->can("skipFlow", VacationRequest::class),
--- a/app/Infrastructure/Http/Middleware/HandleInertiaRequests.php
+++ b/app/Infrastructure/Http/Middleware/HandleInertiaRequests.php
@@ -4,8 +4,10 @@ declare(strict_types=1);

 namespace Toby\Infrastructure\Http\Middleware;

+use Closure;
 use Illuminate\Http\Request;
 use Inertia\Middleware;
+use Toby\Domain\VacationRequestStatesRetriever;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
 use Toby\Eloquent\Models\VacationRequest;
 use Toby\Infrastructure\Http\Resources\UserResource;
@@ -18,24 +20,54 @@ class HandleInertiaRequests extends Middleware

    public function share(Request $request): array
    {
-        $user = $request->user();
-
        return array_merge(parent::share($request), [
-            "auth" => fn() => [
-                "user" => $user ? new UserResource($user) : null,
-                "can" => [
-                    "manageVacationLimits" => $user ? $user->can("manageVacationLimits") : false,
-                    "manageUsers" => $user ? $user->can("manageUsers") : false,
-                    "listAllVacationRequests" => $user ? $user->can("listAll", VacationRequest::class) : false,
-                    "listMonthlyUsage" => $user ? $user->can("listMonthlyUsage") : false,
-                ],
-            ],
-            "flash" => fn() => [
-                "success" => $request->session()->get("success"),
-                "error" => $request->session()->get("error"),
-                "info" => $request->session()->get("info"),
-            ],
-            "years" => fn() => $user ? $this->yearPeriodRetriever->links() : [],
+            "auth" => $this->getAuthData($request),
+            "flash" => $this->getFlashData($request),
+            "years" => $this->getYearsData($request),
+            "vacationRequestsCount" => $this->getVacationRequestsCount($request),
        ]);
    }
+
+    protected function getAuthData(Request $request): Closure
+    {
+        $user = $request->user();
+
+        return fn() => [
+            "user" => $user ? new UserResource($user) : null,
+            "can" => [
+                "manageVacationLimits" => $user ? $user->can("manageVacationLimits") : false,
+                "manageUsers" => $user ? $user->can("manageUsers") : false,
+                "listAllVacationRequests" => $user ? $user->can("listAll", VacationRequest::class) : false,
+                "listMonthlyUsage" => $user ? $user->can("listMonthlyUsage") : false,
+            ],
+        ];
+    }
+
+    protected function getFlashData(Request $request): Closure
+    {
+        return fn() => [
+            "success" => $request->session()->get("success"),
+            "error" => $request->session()->get("error"),
+            "info" => $request->session()->get("info"),
+        ];
+    }
+
+    protected function getYearsData(Request $request): Closure
+    {
+        return fn(): array => $request->user() ? $this->yearPeriodRetriever->links() : [];
+    }
+
+    protected function getVacationRequestsCount(Request $request): Closure
+    {
+        $user = $request->user();
+
+        return fn(): ?int => $user && $user->can("listAll", VacationRequest::class)
+        ? VacationRequest::query()
+            ->whereBelongsTo($this->yearPeriodRetriever->selected())
+            ->states(
+                VacationRequestStatesRetriever::waitingForUserActionStates($user),
+            )
+            ->count()
+        : null;
+    }
 }
--- a/app/Infrastructure/Http/Middleware/TrackUserLastActivity.php
+++ b/app/Infrastructure/Http/Middleware/TrackUserLastActivity.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Infrastructure\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
+
+class TrackUserLastActivity
+{
+    public function handle(Request $request, Closure $next)
+    {
+        $request->user()?->update([
+            "last_active_at" => Carbon::now(),
+        ]);
+
+        return $next($request);
+    }
+}
--- a/app/Infrastructure/Http/Requests/UserRequest.php
+++ b/app/Infrastructure/Http/Requests/UserRequest.php
@@ -25,14 +25,20 @@ class UserRequest extends FormRequest
        ];
    }

-    public function data(): array
+    public function userData(): array
+    {
+        return [
+            "email" => $this->get("email"),
+            "role" => $this->get("role"),
+        ];
+    }
+
+    public function profileData(): array
    {
        return [
            "first_name" => $this->get("firstName"),
            "last_name" => $this->get("lastName"),
-            "email" => $this->get("email"),
            "position" => $this->get("position"),
-            "role" => $this->get("role"),
            "employment_form" => $this->get("employmentForm"),
            "employment_date" => $this->get("employmentDate"),
        ];
--- a/app/Infrastructure/Http/Resources/AbsenceResource.php
+++ b/app/Infrastructure/Http/Resources/AbsenceResource.php
@@ -14,7 +14,7 @@ class AbsenceResource extends JsonResource
    {
        return [
            "id" => $this->id,
-            "user" => new UserResource($this->user),
+            "user" => new SimpleUserResource($this->user),
            "date" => $this->date->toDisplayString(),
        ];
    }
--- a/app/Infrastructure/Http/Resources/HolidayResource.php
+++ b/app/Infrastructure/Http/Resources/HolidayResource.php
@@ -16,6 +16,7 @@ class HolidayResource extends JsonResource
            "id" => $this->id,
            "name" => $this->name,
            "date" => $this->date->toDateString(),
+            "isPast" => $this->date->isPast(),
            "displayDate" => $this->date->toDisplayString(),
            "dayOfWeek" => $this->date->dayName,
        ];
--- a/app/Infrastructure/Http/Resources/SimpleUserResource.php
+++ b/app/Infrastructure/Http/Resources/SimpleUserResource.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Infrastructure\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class SimpleUserResource extends JsonResource
+{
+    public static $wrap = null;
+
+    public function toArray($request): array
+    {
+        return [
+            "id" => $this->id,
+            "name" => $this->profile->full_name,
+            "email" => $this->email,
+            "avatar" => $this->profile->getAvatar(),
+        ];
+    }
+}
--- a/app/Infrastructure/Http/Resources/UserFormDataResource.php
+++ b/app/Infrastructure/Http/Resources/UserFormDataResource.php
@@ -14,13 +14,13 @@ class UserFormDataResource extends JsonResource
    {
        return [
            "id" => $this->id,
-            "firstName" => $this->first_name,
-            "lastName" => $this->last_name,
+            "firstName" => $this->profile->first_name,
+            "lastName" => $this->profile->last_name,
            "email" => $this->email,
            "role" => $this->role,
-            "position" => $this->position,
-            "employmentForm" => $this->employment_form,
-            "employmentDate" => $this->employment_date->toDateString(),
+            "position" => $this->profile->position,
+            "employmentForm" => $this->profile->employment_form,
+            "employmentDate" => $this->profile->employment_date->toDateString(),
        ];
    }
 }
--- a/app/Infrastructure/Http/Resources/UserResource.php
+++ b/app/Infrastructure/Http/Resources/UserResource.php
@@ -14,14 +14,15 @@ class UserResource extends JsonResource
    {
        return [
            "id" => $this->id,
-            "name" => $this->fullName,
+            "name" => $this->profile->full_name,
            "email" => $this->email,
            "role" => $this->role->label(),
-            "position" => $this->position,
-            "avatar" => $this->getAvatar(),
+            "position" => $this->profile->position,
+            "avatar" => $this->profile->getAvatar(),
            "deleted" => $this->trashed(),
-            "employmentForm" => $this->employment_form->label(),
-            "employmentDate" => $this->employment_date->toDisplayString(),
+            "lastActiveAt" => $this->last_active_at?->toDateTimeString(),
+            "employmentForm" => $this->profile->employment_form->label(),
+            "employmentDate" => $this->profile->employment_date->toDisplayString(),
        ];
    }
 }
--- a/app/Infrastructure/Http/Resources/VacationRequestActivityResource.php
+++ b/app/Infrastructure/Http/Resources/VacationRequestActivityResource.php
@@ -15,7 +15,7 @@ class VacationRequestActivityResource extends JsonResource
        return [
            "date" => $this->created_at->toDisplayString(),
            "time" => $this->created_at->format("H:i"),
-            "user" => $this->user ? $this->user->fullName : __("System"),
+            "user" => $this->user ? $this->user->profile->full_name : __("System"),
            "state" => $this->to,
        ];
    }
--- a/app/Infrastructure/Http/Resources/VacationRequestResource.php
+++ b/app/Infrastructure/Http/Resources/VacationRequestResource.php
@@ -15,7 +15,7 @@ class VacationRequestResource extends JsonResource
        return [
            "id" => $this->id,
            "name" => $this->name,
-            "user" => new UserResource($this->user),
+            "user" => new SimpleUserResource($this->user),
            "type" => $this->type,
            "state" => $this->state,
            "from" => $this->from->toDisplayString(),
--- a/app/Infrastructure/Jobs/ClearVacationRequestDaysInGoogleCalendar.php
+++ b/app/Infrastructure/Jobs/ClearVacationRequestDaysInGoogleCalendar.php
@@ -21,7 +21,7 @@ class ClearVacationRequestDaysInGoogleCalendar implements ShouldQueue

    public function handle(): void
    {
-        foreach ($this->vacationRequest->event_ids as $eventId) {
+        foreach ($this->vacationRequest->event_ids ?? [] as $eventId) {
            $calendarEvent = Event::find($eventId);

            if ($calendarEvent->googleEvent->getStatus() !== "cancelled") {
--- a/app/Infrastructure/Jobs/SendVacationRequestDaysToGoogleCalendar.php
+++ b/app/Infrastructure/Jobs/SendVacationRequestDaysToGoogleCalendar.php
@@ -32,7 +32,7 @@ class SendVacationRequestDaysToGoogleCalendar implements ShouldQueue
        $ranges = $this->prepareRanges($days);

        foreach ($ranges as $range) {
-            $text = "{$this->vacationRequest->type->label()} - {$this->vacationRequest->user->fullName} [{$this->vacationRequest->name}]";
+            $text = "{$this->vacationRequest->type->label()} - {$this->vacationRequest->user->profile->full_name} [{$this->vacationRequest->name}]";

            $event = Event::create([
                "name" => $text,