#398 - tidy up queries (#409)

* #400 - fixed n+1 quries in app * - fix * #398 - wip * #398 - tidy up queries * #398 - wip * - merged main * #398 - fix * - laod fix * #398 - update * - cr fixes
blumilksoftware · Mar 25, 2024 · eb00bd2 · eb00bd2
1 parent c96aa4e
commit eb00bd2
Show file tree

Hide file tree

Showing 15 changed files with 151 additions and 59 deletions.
diff --git a/.env.example b/.env.example
@@ -26,6 +26,7 @@ QUEUE_CONNECTION=redis
 SESSION_DRIVER=redis
 SESSION_LIFETIME=120
 FILESYSTEM_DISK=local
+CACHE_QUERY_STORE=redis
 
 MAIL_HOST=toby-mailpit-dev
 MAIL_PORT=1025

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", "vacations"])
+            ->with(["user.profile", "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", "vacations"])
+            ->with(["user.profile", "vacations"])
             ->whereDate("from", "<=", $date)
             ->whereDate("to", ">=", $date)
             ->states(VacationRequestStatesRetriever::notFailedStates())
@@ -77,7 +77,7 @@ public function getUpcomingAbsences(Carbon $date): Collection
     public function getUpcomingRemoteDays(Carbon $date): Collection
     {
         return VacationRequest::query()
-            ->with(["user", "vacations"])
+            ->with(["user.profile", "vacations"])
             ->whereDate("from", ">", $date)
             ->states(VacationRequestStatesRetriever::notFailedStates())
             ->whereIn(

diff --git a/app/Domain/DashboardAggregator.php b/app/Domain/DashboardAggregator.php
@@ -49,25 +49,27 @@ public function aggregateCalendarData(User $user, YearPeriod $yearPeriod): array
     {
         $approvedVacations = $user
             ->vacations()
-            ->with("vacationRequest.vacations")
+            ->with(["vacationRequest.vacations", "vacationRequest.user.profile"])
             ->whereBelongsTo($yearPeriod)
+            ->cache()
             ->approved()
             ->get()
             ->mapWithKeys(
                 fn(Vacation $vacation): array => [
-                    $vacation->date->toDateString() => new DashboardVacationRequestResource($vacation->vacationRequest->load(["user", "vacations"])),
+                    $vacation->date->toDateString() => new DashboardVacationRequestResource($vacation->vacationRequest),
                 ],
             );
 
         $pendingVacations = $user
             ->vacations()
-            ->with("vacationRequest.vacations")
+            ->with(["vacationRequest.vacations", "vacationRequest.user.profile"])
             ->whereBelongsTo($yearPeriod)
+            ->cache()
             ->pending()
             ->get()
             ->mapWithKeys(
                 fn(Vacation $vacation): array => [
-                    $vacation->date->toDateString() => new DashboardVacationRequestResource($vacation->vacationRequest->load(["user", "vacations"])),
+                    $vacation->date->toDateString() => new DashboardVacationRequestResource($vacation->vacationRequest),
                 ],
             );
 
@@ -86,17 +88,19 @@ public function aggregateVacationRequests(User $user, YearPeriod $yearPeriod): J
     {
         if ($user->can("listAllRequests")) {
             $vacationRequests = $yearPeriod->vacationRequests()
-                ->with(["user", "vacations"])
+                ->with(["user", "vacations", "vacations.user", "vacations.user.profile", "user.permissions", "user.profile"])
                 ->states(VacationRequestStatesRetriever::waitingForUserActionStates($user))
                 ->latest("updated_at")
                 ->limit(3)
+                ->cache()
                 ->get();
         } else {
             $vacationRequests = $user->vacationRequests()
-                ->with(["user", "vacations"])
+                ->with(["user", "vacations", "vacations.user", "vacations.user.profile", "user.permissions", "user.profile"])
                 ->whereBelongsTo($yearPeriod)
                 ->latest("updated_at")
                 ->limit(3)
+                ->cache()
                 ->get();
         }
 

diff --git a/app/Domain/UserVacationStatsRetriever.php b/app/Domain/UserVacationStatsRetriever.php
@@ -103,13 +103,15 @@ public function getVacationDaysLimit(User $user, YearPeriod $yearPeriod): int
     {
         return $user->vacationLimits()
             ->whereBelongsTo($yearPeriod)
+            ->cache()
             ->first()?->limit ?? 0;
     }
 
     public function hasVacationDaysLimit(User $user, YearPeriod $yearPeriod): bool
     {
         return $user->vacationLimits()
             ->whereBelongsTo($yearPeriod)
+            ->cache()
             ->first()?->hasVacation() ?? false;
     }
 

diff --git a/app/Eloquent/Helpers/YearPeriodRetriever.php b/app/Eloquent/Helpers/YearPeriodRetriever.php
@@ -4,6 +4,7 @@
 
 namespace Toby\Eloquent\Helpers;
 
+use Illuminate\Cache\CacheManager;
 use Illuminate\Contracts\Session\Session;
 use Toby\Eloquent\Models\YearPeriod;
 
@@ -13,14 +14,17 @@ class YearPeriodRetriever
 
     public function __construct(
         protected Session $session,
+        protected CacheManager $cacheManager,
     ) {}
 
     public function selected(): YearPeriod
     {
-        /** @var YearPeriod $yearPeriod */
-        $yearPeriod = YearPeriod::query()->find($this->session->get(static::SESSION_KEY));
+        return $this->cacheManager->remember("selected_year_period", 60, function () {
+            /** @var YearPeriod $yearPeriod */
+            $yearPeriod = YearPeriod::query()->find($this->session->get(static::SESSION_KEY));
 
-        return $yearPeriod !== null ? $yearPeriod : $this->current();
+            return $yearPeriod !== null ? $yearPeriod : $this->current();
+        });
     }
 
     public function current(): YearPeriod
@@ -33,7 +37,7 @@ public function links(): array
         $selected = $this->selected();
         $current = $this->current();
 
-        $years = YearPeriod::all();
+        $years = YearPeriod::query()->cache()->get();
 
         $navigation = $years->map(fn(YearPeriod $yearPeriod): array => $this->toNavigation($yearPeriod));
 

diff --git a/app/Infrastructure/Http/Controllers/SelectYearPeriodController.php b/app/Infrastructure/Http/Controllers/SelectYearPeriodController.php
@@ -6,6 +6,7 @@
 
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
 use Toby\Eloquent\Models\YearPeriod;
 
@@ -14,6 +15,7 @@ class SelectYearPeriodController extends Controller
     public function __invoke(Request $request, YearPeriod $yearPeriod): RedirectResponse
     {
         $request->session()->put(YearPeriodRetriever::SESSION_KEY, $yearPeriod->id);
+        Cache::forget("selected_year_period");
 
         return redirect()
             ->back()

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(["user", "vacations"])
+            ->with(["vacations.user.profile", "user.permissions", "user.profile"])
             ->whereBelongsTo($yearPeriodRetriever->selected())
             ->latest()
             ->states(VacationRequestStatesRetriever::filterByStatusGroup($status, $request->user()))
@@ -99,7 +99,7 @@ public function indexForApprovers(
         $type = $request->get("type");
 
         $vacationRequests = VacationRequest::query()
-            ->with(["user", "vacations"])
+            ->with(["vacations.user.profile", "user.permissions", "user.profile"])
             ->whereBelongsTo($yearPeriod)
             ->when($user !== null, fn(Builder $query): Builder => $query->where("user_id", $user))
             ->when($type !== null, fn(Builder $query): Builder => $query->where("type", $type))
@@ -131,7 +131,7 @@ public function show(VacationRequest $vacationRequest, UserVacationStatsRetrieve
     {
         $this->authorize("show", $vacationRequest);
 
-        $vacationRequest->load(["user", "vacations", "activities", "activities.user.profile"]);
+        $vacationRequest->load(["vacations.user.profile", "user.permissions", "user.profile", "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
@@ -32,7 +32,7 @@ public function share(Request $request): array
 
     protected function getAuthData(Request $request): Closure
     {
-        $user = $request->user();
+        $user = $request->user()?->load("profile");
 
         return fn(): array => [
             "user" => $user ? new UserResource($user) : null,

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

diff --git a/composer.json b/composer.json
@@ -15,6 +15,7 @@
         "fakerphp/faker": "^1.22.0",
         "guzzlehttp/guzzle": "^7.7.0",
         "inertiajs/inertia-laravel": "^0.6.11",
+        "laragear/cache-query": "^4.0",
         "laravel/framework": "^10.33.0",
         "laravel/sanctum": "^3.3.2",
         "laravel/socialite": "^5.10.0",
@@ -30,6 +31,7 @@
         "spatie/laravel-slack-slash-command": "^1.11.4"
     },
     "require-dev": {
+        "barryvdh/laravel-debugbar": "^3.12",
         "blumilksoftware/codestyle": "^2.8.0",
         "laravel/dusk": "^7.11.4",
         "mockery/mockery": "^1.5.1",