Refactoring of PIREP submission and field code #146

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

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;
}
}