Eager loading update for frontend controllers and widgets (#1348)
* Update AirportController.php Eager load `files` * Update DashboardController.php Eager load `journal` for user , and `aircraft, arr_airport, comments, dpt_airport` for last_pirep. * Update FlightController.php Eager load + `alt_airport, subfleets` (with their airlines) for flights and `current_airport` for user (though current_airport can be removed and we can base the in blade checks on `$user->curr_airport_id` to reduce db reads and model loading) * Update HomeController.php Eager load `home_airport` for users * Update PirepController.php Eager load `airline, aircraft, fares, transactions, dpt_airport, arr_airport, comments, simbrief, user with rank` for pirep details * Update ProfileController.php Eager load `airline, awards, current_airport, fields.field, home_airport, last_pirep, rank` for user * Update UserController.php Eager load `airline, current_airport, fields.field, home_airport, rank` for users and count `awards` * Update AirportController.php * Update DashboardController.php * Update PirepController.php * Update ProfileController.php * Update LatestNews.php Eager load `user` for news * Update LatestPilots.php Eager load `home_airport` for latest users * StyleFix 1 * StlyeFix 1.5 * Update SimBriefController.php Eager load airline with flight * Update SimBriefController.php * Update SimBriefController.php
This commit is contained in:
@@ -62,7 +62,7 @@ class SimBriefController
|
||||
$aircraft_id = $request->input('aircraft_id');
|
||||
|
||||
/** @var Flight $flight */
|
||||
$flight = $this->flightRepo->with(['fares', 'subfleets'])->find($flight_id);
|
||||
$flight = $this->flightRepo->with(['airline', 'arr_airport', 'dpt_airport', 'fares.fare', 'subfleets'])->find($flight_id);
|
||||
|
||||
if (!$flight) {
|
||||
flash()->error('Unknown flight');
|
||||
@@ -136,7 +136,7 @@ class SimBriefController
|
||||
// SimBrief profile does not exists and everything else is ok
|
||||
// Select aircraft which will be used for calculations and details
|
||||
/** @var Aircraft $aircraft */
|
||||
$aircraft = Aircraft::where('id', $aircraft_id)->first();
|
||||
$aircraft = Aircraft::with(['airline'])->where('id', $aircraft_id)->first();
|
||||
|
||||
// Figure out the proper fares to use for this flight/aircraft
|
||||
$all_fares = $this->fareSvc->getFareWithOverrides($aircraft->subfleet->fares, $flight->fares);
|
||||
@@ -263,7 +263,7 @@ class SimBriefController
|
||||
$user = Auth::user();
|
||||
|
||||
/** @var SimBrief $simbrief */
|
||||
$simbrief = SimBrief::with(['flight'])->find($id);
|
||||
$simbrief = SimBrief::with(['flight.airline', 'pirep.airline'])->find($id);
|
||||
if (!$simbrief) {
|
||||
flash()->error('SimBrief briefing not found');
|
||||
return redirect(route('frontend.flights.index'));
|
||||
|
||||
Reference in New Issue
Block a user