#406 Refactor bids (#432)

* Add flight_id column to pireps table

* Refactor PIREPs and bids closes 406

* Formatting
This commit is contained in:
Nabeel S
2019-11-05 11:44:31 -05:00
committed by GitHub
parent db087d0ccb
commit f5183babf6
35 changed files with 967 additions and 798 deletions

View File

@@ -4,9 +4,6 @@ namespace App\Http\Requests\Acars;
use App\Contracts\FormRequest;
/**
* Class CommentRequest
*/
class CommentRequest extends FormRequest
{
public function rules(): array

View File

@@ -4,25 +4,17 @@ namespace App\Http\Requests\Acars;
use App\Contracts\FormRequest;
use App\Models\Pirep;
use Auth;
use Illuminate\Support\Facades\Auth;
/**
* Class EventRequest
*/
class EventRequest extends FormRequest
{
/**
* @throws \Illuminate\Database\Eloquent\ModelNotFoundException
*
* @return bool
*/
public function authorize()
public function authorize(): bool
{
$pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
return $pirep->user_id === Auth::id();
}
public function rules()
public function rules(): array
{
$rules = [
'events' => 'required|array',

View File

@@ -9,10 +9,7 @@ use App\Contracts\FormRequest;
*/
class FieldsRequest extends FormRequest
{
/**
* @return array
*/
public function rules()
public function rules(): array
{
return [
'fields' => 'required|array',

View File

@@ -4,26 +4,22 @@ namespace App\Http\Requests\Acars;
use App\Contracts\FormRequest;
use App\Models\Pirep;
use Auth;
use Illuminate\Support\Facades\Auth;
/**
* Class FileRequest
*/
class FileRequest extends FormRequest
{
public function authorize()
public function authorize(): bool
{
$pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
return $pirep->user_id === Auth::id();
}
public function rules()
public function rules(): array
{
$rules = [
'distance' => 'required|numeric',
'flight_time' => 'required|integer',
'fuel_used' => 'required|numeric',
'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',

View File

@@ -4,20 +4,17 @@ namespace App\Http\Requests\Acars;
use App\Contracts\FormRequest;
use App\Models\Pirep;
use Auth;
use Illuminate\Support\Facades\Auth;
/**
* Class LogRequest
*/
class LogRequest extends FormRequest
{
public function authorize()
public function authorize(): bool
{
$pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
return $pirep->user_id === Auth::id();
}
public function rules()
public function rules(): array
{
$rules = [
'logs' => 'required|array',

View File

@@ -4,36 +4,20 @@ namespace App\Http\Requests\Acars;
use App\Contracts\FormRequest;
use App\Models\Pirep;
use Auth;
use Illuminate\Support\Facades\Auth;
/**
* Class PositionRequest
*/
class PositionRequest extends FormRequest
{
/**
* @return bool
* Is the user allowed to do this?
*/
public function authorize()
public function authorize(): bool
{
$pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
return $pirep->user_id === Auth::id();
}
/**
* @return array
*/
/*public function sanitize()
{
return [
'positions.*.sim_time' => Acars::$sanitize['sim_time'],
];
}*/
/**
* @return array
*/
public function rules()
public function rules(): array
{
$rules = [
'positions' => 'required|array',

View File

@@ -4,32 +4,18 @@ namespace App\Http\Requests\Acars;
use App\Contracts\FormRequest;
/**
* Class PrefileRequest
*/
class PrefileRequest extends FormRequest
{
/**
* @return array|void
*/
/*public function sanitize()
{
return Pirep::$sanitize;
}*/
/**
* @return array
*/
public function rules()
public function rules(): array
{
$rules = [
'airline_id' => 'required|exists:airlines,id',
'aircraft_id' => 'required|exists:aircraft,id',
'flight_number' => 'required',
'dpt_airport_id' => 'required',
'arr_airport_id' => 'required',
'source_name' => 'required',
'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',
'source_name' => 'required',
'alt_airport_id' => 'nullable',
'status' => 'nullable',
'level' => 'nullable|numeric',

View File

@@ -4,20 +4,17 @@ namespace App\Http\Requests\Acars;
use App\Contracts\FormRequest;
use App\Models\Pirep;
use Auth;
use Illuminate\Support\Facades\Auth;
/**
* Class RouteRequest
*/
class RouteRequest extends FormRequest
{
public function authorize()
public function authorize(): bool
{
$pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
return $pirep->user_id === Auth::id();
}
public function rules()
public function rules(): array
{
$rules = [
'route' => 'required|array',

View File

@@ -4,20 +4,17 @@ namespace App\Http\Requests\Acars;
use App\Contracts\FormRequest;
use App\Models\Pirep;
use Auth;
use Illuminate\Support\Facades\Auth;
/**
* Class UpdateRequest
*/
class UpdateRequest extends FormRequest
{
public function authorize()
public function authorize(): bool
{
$pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
return $pirep->user_id === Auth::id();
}
public function rules()
public function rules(): array
{
$rules = [
'airline_id' => 'nullable|exists:airlines,id',