Field and error message cleanup

This commit is contained in:
Nabeel Shahzad
2017-12-31 14:20:52 -06:00
parent d93e461266
commit 11c724649c
12 changed files with 153 additions and 136 deletions

View File

@@ -7,9 +7,9 @@ use App\Models\Traits\HashId;
class Acars extends BaseModel
{
use HashId;
public $incrementing = false;
public $table = 'acars';
public $incrementing = false;
public $fillable = [
'pirep_id',
@@ -37,6 +37,10 @@ class Acars extends BaseModel
'fuel_flow' => 'float',
];
public static $rules = [
'pirep_id' => 'required',
];
/**
* FKs
*/

View File

@@ -6,8 +6,6 @@ class Aircraft extends BaseModel
{
public $table = 'aircraft';
protected $dates = ['deleted_at'];
public $fillable = [
'subfleet_id',
'airport_id',

View File

@@ -34,9 +34,11 @@ class Airline extends BaseModel
* @var array
*/
public static $rules = [
'iata' => 'required|max:5',
'icao' => 'required|max:5',
'name' => 'required',
'country' => 'nullable',
'iata' => 'nullable|max:5',
'icao' => 'required|max:5',
'logo' => 'nullable',
'name' => 'required',
];
/**
@@ -46,4 +48,21 @@ class Airline extends BaseModel
return $this->icao;
}
protected static function boot()
{
parent::boot();
/**
* IATA and ICAO should be in all caps
*/
static::creating(function (Airline $model) {
if (!empty($model->iata)) {
$model->iata = strtoupper($model->iata);
}
if (!empty($model->icao)) {
$model->icao = strtoupper($model->icao);
}
});
}
}

View File

@@ -38,14 +38,12 @@ class Airport extends BaseModel
/**
* Validation rules
*
* @var array
*/
public static $rules = [
'icao' => 'required',
'name' => 'required',
'lat' => 'required',
'lon' => 'required',
'icao' => 'required',
'name' => 'required',
'lat' => 'required',
'lon' => 'required',
];
/**

View File

@@ -35,5 +35,4 @@ class Setting extends BaseModel
}
});
}
}