Trim ICAO/IATA names, clean up model fields

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
      */

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

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',

app/Models/FlightFields.php

@@ -11,10 +11,7 @@ class FlightFields extends BaseModel
 {
     public $table = 'flight_fields';
 
-    protected $dates = ['deleted_at'];
-
-    public $fillable
-        = [
+    public $fillable = [
         'flight_id',
         'name',
         'value',

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',

app/Models/PirepComment.php

@@ -17,11 +17,6 @@ class PirepComment extends BaseModel
         'comment',
     ];
 
-    /**
-     * Validation rules
-     *
-     * @var array
-     */
     public static $rules = [
         'comment' => 'required',
     ];

app/Models/PirepField.php

@@ -18,7 +18,6 @@ class PirepField extends BaseModel
     ];
 
     protected $casts = [
-        'name'     => 'string',
         'required' => 'boolean',
     ];
 

app/Models/PirepFieldValues.php

@@ -11,33 +11,14 @@ class PirepFieldValues extends BaseModel
 {
     public $table = 'pirep_field_values';
 
-    public $fillable
-        = [
+    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
-        = [
+    public static $rules = [
         'name' => 'required',
     ];
 

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',
@@ -30,7 +29,7 @@ class Rank extends BaseModel
 
     public static $rules = [
         'name'  => 'required',
-        'hours' => 'required',
+        'hours' => 'required|integer',
     ];
 
     public function subfleets() {

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

app/Models/Subfleet.php

@@ -16,6 +16,9 @@ class Subfleet extends BaseModel
         'name',
         'type',
         'fuel_type',
+        'cargo_capacity',
+        'fuel_capacity',
+        'gross_weight',
     ];
 
     /**