Fix/eager loading optimizations (#1889)

* Solve slow page loading times with 500 subfleets * revised load to loadMissing * fix load missing to prevent eager loading * StyleCI Fixes * More StyleCI fixes --------- Co-authored-by: Nabeel S. <nabeelio@users.noreply.github.com>
nabeelio · Nov 11, 2024 · accf667 · accf667
1 parent 0192625
commit accf667
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/app/Http/Controllers/Admin/PirepController.php b/app/Http/Controllers/Admin/PirepController.php
@@ -73,6 +73,8 @@ public function aircraftList(?User $user = null): array
             $subfleets = $this->userSvc->getAllowableSubfleets($user);
         }
 
+        $subfleets->loadMissing('aircraft');
+
         foreach ($subfleets as $subfleet) {
             $tmp = [];
             foreach ($subfleet->aircraft as $ac) {

diff --git a/app/Http/Controllers/Frontend/PirepController.php b/app/Http/Controllers/Frontend/PirepController.php
@@ -85,6 +85,8 @@ public function aircraftList(bool $add_blank = false): array
             $aircraft[''] = '';
         }
 
+        $subfleets->loadMissing('aircraft');
+
         foreach ($subfleets as $subfleet) {
             $tmp = [];
             foreach ($subfleet->aircraft->when($location_check, function ($query) use ($user_loc) {

diff --git a/app/Services/FlightService.php b/app/Services/FlightService.php
@@ -190,6 +190,8 @@ public function filterSubfleets(User $user, Flight $flight)
         $aircraft_not_booked = setting('bids.block_aircraft', false);
 
         if ($aircraft_at_dpt_airport || $aircraft_not_booked) {
+            $subfleets->loadMissing('aircraft');
+
             foreach ($subfleets as $subfleet) {
                 $subfleet->aircraft = $subfleet->aircraft->filter(
                     function ($aircraft, $i) use ($user, $flight, $aircraft_at_dpt_airport, $aircraft_not_booked) {