* SimBrief integration #405 * Add briefing as API response; add acars_xml field #405
This commit is contained in:
@@ -3,11 +3,14 @@
|
||||
namespace App\Http\Controllers\Api;
|
||||
|
||||
use App\Contracts\Controller;
|
||||
use App\Exceptions\AssetNotFound;
|
||||
use App\Http\Resources\Flight as FlightResource;
|
||||
use App\Http\Resources\Navdata as NavdataResource;
|
||||
use App\Models\SimBrief;
|
||||
use App\Repositories\Criteria\WhereCriteria;
|
||||
use App\Repositories\FlightRepository;
|
||||
use App\Services\FlightService;
|
||||
use Exception;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Prettus\Repository\Criteria\RequestCriteria;
|
||||
@@ -51,7 +54,18 @@ class FlightController extends Controller
|
||||
*/
|
||||
public function get($id)
|
||||
{
|
||||
$flight = $this->flightRepo->find($id);
|
||||
$user = Auth::user();
|
||||
$flight = $this->flightRepo->with([
|
||||
'airline',
|
||||
'subfleets',
|
||||
'subfleets.aircraft',
|
||||
'subfleets.fares',
|
||||
'field_values',
|
||||
'simbrief' => function ($query) use ($user) {
|
||||
return $query->where('user_id', $user->id);
|
||||
},
|
||||
])->find($id);
|
||||
|
||||
$this->flightSvc->filterSubfleets(Auth::user(), $flight);
|
||||
|
||||
return new FlightResource($flight);
|
||||
@@ -64,6 +78,7 @@ class FlightController extends Controller
|
||||
*/
|
||||
public function search(Request $request)
|
||||
{
|
||||
$user = Auth::user();
|
||||
$where = [
|
||||
'active' => true,
|
||||
'visible' => true,
|
||||
@@ -95,6 +110,9 @@ class FlightController extends Controller
|
||||
'subfleets.aircraft',
|
||||
'subfleets.fares',
|
||||
'field_values',
|
||||
'simbrief' => function ($query) use ($user) {
|
||||
return $query->where('user_id', $user->id);
|
||||
},
|
||||
])
|
||||
->paginate();
|
||||
} catch (RepositoryException $e) {
|
||||
@@ -109,6 +127,32 @@ class FlightController extends Controller
|
||||
return FlightResource::collection($flights);
|
||||
}
|
||||
|
||||
/**
|
||||
* Output the flight briefing from simbrief or whatever other format
|
||||
*
|
||||
* @param string $id The flight ID
|
||||
*
|
||||
* @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
|
||||
*/
|
||||
public function briefing($id)
|
||||
{
|
||||
$user = Auth::user();
|
||||
$w = [
|
||||
'user_id' => $user->id,
|
||||
'flight_id' => $id,
|
||||
];
|
||||
|
||||
$simbrief = SimBrief::where($w)->first();
|
||||
|
||||
if ($simbrief === null) {
|
||||
throw new AssetNotFound(new Exception('Flight briefing not found'));
|
||||
}
|
||||
|
||||
return response($simbrief->acars_xml, 200, [
|
||||
'Content-Type' => 'application/xml',
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a flight's route
|
||||
*
|
||||
|
||||
@@ -5,10 +5,8 @@ namespace App\Http\Controllers\Api;
|
||||
use App\Contracts\Controller;
|
||||
use App\Events\PirepPrefiled;
|
||||
use App\Events\PirepUpdated;
|
||||
use App\Exceptions\AircraftNotAtAirport;
|
||||
use App\Exceptions\AircraftPermissionDenied;
|
||||
use App\Exceptions\PirepCancelled;
|
||||
use App\Exceptions\UserNotAtAirport;
|
||||
use App\Http\Requests\Acars\CommentRequest;
|
||||
use App\Http\Requests\Acars\FieldsRequest;
|
||||
use App\Http\Requests\Acars\FileRequest;
|
||||
@@ -22,7 +20,6 @@ use App\Http\Resources\PirepComment as PirepCommentResource;
|
||||
use App\Http\Resources\PirepFieldCollection;
|
||||
use App\Models\Acars;
|
||||
use App\Models\Enums\AcarsType;
|
||||
use App\Models\Enums\FlightType;
|
||||
use App\Models\Enums\PirepFieldSource;
|
||||
use App\Models\Enums\PirepSource;
|
||||
use App\Models\Enums\PirepState;
|
||||
@@ -113,7 +110,7 @@ class PirepController extends Controller
|
||||
protected function checkCancelled(Pirep $pirep)
|
||||
{
|
||||
if ($pirep->cancelled) {
|
||||
throw new PirepCancelled();
|
||||
throw new PirepCancelled($pirep);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -199,49 +196,9 @@ class PirepController extends Controller
|
||||
$user = Auth::user();
|
||||
|
||||
$attrs = $this->parsePirep($request);
|
||||
$attrs['user_id'] = $user->id;
|
||||
$attrs['source'] = PirepSource::ACARS;
|
||||
$attrs['state'] = PirepState::IN_PROGRESS;
|
||||
|
||||
if (!array_key_exists('status', $attrs)) {
|
||||
$attrs['status'] = PirepStatus::INITIATED;
|
||||
}
|
||||
|
||||
$pirep = new Pirep($attrs);
|
||||
|
||||
// See if this user is at the current airport
|
||||
/* @noinspection NotOptimalIfConditionsInspection */
|
||||
if (setting('pilots.only_flights_from_current')
|
||||
&& $user->curr_airport_id !== $pirep->dpt_airport_id) {
|
||||
throw new UserNotAtAirport($user, $pirep->dpt_airport);
|
||||
}
|
||||
|
||||
// See if this user is allowed to fly this aircraft
|
||||
if (setting('pireps.restrict_aircraft_to_rank', false)
|
||||
&& !$this->userSvc->aircraftAllowed($user, $pirep->aircraft_id)) {
|
||||
throw new AircraftPermissionDenied($user, $pirep->aircraft);
|
||||
}
|
||||
|
||||
// See if this aircraft is at the departure airport
|
||||
/* @noinspection NotOptimalIfConditionsInspection */
|
||||
if (setting('pireps.only_aircraft_at_dpt_airport')
|
||||
&& $pirep->aircraft_id !== $pirep->dpt_airport_id) {
|
||||
throw new AircraftNotAtAirport($pirep->aircraft);
|
||||
}
|
||||
|
||||
// Find if there's a duplicate, if so, let's work on that
|
||||
$dupe_pirep = $this->pirepSvc->findDuplicate($pirep);
|
||||
if ($dupe_pirep !== false) {
|
||||
$pirep = $dupe_pirep;
|
||||
$this->checkCancelled($pirep);
|
||||
}
|
||||
|
||||
// Default to a scheduled passenger flight
|
||||
if (!array_key_exists('flight_type', $attrs)) {
|
||||
$attrs['flight_type'] = FlightType::SCHED_PAX;
|
||||
}
|
||||
|
||||
$pirep->save();
|
||||
$pirep = $this->pirepSvc->prefile($user, $attrs);
|
||||
|
||||
Log::info('PIREP PREFILED');
|
||||
Log::info($pirep->id);
|
||||
|
||||
Reference in New Issue
Block a user