Fix and enable Subfleet/Fare tests and factories

app/Http/Controllers/Admin/SubfleetController.php

@@ -240,7 +240,7 @@ class SubfleetController extends BaseController
          */
         if ($request->isMethod('post')) {
             $fare = $this->fareRepo->findWithoutFail($request->fare_id);
-            $fare_svc->setForAircraft($subfleet, $fare);
+            $fare_svc->setForSubfleet($subfleet, $fare);
         }
 
         // update the pivot table with overrides for the fares
@@ -248,7 +248,7 @@ class SubfleetController extends BaseController
             $override = [];
             $fare = $this->fareRepo->findWithoutFail($request->fare_id);
             $override[$request->name] = $request->value;
-            $fare_svc->setForAircraft($subfleet, $fare, $override);
+            $fare_svc->setForSubfleet($subfleet, $fare, $override);
         }
 
         // dissassociate fare from teh aircraft

app/Models/Fare.php

@@ -15,41 +15,29 @@ class Fare extends Model
 
     protected $dates = ['deleted_at'];
 
-    public $fillable
-        = [
-            'code',
-            'name',
-            'price',
-            'cost',
-            'notes',
-            'active',
-        ];
+    public $fillable = [
+        'code',
+        'name',
+        'price',
+        'cost',
+        'capacity',
+        'notes',
+        'active',
+    ];
 
-    /**
-     * The attributes that should be casted to native types.
-     *
-     * @var array
-     */
-    protected $casts
-        = [
-            'code'   => 'string',
-            'name'   => 'string',
-            'price'  => 'float',
-            'cost'   => 'float',
-            'notes'  => 'string',
-            'active' => 'boolean',
-        ];
+    protected $casts = [
+        'code'      => 'string',
+        'name'      => 'string',
+        'price'     => 'float',
+        'cost'      => 'float',
+        'capacity'  => 'integer',
+        'active'    => 'boolean',
+    ];
 
-    /**
-     * Validation rules
-     *
-     * @var array
-     */
-    public static $rules
-        = [
-            'code' => 'required',
-            'name' => 'required',
-        ];
+    public static $rules = [
+        'code' => 'required',
+        'name' => 'required',
+    ];
 
     /**
      * any foreign keys

app/Services/FareService.php

@@ -16,11 +16,8 @@ class FareService extends BaseService {
      *
      * @return Aircraft
      */
-    public function setForAircraft(
-        Subfleet &$subfleet,
-        Fare &$fare,
-        array $override=[]
-    ) {
+    public function setForSubfleet(Subfleet &$subfleet, Fare &$fare, array $override=[])
+    {
         $subfleet->fares()->syncWithoutDetaching([$fare->id]);
 
         # modify any pivot values?
@@ -40,7 +37,7 @@ class FareService extends BaseService {
      * @param Aircraft $subfleet
      * @return Fare[]
      */
-    public function getForAircraft(Subfleet &$subfleet)
+    public function getForSubfleet(Subfleet &$subfleet)
     {
         $fares = $subfleet->fares->map(function($fare) {
             if(!is_null($fare->pivot->price)) {