Rename UserFlight to UserBid to match functionality

app/Http/Controllers/Api/FlightController.php

@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Api;
 use Illuminate\Http\Request;
 
 use App\Http\Controllers\AppBaseController;
-use App\Models\Transformers\FlightTransformer;
 use App\Repositories\FlightRepository;
 use App\Http\Resources\Flight as FlightResource;
 use Prettus\Repository\Exceptions\RepositoryException;
@@ -33,7 +32,7 @@ class FlightController extends AppBaseController
         } catch (RepositoryException $e) {
             return response($e, 503);
         }
+
         return FlightResource::collection($flights);
-        //return fractal($flights, new FlightTransformer())->respond();
     }
 }

app/Http/Controllers/Api/PirepController.php

@@ -2,16 +2,23 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Models\Pirep;
-use App\Models\Transformers\PirepTransformer;
+use App\Http\Resources\Pirep as PirepResource;
 use App\Http\Controllers\AppBaseController;
+use App\Repositories\PirepRepository;
 
 
 class PirepController extends AppBaseController
 {
+    protected $pirepRepo;
+
+    public function __construct(PirepRepository $pirepRepo)
+    {
+        $this->pirepRepo = $pirepRepo;
+    }
+
     public function get($id)
     {
-        $pirep = Pirep::find($id);
-        return fractal($pirep, new PirepTransformer())->respond();
+        PirepResource::withoutWrapping();
+        return new PirepResource($this->pirepRepo->find($id));
     }
 }

app/Http/Controllers/Frontend/FlightController.php

@@ -10,7 +10,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
 use App\Http\Controllers\AppBaseController;
-use App\Models\UserFlight;
+use App\Models\UserBid;
 use App\Repositories\FlightRepository;
 use App\Repositories\Criteria\WhereCriteria;
 
@@ -48,7 +48,7 @@ class FlightController extends AppBaseController
 
         $flights = $this->flightRepo->paginate();
 
-        $saved_flights = UserFlight::where('user_id', Auth::id())
+        $saved_flights = UserBid::where('user_id', Auth::id())
                          ->pluck('flight_id')->toArray();
 
         return $this->view('flights.index', [
@@ -69,7 +69,7 @@ class FlightController extends AppBaseController
     {
         $flights = $this->flightRepo->searchCriteria($request)->paginate();
 
-        $saved_flights = UserFlight::where('user_id', Auth::id())
+        $saved_flights = UserBid::where('user_id', Auth::id())
                          ->pluck('flight_id')->toArray();
 
         return $this->view('flights.index', [
@@ -89,7 +89,7 @@ class FlightController extends AppBaseController
         $cols = ['user_id' => $user_id,  'flight_id' => $flight_id];
 
         if($action === 'save') {
-            $uf = UserFlight::create($cols);
+            $uf = UserBid::create($cols);
             $uf->save();
 
             return response()->json([
@@ -100,7 +100,7 @@ class FlightController extends AppBaseController
 
         elseif ($action === 'remove') {
             try {
-                $uf = UserFlight::where($cols)->first();
+                $uf = UserBid::where($cols)->first();
                 $uf->delete();
             } catch (Exception $e) { }
 

app/Http/Resources/Pirep.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\Resource;
+
+class Pirep extends Resource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return parent::toArray($request);
+    }
+}

app/Models/Transformers/PirepTransformer.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Models\Transformers;
-
-use App\Models\Pirep;
-use League\Fractal\TransformerAbstract;
-
-class PirepTransformer extends TransformerAbstract
-{
-    public static $aptXform = null;
-    public static $flightXform = null;
-
-    public function __construct()
-    {
-        PirepTransformer::$aptXform = new AirportTransform();
-        PirepTransformer::$flightXform = new FlightTransformer();
-    }
-
-    public function transform(Pirep $pirep)
-    {
-        $p = [
-            'id'          => $pirep->id,
-            'route_code'  => $pirep->route_code,
-            'route_leg'   => $pirep->route_leg,
-            'level'       => $pirep->level,
-            'route'       => $pirep->route,
-            'source'      => $pirep->source,
-            'status'      => $pirep->status,
-            'raw_data'    => $pirep->raw_data,
-            'flight_time' => $pirep->flight_time,
-            'aircraft'    => [],
-            'dpt'         => PirepTransformer::$aptXform->transform($pirep->dpt_airport),
-            'arr'         => PirepTransformer::$aptXform->transform($pirep->arr_airport),
-            'user'        => [
-                'id'       => $pirep->user->id,
-                'pilot_id' => $pirep->user->pilot_id(),
-            ],
-        ];
-
-        if ($pirep->flight_id) {
-            $p['flight'] = PirepTransformer::$flightXform->transform($pirep->flight);
-        }
-
-        return $p;
-    }
-}

app/Models/User.php

@@ -140,7 +140,7 @@ class User extends Authenticatable
 
     public function flights()
     {
-        return $this->hasMany('App\Models\UserFlight', 'user_id');
+        return $this->hasMany('App\Models\UserBid', 'user_id');
     }
 
     public function pireps()

app/Models/UserBid.php

@@ -7,16 +7,14 @@ use Eloquent as Model;
 /**
  * @package App\Models
  */
-class UserFlight extends Model
+class UserBid extends Model
 {
-    public $table = 'user_flights';
-    public $timestamps = false;
+    public $table = 'user_bids';
 
-    public $fillable
-        = [
-            'user_id',
-            'flight_id',
-        ];
+    public $fillable = [
+        'user_id',
+        'flight_id',
+    ];
 
     /**
      * Relationships