073e48c396
* 391 Notification refactorings (#441) * Refactor notifications to allow easier plugins * Notification refactoring * Formatting * Move news to NewsService; cleanup of events * More refactoring; added send email out for news item and the template * Formatting * Formatting * Fix missing newsRepo (#445) * Refactor and add importer to Installer module #443 (#444) * Refactor and add importer to Installer module #443 * Refactor for finances to use in import * Import groups into roles * Formatting * Formatting * Add interface in installer for import * Notes about importing * Check for installer folder * Formatting * Fix pirep->user mapping * Unused import * Formatting * Replace importer with AJAX powered; better error handling #443 (#447) * Replace importer with AJAX powered; better error handling #443 * Formatting * Fix command line importer * Remove bootstrap cache (#448) * Cleanup the bootstrap/cache directory when packaging * Fix removal of bootstrap cache * Formatting * Stricter checks on ACARS API data (#451) * Stricter checks on ACARS API data * More checks * Fix for flight_number check forcing to exist * Allow nullable on flight_id * Avoid proc_open use #455 (#456) * Use PhpExecutableFinder() closes #457 #458 (#460) * Use DateTimeZone instead of int for creating datetime closes #461 * Fix CSV imports giving Storage class not found #454 (#462) * Fix CSV imports giving Storage class not found #454 * Update yarn files for security alert * Add PHP 7.4 support (#464) * Add PHP 7.4 to build matrix * DB fix * YAML parser fix in test data * Show versions * Package updates * Track used ICAOs * 7.4 METAR parsing fix * METAR parser fix * Formatting * Add meters to response units * Call instance for unit conversion * Return value * Catch exception for unknown quantity * Comment fix * Formatting * METAR parsing fixes on PHP 7.4 * Package updates * More random airport ID * More random airport ID * Properly disable toolbar * Semver written out to version file * Use dev as default identifier * Fix BindingResolutionError when debug toolbar isn't present (#465) * Fix BindingResolutionError when debug toolbar isn't present * Formatting * Split the importer module out from the installer module (#468) * Split the importer module out from the installer module * Cleanup of unused imports * Move updater into separate module #453 * Remove unused imports/formatting * Disable the install and importer modules at the end of the setup * Unused imports; update IJ style * test explicit stage for php+mysql * add more to matrix * Add different MariaDB versions * undo * Cleanup Model doc * Pilots cannot use the dashboard or flights without admin rights (#481) * Use auth middleware instead of specific groups for logged in state * Auth check for admin access * Check user admin access for updates * Formatting * Allow nullable field and calculate distance if nulled for flight import #478 (#482) * Check for no roles being attached #480 (#483) * Return the flight fares if there are no subfleet fares #488 (#489) * Return the flight fares if there are no subfleet fares #488 * Formatting * Formatting * Account for units when entering fuel amounts #493 * Search for ICAO not working properly (#496) * /flights and /flights/search direct to the same endpoint * Properly set the distance/planned_distance on save (#497) * 491 Installation Error (#495) * Disable CSRF token * Add error handling around looking up the theme and set a default * Note about logs in issue template * Formatting * Fix GeoService errors when viewing PIREP #498 (#499) * Add new command to export a specific PIREP for debugging (#501) * Set a default model value for airports on PIREP (#500) * Set a default model value for airports on PIREP * Fix airport icao reference * Default airport models * Catch broader exception writing out config files #491 * style * Add reference to docs on doc site (#502) * Properly create/update rows importing #486 (#503) * Add base Dockerfile for Dockerhub builds (#504) * New subfleet not being attached to an airline on import #479 (#505) * Fix subfleet not being attached to an airline on creation in import #479 * Call airline name with optional() around subfleet * Minor cleanup * Search flights by subfleet #484 (#506) * API level search of flights #484 * Add Subfleet to flights page for search * Make the fuel used optional (#512) * Add make to Docker container * Add getRootDomain() to Utils (#514) * Show admin dropdown for admin-access ability (#515) * Show admin dropdown for admin-access ability closes #509 * Formatting * Check user permissions on the routes #508 (#516) * Check user permissions on the routes #508 * Formatting * Return default value on exception for setting() * Correct text for no subfleets #507 (#518) * Add a public_url() helper #513 (#519) * Reduce number of queries for update check (#520) * Try to clear caches before updating (#522) * Try to clear caches before updating * Add clear-compiled to maintenance cache list * Formatting * Set PIREPs page to public (#526) Set PIREPs page to public * Fix live and route map errors #527 (#528) * Add menu bar for mobile (#529) * Format all blade templates to 2 spaces #530 (#531) * Fix PIREP edit endpoint closes #533 (#534) * Fix import during flight cron #532 (#535) * PIREPS resource except for show (#536) * Use optional() around the airport fields (#537) * Use optional() around the airport fields * Add null-coalesce around full_name * Add link to download ACARS config from profile (#539) * Add link to download ACARS config from profile * Formatting * Update xml config file template (#540)
138 lines
3.6 KiB
PHP
138 lines
3.6 KiB
PHP
<?php
|
|
|
|
namespace App\Repositories;
|
|
|
|
use App\Contracts\Repository;
|
|
use App\Models\Flight;
|
|
use App\Repositories\Criteria\WhereCriteria;
|
|
use Illuminate\Http\Request;
|
|
use Prettus\Repository\Contracts\CacheableInterface;
|
|
use Prettus\Repository\Traits\CacheableRepository;
|
|
|
|
/**
|
|
* Class FlightRepository
|
|
*/
|
|
class FlightRepository extends Repository implements CacheableInterface
|
|
{
|
|
use CacheableRepository;
|
|
|
|
protected $fieldSearchable = [
|
|
'arr_airport_id',
|
|
'distance',
|
|
'dpt_airport_id',
|
|
'flight_number' => 'like',
|
|
'route_code' => 'like',
|
|
'route_leg' => 'like',
|
|
'route' => 'like',
|
|
'notes' => 'like',
|
|
];
|
|
|
|
public function model(): string
|
|
{
|
|
return Flight::class;
|
|
}
|
|
|
|
/**
|
|
* Find a flight based on the given criterea
|
|
*
|
|
* @param $airline_id
|
|
* @param $flight_num
|
|
* @param null $route_code
|
|
* @param null $route_leg
|
|
*
|
|
* @return mixed
|
|
*/
|
|
public function findFlight($airline_id, $flight_num, $route_code = null, $route_leg = null)
|
|
{
|
|
$where = [
|
|
'airline_id' => $airline_id,
|
|
'flight_number' => $flight_num,
|
|
'active' => true,
|
|
];
|
|
|
|
if (filled($route_code)) {
|
|
$where['route_code'] = $route_code;
|
|
}
|
|
|
|
if (filled($route_leg)) {
|
|
$where['route_leg'] = $route_leg;
|
|
}
|
|
|
|
return $this->findWhere($where);
|
|
}
|
|
|
|
/**
|
|
* Create the search criteria and return this with the stuff pushed
|
|
*
|
|
* @param Request $request
|
|
* @param bool $only_active
|
|
*
|
|
* @throws \Prettus\Repository\Exceptions\RepositoryException
|
|
*
|
|
* @return $this
|
|
*/
|
|
public function searchCriteria(Request $request, bool $only_active = true): self
|
|
{
|
|
$where = [];
|
|
$relations = [];
|
|
|
|
if ($only_active === true) {
|
|
$where['active'] = $only_active;
|
|
$where['visible'] = $only_active;
|
|
}
|
|
|
|
if ($request->filled('flight_id')) {
|
|
$where['id'] = $request->input('flight_id');
|
|
}
|
|
|
|
if ($request->filled('airline_id')) {
|
|
$where['airline_id'] = $request->input('airline_id');
|
|
}
|
|
|
|
if ($request->filled('flight_number')) {
|
|
$where['flight_number'] = $request->input('flight_number');
|
|
}
|
|
|
|
if ($request->filled('route_code')) {
|
|
$where['route_code'] = $request->input('route_code');
|
|
}
|
|
|
|
if ($request->filled('dpt_airport_id')) {
|
|
$where['dpt_airport_id'] = strtoupper($request->input('dpt_airport_id'));
|
|
}
|
|
|
|
if ($request->filled('dep_icao')) {
|
|
$where['dpt_airport_id'] = strtoupper($request->input('dep_icao'));
|
|
}
|
|
|
|
if ($request->filled('arr_airport_id')) {
|
|
$where['arr_airport_id'] = strtoupper($request->input('arr_airport_id'));
|
|
}
|
|
|
|
if ($request->filled('arr_icao')) {
|
|
$where['arr_airport_id'] = strtoupper($request->input('arr_icao'));
|
|
}
|
|
|
|
// Distance, greater than
|
|
if ($request->filled('dgt')) {
|
|
$where[] = ['distance', '>=', $request->input('dgt')];
|
|
}
|
|
|
|
// Distance, less than
|
|
if ($request->filled('dlt')) {
|
|
$where[] = ['distance', '<=', $request->input('dlt')];
|
|
}
|
|
|
|
// Do a special query for finding the child subfleets
|
|
if ($request->filled('subfleet_id')) {
|
|
$relations['subfleets'] = [
|
|
'subfleets.id' => $request->input('subfleet_id'),
|
|
];
|
|
}
|
|
|
|
$this->pushCriteria(new WhereCriteria($request, $where, $relations));
|
|
|
|
return $this;
|
|
}
|
|
}
|