FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring of PIREP submission and field code #146

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-01-23 15:48:30 -06:00
parent 341424ad7e
commit f9efa81bb4
19 changed files with 191 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Database/migrations/2017_06_28_195426_create_pirep_tables.php
View File

@@ -84,6 +84,7 @@ class CreatePirepTables extends Migration
Schema::create('pirep_fields', function (Blueprint $table) {
$table->bigIncrements('id');
$table->string('name', 50);
$table->string('slug', 50)->nullable();
$table->boolean('required')->default(false);
});

5
app/Database/seeds/sample.yml
View File

@@ -405,7 +405,12 @@ pireps:
pirep_fields:
- id: 1
name: departure gate
slug: departure_gate
required: 1
- id: 2
name: arrival gate
slug: arrival_gate
required: 0
pirep_field_values:

11
app/Http/Controllers/Admin/PirepFieldController.php
View File

@@ -22,9 +22,9 @@ class PirepFieldController extends BaseController
/**
* Display a listing of the PirepField.
*
* @param Request $request
* @return Response
* @throws \Prettus\Repository\Exceptions\RepositoryException
*/
public function index(Request $request)
{
@@ -38,7 +38,6 @@ class PirepFieldController extends BaseController
/**
* Show the form for creating a new PirepField.
*
* @return Response
*/
public function create()
@@ -48,9 +47,7 @@ class PirepFieldController extends BaseController
/**
* Store a newly created PirepField in storage.
*
* @param CreatePirepFieldRequest $request
*
* @return Response
* @throws \Prettus\Validator\Exceptions\ValidatorException
*/
@@ -67,9 +64,7 @@ class PirepFieldController extends BaseController
/**
* Display the specified PirepField.
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -88,9 +83,7 @@ class PirepFieldController extends BaseController
/**
* Show the form for editing the specified PirepField.
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -130,9 +123,7 @@ class PirepFieldController extends BaseController
/**
* Remove the specified PirepField from storage.
*
* @param int $id
*
* @return Response
*/
public function destroy($id)

9
app/Http/Controllers/Api/PirepController.php
View File

@@ -2,7 +2,6 @@
namespace App\Http\Controllers\Api;
use App\Rules\Minutes;
use Log;
use Auth;
use Illuminate\Database\Eloquent\ModelNotFoundException;
@@ -78,8 +77,8 @@ class PirepController extends RestController
'flight_number' => 'required',
'route_code' => 'nullable',
'route_leg' => 'nullable',
'flight_time' => ['nullable', new Minutes],
'planned_flight_time' => ['nullable', new Minutes],
'flight_time' => ['nullable', 'integer'],
'planned_flight_time' => ['nullable', 'integer'],
'level' => 'required|integer',
'route' => 'nullable',
'notes' => 'nullable',
@@ -133,7 +132,7 @@ class PirepController extends RestController
$file_rules = [
# actual flight time is required
'flight_time' => ['required', new Minutes],
'flight_time' => ['required', 'integer'],
'flight_number' => 'nullable',
'dpt_airport_id' => 'nullable',
'arr_airport_id' => 'nullable',
@@ -142,7 +141,7 @@ class PirepController extends RestController
'flight_id' => 'nullable',
'route_code' => 'nullable',
'route_leg' => 'nullable',
'planned_flight_time' => ['nullable', new Minutes],
'planned_flight_time' => ['nullable', 'integer'],
'level' => 'nullable',
'route' => 'nullable',
'notes' => 'nullable',

55
app/Http/Controllers/Frontend/PirepController.php
View File

@@ -2,7 +2,9 @@
namespace App\Http\Controllers\Frontend;
use Log;
use App\Facades\Utils;
use App\Http\Requests\CreatePirepRequest;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
@@ -61,11 +63,15 @@ class PirepController extends Controller
* @param null $user
* @return array
*/
public function aircraftList($user=null)
public function aircraftList($user=null, $add_blank=false)
{
$aircraft = [];
$subfleets = $this->userSvc->getAllowableSubfleets($user);
if($add_blank) {
$aircraft[''] = '';
}
foreach ($subfleets as $subfleet) {
$tmp = [];
foreach ($subfleet->aircraft as $ac) {
@@ -107,49 +113,56 @@ class PirepController extends Controller
$user = Auth::user();
return $this->view('pireps.create', [
'aircraft' => $this->aircraftList($user),
'airports' => $this->airportRepo->selectBoxList(),
'airlines' => $this->airlineRepo->selectBoxList(),
'pirepfields' => $this->pirepFieldRepo->all(),
'fieldvalues' => [],
'airlines' => $this->airlineRepo->selectBoxList(true),
'aircraft' => $this->aircraftList($user, true),
'airports' => $this->airportRepo->selectBoxList(true),
'pirep_fields' => $this->pirepFieldRepo->all(),
'field_values' => [],
]);
}
public function store(Request $request)
/**
*
* @param CreatePirepRequest $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(CreatePirepRequest $request)
{
$pirep_fields = $request->all();
// Create the main PIREP
$pirep = new Pirep($pirep_fields);
$pirep = new Pirep($request->all());
$pirep->user_id = Auth::user()->id;
# Make sure this isn't a duplicate
$dupe_pirep = $this->pirepSvc->findDuplicate($pirep);
if ($dupe_pirep !== false) {
flash()->error('This PIREP has already been filed.');
return redirect(route('frontend.pireps.create'))->withInput();
}
// Any special fields
$pirep->pilot()->associate(Auth::user());
$pirep->flight_time = ((int) Utils::hoursToMinutes($request['hours']))
+ ((int) $request['minutes']);
// The custom fields from the form
$custom_fields = [];
foreach($pirep_fields as $field_name => $field_val)
{
if (strpos($field_name, 'field_') === false) {
$pirep_fields = $this->pirepFieldRepo->all();
foreach ($pirep_fields as $field) {
if(!$request->filled($field->slug)) {
continue;
}
$field_id = explode('field_', $field_name)[1];
$cfield = PirepField::find($field_id);
$custom_fields[] = [
'name' => $cfield->name,
'value' => $field_val,
'name' => $field->name,
'value' => $request->input($field->slug),
'source' => PirepSource::MANUAL
];
}
Log::info('PIREP Custom Fields', $custom_fields);
$pirep = $this->pirepSvc->create($pirep, $custom_fields);
$this->pirepSvc->saveRoute($pirep);
//Flash::success('PIREP submitted successfully!');
return redirect(route('frontend.pireps.index'));
return redirect(route('frontend.pireps.show', ['id' => $pirep->id]));
}
public function show($id)

22
app/Http/Requests/CreatePirepRequest.php
View File

@@ -2,13 +2,14 @@
namespace App\Http\Requests;
use App\Models\Pirep;
use Log;
use Illuminate\Foundation\Http\FormRequest;
use App\Models\Pirep;
use App\Repositories\PirepFieldRepository;
class CreatePirepRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
@@ -26,6 +27,21 @@ class CreatePirepRequest extends FormRequest
*/
public function rules()
{
return Pirep::$rules;
$field_rules = Pirep::$rules;
$field_rules['hours'] = 'nullable|integer';
$field_rules['minutes'] = 'required|integer';
# Add the validation rules for the custom fields
$pirepFieldRepo = app(PirepFieldRepository::class);
$custom_fields = $pirepFieldRepo->all();
foreach ($custom_fields as $field) {
$field_rules[$field->slug] = $field->required ? 'required' : 'nullable';
}
Log::debug('createPirepFormRequest::rules', $field_rules);
return $field_rules;
}
}

26
app/Models/Pirep.php
View File

@@ -57,11 +57,13 @@ class Pirep extends BaseModel
];
public static $rules = [
'flight_number' => 'required',
'dpt_airport_id' => 'required',
'arr_airport_id' => 'required',
'notes' => 'nullable',
'route' => 'nullable',
'airline_id' => 'required|exists:airlines,id',
'aircraft_id' => 'required|exists:aircraft,id',
'flight_number' => 'required',
'dpt_airport_id' => 'required',
'arr_airport_id' => 'required',
'notes' => 'nullable',
'route' => 'nullable',
];
/**
@@ -71,12 +73,14 @@ class Pirep extends BaseModel
public function getIdentAttribute()
{
$flight_id = $this->airline->code;
if(!empty($this->flight_number)) {
$flight_id .= $this->flight_number;
} else {
if ($this->flight_id) {
$flight_id .= $this->flight->flight_number;
}
$flight_id .= $this->flight_number;
if(filled($this->route_code)) {
$flight_id .= '/C'.$this->route_code;
}
if(filled($this->route_leg)) {
$flight_id .= '/L'.$this->route_leg;
}
return $flight_id;

27
app/Models/PirepField.php
View File

@@ -14,6 +14,7 @@ class PirepField extends BaseModel
public $fillable = [
'name',
'slug',
'required',
];
@@ -24,4 +25,30 @@ class PirepField extends BaseModel
public static $rules = [
'name' => 'required',
];
/**
* Create/update the field slug
*/
protected static function boot()
{
parent::boot();
/**
* On creation
*/
static::creating(function (PirepField $model) {
if (!empty($model->slug)) {
$model->slug = str_slug($model->name);
}
});
/**
* When updating
*/
static::updating(function(PirepField $model) {
if (!empty($model->slug)) {
$model->slug = str_slug($model->name);
}
});
}
}

2
app/Repositories/AirlineRepository.php
View File

@@ -31,7 +31,7 @@ class AirlineRepository extends BaseRepository implements CacheableInterface
$items = $this->all();
if($add_blank) {
$retval[] = '';
$retval[''] = '';
}
foreach ($items as $i) {

25
app/Rules/Minutes.php
View File

@@ -1,25 +0,0 @@
<?php
namespace App\Rules;
use Illuminate\Contracts\Validation\Rule;
/**
* Class Minutes
* @package App\Rules
*
* Make sure that a given value is an integer, but the custom
* validation message is what really matters here
*/
class Minutes implements Rule
{
public function passes($attribute, $value): bool
{
return \is_int(filter_var($value, FILTER_VALIDATE_INT));
}
public function message(): string
{
return ':attribute must be an integer, in minutes';
}
}

4
app/Services/PIREPService.php
View File

@@ -73,11 +73,11 @@ class PIREPService extends BaseService
'flight_number' => $pirep->flight_number,
];
if(!empty($pirep->route_code)) {
if(filled($pirep->route_code)) {
$where['route_code'] = $pirep->route_code;
}
if(!empty($pirep->route_leg)) {
if(filled($pirep->route_leg)) {
$where['route_leg'] = $pirep->route_leg;
}