7.0.0-beta3 Release (#541)

* 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)
2020-02-08 13:29:34 -05:00
parent a335ed8e9b
commit 073e48c396
515 changed files with 13939 additions and 10717 deletions
--- a/app/Http/Controllers/Admin/AircraftController.php
+++ b/app/Http/Controllers/Admin/AircraftController.php
@@ -14,10 +14,10 @@ use App\Repositories\AircraftRepository;
 use App\Repositories\AirportRepository;
 use App\Services\ExportService;
 use App\Services\ImportService;
-use Flash;
 use Illuminate\Http\Request;
-use Log;
-use Storage;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+use Laracasts\Flash\Flash;

 /**
 * Class AircraftController
--- a/app/Http/Controllers/Admin/AirportController.php
+++ b/app/Http/Controllers/Admin/AirportController.php
@@ -13,15 +13,11 @@ use App\Repositories\Criteria\WhereCriteria;
 use App\Services\ExportService;
 use App\Services\ImportService;
 use App\Support\Timezonelist;
-use Flash;
 use Illuminate\Http\Request;
-use Log;
-use Response;
-use Storage;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+use Laracasts\Flash\Flash;

-/**
- * Class AirportController
- */
 class AirportController extends Controller
 {
    private $airportRepo;
@@ -46,7 +42,7 @@ class AirportController extends Controller
     *
     * @throws \Prettus\Repository\Exceptions\RepositoryException
     *
-     * @return Response
+     * @return mixed
     */
    public function index(Request $request)
    {
@@ -68,7 +64,7 @@ class AirportController extends Controller
    /**
     * Show the form for creating a new Airport.
     *
-     * @return Response
+     * @return mixed
     */
    public function create()
    {
@@ -84,7 +80,7 @@ class AirportController extends Controller
     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     *
-     * @return Response
+     * @return mixed
     */
    public function store(CreateAirportRequest $request)
    {
@@ -102,7 +98,7 @@ class AirportController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function show($id)
    {
@@ -123,7 +119,7 @@ class AirportController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function edit($id)
    {
@@ -148,7 +144,7 @@ class AirportController extends Controller
     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     *
-     * @return Response
+     * @return mixed
     */
    public function update($id, UpdateAirportRequest $request)
    {
@@ -173,7 +169,7 @@ class AirportController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function destroy($id)
    {
--- a/app/Http/Controllers/Admin/AwardController.php
+++ b/app/Http/Controllers/Admin/AwardController.php
@@ -7,10 +7,9 @@ use App\Http\Requests\CreateAwardRequest;
 use App\Http\Requests\UpdateAwardRequest;
 use App\Repositories\AwardRepository;
 use App\Services\AwardService;
-use Flash;
 use Illuminate\Http\Request;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;

 class AwardController extends Controller
 {
@@ -62,7 +61,7 @@ class AwardController extends Controller
     *
     * @throws \Prettus\Repository\Exceptions\RepositoryException
     *
-     * @return Response
+     * @return mixed
     */
    public function index(Request $request)
    {
@@ -76,8 +75,6 @@ class AwardController extends Controller

    /**
     * Show the form for creating a new Fare.
-     *
-     * @return Response
     */
    public function create()
    {
@@ -96,7 +93,7 @@ class AwardController extends Controller
     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     *
-     * @return Response
+     * @return mixed
     */
    public function store(CreateAwardRequest $request)
    {
@@ -112,7 +109,7 @@ class AwardController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function show($id)
    {
@@ -133,7 +130,7 @@ class AwardController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function edit($id)
    {
@@ -161,7 +158,7 @@ class AwardController extends Controller
     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     *
-     * @return Response
+     * @return mixed
     */
    public function update($id, UpdateAwardRequest $request)
    {
@@ -183,7 +180,7 @@ class AwardController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function destroy($id)
    {
--- a/app/Http/Controllers/Admin/DashboardController.php
+++ b/app/Http/Controllers/Admin/DashboardController.php
@@ -7,6 +7,8 @@ use App\Repositories\KvpRepository;
 use App\Repositories\NewsRepository;
 use App\Repositories\PirepRepository;
 use App\Repositories\UserRepository;
+use App\Services\CronService;
+use App\Services\NewsService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
@@ -14,27 +16,35 @@ use Laracasts\Flash\Flash;

 class DashboardController extends Controller
 {
+    private $cronSvc;
    private $kvpRepo;
    private $newsRepo;
+    private $newsSvc;
    private $pirepRepo;
    private $userRepo;

    /**
     * DashboardController constructor.
     *
+     * @param CronService     $cronSvc
     * @param KvpRepository   $kvpRepo
     * @param NewsRepository  $newsRepo
+     * @param NewsService     $newsSvc
     * @param PirepRepository $pirepRepo
     * @param UserRepository  $userRepo
     */
    public function __construct(
+        CronService $cronSvc,
        KvpRepository $kvpRepo,
        NewsRepository $newsRepo,
+        NewsService $newsSvc,
        PirepRepository $pirepRepo,
        UserRepository $userRepo
    ) {
+        $this->cronSvc = $cronSvc;
        $this->kvpRepo = $kvpRepo;
        $this->newsRepo = $newsRepo;
+        $this->newsSvc = $newsSvc;
        $this->pirepRepo = $pirepRepo;
        $this->userRepo = $userRepo;
    }
@@ -74,9 +84,10 @@ class DashboardController extends Controller
        $this->checkNewVersion();

        return view('admin.dashboard.index', [
-            'news'           => $this->newsRepo->getLatest(),
-            'pending_pireps' => $this->pirepRepo->getPendingCount(),
-            'pending_users'  => $this->userRepo->getPendingCount(),
+            'news'                => $this->newsRepo->getLatest(),
+            'pending_pireps'      => $this->pirepRepo->getPendingCount(),
+            'pending_users'       => $this->userRepo->getPendingCount(),
+            'cron_problem_exists' => $this->cronSvc->cronProblemExists(),
        ]);
    }

@@ -93,10 +104,10 @@ class DashboardController extends Controller
            $attrs = $request->post();
            $attrs['user_id'] = Auth::user()->id;

-            $this->newsRepo->create($attrs);
+            $this->newsSvc->addNews($attrs);
        } elseif ($request->isMethod('delete')) {
-            $news_id = $request->input('news_id');
-            $this->newsRepo->delete($news_id);
+            $id = $request->input('news_id');
+            $this->newsSvc->deleteNews($id);
        }

        return view('admin.dashboard.news', [
--- a/app/Http/Controllers/Admin/ExpenseController.php
+++ b/app/Http/Controllers/Admin/ExpenseController.php
@@ -10,16 +10,12 @@ use App\Repositories\AirlineRepository;
 use App\Repositories\ExpenseRepository;
 use App\Services\ExportService;
 use App\Services\ImportService;
-use Flash;
 use Illuminate\Http\Request;
-use Log;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;
-use Storage;

-/**
- * Class ExpenseController
- */
 class ExpenseController extends Controller
 {
    private $airlineRepo;
@@ -122,7 +118,7 @@ class ExpenseController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function edit($id)
    {
@@ -149,7 +145,7 @@ class ExpenseController extends Controller
     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     *
-     * @return Response
+     * @return mixed
     */
    public function update($id, Request $request)
    {
@@ -173,7 +169,7 @@ class ExpenseController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function destroy($id)
    {
--- a/app/Http/Controllers/Admin/FareController.php
+++ b/app/Http/Controllers/Admin/FareController.php
@@ -9,16 +9,12 @@ use App\Http\Requests\UpdateFareRequest;
 use App\Repositories\FareRepository;
 use App\Services\ExportService;
 use App\Services\ImportService;
-use Flash;
 use Illuminate\Http\Request;
-use Log;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;
-use Storage;

-/**
- * Class FareController
- */
 class FareController extends Controller
 {
    private $fareRepo;
@@ -45,7 +41,7 @@ class FareController extends Controller
     *
     * @throws \Prettus\Repository\Exceptions\RepositoryException
     *
-     * @return Response
+     * @return mixed
     */
    public function index(Request $request)
    {
@@ -58,8 +54,6 @@ class FareController extends Controller

    /**
     * Show the form for creating a new Fare.
-     *
-     * @return Response
     */
    public function create()
    {
@@ -73,7 +67,7 @@ class FareController extends Controller
     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     *
-     * @return Response
+     * @return mixed
     */
    public function store(CreateFareRequest $request)
    {
@@ -89,7 +83,7 @@ class FareController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function show($id)
    {
@@ -107,7 +101,7 @@ class FareController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function edit($id)
    {
@@ -128,7 +122,7 @@ class FareController extends Controller
     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     *
-     * @return Response
+     * @return mixed
     */
    public function update($id, UpdateFareRequest $request)
    {
@@ -149,7 +143,7 @@ class FareController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function destroy($id)
    {
--- a/app/Http/Controllers/Admin/FileController.php
+++ b/app/Http/Controllers/Admin/FileController.php
@@ -8,12 +8,8 @@ use App\Services\FileService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Rule;
 use Laracasts\Flash\Flash;

-/**
- * Class FileController
- */
 class FileController extends Controller
 {
    private $fileSvc;
--- a/app/Http/Controllers/Admin/FinanceController.php
+++ b/app/Http/Controllers/Admin/FinanceController.php
@@ -10,9 +10,6 @@ use App\Services\FinanceService;
 use App\Support\Dates;
 use Illuminate\Http\Request;

-/**
- * Class FinanceController
- */
 class FinanceController extends Controller
 {
    private $airlineRepo;
@@ -43,25 +40,14 @@ class FinanceController extends Controller
    public function index(Request $request)
    {
        $month = $request->query('month', date('Y-m'));
-        $between = Dates::getMonthBoundary($month);
+        $transaction_groups = $this->financeSvc->getAllAirlineTransactionsBetween($month);

-        $first_journal = Journal::where(['type' => JournalType::AIRLINE])
+        $first_journal = Journal::select(['created_at'])
+            ->where(['type' => JournalType::AIRLINE])
            ->orderBy('created_at', 'asc')
            ->limit(1)
            ->first();

-        $transaction_groups = [];
-        $airlines = $this->airlineRepo->orderBy('icao')->all();
-
-        // group by the airline
-        foreach ($airlines as $airline) {
-            $transaction_groups[] = $this->financeSvc->getAirlineTransactionsBetween(
-                $airline,
-                $between[0],
-                $between[1]
-            );
-        }
-
        return view('admin.finances.index', [
            'current_month'      => $month,
            'months_list'        => Dates::getMonthsList($first_journal->created_at),
--- a/app/Http/Controllers/Admin/FlightController.php
+++ b/app/Http/Controllers/Admin/FlightController.php
@@ -23,6 +23,7 @@ use App\Services\ImportService;
 use App\Support\Units\Time;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
 use Laracasts\Flash\Flash;

 /**
--- a/app/Http/Controllers/Admin/FlightFieldController.php
+++ b/app/Http/Controllers/Admin/FlightFieldController.php
@@ -4,14 +4,10 @@ namespace App\Http\Controllers\Admin;

 use App\Contracts\Controller;
 use App\Repositories\FlightFieldRepository;
-use Flash;
 use Illuminate\Http\Request;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;

-/**
- * Class FlightFieldController
- */
 class FlightFieldController extends Controller
 {
    private $flightFieldRepo;
@@ -34,7 +30,7 @@ class FlightFieldController extends Controller
     *
     * @throws \Prettus\Repository\Exceptions\RepositoryException
     *
-     * @return Response
+     * @return mixed
     */
    public function index(Request $request)
    {
@@ -48,8 +44,6 @@ class FlightFieldController extends Controller

    /**
     * Show the form for creating a new FlightField.
-     *
-     * @return Response
     */
    public function create()
    {
@@ -63,7 +57,7 @@ class FlightFieldController extends Controller
     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     *
-     * @return Response
+     * @return mixed
     */
    public function store(Request $request)
    {
@@ -81,7 +75,7 @@ class FlightFieldController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function show($id)
    {
@@ -102,7 +96,7 @@ class FlightFieldController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function edit($id)
    {
@@ -126,7 +120,7 @@ class FlightFieldController extends Controller
     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return mixed
     */
    public function update($id, Request $request)
    {
@@ -150,7 +144,7 @@ class FlightFieldController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function destroy($id)
    {
--- a/app/Http/Controllers/Admin/MaintenanceController.php
+++ b/app/Http/Controllers/Admin/MaintenanceController.php
@@ -19,15 +19,8 @@ class MaintenanceController extends Controller

    public function index()
    {
-        // Generate the cron path. Replace php-fpm with just php
-        $cron_path = [
-            '* * * * *',
-            $this->cronSvc->getCronPath(),
-            '>> /dev/null 2>&1',
-        ];
-
        return view('admin.maintenance.index', [
-            'cron_path'           => implode(' ', $cron_path),
+            'cron_path'           => $this->cronSvc->getCronExecString(),
            'cron_problem_exists' => $this->cronSvc->cronProblemExists(),
        ]);
    }
@@ -49,6 +42,7 @@ class MaintenanceController extends Controller
            $calls[] = 'config:cache';
            $calls[] = 'cache:clear';
            $calls[] = 'route:cache';
+            $calls[] = 'clear-compiled';
        }

        // If we want to clear only the views but keep everything else
--- a/app/Http/Controllers/Admin/PirepController.php
+++ b/app/Http/Controllers/Admin/PirepController.php
@@ -21,16 +21,12 @@ use App\Services\FareService;
 use App\Services\PirepService;
 use App\Services\UserService;
 use App\Support\Units\Time;
-use Flash;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Log;
+use Illuminate\Support\Facades\Log;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;

-/**
- * Class PirepController
- */
 class PirepController extends Controller
 {
    private $airportRepo;
@@ -170,7 +166,7 @@ class PirepController extends Controller
     *
     * @param Request $request
     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return mixed
     */
    public function fares(Request $request)
    {
@@ -192,7 +188,7 @@ class PirepController extends Controller
     *
     * @throws \Prettus\Repository\Exceptions\RepositoryException
     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return mixed
     */
    public function index(Request $request)
    {
@@ -218,7 +214,7 @@ class PirepController extends Controller
     *
     * @throws \Prettus\Repository\Exceptions\RepositoryException
     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return mixed
     */
    public function pending(Request $request)
    {
@@ -238,7 +234,7 @@ class PirepController extends Controller
    /**
     * Show the form for creating a new Pirep.
     *
-     * @return Response
+     * @return mixed
     */
    public function create()
    {
@@ -279,7 +275,7 @@ class PirepController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function show($id)
    {
@@ -302,7 +298,7 @@ class PirepController extends Controller
     *
     * @throws \InvalidArgumentException
     *
-     * @return Response
+     * @return mixed
     */
    public function edit($id)
    {
@@ -388,7 +384,7 @@ class PirepController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function destroy($id)
    {
--- a/app/Http/Controllers/Admin/PirepFieldController.php
+++ b/app/Http/Controllers/Admin/PirepFieldController.php
@@ -6,14 +6,10 @@ use App\Contracts\Controller;
 use App\Http\Requests\CreatePirepFieldRequest;
 use App\Http\Requests\UpdatePirepFieldRequest;
 use App\Repositories\PirepFieldRepository;
-use Flash;
 use Illuminate\Http\Request;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;

-/**
- * Class PirepFieldController
- */
 class PirepFieldController extends Controller
 {
    private $pirepFieldRepo;
@@ -36,7 +32,7 @@ class PirepFieldController extends Controller
     *
     * @throws \Prettus\Repository\Exceptions\RepositoryException
     *
-     * @return Response
+     * @return mixed
     */
    public function index(Request $request)
    {
@@ -51,7 +47,7 @@ class PirepFieldController extends Controller
    /**
     * Show the form for creating a new PirepField.
     *
-     * @return Response
+     * @return mixed
     */
    public function create()
    {
@@ -65,7 +61,7 @@ class PirepFieldController extends Controller
     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     *
-     * @return Response
+     * @return mixed
     */
    public function store(CreatePirepFieldRequest $request)
    {
@@ -85,7 +81,7 @@ class PirepFieldController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function show($id)
    {
@@ -107,7 +103,7 @@ class PirepFieldController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function edit($id)
    {
@@ -158,7 +154,7 @@ class PirepFieldController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function destroy($id)
    {
--- a/app/Http/Controllers/Admin/RankController.php
+++ b/app/Http/Controllers/Admin/RankController.php
@@ -9,14 +9,10 @@ use App\Repositories\RankRepository;
 use App\Repositories\SubfleetRepository;
 use App\Services\FleetService;
 use Cache;
-use Flash;
 use Illuminate\Http\Request;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;

-/**
- * Class RankController
- */
 class RankController extends Controller
 {
    private $fleetSvc;
@@ -67,7 +63,7 @@ class RankController extends Controller
     *
     * @throws \Prettus\Repository\Exceptions\RepositoryException
     *
-     * @return Response
+     * @return mixed
     */
    public function index(Request $request)
    {
@@ -82,7 +78,7 @@ class RankController extends Controller
    /**
     * Show the form for creating a new Ranking.
     *
-     * @return Response
+     * @return mixed
     */
    public function create()
    {
@@ -96,7 +92,7 @@ class RankController extends Controller
     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     *
-     * @return Response
+     * @return mixed
     */
    public function store(CreateRankRequest $request)
    {
@@ -115,7 +111,7 @@ class RankController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function show($id)
    {
@@ -137,7 +133,7 @@ class RankController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function edit($id)
    {
@@ -165,7 +161,7 @@ class RankController extends Controller
     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     *
-     * @return Response
+     * @return mixed
     */
    public function update($id, UpdateRankRequest $request)
    {
@@ -190,7 +186,7 @@ class RankController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function destroy($id)
    {
--- a/app/Http/Controllers/Admin/RolesController.php
+++ b/app/Http/Controllers/Admin/RolesController.php
@@ -7,29 +7,33 @@ use App\Http\Requests\CreateRoleRequest;
 use App\Http\Requests\UpdateRoleRequest;
 use App\Repositories\PermissionsRepository;
 use App\Repositories\RoleRepository;
-use Flash;
+use App\Services\RoleService;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;

-/**
- * Class AirlinesController
- */
 class RolesController extends Controller
 {
    private $permsRepo;
    private $rolesRepo;
+    private $roleSvc;

    /**
     * AirlinesController constructor.
     *
     * @param PermissionsRepository $permsRepo
     * @param RoleRepository        $rolesRepo
+     * @param                       $roleSvc
     */
-    public function __construct(PermissionsRepository $permsRepo, RoleRepository $rolesRepo)
-    {
+    public function __construct(
+        PermissionsRepository $permsRepo,
+        RoleRepository $rolesRepo,
+        RoleService $roleSvc
+    ) {
        $this->permsRepo = $permsRepo;
        $this->rolesRepo = $rolesRepo;
+        $this->roleSvc = $roleSvc;
    }

    /**
@@ -132,8 +136,6 @@ class RolesController extends Controller
     * @param int               $id
     * @param UpdateRoleRequest $request
     *
-     * @throws \Prettus\Validator\Exceptions\ValidatorException
-     *
     * @return Response
     */
    public function update($id, UpdateRoleRequest $request)
@@ -145,14 +147,8 @@ class RolesController extends Controller
            return redirect(route('admin.roles.index'));
        }

-        $this->rolesRepo->update($request->all(), $id);
-
-        // Update the permissions, filter out null/invalid values
-        $perms = collect($request->permissions)->filter(static function ($v, $k) {
-            return $v;
-        });
-
-        $role->permissions()->sync($perms);
+        $this->roleSvc->updateRole($role, $request->all());
+        $this->roleSvc->setPermissionsForRole($role, $request->permissions);

        Flash::success('Roles updated successfully.');
        return redirect(route('admin.roles.index'));
--- a/app/Http/Controllers/Admin/SettingsController.php
+++ b/app/Http/Controllers/Admin/SettingsController.php
@@ -8,9 +8,6 @@ use Igaster\LaravelTheme\Facades\Theme;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;

-/**
- * Class SettingsController
- */
 class SettingsController extends Controller
 {
    /**
--- a/app/Http/Controllers/Admin/SubfleetController.php
+++ b/app/Http/Controllers/Admin/SubfleetController.php
@@ -18,16 +18,12 @@ use App\Services\ExportService;
 use App\Services\FareService;
 use App\Services\FleetService;
 use App\Services\ImportService;
-use Flash;
 use Illuminate\Http\Request;
-use Log;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;
-use Storage;

-/**
- * Class SubfleetController
- */
 class SubfleetController extends Controller
 {
    private $aircraftRepo;
@@ -115,7 +111,7 @@ class SubfleetController extends Controller
     *
     * @throws \Prettus\Repository\Exceptions\RepositoryException
     *
-     * @return Response
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     */
    public function index(Request $request)
    {
@@ -129,8 +125,6 @@ class SubfleetController extends Controller

    /**
     * Show the form for creating a new Subfleet.
-     *
-     * @return Response
     */
    public function create()
    {
@@ -147,7 +141,7 @@ class SubfleetController extends Controller
     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     *
-     * @return Response
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
     */
    public function store(CreateSubfleetRequest $request)
    {
@@ -163,7 +157,7 @@ class SubfleetController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function show($id)
    {
@@ -186,7 +180,7 @@ class SubfleetController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function edit($id)
    {
@@ -217,7 +211,7 @@ class SubfleetController extends Controller
     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     *
-     * @return Response
+     * @return mixed
     */
    public function update($id, UpdateSubfleetRequest $request)
    {
@@ -239,7 +233,7 @@ class SubfleetController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function destroy($id)
    {
@@ -269,8 +263,6 @@ class SubfleetController extends Controller
     *
     * @param Request $request
     *
-     * @throws \League\Csv\CannotInsertRecord
-     *
     * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
     */
    public function export(Request $request)
@@ -291,7 +283,7 @@ class SubfleetController extends Controller
     *
     * @throws \Illuminate\Validation\ValidationException
     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return mixed
     */
    public function import(Request $request)
    {
@@ -322,7 +314,7 @@ class SubfleetController extends Controller
    /**
     * @param Subfleet $subfleet
     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return mixed
     */
    protected function return_ranks_view(?Subfleet $subfleet)
    {
@@ -338,7 +330,7 @@ class SubfleetController extends Controller
    /**
     * @param Subfleet $subfleet
     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return mixed
     */
    protected function return_fares_view(?Subfleet $subfleet)
    {
@@ -357,7 +349,7 @@ class SubfleetController extends Controller
     * @param         $id
     * @param Request $request
     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return mixed
     */
    public function ranks($id, Request $request)
    {
@@ -396,7 +388,7 @@ class SubfleetController extends Controller
    /**
     * @param Subfleet $subfleet
     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return mixed
     */
    protected function return_expenses_view(?Subfleet $subfleet)
    {
@@ -414,7 +406,7 @@ class SubfleetController extends Controller
     *
     * @throws \Exception
     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return mixed
     */
    public function expenses($id, Request $request)
    {
@@ -454,7 +446,7 @@ class SubfleetController extends Controller
     * @param         $id
     * @param Request $request
     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return mixed
     */
    public function fares($id, Request $request)
    {
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -15,17 +15,13 @@ use App\Repositories\PirepRepository;
 use App\Repositories\UserRepository;
 use App\Services\UserService;
 use App\Support\Timezonelist;
-use DB;
-use Flash;
-use Hash;
 use Illuminate\Http\Request;
-use Log;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Log;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Exceptions\RepositoryException;
-use Response;

-/**
- * Class UserController
- */
 class UserController extends Controller
 {
    private $airlineRepo;
@@ -80,7 +76,7 @@ class UserController extends Controller
    /**
     * Show the form for creating a new User.
     *
-     * @return Response
+     * @return mixed
     */
    public function create()
    {
@@ -106,7 +102,7 @@ class UserController extends Controller
     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     *
-     * @return Response
+     * @return mixed
     */
    public function store(CreateUserRequest $request)
    {
@@ -122,7 +118,7 @@ class UserController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function show($id)
    {
@@ -158,7 +154,7 @@ class UserController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function edit($id)
    {
@@ -202,7 +198,7 @@ class UserController extends Controller
     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     *
-     * @return Response
+     * @return mixed
     */
    public function update($id, UpdateUserRequest $request)
    {
@@ -247,9 +243,11 @@ class UserController extends Controller
        }

        // Delete all of the roles and then re-attach the valid ones
-        DB::table('role_user')->where('user_id', $id)->delete();
-        foreach ($request->input('roles') as $key => $value) {
-            $user->attachRole($value);
+        if (!empty($request->input('roles'))) {
+            DB::table('role_user')->where('user_id', $id)->delete();
+            foreach ($request->input('roles') as $key => $value) {
+                $user->attachRole($value);
+            }
        }

        Flash::success('User updated successfully.');
@@ -262,7 +260,7 @@ class UserController extends Controller
     *
     * @param int $id
     *
-     * @return Response
+     * @return mixed
     */
    public function destroy($id)
    {