#400 - fixed n+1 queries in app (#407)

* #400 - fixed n+1 quries in app * - fix * #400 - merged main * #400 - added debugbar
blumilksoftware · Mar 20, 2024 · c96aa4e · c96aa4e
1 parent 5f4694a
commit c96aa4e
Show file tree

Hide file tree

Showing 14 changed files with 187 additions and 25 deletions.
diff --git a/app/Architecture/Providers/AppServiceProvider.php b/app/Architecture/Providers/AppServiceProvider.php
@@ -5,6 +5,7 @@
 namespace Toby\Architecture\Providers;
 
 use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Notifications\ChannelManager;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Notification;
@@ -22,6 +23,7 @@ public function register(): void
 
     public function boot(): void
     {
+        Model::preventLazyLoading(!app()->isProduction());
         Carbon::macro("toDisplayString", fn(): string => $this->translatedFormat("d.m.Y"));
         Carbon::macro("toDisplayDateTimeString", fn(): string => $this->translatedFormat("d.m.Y H:i:s"));
     }

diff --git a/app/Domain/Actions/VacationRequest/WaitForTechApprovalAction.php b/app/Domain/Actions/VacationRequest/WaitForTechApprovalAction.php
@@ -35,6 +35,7 @@ protected function notifyTechApprovers(VacationRequest $vacationRequest): void
     {
         $users = Permission::findByName("receiveVacationRequestWaitsForApprovalNotification")
             ->users()
+            ->with("permissions")
             ->get();
 
         $users = $users->filter(fn(User $user): bool => $user->can("acceptAsTechApprover", $vacationRequest));

diff --git a/app/Domain/CalendarGenerator.php b/app/Domain/CalendarGenerator.php
@@ -59,7 +59,7 @@ protected function getVacationsForPeriod(CarbonPeriod $period): Collection
             ->orWhere(function ($query): void {
                 $query->pending();
             })
-            ->with("vacationRequest")
+            ->with("vacationRequest.vacations")
             ->get()
             ->groupBy(fn(Vacation $vacation): string => $vacation->date->toDateString());
     }

diff --git a/app/Domain/DailySummaryRetriever.php b/app/Domain/DailySummaryRetriever.php
@@ -23,7 +23,7 @@ public function __construct(
     public function getAbsences(Carbon $date): Collection
     {
         return VacationRequest::query()
-            ->with(["user"])
+            ->with(["user", "vacations"])
             ->whereDate("from", "<=", $date)
             ->whereDate("to", ">=", $date)
             ->states(VacationRequestStatesRetriever::notFailedStates())
@@ -41,7 +41,7 @@ public function getAbsences(Carbon $date): Collection
     public function getRemoteDays(Carbon $date): Collection
     {
         return VacationRequest::query()
-            ->with(["user"])
+            ->with(["user", "vacations"])
             ->whereDate("from", "<=", $date)
             ->whereDate("to", ">=", $date)
             ->states(VacationRequestStatesRetriever::notFailedStates())
@@ -59,7 +59,7 @@ public function getRemoteDays(Carbon $date): Collection
     public function getUpcomingAbsences(Carbon $date): Collection
     {
         return VacationRequest::query()
-            ->with(["user"])
+            ->with(["user", "vacations"])
             ->whereDate("from", ">", $date)
             ->states(VacationRequestStatesRetriever::notFailedStates())
             ->whereIn(
@@ -77,7 +77,7 @@ public function getUpcomingAbsences(Carbon $date): Collection
     public function getUpcomingRemoteDays(Carbon $date): Collection
     {
         return VacationRequest::query()
-            ->with(["user"])
+            ->with(["user", "vacations"])
             ->whereDate("from", ">", $date)
             ->states(VacationRequestStatesRetriever::notFailedStates())
             ->whereIn(

diff --git a/app/Domain/DashboardAggregator.php b/app/Domain/DashboardAggregator.php
@@ -55,7 +55,7 @@ public function aggregateCalendarData(User $user, YearPeriod $yearPeriod): array
             ->get()
             ->mapWithKeys(
                 fn(Vacation $vacation): array => [
-                    $vacation->date->toDateString() => new DashboardVacationRequestResource($vacation->vacationRequest),
+                    $vacation->date->toDateString() => new DashboardVacationRequestResource($vacation->vacationRequest->load(["user", "vacations"])),
                 ],
             );
 
@@ -67,7 +67,7 @@ public function aggregateCalendarData(User $user, YearPeriod $yearPeriod): array
             ->get()
             ->mapWithKeys(
                 fn(Vacation $vacation): array => [
-                    $vacation->date->toDateString() => new DashboardVacationRequestResource($vacation->vacationRequest),
+                    $vacation->date->toDateString() => new DashboardVacationRequestResource($vacation->vacationRequest->load(["user", "vacations"])),
                 ],
             );
 
@@ -86,14 +86,14 @@ public function aggregateVacationRequests(User $user, YearPeriod $yearPeriod): J
     {
         if ($user->can("listAllRequests")) {
             $vacationRequests = $yearPeriod->vacationRequests()
-                ->with(["user"])
+                ->with(["user", "vacations"])
                 ->states(VacationRequestStatesRetriever::waitingForUserActionStates($user))
                 ->latest("updated_at")
                 ->limit(3)
                 ->get();
         } else {
             $vacationRequests = $user->vacationRequests()
-                ->with(["user"])
+                ->with(["user", "vacations"])
                 ->whereBelongsTo($yearPeriod)
                 ->latest("updated_at")
                 ->limit(3)

diff --git a/app/Infrastructure/Http/Controllers/EquipmentController.php b/app/Infrastructure/Http/Controllers/EquipmentController.php
@@ -33,6 +33,7 @@ public function index(Request $request): RedirectResponse|Response
         $searchQuery = $request->query("search");
 
         $equipmentItems = EquipmentItem::query()
+            ->with("assignee")
             ->search($searchQuery)
             ->when(
                 $request->query("assignee") && $request->query("assignee") !== "unassigned",
@@ -72,6 +73,7 @@ public function indexForEmployee(Request $request): RedirectResponse|Response
         $searchQuery = $request->query("search");
 
         $equipmentItems = EquipmentItem::query()
+            ->with("assignee")
             ->search($searchQuery)
             ->labels($request->query("labels"))
             ->where("assignee_id", $request->user()->id)
@@ -172,7 +174,7 @@ public function downloadExcel(): BinaryFileResponse
     {
         $this->authorize("manageEquipment");
 
-        $equipmentItems = EquipmentItem::query()->get();
+        $equipmentItems = EquipmentItem::query()->with("assignee")->get();
 
         $equipmentExport = new EquipmentExport($equipmentItems);
 

diff --git a/app/Infrastructure/Http/Controllers/KeysController.php b/app/Infrastructure/Http/Controllers/KeysController.php
@@ -23,6 +23,7 @@ class KeysController extends Controller
     public function index(Request $request): Response
     {
         $keys = Key::query()
+            ->with("user")
             ->get()
             ->sortBy("id");
 

diff --git a/app/Infrastructure/Http/Controllers/ResumeController.php b/app/Infrastructure/Http/Controllers/ResumeController.php
@@ -23,6 +23,7 @@ public function index(): Response
         $this->authorize("manageResumes");
 
         $resumes = Resume::query()
+            ->with("user")
             ->latest("updated_at")
             ->paginate();
 

diff --git a/app/Infrastructure/Http/Controllers/VacationRequestController.php b/app/Infrastructure/Http/Controllers/VacationRequestController.php
@@ -43,7 +43,7 @@ public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever
 
         $vacationRequests = $request->user()
             ->vacationRequests()
-            ->with("vacations")
+            ->with(["user", "vacations"])
             ->whereBelongsTo($yearPeriodRetriever->selected())
             ->latest()
             ->states(VacationRequestStatesRetriever::filterByStatusGroup($status, $request->user()))
@@ -131,6 +131,7 @@ public function show(VacationRequest $vacationRequest, UserVacationStatsRetrieve
     {
         $this->authorize("show", $vacationRequest);
 
+        $vacationRequest->load(["user", "vacations", "activities", "activities.user.profile"]);
         $limit = $statsRetriever->getVacationDaysLimit($vacationRequest->user, $vacationRequest->yearPeriod);
         $used = $statsRetriever->getUsedVacationDays($vacationRequest->user, $vacationRequest->yearPeriod);
         $pending = $statsRetriever->getPendingVacationDays($vacationRequest->user, $vacationRequest->yearPeriod);

diff --git a/app/Infrastructure/Http/Middleware/HandleInertiaRequests.php b/app/Infrastructure/Http/Middleware/HandleInertiaRequests.php
@@ -36,11 +36,12 @@ protected function getAuthData(Request $request): Closure
 
         return fn(): array => [
             "user" => $user ? new UserResource($user) : null,
-            "can" => Permission::all()->mapWithKeys(
-                fn(Permission $permission): array => [
-                    $permission->name => $user ? $user->hasPermissionTo($permission) : false,
-                ],
-            ),
+            "can" => Permission::query()->with("roles")->get()
+                ->mapWithKeys(
+                    fn(Permission $permission): array => [
+                        $permission->name => $user ? $user->hasPermissionTo($permission) : false,
+                    ],
+                ),
         ];
     }
 
@@ -63,13 +64,13 @@ protected function getVacationRequestsCount(Request $request): Closure
         $user = $request->user();
 
         return fn(): ?int => $user && $user->can("listAllRequests")
-        ? VacationRequest::query()
-            ->whereBelongsTo($this->yearPeriodRetriever->selected())
-            ->states(
-                VacationRequestStatesRetriever::waitingForUserActionStates($user),
-            )
-            ->count()
-        : null;
+            ? VacationRequest::query()
+                ->whereBelongsTo($this->yearPeriodRetriever->selected())
+                ->states(
+                    VacationRequestStatesRetriever::waitingForUserActionStates($user),
+                )
+                ->count()
+            : null;
     }
 
     protected function getDeployInformation(): Closure

diff --git a/app/Infrastructure/Http/Resources/VacationRequestResource.php b/app/Infrastructure/Http/Resources/VacationRequestResource.php
@@ -38,7 +38,7 @@ public function toArray($request): array
             "to" => $this->to->toDisplayString(),
             "displayDate" => $this->getDate($this->from->toDisplayString(), $this->to->toDisplayString()),
             "comment" => $this->comment,
-            "days" => VacationResource::collection($this->vacations),
+            "days" => VacationResource::collection($this->vacations->load("user")),
             "can" => [
                 "acceptAsTechnical" => $this->resource->state->canTransitionTo(AcceptedByTechnical::class)
                     && $user->can("acceptAsTechApprover", $this->resource),

diff --git a/composer.json b/composer.json
@@ -9,6 +9,7 @@
         "ext-pdo": "*",
         "ext-redis": "*",
         "azuyalabs/yasumi": "^2.6.0",
+        "barryvdh/laravel-debugbar": "^3.12",
         "barryvdh/laravel-dompdf": "^2.0.1",
         "doctrine/dbal": "^3.7.2",
         "fakerphp/faker": "^1.22.0",

diff --git a/composer.lock b/composer.lock
diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore