Stricter checks on ACARS API data (#451)

* Stricter checks on ACARS API data

* More checks
This commit is contained in:
Nabeel S
2019-12-02 18:27:58 -05:00
committed by GitHub
parent 83821d1e04
commit b06287da23
12 changed files with 166 additions and 86 deletions

View File

@@ -10,7 +10,7 @@ class CommentRequest extends FormRequest
{
$rules = [
'comment' => 'required',
'created_at' => 'nullable|date',
'created_at' => 'sometimes|date',
];
return $rules;

View File

@@ -19,9 +19,9 @@ class EventRequest extends FormRequest
$rules = [
'events' => 'required|array',
'events.*.event' => 'required',
'events.*.lat' => 'nullable|numeric',
'events.*.lon' => 'nullable|numeric',
'events.*.created_at' => 'nullable|date',
'events.*.lat' => 'sometimes|numeric',
'events.*.lon' => 'sometimes|numeric',
'events.*.created_at' => 'sometimes|date',
];
return $rules;

View File

@@ -20,28 +20,28 @@ class FileRequest extends FormRequest
'distance' => 'required|numeric',
'flight_time' => 'required|integer',
'fuel_used' => 'required|numeric',
'block_time' => 'nullable|integer',
'airline_id' => 'nullable|exists:airlines,id',
'aircraft_id' => 'nullable|exists:aircraft,id',
'flight_number' => 'nullable',
'flight_type' => 'nullable',
'dpt_airport_id' => 'nullable',
'arr_airport_id' => 'nullable',
'route_code' => 'nullable',
'route_leg' => 'nullable',
'planned_distance' => 'nullable|numeric',
'planned_flight_time' => 'nullable|integer',
'level' => 'nullable|numeric',
'zfw' => 'nullable|numeric',
'block_fuel' => 'nullable|numeric',
'route' => 'nullable',
'notes' => 'nullable',
'source_name' => 'nullable',
'score' => 'nullable|integer',
'landing_rate' => 'nullable|numeric',
'block_off_time' => 'nullable|date',
'block_on_time' => 'nullable|date',
'created_at' => 'nullable|date',
'block_time' => 'sometimes|integer',
'airline_id' => 'sometimes|exists:airlines,id',
'aircraft_id' => 'sometimes|exists:aircraft,id',
'flight_number' => 'sometimes',
'flight_type' => 'sometimes',
'dpt_airport_id' => 'sometimes|size:4',
'arr_airport_id' => 'sometimes|size:4',
'route_code' => 'sometimes',
'route_leg' => 'sometimes',
'planned_distance' => 'sometimes|numeric',
'planned_flight_time' => 'sometimes|integer',
'level' => 'sometimes|numeric',
'zfw' => 'sometimes|numeric',
'block_fuel' => 'sometimes|numeric',
'route' => 'sometimes',
'notes' => 'sometimes',
'source_name' => 'sometimes',
'score' => 'sometimes|integer',
'landing_rate' => 'sometimes|numeric',
'block_off_time' => 'sometimes|date',
'block_on_time' => 'sometimes|date',
'created_at' => 'sometimes|date',
// See if the fare objects are included and formatted properly
'fares' => 'nullable|array',

View File

@@ -19,9 +19,9 @@ class LogRequest extends FormRequest
$rules = [
'logs' => 'required|array',
'logs.*.log' => 'required',
'logs.*.lat' => 'nullable|numeric',
'logs.*.lon' => 'nullable|numeric',
'logs.*.created_at' => 'nullable|date',
'logs.*.lat' => 'sometimes|numeric',
'logs.*.lon' => 'sometimes|numeric',
'logs.*.created_at' => 'sometimes|date',
];
return $rules;

View File

@@ -23,18 +23,18 @@ class PositionRequest extends FormRequest
'positions' => 'required|array',
'positions.*.lat' => 'required|numeric',
'positions.*.lon' => 'required|numeric',
'positions.*.status' => 'nullable',
'positions.*.altitude' => 'nullable|numeric',
'positions.*.heading' => 'nullable|numeric|between:0,360',
'positions.*.vs' => 'nullable',
'positions.*.gs' => 'nullable',
'positions.*.transponder' => 'nullable',
'positions.*.autopilot' => 'nullable',
'positions.*.fuel' => 'nullable|numeric',
'positions.*.fuel_flow' => 'nullable|numeric',
'positions.*.log' => 'nullable',
'positions.*.sim_time' => 'nullable|date',
'positions.*.created_at' => 'nullable|date',
'positions.*.status' => 'sometimes',
'positions.*.altitude' => 'sometimes|numeric',
'positions.*.heading' => 'sometimes|numeric|between:0,360',
'positions.*.vs' => 'sometimes',
'positions.*.gs' => 'sometimes',
'positions.*.transponder' => 'sometimes',
'positions.*.autopilot' => 'sometimes',
'positions.*.fuel' => 'sometimes|numeric',
'positions.*.fuel_flow' => 'sometimes|numeric',
'positions.*.log' => 'sometimes|nullable',
'positions.*.sim_time' => 'sometimes|date',
'positions.*.created_at' => 'sometimes|date',
];
return $rules;

View File

@@ -12,29 +12,29 @@ class PrefileRequest extends FormRequest
'airline_id' => 'required|exists:airlines,id',
'aircraft_id' => 'required|exists:aircraft,id',
'flight_number' => 'required',
'dpt_airport_id' => 'required',
'arr_airport_id' => 'required',
'flight_id' => 'nullable',
'dpt_airport_id' => 'required|size:4',
'arr_airport_id' => 'required|size:4',
'flight_id' => 'sometimes|exists:flights,id',
'source_name' => 'required',
'alt_airport_id' => 'nullable',
'status' => 'nullable',
'alt_airport_id' => 'sometimes|size:4',
'status' => 'sometimes',
'level' => 'nullable|numeric',
'flight_type' => 'nullable',
'route_code' => 'nullable',
'route_leg' => 'nullable',
'distance' => 'nullable|numeric',
'block_time' => 'nullable|integer',
'flight_time' => 'nullable|integer',
'planned_distance' => 'nullable|numeric',
'planned_flight_time' => 'nullable|integer',
'zfw' => 'nullable|numeric',
'block_fuel' => 'nullable|numeric',
'flight_type' => 'sometimes',
'route_code' => 'sometimes',
'route_leg' => 'sometimes',
'distance' => 'sometimes|numeric',
'block_time' => 'sometimes|integer',
'flight_time' => 'sometimes|integer',
'planned_distance' => 'sometimes|numeric',
'planned_flight_time' => 'sometimes|integer',
'zfw' => 'sometimes|numeric',
'block_fuel' => 'sometimes|numeric',
'route' => 'nullable',
'notes' => 'nullable',
'score' => 'nullable|integer',
'block_off_time' => 'nullable|date',
'block_on_time' => 'nullable|date',
'created_at' => 'nullable|date',
'score' => 'sometimes|integer',
'block_off_time' => 'sometimes|date',
'block_on_time' => 'sometimes|date',
'created_at' => 'sometimes|date',
// See if the fare objects are included and formatted properly
'fares' => 'nullable|array',

View File

@@ -20,7 +20,7 @@ class RouteRequest extends FormRequest
'route' => 'required|array',
'route.*.name' => 'required',
'route.*.order' => 'required|int',
'route.*.nav_type' => 'nullable|int',
'route.*.nav_type' => 'sometimes|int',
'route.*.lat' => 'required|numeric',
'route.*.lon' => 'required|numeric',
];

View File

@@ -19,29 +19,29 @@ class UpdateRequest extends FormRequest
$rules = [
'airline_id' => 'nullable|exists:airlines,id',
'aircraft_id' => 'nullable|exists:aircraft,id',
'flight_number' => 'nullable',
'dpt_airport_id' => 'nullable',
'arr_airport_id' => 'nullable',
'flight_number' => 'sometimes|required|exists:flights,id',
'dpt_airport_id' => 'sometimes|required|size:4',
'arr_airport_id' => 'sometimes|required|size:4',
'route_code' => 'nullable',
'route_leg' => 'nullable',
'distance' => 'nullable|numeric',
'planned_distance' => 'nullable|numeric',
'block_time' => 'nullable|integer',
'flight_time' => 'nullable|integer',
'distance' => 'sometimes|numeric',
'planned_distance' => 'sometimes|numeric',
'block_time' => 'sometimes|integer',
'flight_time' => 'sometimes|integer',
'flight_type' => 'nullable',
'planned_flight_time' => 'nullable|integer',
'level' => 'nullable|numeric',
'zfw' => 'nullable|numeric',
'fuel_used' => 'nullable|numeric',
'block_fuel' => 'nullable|numeric',
'route' => 'nullable',
'notes' => 'nullable',
'source_name' => 'nullable|max:25',
'landing_rate' => 'nullable|numeric',
'block_off_time' => 'nullable',
'block_on_time' => 'nullable',
'created_at' => 'nullable',
'status' => 'nullable',
'planned_flight_time' => 'sometimes|integer',
'level' => 'sometimes|numeric',
'zfw' => 'sometimes|numeric',
'fuel_used' => 'sometimes|numeric',
'block_fuel' => 'sometimes|numeric',
'route' => 'sometimes|nullable',
'notes' => 'sometimes|nullable',
'source_name' => 'sometimes|max:25',
'landing_rate' => 'sometimes|numeric',
'block_off_time' => 'sometimes|date',
'block_on_time' => 'sometimes|date',
'created_at' => 'sometimes|date',
'status' => 'sometimes',
'score' => 'nullable|integer',
// See if the fare objects are included and formatted properly