389 API Changes

.gitignore

@@ -1,6 +1,7 @@
 _ide_helper.php
 .php_cs.cache
 .phpstorm.meta.php
+.phpunit.result.cache
 /vendor
 node_modules/
 npm-debug.log

.travis/deploy_script.sh

@@ -66,6 +66,7 @@ if [ "$TRAVIS" = "true" ]; then
         .php_cs.cache
         .phpstorm.meta.php
         .styleci.yml
+        .phpunit.result.cache
         env.php
         intellij_style.xml
         config.php

app/Contracts/Repository.php

@@ -108,4 +108,32 @@ public function whereNotInOrder($col, $values, $sort_by, $order_by = 'asc')
             return $q;
         });
     }
+
+    /**
+     * Retrieve all data of repository, paginated. Added in extra parameter to read from the
+     * request which page it should be on
+     *
+     * @param null   $limit
+     * @param array  $columns
+     * @param string $method
+     *
+     * @throws \Prettus\Repository\Exceptions\RepositoryException
+     *
+     * @return mixed
+     */
+    public function paginate($limit = null, $columns = ['*'], $method = 'paginate')
+    {
+        $this->applyCriteria();
+        $this->applyScope();
+
+        $max = config('repository.pagination.limit', 50);
+        $limit = (int) ($limit ?? request()->query('limit') ?? $max);
+        $page = request()->query('page', 1);
+
+        $results = $this->model->{$method}($limit, $columns, 'page', $page);
+        $results->appends(app('request')->query());
+        $this->resetModel();
+
+        return $this->parserResult($results);
+    }
 }

app/Http/Controllers/Api/AcarsController.php

@@ -8,6 +8,7 @@
 use App\Http\Requests\Acars\LogRequest;
 use App\Http\Requests\Acars\PositionRequest;
 use App\Http\Resources\AcarsRoute as AcarsRouteResource;
+use App\Http\Resources\Pirep as PirepResource;
 use App\Models\Acars;
 use App\Models\Enums\AcarsType;
 use App\Models\Enums\PirepStatus;
@@ -21,9 +22,6 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 
-/**
- * Class AcarsController
- */
 class AcarsController extends Controller
 {
     private $acarsRepo;
@@ -61,14 +59,28 @@ protected function checkCancelled(Pirep $pirep)
         }
     }
 
+    /**
+     * Get all the active PIREPs
+     *
+     * @return mixed
+     */
+    public function live_flights()
+    {
+        $pireps = $this->acarsRepo->getPositions(setting('acars.live_time'))->filter(function ($pirep) {
+            return $pirep->position !== null;
+        });
+
+        return PirepResource::collection($pireps);
+    }
+
     /**
      * Return all of the flights (as points) in GeoJSON format
      *
      * @param Request $request
      *
      * @return mixed
      */
-    public function index(Request $request)
+    public function pireps_geojson(Request $request)
     {
         $pireps = $this->acarsRepo->getPositions(setting('acars.live_time'));
         $positions = $this->geoSvc->getFeatureForLiveFlights($pireps);

app/Http/Controllers/Api/AirlineController.php

@@ -7,9 +7,6 @@
 use App\Repositories\AirlineRepository;
 use Illuminate\Http\Request;
 
-/**
- * Class AirlineController
- */
 class AirlineController extends Controller
 {
     private $airlineRepo;
@@ -34,7 +31,6 @@ public function __construct(
      */
     public function index(Request $request)
     {
-        //$this->airlineRepo->pushCriteria(new RequestCriteria($request));
         $airports = $this->airlineRepo
             ->whereOrder(['active' => true], 'name', 'asc')
             ->paginate();

app/Http/Controllers/Api/PirepController.php

@@ -33,10 +33,10 @@
 use App\Services\Finance\PirepFinanceService;
 use App\Services\PirepService;
 use App\Services\UserService;
-use Auth;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
-use Log;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class PirepController
@@ -52,8 +52,6 @@ class PirepController extends Controller
     private $userSvc;
 
     /**
-     * PirepController constructor.
-     *
      * @param AcarsRepository     $acarsRepo
      * @param FareService         $fareSvc
      * @param PirepFinanceService $financeSvc
@@ -159,22 +157,6 @@ protected function updateFares($pirep, Request $request)
         $this->fareSvc->saveForPirep($pirep, $fares);
     }
 
-    /**
-     * Get all the active PIREPs
-     *
-     * @return mixed
-     */
-    public function index()
-    {
-        $pireps = $this->acarsRepo
-            ->getPositions(setting('acars.live_time'))
-            ->filter(function ($pirep) {
-                return $pirep->position !== null;
-            });
-
-        return PirepResource::collection($pireps);
-    }
-
     /**
      * @param $pirep_id
      *

app/Http/Routes/api.php

@@ -4,8 +4,9 @@
  * Public routes
  */
 Route::group([], function () {
-    Route::get('acars', 'AcarsController@index');
-    Route::get('pireps', 'PirepController@index');
+    Route::get('acars', 'AcarsController@live_flights');
+    Route::get('acars/geojson', 'AcarsController@pireps_geojson');
+
     Route::get('pireps/{pirep_id}', 'PirepController@get');
     Route::get('pireps/{pirep_id}/acars/geojson', 'AcarsController@acars_geojson');
 
@@ -15,7 +16,7 @@
 });
 
 /*
- * these need to be authenticated with a user's API key
+ * These need to be authenticated with a user's API key
  */
 Route::group(['middleware' => ['api.auth']], function () {
     Route::get('airlines', 'AirlineController@index');
@@ -35,6 +36,7 @@
     Route::get('flights/{id}', 'FlightController@get');
     Route::get('flights/{id}/route', 'FlightController@route');
 
+    Route::get('pireps', 'UserController@pireps');
     Route::put('pireps/{pirep_id}', 'PirepController@update');
 
     /*

composer.json

@@ -34,7 +34,7 @@
         "league/geotools": "0.8.*",
         "league/iso3166": "2.1.*",
         "markrogoyski/math-php": "^0.38.0",
-        "myclabs/deep-copy": "1.8.*",
+        "myclabs/deep-copy": "~1.9.0",
         "nabeel/vacentral": "~2.0",
         "nwidart/laravel-modules": "~5.1",
         "php-units-of-measure/php-units-of-measure": "~2.1.0",
@@ -60,8 +60,8 @@
         "fzaninotto/faker": "~1.8.0",
         "friendsofphp/php-cs-fixer": "^2.15",
         "mockery/mockery": "0.9.*",
-        "nunomaduro/collision": "^2.0",
-        "phpunit/phpunit": "7.5.*",
+        "nunomaduro/collision": "^3.0",
+        "phpunit/phpunit": "~8.3",
         "squizlabs/php_codesniffer": "3.*"
     },
     "autoload": {