389 API Changes (#393)

* Update PHPUnit to 8

* Fix API endpoints closes #389

* Update pagination method in Repository contract to look at the page number closes #390

* Remove unused imports

* Fix tests in FlightTests

* Typecast page

* Don't register factories

* Remove Factory loading

* Remove unused imports
This commit is contained in:
Nabeel S
2019-09-13 11:21:40 -04:00
committed by GitHub
parent 23eb9dcbda
commit d68d8791bd
21 changed files with 230 additions and 172 deletions

View File

@@ -8,6 +8,7 @@ use App\Http\Requests\Acars\EventRequest;
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\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
/**
* Class AcarsController
*/
class AcarsController extends Controller
{
private $acarsRepo;
@@ -61,6 +59,20 @@ class AcarsController extends Controller
}
}
/**
* 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
*
@@ -68,7 +80,7 @@ class AcarsController extends Controller
*
* @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);

View File

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

View File

@@ -33,10 +33,10 @@ use App\Services\FareService;
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 @@ class PirepController extends Controller
$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
*