make sure resources return the data object #186

app/Http/Controllers/Api/AcarsController.php

@@ -35,5 +35,4 @@ class AcarsController extends RestController
             'Content-type' => 'application/json'
         ]);
     }
-
 }

app/Http/Controllers/Api/AirlineController.php

@@ -35,7 +35,6 @@ class AirlineController extends RestController
     public function get($id)
     {
         $id = strtoupper($id);
-        AirlineResource::withoutWrapping();
         return new AirlineResource($this->airlineRepo->find($id));
     }
 }

app/Http/Controllers/Api/AirportController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Api;
 
+use Log;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 
@@ -58,7 +59,6 @@ class AirportController extends RestController
     public function get($id)
     {
         $id = strtoupper($id);
-        AirportResource::withoutWrapping();
         return new AirportResource($this->airportRepo->find($id));
     }
 
@@ -73,7 +73,12 @@ class AirportController extends RestController
             config('cache.keys.AIRPORT_VACENTRAL_LOOKUP.key') . $id,
             config('cache.keys.RANKS_PILOT_LIST.time'),
             function () use ($id) {
-                return AirportLookup::get($id);
+                try {
+                    return AirportLookup::get($id);
+                } catch (\VaCentral\HttpException $e) {
+                    Log::error($e);
+                    return [];
+                }
             }
         );
 

app/Http/Controllers/Api/FleetController.php

@@ -30,7 +30,7 @@ class FleetController extends RestController
     {
         $subfleets = $this->subfleetRepo
                           ->with(['aircraft', 'airline', 'fares', 'ranks'])
-                          ->paginate(50);
+                          ->paginate();
 
         return SubfleetResource::collection($subfleets);
     }
@@ -51,13 +51,11 @@ class FleetController extends RestController
             $where['id'] = $id;
         }
 
-        #$all_aircraft = $this->aircraftRepo->all();
         $aircraft = $this->aircraftRepo
                          ->with(['subfleet', 'subfleet.fares'])
                          ->findWhere($where)
                          ->first();
 
-        AircraftResource::withoutWrapping();
         return new AircraftResource($aircraft);
     }
 }

app/Http/Controllers/Api/FlightController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Http\Resources\FlightCollection;
 use App\Repositories\Criteria\WhereCriteria;
 use App\Services\FlightService;
 use Auth;
@@ -33,6 +34,8 @@ class FlightController extends RestController
 
     /**
      * Return all the flights, paginated
+     * @param Request $request
+     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
      */
     public function index(Request $request)
     {
@@ -63,7 +66,6 @@ class FlightController extends RestController
         $flight = $this->flightRepo->find($id);
         $this->flightSvc->filterSubfleets(Auth::user(), $flight);
 
-        FlightResource::withoutWrapping();
         return new FlightResource($flight);
     }
 

app/Http/Controllers/Api/PirepController.php

@@ -79,7 +79,6 @@ class PirepController extends RestController
      */
     public function get($id)
     {
-        PirepResource::withoutWrapping();
         return new PirepResource($this->pirepRepo->find($id));
     }
 
@@ -138,7 +137,6 @@ class PirepController extends RestController
 
         $this->updateFields($pirep, $request);
 
-        PirepResource::withoutWrapping();
         return new PirepResource($pirep);
     }
 
@@ -166,7 +164,6 @@ class PirepController extends RestController
         $pirep = $this->pirepRepo->update($attrs, $id);
         $this->updateFields($pirep, $request);
 
-        PirepResource::withoutWrapping();
         return new PirepResource($pirep);
     }
 
@@ -208,7 +205,6 @@ class PirepController extends RestController
             $this->pirepSvc->saveRoute($pirep);
         }
 
-        PirepResource::withoutWrapping();
         return new PirepResource($pirep);
     }
 
@@ -227,7 +223,6 @@ class PirepController extends RestController
             'state' => PirepState::CANCELLED,
         ], $id);
 
-        PirepResource::withoutWrapping();
         return new PirepResource($pirep);
     }
 
@@ -248,16 +243,15 @@ class PirepController extends RestController
     }
 
     /**
-     * Return the GeoJSON for the ACARS line
+     * Return the routes for the ACARS line
      * @param $id
      * @param Request $request
      * @return AcarsRouteResource
      */
     public function acars_get($id, Request $request)
     {
-        $pirep = $this->pirepRepo->find($id);
+        $this->pirepRepo->find($id);
 
-        AcarsRouteResource::withoutWrapping();
         return new AcarsRouteResource(Acars::where([
             'pirep_id' => $id,
             'type' => AcarsType::FLIGHT_PATH

app/Http/Controllers/Api/UserController.php

@@ -37,7 +37,6 @@ class UserController extends RestController
      */
     public function index(Request $request)
     {
-        UserResource::withoutWrapping();
         return new UserResource(Auth::user());
     }
 
@@ -46,7 +45,6 @@ class UserController extends RestController
      */
     public function get($id)
     {
-        UserResource::withoutWrapping();
         return new UserResource($this->userRepo->find($id));
     }
 
@@ -79,7 +77,6 @@ class UserController extends RestController
         $user = $this->userRepo->find($id);
         $subfleets = $this->userSvc->getAllowableSubfleets($user);
 
-        SubfleetResource::withoutWrapping();
         return SubfleetResource::collection($subfleets);
     }