From fe4e200983839d85b17d265a3df5e2d595293ba5 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Wed, 3 Jan 2018 22:04:51 -0600 Subject: [PATCH] Trim ICAO/IATA names, clean up model fields --- app/Models/Aircraft.php | 13 ++++++++++++ app/Models/Airport.php | 11 +++------- app/Models/Fare.php | 4 ---- app/Models/FlightFields.php | 13 +++++------- app/Models/Pirep.php | 1 - app/Models/PirepComment.php | 5 ----- app/Models/PirepField.php | 1 - app/Models/PirepFieldValues.php | 37 ++++++++------------------------- app/Models/Rank.php | 5 ++--- app/Models/Setting.php | 17 +++++++++++---- app/Models/Subfleet.php | 3 +++ 11 files changed, 48 insertions(+), 62 deletions(-) diff --git a/app/Models/Aircraft.php b/app/Models/Aircraft.php index 39473fc8..932603cd 100644 --- a/app/Models/Aircraft.php +++ b/app/Models/Aircraft.php @@ -34,6 +34,19 @@ class Aircraft extends BaseModel 'name' => 'required', ]; + /** + * Callbacks + */ + protected static function boot() + { + parent::boot(); + static::creating(function (Airport $model) { + if (!empty($model->icao)) { + $model->icao = strtoupper(trim($model->icao)); + } + }); + } + /** * foreign keys */ diff --git a/app/Models/Airport.php b/app/Models/Airport.php index 3c3c926c..d03fa736 100644 --- a/app/Models/Airport.php +++ b/app/Models/Airport.php @@ -48,22 +48,17 @@ class Airport extends BaseModel ]; /** - * Some fancy callbacks + * Callbacks */ protected static function boot() { - parent::boot(); - - /** - * Make sure the ID is set to the ICAO - */ static::creating(function (Airport $model) { if(!empty($model->iata)) { - $model->iata = strtoupper($model->iata); + $model->iata = strtoupper(trim($model->iata)); } - $model->icao = strtoupper($model->icao); + $model->icao = strtoupper(trim($model->icao)); $model->id = $model->icao; }); } diff --git a/app/Models/Fare.php b/app/Models/Fare.php index 5fbb25ae..c3769909 100644 --- a/app/Models/Fare.php +++ b/app/Models/Fare.php @@ -11,8 +11,6 @@ class Fare extends BaseModel { public $table = 'fares'; - protected $dates = ['deleted_at']; - public $fillable = [ 'code', 'name', @@ -24,8 +22,6 @@ class Fare extends BaseModel ]; protected $casts = [ - 'code' => 'string', - 'name' => 'string', 'price' => 'float', 'cost' => 'float', 'capacity' => 'integer', diff --git a/app/Models/FlightFields.php b/app/Models/FlightFields.php index ffc88204..59fd37a5 100644 --- a/app/Models/FlightFields.php +++ b/app/Models/FlightFields.php @@ -11,14 +11,11 @@ class FlightFields extends BaseModel { public $table = 'flight_fields'; - protected $dates = ['deleted_at']; - - public $fillable - = [ - 'flight_id', - 'name', - 'value', - ]; + public $fillable = [ + 'flight_id', + 'name', + 'value', + ]; protected $casts = []; diff --git a/app/Models/Pirep.php b/app/Models/Pirep.php index 5d12fb2c..3a685e24 100644 --- a/app/Models/Pirep.php +++ b/app/Models/Pirep.php @@ -45,7 +45,6 @@ class Pirep extends BaseModel ]; protected $casts = [ - 'id' => 'string', 'flight_time' => 'integer', 'planned_flight_time' => 'integer', 'level' => 'integer', diff --git a/app/Models/PirepComment.php b/app/Models/PirepComment.php index 78edb56d..ff22e290 100644 --- a/app/Models/PirepComment.php +++ b/app/Models/PirepComment.php @@ -17,11 +17,6 @@ class PirepComment extends BaseModel 'comment', ]; - /** - * Validation rules - * - * @var array - */ public static $rules = [ 'comment' => 'required', ]; diff --git a/app/Models/PirepField.php b/app/Models/PirepField.php index 4e844b19..24cbc877 100644 --- a/app/Models/PirepField.php +++ b/app/Models/PirepField.php @@ -18,7 +18,6 @@ class PirepField extends BaseModel ]; protected $casts = [ - 'name' => 'string', 'required' => 'boolean', ]; diff --git a/app/Models/PirepFieldValues.php b/app/Models/PirepFieldValues.php index bed669d9..c8fdef24 100644 --- a/app/Models/PirepFieldValues.php +++ b/app/Models/PirepFieldValues.php @@ -11,35 +11,16 @@ class PirepFieldValues extends BaseModel { public $table = 'pirep_field_values'; - public $fillable - = [ - 'pirep_id', - 'name', - 'value', - 'source', - ]; + public $fillable = [ + 'pirep_id', + 'name', + 'value', + 'source', + ]; - /** - * The attributes that should be casted to native types. - * - * @var array - */ - protected $casts - = [ - 'name' => 'string', - 'value' => 'string', - 'source' => 'string', - ]; - - /** - * Validation rules - * - * @var array - */ - public static $rules - = [ - 'name' => 'required', - ]; + public static $rules = [ + 'name' => 'required', + ]; /** * Foreign Keys diff --git a/app/Models/Rank.php b/app/Models/Rank.php index 306e593c..47720d70 100644 --- a/app/Models/Rank.php +++ b/app/Models/Rank.php @@ -21,7 +21,6 @@ class Rank extends BaseModel ]; protected $casts = [ - 'name' => 'string', 'hours' => 'integer', 'auto_approve_acars' => 'bool', 'auto_approve_manual' => 'bool', @@ -29,8 +28,8 @@ class Rank extends BaseModel ]; public static $rules = [ - 'name' => 'required', - 'hours' => 'required', + 'name' => 'required', + 'hours' => 'required|integer', ]; public function subfleets() { diff --git a/app/Models/Setting.php b/app/Models/Setting.php index 2687b55c..f48602a4 100644 --- a/app/Models/Setting.php +++ b/app/Models/Setting.php @@ -17,18 +17,27 @@ class Setting extends BaseModel 'description', ]; + public static $rules = [ + 'name' => 'required', + 'key' => 'required', + 'group' => 'required', + ]; + + /** + * @param $key + * @return mixed + */ public static function formatKey($key) { return str_replace('.', '_', strtolower($key)); } + /** + * Callbacks + */ protected static function boot() { parent::boot(); - - /** - * Make sure any dots are replaced with underscores - */ static::creating(function (Setting $model) { if (!empty($model->id)) { $model->id = Setting::formatKey($model->id); diff --git a/app/Models/Subfleet.php b/app/Models/Subfleet.php index 3e975a7c..0430208c 100644 --- a/app/Models/Subfleet.php +++ b/app/Models/Subfleet.php @@ -16,6 +16,9 @@ class Subfleet extends BaseModel 'name', 'type', 'fuel_type', + 'cargo_capacity', + 'fuel_capacity', + 'gross_weight', ]; /**