Flight history #807

2020-09-08 09:29:46 -04:00
295 changed files with 7533 additions and 34185 deletions
@@ -1,10 +1,6 @@
 #
 root = true

-[*]
-end_of_line = lf
-insert_final_newline = true
-
 [*.js]
 indent_style = space
 indent_size = 2
@@ -27,4 +23,4 @@ indent_style = tab
 # Matches the exact files either package.json or .travis.yml
 [{package.json, .travis.yml}]
 indent_style = space
-indent_size = 2
+indent_size = 2
@@ -28,8 +28,6 @@ services:
 install:
  - php --version
  - mysql --version
-  # Downgrade composer version to 1.x
-  - composer self-update --1
  - composer install --dev --no-interaction --verbose
  - npm i tar-to-zip -g
  - cp .travis/env.travis.php env.php
@@ -1,15 +1,18 @@
-# phpVMS <sup>7</sup>
+# phpvms <sup>7</sup>

 [![Build Status](https://travis-ci.org/nabeelio/phpvms.svg)](https://travis-ci.org/nabeelio/phpvms) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d668bebb0a3c46bda381af16ce3d9450)](https://www.codacy.com/app/nabeelio/phpvms?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nabeelio/phpvms&amp;utm_campaign=Badge_Grade) [![Latest Stable Version](https://poser.pugx.org/nabeel/phpvms/v/stable)](https://packagist.org/packages/nabeel/phpvms) ![StyleCI](https://github.styleci.io/repos/93688482/shield?branch=dev) [![License](https://poser.pugx.org/nabeel/phpvms/license)](https://packagist.org/packages/nabeel/phpvms)

-The next phpvms version built on the laravel framework. work in progress. The latest documentation, with installation instructions is available [on the phpVMS documentation](https://docs.phpvms.net/) page.
+The next phpvms version built on the laravel framework. work in progress. The latest documentation, with installation instructions is available 
+                                                                          [on the phpVMS documentation](http://docs.phpvms.net/) page.

-## Installation
+# installation

 A full distribution, with all of the composer dependencies, is available at this 
 [GitHub Releases](https://github.com/nabeelio/phpvms/releases) link. 

-### Requirements
+
+
+## Requirements

 - PHP 7.3+, extensions:
  - cURL
@@ -21,16 +24,16 @@ A full distribution, with all of the composer dependencies, is available at this
 - Database:
  - MySQL 5.5+ (or MySQL variant, including MariaDB and Percona)

-[View more details on requirements](https://docs.phpvms.net/requirements)
+[View more details on requirements](http://docs.phpvms.net/setup/requirements)

-### Installer
+## Installer

 1. Upload to your server
 1. Visit the site, and follow the link to the installer

-[View installation details](https://docs.phpvms.net/installation/installation)
+[View installation details](http://docs.phpvms.net/setup/installation)

-## Development Environment
+# development environment

 A full development environment can be brought up using Docker:

@@ -47,7 +50,7 @@ Then go to `http://localhost`. If you're using dnsmasq, the `app` container is l
 127.0.0.1   phpvms.test
 ```

-### Building JS/CSS assets
+## Building JS/CSS assets

 Yarn is required, run:

@@ -92,9 +92,8 @@ class CreateDatabase extends Command
        }

        if ($this->option('reset') === true) {
-            if (file_exists($dbPath)) {
-                unlink(config($dbkey.'database'));
-            }
+            $cmd = ['rm', '-rf', config($dbkey.'database')];
+            $this->runCommand($cmd);
        }

        if (!file_exists($dbPath)) {
@@ -3,7 +3,7 @@
 namespace App\Console\Commands;

 use App\Contracts\Command;
-use Illuminate\Support\Facades\DB;
+use DB;
 use Symfony\Component\Yaml\Yaml;

 /**
@@ -25,20 +25,6 @@ class YamlExport extends Command
            exit();
        }

-        // A "preset" for exporting the base set of data
-        if ($tables[0] === 'base') {
-            $tables = [
-                'airlines',
-                'aircraft',
-                'subfleets',
-                'subfleet_fare',
-                'subfleet_rank',
-                'bids',
-                'fares',
-                'flights',
-            ];
-        }
-
        $export_tables = [];
        foreach ($tables as $table) {
            $export_tables[$table] = [];
@@ -36,10 +36,7 @@ abstract class Award
     * You don't really need to mess with anything below here
     */

-    /** @var \App\Models\Award|null */
    protected $award;
-
-    /** @var \App\Models\User|null */
    protected $user;

    public function __construct(AwardModel $award = null, User $user = null)
@@ -3,9 +3,9 @@
 namespace App\Contracts;

 use App\Models\Airline;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
+use Log;
+use Validator;

 /**
 * Common functionality used across all of the importers
@@ -51,9 +51,9 @@ class ImportExport
     *
     * @param $code
     *
-     * @return Airline
+     * @return \Illuminate\Database\Eloquent\Model
     */
-    public function getAirline($code): Airline
+    public function getAirline($code)
    {
        $airline = Airline::firstOrCreate([
            'icao' => $code,
@@ -3,11 +3,8 @@
 namespace App\Contracts;

 use App\Support\Database;
-use Exception;
-use Illuminate\Support\Facades\DB;
+use DB;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\ValidationException;

 /**
 * Class Migration
@@ -28,29 +25,6 @@ abstract class Migration extends \Illuminate\Database\Migrations\Migration
    {
    }

-    /**
-     * Add a module and enable it
-     *
-     * @param array $attrs
-     */
-    public function addModule(array $attrs)
-    {
-        $module = array_merge([
-            'enabled'    => true,
-            'created_at' => DB::raw('NOW()'),
-            'updated_at' => DB::raw('NOW()'),
-        ], $attrs);
-
-        try {
-            DB::table('modules')->insert($module);
-        } catch (Exception $e) {
-            // setting already exists, just ignore it
-            if ($e->getCode() === 23000) {
-                return;
-            }
-        }
-    }
-
    /**
     * Seed a YAML file into the database
     *
@@ -61,7 +35,7 @@ abstract class Migration extends \Illuminate\Database\Migrations\Migration
        try {
            $path = base_path($file);
            Database::seed_from_yaml_file($path, false);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
            Log::error('Unable to load '.$file.' file');
            Log::error($e);
        }
@@ -78,7 +52,7 @@ abstract class Migration extends \Illuminate\Database\Migrations\Migration
        foreach ($rows as $row) {
            try {
                DB::table($table)->insert($row);
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                // setting already exists, just ignore it
                if ($e->getCode() === 23000) {
                    continue;
@@ -86,22 +60,4 @@ abstract class Migration extends \Illuminate\Database\Migrations\Migration
            }
        }
    }
-
-    /**
-     * Add an award from the migrations (for example, if you're adding an award module)
-     *
-     * @param array $award See \App\Models\Awardv
-     *
-     * @throws \Illuminate\Validation\ValidationException
-     */
-    public function addAward(array $award)
-    {
-        $validator = Validator::make($award, \App\Models\Award::$rules);
-        if ($validator->fails()) {
-            throw new ValidationException($validator);
-        }
-
-        $awardModel = new \App\Models\Award($award);
-        $awardModel->save();
-    }
 }
@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Contracts\Modules;
-
-/**
- * Base class for module service providers
- * Add-on module service providers must extend this class. Docs on Service Providers:
- * https://laravel.com/docs/7.x/providers
- *
- * For a sample service provider, view the sample module one:
- * https://github.com/nabeelio/phpvms-module/blob/master/Providers/SampleServiceProvider.php
- */
-abstract class ServiceProvider extends \Illuminate\Support\ServiceProvider
-{
-    /**
-     * A boot method is required, even if it doesn't do anything.
-     * https://laravel.com/docs/7.x/providers#the-boot-method
-     *
-     * This is normally where you'd register the routes or other startup tasks for your module
-     */
-    public function boot(): void
-    {
-    }
-
-    /**
-     * This is required to register the links in either the public or admin toolbar
-     * For example, adding a frontend link:
-     *
-     * $this->moduleSvc->addFrontendLink('Sample', '/sample', '', $logged_in=true);
-     *
-     * Or an admin link:
-     *
-     * $this->moduleSvc->addAdminLink('Sample', '/admin/sample');
-     */
-    public function registerLinks(): void
-    {
-    }
-
-    /**
-     * Deferred providers:
-     * https://laravel.com/docs/7.x/providers#deferred-providers
-     *
-     * @return array
-     */
-    public function provides(): array
-    {
-        return [];
-    }
-}
@@ -6,7 +6,8 @@ use Illuminate\Validation\Validator;
 use Prettus\Repository\Eloquent\BaseRepository;

 /**
- * @mixin \Prettus\Repository\Eloquent\BaseRepository
+ * @mixin Model
+ * @mixin BaseRepository
 */
 abstract class Repository extends BaseRepository
 {
@@ -5,6 +5,11 @@ use Illuminate\Database\Schema\Blueprint;

 class RolesPermissionsTables extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        // Create table for storing roles
@@ -74,6 +79,11 @@ class RolesPermissionsTables extends Migration
        $this->addData('roles', $roles);
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('permission_user');
@@ -6,6 +6,11 @@ use Illuminate\Support\Facades\Schema;

 class CreatePasswordResetsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::create('password_resets', function (Blueprint $table) {
@@ -15,6 +20,11 @@ class CreatePasswordResetsTable extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('password_resets');
@@ -6,6 +6,11 @@ use Illuminate\Support\Facades\Schema;

 class CreateSessionsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::create('sessions', function (Blueprint $table) {
@@ -18,6 +23,11 @@ class CreateSessionsTable extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('sessions');
@@ -5,6 +5,11 @@ use Illuminate\Database\Schema\Blueprint;

 class CreateAirlinesTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::create('airlines', function (Blueprint $table) {
@@ -27,6 +32,11 @@ class CreateAirlinesTable extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('airlines');
@@ -5,6 +5,11 @@ use Illuminate\Database\Schema\Blueprint;

 class CreateFaresTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::create('fares', function (Blueprint $table) {
@@ -20,6 +25,11 @@ class CreateFaresTable extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('fares');
@@ -7,6 +7,11 @@ use Illuminate\Database\Schema\Blueprint;

 class CreateFlightTables extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::create('flights', function (Blueprint $table) {
@@ -5,6 +5,11 @@ use Illuminate\Database\Schema\Blueprint;

 class CreateRanksTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::create('ranks', function (Blueprint $table) {
@@ -25,6 +30,11 @@ class CreateRanksTable extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('ranks');
@@ -3,6 +3,9 @@
 use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;

+/**
+ * Class CreateSubfleetTables
+ */
 class CreateSubfleetTables extends Migration
 {
    public function up()
@@ -45,6 +48,11 @@ class CreateSubfleetTables extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('subfleets');
@@ -7,6 +7,11 @@ use Illuminate\Support\Facades\Schema;

 class CreateBidsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::create('bids', function (Blueprint $table) {
@@ -20,6 +25,11 @@ class CreateBidsTable extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('bids');
@@ -6,6 +6,11 @@ use Illuminate\Support\Facades\Schema;

 class CreateJobsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::create('jobs', function (Blueprint $table) {
@@ -19,6 +24,11 @@ class CreateJobsTable extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('jobs');
@@ -6,6 +6,11 @@ use Illuminate\Support\Facades\Schema;

 class CreateFailedJobsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::create('failed_jobs', function (Blueprint $table) {
@@ -18,6 +23,11 @@ class CreateFailedJobsTable extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('failed_jobs');
@@ -6,6 +6,11 @@ use Illuminate\Support\Facades\Schema;

 class CreateNavdataTables extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        /*
@@ -26,6 +31,11 @@ class CreateNavdataTables extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('navdata');
@@ -7,6 +7,11 @@ use Illuminate\Support\Facades\Schema;

 class CreateAcarsTables extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::create('acars', function (Blueprint $table) {
@@ -39,6 +44,11 @@ class CreateAcarsTables extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('acars');
@@ -6,6 +6,11 @@ use Illuminate\Support\Facades\Schema;

 class CreateStatsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::create('stats', function (Blueprint $table) {
@@ -20,6 +25,11 @@ class CreateStatsTable extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('stats');
@@ -17,6 +17,11 @@ class CreateNewsTable extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::drop('news');
@@ -3,10 +3,14 @@
 use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Modules\Awards\Awards\PilotFlightAwards;

 class CreateAwardsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::create('awards', function (Blueprint $table) {
@@ -19,6 +23,7 @@ class CreateAwardsTable extends Migration
            // EG, the airports has an internal expense for gate costs
            $table->string('ref_model')->nullable();
            $table->text('ref_model_params')->nullable();
+            //$table->string('ref_model_id', 36)->nullable();

            $table->timestamps();

@@ -33,20 +38,13 @@ class CreateAwardsTable extends Migration

            $table->index(['user_id', 'award_id']);
        });
-
-        /**
-         * Add a default, sample award
-         */
-        $award = [
-            'name'             => 'Pilot 50 flights',
-            'description'      => 'When a pilot has 50 flights, give this award',
-            'ref_model'        => PilotFlightAwards::class,
-            'ref_model_params' => 50,
-        ];
-
-        $this->addAward($award);
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('awards');
@@ -6,6 +6,11 @@ use Illuminate\Support\Facades\Schema;

 class CreateJournalTransactionsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::create('journal_transactions', function (Blueprint $table) {
@@ -29,6 +34,11 @@ class CreateJournalTransactionsTable extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('journal_transactions');
@@ -6,6 +6,11 @@ use Illuminate\Support\Facades\Schema;

 class CreateJournalsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::create('journals', function (Blueprint $table) {
@@ -19,6 +24,11 @@ class CreateJournalsTable extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('journals');
@@ -1,7 +1,6 @@
 <?php

 use App\Contracts\Migration;
-use App\Contracts\Model;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

@@ -15,7 +14,7 @@ class CreateFilesTable extends Migration
    public function up()
    {
        Schema::create('files', function (Blueprint $table) {
-            $table->string('id', Model::ID_MAX_LENGTH);
+            $table->string('id', \App\Contracts\Model::ID_MAX_LENGTH);
            $table->string('name');
            $table->string('description')->nullable();
            $table->string('disk')->nullable();
@@ -1,12 +1,17 @@
 <?php

-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;

 class AddReadonlyToRoles extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up(): void
    {
        Schema::table('roles', static function (Blueprint $table) {
@@ -19,6 +24,11 @@ class AddReadonlyToRoles extends Migration
            ->update(['read_only' => true]);
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down(): void
    {
        Schema::table('roles', static function (Blueprint $table) {
@@ -1,19 +1,21 @@
 <?php

-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;

-/**
- * Kinda of gross operations to change the pilot ID column
- * 1. Add an `pilot_id` column, which will get populated with the current ID
- * 2. Drop the `id` column, and then recreate it as a string field
- * 3. Iterate through all of the users and set their `id` to the `pilot_id`
- * 4. Change the other tables column types that reference `user_id`
- */
 class UsersAddPilotId extends Migration
 {
+    /**
+     * Kinda of gross operations to change the pilot ID column
+     * 1. Add an `pilot_id` column, which will get populated with the current ID
+     * 2. Drop the `id` column, and then recreate it as a string field
+     * 3. Iterate through all of the users and set their `id` to the `pilot_id`
+     * 4. Change the other tables column types that reference `user_id`
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::table('users', static function (Blueprint $table) {
@@ -27,6 +29,11 @@ class UsersAddPilotId extends Migration
        DB::table('users')->update(['pilot_id' => DB::raw('`id`')]);
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::table('users', function (Blueprint $table) {
@@ -1,11 +1,16 @@
 <?php

-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

 class CreateNotificationsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::create('notifications', function (Blueprint $table) {
@@ -18,6 +23,11 @@ class CreateNotificationsTable extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('notifications');
@@ -1,16 +1,18 @@
 <?php

-use App\Contracts\Migration;
 use App\Models\Enums\PirepState;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;

-/**
- * Change the PIREP state column to be a TINYINT
- */
 class PirepsChangeStateType extends Migration
 {
+    /**
+     * Change the PIREP state column to be a TINYINT
+     *
+     * @return void
+     */
    public function up()
    {
        // Migrate the old rejected state
@@ -23,4 +25,13 @@ class PirepsChangeStateType extends Migration
            $table->unsignedSmallInteger('state')->change();
        });
    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
 }
@@ -5,15 +5,27 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

-/**
- * Add a `flight_id` column to the PIREPs table
- */
 class PirepsAddFlightId extends Migration
 {
+    /**
+     * Add a `flight_id` column to the PIREPs table
+     */
    public function up()
    {
        Schema::table('pireps', function (Blueprint $table) {
            $table->string('flight_id', Model::ID_MAX_LENGTH)->nullable()->after('aircraft_id');
        });
    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('pireps', function (Blueprint $table) {
+            $table->dropColumn('flight_id');
+        });
+    }
 }
@@ -4,11 +4,11 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

-/**
- * Add a `flight_type` column to the expenses table
- */
 class ExpensesAddFlightType extends Migration
 {
+    /**
+     * Add a `flight_type` column to the expenses table
+     */
    public function up()
    {
        Schema::table('expenses', function (Blueprint $table) {
@@ -18,6 +18,11 @@ class ExpensesAddFlightType extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::table('expenses', function (Blueprint $table) {
@@ -1,6 +1,6 @@
 <?php

-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\Schema;

 /**
@@ -25,4 +25,13 @@ class ModifyAirportsCoordinates extends Migration
            $table->decimal('lon', 11, 5)->change()->default(0.0)->nullable();
        });
    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
 }
@@ -1,6 +1,6 @@
 <?php

-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\Schema;

 /**
@@ -8,10 +8,24 @@ use Illuminate\Support\Facades\Schema;
 */
 class FlightFieldNullable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::table('flight_field_values', function ($table) {
            $table->text('value')->change()->nullable();
        });
    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
 }
@@ -1,14 +1,14 @@
 <?php

-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

-/**
- * Add a `load_factor` and `load_factor_variance` columns to the expenses table
- */
 class FlightsAddLoadFactor extends Migration
 {
+    /**
+     * Add a `load_factor` and `load_factor_variance` columns to the expenses table
+     */
    public function up()
    {
        Schema::table('flights', function (Blueprint $table) {
@@ -22,6 +22,11 @@ class FlightsAddLoadFactor extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::table('flights', function (Blueprint $table) {
@@ -1,14 +1,14 @@
 <?php

-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

-/**
- * Add a `pilot_pay` column for a fixed amount to pay to a pilot for a flight
- */
 class FlightsAddPilotPay extends Migration
 {
+    /**
+     * Add a `pilot_pay` column for a fixed amount to pay to a pilot for a flight
+     */
    public function up()
    {
        Schema::table('flights', function (Blueprint $table) {
@@ -18,6 +18,11 @@ class FlightsAddPilotPay extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::table('flights', function (Blueprint $table) {
@@ -1,15 +1,15 @@
 <?php

-use App\Contracts\Migration;
 use App\Models\Enums\FareType;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

-/**
- * Add a `pilot_pay` column for a fixed amount to pay to a pilot for a flight
- */
 class FaresAddType extends Migration
 {
+    /**
+     * Add a `pilot_pay` column for a fixed amount to pay to a pilot for a flight
+     */
    public function up()
    {
        Schema::table('fares', function (Blueprint $table) {
@@ -19,4 +19,16 @@ class FaresAddType extends Migration
                ->after('capacity');
        });
    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('fares', function (Blueprint $table) {
+            $table->dropColumn('type');
+        });
+    }
 }
@@ -1,6 +1,6 @@
 <?php

-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

@@ -33,4 +33,13 @@ class IncreaseIdLengths extends Migration
            });
        }
    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
 }
@@ -1,6 +1,6 @@
 <?php

-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

@@ -15,4 +15,13 @@ class RemoveSubfleetTypeIndex extends Migration
            $table->dropUnique(['type']);
        });
    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
 }
@@ -1,6 +1,6 @@
 <?php

-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

@@ -1,7 +1,7 @@
 <?php

-use App\Contracts\Migration;
 use App\Models\Enums\PageType;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

@@ -11,6 +11,11 @@ use Illuminate\Support\Facades\Schema;
 */
 class CreatePages extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
    public function up()
    {
        Schema::create('pages', function (Blueprint $table) {
@@ -28,6 +33,11 @@ class CreatePages extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::dropIfExists('pages');
@@ -1,6 +1,6 @@
 <?php

-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

@@ -9,7 +9,11 @@ class AirlineRemoveNullable extends Migration
    public function up()
    {
        Schema::table('airlines', function (Blueprint $table) {
-            $table->dropUnique(['iata']);
+            $table->dropUnique('airlines_iata_unique');
        });
    }
+
+    public function down()
+    {
+    }
 }
@@ -1,6 +1,6 @@
 <?php

-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

@@ -12,4 +12,8 @@ class PageIconNullable extends Migration
            $table->string('icon')->change()->nullable();
        });
    }
+
+    public function down()
+    {
+    }
 }
@@ -1,15 +1,15 @@
 <?php

-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

-/**
- * Add a `link` column and make the body optional. Also add a "new_window" bool
- * which determines if we open this link in a new window or not
- */
 class PagesAddLink extends Migration
 {
+    /**
+     * Add a `link` column and make the body optional. Also add a "new_window" bool
+     * which determines if we open this link in a new window or not
+     */
    public function up()
    {
        Schema::table('pages', function (Blueprint $table) {
@@ -23,6 +23,9 @@ class PagesAddLink extends Migration
        });
    }

+    /**
+     * @return void
+     */
    public function down()
    {
        Schema::table('fares', function (Blueprint $table) {
@@ -5,11 +5,11 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

-/**
- * Add two tables for holding user fields and the values
- */
 class CreateUserFields extends Migration
 {
+    /**
+     * Add two tables for holding user fields and the values
+     */
    public function up()
    {
        /*
@@ -39,4 +39,11 @@ class CreateUserFields extends Migration
            $table->index(['user_field_id', 'user_id']);
        });
    }
+
+    /**
+     * @return void
+     */
+    public function down()
+    {
+    }
 }
@@ -1,6 +1,6 @@
 <?php

-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

@@ -19,6 +19,11 @@ class AircraftAddMtow extends Migration
        });
    }

+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
    public function down()
    {
        Schema::table('aircraft', function (Blueprint $table) {
@@ -1,29 +0,0 @@
-<?php
-
-use App\Contracts\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateModulesTable extends Migration
-{
-    public function up()
-    {
-        Schema::create('modules', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name');
-            $table->boolean('enabled')->default(1);
-            $table->timestamps();
-        });
-
-        $this->addModule(['name' => 'Awards']);
-        $this->addModule(['name' => 'Sample']);
-        $this->addModule(['name' => 'VMSAcars']);
-        $this->addModule(['name' => 'Vacentral']);
-        $this->addModule(['name' => 'TestModule']);
-    }
-
-    public function down()
-    {
-        Schema::dropIfExists('modules');
-    }
-}
@@ -1,18 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-/**
- * Change the pages body column type to a Medium Text, max size of 16MB
- */
-class ModifyPagesSize extends Migration
-{
-    public function up()
-    {
-        Schema::table('pages', function (Blueprint $table) {
-            $table->mediumText('body')->change()->nullable();
-        });
-    }
-}
@@ -1,19 +0,0 @@
-<?php
-
-use App\Contracts\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-/**
- * Change the downloads link size
- */
-class ModifyDownloadLinkSize extends Migration
-{
-    public function up()
-    {
-        Schema::table('files', function (Blueprint $table) {
-            $table->mediumText('disk')->change()->nullable();
-            $table->mediumText('path')->change()->nullable();
-        });
-    }
-}
@@ -1,21 +1,15 @@
 <?php

-use App\Services\Installer\MigrationService;
 use App\Services\Installer\SeederService;
 use Illuminate\Database\Seeder;

 class DatabaseSeeder extends Seeder
 {
-    /** @var MigrationService */
-    private $migrationSvc;
-
-    /** @var SeederService */
-    private $seederSvc;
+    private $seederService;

    public function __construct()
    {
-        $this->migrationSvc = app(MigrationService::class);
-        $this->seederSvc = app(SeederService::class);
+        $this->seederService = app(SeederService::class);
    }

    /**
@@ -25,12 +19,6 @@ class DatabaseSeeder extends Seeder
     */
    public function run()
    {
-        // Make sure any migrations that need to be run are run/cleared out
-        if ($this->migrationSvc->migrationsAvailable()) {
-            $this->migrationSvc->runAllMigrations();
-        }
-
-        // Then sync all of the seeds
-        $this->seederSvc->syncAllSeeds();
+        $this->seederService->syncAllSeeds();
    }
 }
@@ -1,2 +1 @@
 local.yml
-vmsacars.yml
@@ -1,10 +1,30 @@

+#airlines:
+#  - id: 1
+#    icao: VMS
+#    iata: VM
+#    name: phpvms airlines
+#    country: us
+#    active: 1
+#    created_at: now
+#    updated_at: now
+
 roles:
  id_column: name
  data:
    - name: fleet-only
      display_name: Edit Fleet

+awards:
+  - id: 1
+    name: Pilot 50 flights
+    description: When a pilot has 50 flights, give this award
+    image_url:
+    ref_model: Modules\Awards\Awards\PilotFlightAwards
+    ref_model_params: 50
+    created_at: now
+    updated_at: now
+
 news:
  - id: 1
    user_id: 1
@@ -116,91 +136,34 @@ airports:
    ground_handling_cost: 50
 #
 aircraft:
-  -
-    id: 1
+  - id: 1
    subfleet_id: 1
-    icao: null
-    iata: null
    airport_id: KJFK
-    landing_time: '2020-10-23 07:50:16'
-    name: 'Boeing 747-438'
+    name: Boeing 747-438
    registration: 001Z
-    hex_code: null
-    mtow: '0.00'
-    zfw: '0.00'
-    flight_time: 540
+    flight_time: 360
    status: A
-    state: 0
-    created_at: null
-    updated_at: '2020-10-23 07:50:16'
-  -
-    id: 2
+  - id: 2
    subfleet_id: 2
-    icao: null
-    iata: null
    airport_id: LGRP
-    landing_time: null
-    name: 'Boeing 777-200'
+    name: Boeing 777-200
    registration: C202
-    hex_code: null
-    mtow: '0.00'
-    zfw: '0.00'
    flight_time: 260
    status: A
-    state: 0
-    created_at: null
-    updated_at: null
-  -
-    id: 3
+  - id: 3
    subfleet_id: 1
-    icao: null
-    iata: null
    airport_id: KAUS
-    landing_time: '2020-10-24 08:50:13'
-    name: 'Boeing 747-412'
+    name: Boeing 747-412
    registration: S2333
-    hex_code: null
-    mtow: '0.00'
-    zfw: '0.00'
-    flight_time: 180
-    status: A
-    state: 0
-    created_at: null
-    updated_at: '2020-10-24 08:50:13'
-  -
-    id: 4
-    subfleet_id: 1
-    icao: null
-    iata: null
-    airport_id: KAUS
-    landing_time: null
-    name: 'Boeing 747-436 RETIRED'
-    registration: null
-    hex_code: null
-    mtow: '0.00'
-    zfw: '0.00'
-    flight_time: 45
-    status: R
-    state: 0
-    created_at: null
-    updated_at: null
-  -
-    id: 5
-    subfleet_id: 4
-    icao: A320
-    iata: '320'
-    airport_id: EGLL
-    landing_time: null
-    name: 'Airbus A320'
-    registration: N786DL
-    hex_code: b47165dd
-    mtow: '78800.00'
-    zfw: '62500.00'
    flight_time: 0
    status: A
-    state: 0
-    created_at: '2020-10-22 13:38:50'
-    updated_at: '2020-10-22 13:38:50'
+  - id: 4
+    subfleet_id: 1
+    airport_id: KAUS
+    name: Boeing 747-436 RETIRED
+    registration:
+    flight_time: 45
+    status: R

 expenses:
  - name: Per-Flight (no muliplier)
@@ -257,192 +220,68 @@ expenses:
    updated_at: now

 fares:
-  -
-    id: 1
-    code: 'Y'
+  - id: 1
+    code: Y
    name: Economy
-    price: '100.00'
-    cost: '0.00'
+    price: 100
    capacity: 200
-    type: 0
-    notes: null
-    active: 1
-    created_at: null
-    updated_at: null
-  -
-    id: 2
+  - id: 2
    code: B
    name: Business
-    price: '500.00'
-    cost: '0.00'
+    price: 500
    capacity: 10
-    type: 0
-    notes: null
-    active: 1
-    created_at: null
-    updated_at: null
-  -
-    id: 3
+  - id: 3
    code: F
    name: First-Class
-    price: '800.00'
-    cost: '0.00'
+    price: 800
    capacity: 5
-    type: 0
-    notes: null
-    active: 1
-    created_at: null
-    updated_at: null

 subfleets:
-  -
-    id: 1
+  - id: 1
    airline_id: 1
+    name: 747-43X RB211-524G
    type: 744-3X-RB211
-    name: '747-43X RB211-524G'
-    cost_block_hour: '1000.00'
-    cost_delay_minute: '0.00'
-    fuel_type: null
-    ground_handling_multiplier: '200.00'
-    cargo_capacity: null
-    fuel_capacity: null
-    gross_weight: null
-    created_at: null
-    updated_at: null
-  -
-    id: 2
+    cost_block_hour: 1000
+    ground_handling_multiplier: 200
+  - id: 2
    airline_id: 1
+    name: 777-222ER GE90-76B
    type: 772-22ER-GE90-76B
-    name: '777-222ER GE90-76B'
-    cost_block_hour: '500.00'
-    cost_delay_minute: '0.00'
-    fuel_type: null
-    ground_handling_multiplier: '150.00'
-    cargo_capacity: null
-    fuel_capacity: null
-    gross_weight: null
-    created_at: null
-    updated_at: null
-  -
-    id: 3
+    cost_block_hour: 500
+    ground_handling_multiplier: 150
+  - id: 3
    airline_id: 1
+    name: 777-367 ER GE90-115B
    type: 772-36ER-GE90-115B
-    name: '777-367 ER GE90-115B'
-    cost_block_hour: '100.00'
-    cost_delay_minute: '0.00'
-    fuel_type: null
-    ground_handling_multiplier: '150.00'
-    cargo_capacity: null
-    fuel_capacity: null
-    gross_weight: null
-    created_at: null
-    updated_at: null
-  -
-    id: 4
-    airline_id: 1
-    type: A320
-    name: A320
-    cost_block_hour: '2300.00'
-    cost_delay_minute: null
-    fuel_type: 1
-    ground_handling_multiplier: '100.00'
-    cargo_capacity: null
-    fuel_capacity: null
-    gross_weight: null
-    created_at: '2020-10-22 13:36:49'
-    updated_at: '2020-10-22 13:36:49'
+    cost_block_hour: 100
+    ground_handling_multiplier: 150

+# add a few mods to aircraft and fares
 subfleet_fare:
-  -
-    subfleet_id: 1
+
+  # Fare classes on the 747
+  - subfleet_id: 1
    fare_id: 1
-    price: '200'
-    cost: null
-    capacity: '400'
-    created_at: null
-    updated_at: null
-  -
-    subfleet_id: 1
+    price: 200
+    capacity: 400
+  - subfleet_id: 1
    fare_id: 2
    price: 120%
-    cost: null
-    capacity: null
-    created_at: null
-    updated_at: null
-  -
-    subfleet_id: 1
+  - subfleet_id: 1
    fare_id: 3
-    price: '1000'
-    cost: null
+    price: 1000
    capacity: 110%
-    created_at: null
-    updated_at: null
-  -
-    subfleet_id: 2
+
+  # Fare classes on the 777
+  - subfleet_id: 2
    fare_id: 1
-    price: null
-    cost: null
-    capacity: null
-    created_at: null
-    updated_at: null
-  -
-    subfleet_id: 2
+  - subfleet_id: 2
    fare_id: 3
-    price: null
-    cost: null
-    capacity: '10'
-    created_at: null
-    updated_at: null
-  -
-    subfleet_id: 4
-    fare_id: 1
-    price: null
-    cost: null
-    capacity: '123'
-    created_at: null
-    updated_at: null
-  -
-    subfleet_id: 4
-    fare_id: 2
-    price: null
-    cost: null
-    capacity: '8'
-    created_at: null
-    updated_at: null
-  -
-    subfleet_id: 4
-    fare_id: 3
-    price: null
-    cost: null
-    capacity: '2'
-    created_at: null
-    updated_at: null
+    capacity: 10
+
 subfleet_rank:
-  -
-    rank_id: 1
+  - rank_id: 1
    subfleet_id: 1
-    acars_pay: null
-    manual_pay: null
-  -
-    rank_id: 1
-    subfleet_id: 4
-    acars_pay: null
-    manual_pay: null
-  -
-    rank_id: 2
-    subfleet_id: 4
-    acars_pay: null
-    manual_pay: null
-  -
-    rank_id: 3
-    subfleet_id: 4
-    acars_pay: null
-    manual_pay: null
-  -
-    rank_id: 4
-    subfleet_id: 4
-    acars_pay: null
-    manual_pay: null

 flights:
  - id: flightid_1
@@ -520,35 +359,6 @@ flights:
    route: 'MLY5 KEMBO UG442 SIA UG633 OTEKO UR640 NALRO GUBEL3'
    created_at: NOW
    updated_at: NOW
-  -
-    id: q8mvZ5vdExoy0mQG
-    airline_id: 1
-    flight_number: 3003
-    route_code: null
-    route_leg: null
-    dpt_airport_id: KSEA
-    arr_airport_id: KPAE
-    alt_airport_id: null
-    dpt_time: '8:00'
-    arr_time: '8:45'
-    level: null
-    distance: '27.51'
-    flight_time: 45
-    flight_type: J
-    load_factor: null
-    load_factor_variance: null
-    route: null
-    pilot_pay: null
-    notes: null
-    scheduled: 0
-    days: null
-    start_date: null
-    end_date: null
-    has_bid: 1
-    active: 1
-    visible: 1
-    created_at: now
-    updated_at: now

 flight_fields:
  - name: Departure Terminal
@@ -579,24 +389,12 @@ flight_subfleet:
    flight_id: flightid_4

 bids:
-  -
-    id: 100
+  - id: 100
    user_id: 1
    flight_id: flightid_1
-    created_at: now
-    updated_at: now
-  -
-    id: 101
+  - id: 101
    user_id: 1
    flight_id: flightid_3
-    created_at: now
-    updated_at: now
-  -
-    id: 102
-    user_id: 1
-    flight_id: q8mvZ5vdExoy0mQG
-    created_at: now
-    updated_at: now

 pireps:
  - id: pirepid_1
@@ -92,10 +92,3 @@ user_field_values:
    user_field_id: 2
    user_id: 1
    value: 'Nobody did'
-
-user_awards:
-  - id: 1
-    user_id: 1
-    award_id: 1
-    created_at: now
-    updated_at: now
@@ -1,10 +0,0 @@
- name: 'Awards'
-  enabled: 1
- name: 'Sample'
-  enabled: 1
- name: 'VMSAcars'
-  enabled: 1
- name: 'Vacentral'
-  enabled: 1
- name: 'TestModule'
-  enabled: 1
@@ -51,6 +51,3 @@
 - name: maintenance
  display_name: Maintenance
  description: Run maintenance tasks
- name: modules
-  display_name: Modules
-  description: Add/Edit Modules
@@ -130,20 +130,6 @@
  options: ''
  type: int
  description: 'Initial zoom level on the map'
- key: airports.default_ground_handling_cost
-  name: 'Default Ground Handling Cost'
-  group: airports
-  value: 250
-  options:
-  type: int
-  description: If an airport's Ground Handling Cost Cost isn't added, set this value by default
- key: airports.default_jet_a_fuel_cost
-  name: 'Default Jet A Fuel Cost'
-  group: airports
-  value: 0.7
-  options:
-  type: text
-  description: If an airport's Jet A Fuel Cost isn't added, set this value by default
 - key: bids.disable_flight_on_bid
  name: 'Disable flight on bid'
  group: bids
@@ -18,7 +18,7 @@ class ValidationException extends AbstractHttpException

        parent::__construct(
            400,
-            'Validation Error'
+            'Validation exception'
        );
    }

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-class ModuleExistsException extends AbstractHttpException
-{
-    private $module_name;
-
-    public function __construct($module_name)
-    {
-        $this->module_name = $module_name;
-        parent::__construct(
-            409,
-            'Module '.$module_name.' Already Exists!'
-        );
-    }
-
-    /**
-     * Return the RFC 7807 error type (without the URL root)
-     */
-    public function getErrorType(): string
-    {
-        return 'module-already-exists';
-    }
-
-    /**
-     * Get the detailed error string
-     */
-    public function getErrorDetails(): string
-    {
-        return $this->getMessage();
-    }
-
-    /**
-     * Return an array with the error details, merged with the RFC7807 response
-     */
-    public function getErrorMetadata(): array
-    {
-        return [];
-    }
-}
@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-class ModuleInstallationError extends AbstractHttpException
-{
-    public function __construct()
-    {
-        parent::__construct(
-            500,
-            'Installation of Module Failed!'
-        );
-    }
-
-    /**
-     * Return the RFC 7807 error type (without the URL root)
-     */
-    public function getErrorType(): string
-    {
-        return 'module-installation-error';
-    }
-
-    /**
-     * Get the detailed error string
-     */
-    public function getErrorDetails(): string
-    {
-        return $this->getMessage();
-    }
-
-    /**
-     * Return an array with the error details, merged with the RFC7807 response
-     */
-    public function getErrorMetadata(): array
-    {
-        return [];
-    }
-}
@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-class ModuleInvalidFileType extends AbstractHttpException
-{
-    public function __construct()
-    {
-        parent::__construct(
-            415,
-            'The Module File Type is Invalid!'
-        );
-    }
-
-    /**
-     * Return the RFC 7807 error type (without the URL root)
-     */
-    public function getErrorType(): string
-    {
-        return 'module-file-type-invalid';
-    }
-
-    /**
-     * Get the detailed error string
-     */
-    public function getErrorDetails(): string
-    {
-        return $this->getMessage();
-    }
-
-    /**
-     * Return an array with the error details, merged with the RFC7807 response
-     */
-    public function getErrorMetadata(): array
-    {
-        return [];
-    }
-}
@@ -160,7 +160,6 @@ class AircraftController extends Controller
     */
    public function update($id, UpdateAircraftRequest $request)
    {
-        /** @var \App\Models\Aircraft $aircraft */
        $aircraft = $this->aircraftRepo->findWithoutFail($id);

        if (empty($aircraft)) {
@@ -172,7 +171,7 @@ class AircraftController extends Controller
        $this->aircraftRepo->update($attrs, $id);

        Flash::success('Aircraft updated successfully.');
-        return redirect(route('admin.aircraft.index').'?subfleet='.$aircraft->subfleet_id);
+        return redirect(route('admin.aircraft.index'));
    }

    /**
@@ -184,7 +183,6 @@ class AircraftController extends Controller
     */
    public function destroy($id)
    {
-        /** @var \App\Models\Aircraft $aircraft */
        $aircraft = $this->aircraftRepo->findWithoutFail($id);

        if (empty($aircraft)) {
@@ -12,7 +12,6 @@ use App\Repositories\FareRepository;
 use App\Services\ExportService;
 use App\Services\ImportService;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
 use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;

@@ -163,8 +162,6 @@ class FareController extends Controller
            return redirect(route('admin.fares.index'));
        }

-        Log::info('Deleting fare "'.$fare->name.'", id='.$fare->id);
-
        $this->fareRepo->delete($id);

        Flash::success('Fare deleted successfully.');
@@ -1,122 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin;
-
-use App\Contracts\Controller;
-use App\Services\ModuleService;
-use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Contracts\View\Factory;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Routing\Redirector;
-use Illuminate\View\View;
-
-class ModulesController extends Controller
-{
-    private $moduleSvc;
-
-    public function __construct(ModuleService $moduleSvc)
-    {
-        $this->moduleSvc = $moduleSvc;
-    }
-
-    /**
-     * Display a listing of the Module.
-     *
-     * @return mixed
-     */
-    public function index()
-    {
-        $modules = $this->moduleSvc->getAllModules();
-        $new_modules = $this->moduleSvc->scan();
-        return view('admin.modules.index', [
-            'modules'     => $modules,
-            'new_modules' => $new_modules,
-        ]);
-    }
-
-    /**
-     * Show the form for creating a new Module.
-     *
-     * @return Application|Factory|View
-     */
-    public function create()
-    {
-        return view('admin.modules.create');
-    }
-
-    /**
-     * Store a newly Uploaded Module in the Storage.
-     *
-     * @param Request $request
-     *
-     * @return Application|RedirectResponse|Redirector
-     */
-    public function store(Request $request)
-    {
-        $this->moduleSvc->installModule($request->file('module_file'));
-        return $this->index();
-    }
-
-    /**
-     * Show the form for editing the specified Module.
-     *
-     * @param $id
-     *
-     * @return Application|Factory|View
-     */
-    public function edit($id)
-    {
-        $module = $this->moduleSvc->getModule($id);
-        return view('admin.modules.edit', [
-            'module' => $module,
-        ]);
-    }
-
-    /**
-     * Update the specified Module in storage.
-     *
-     * @param $id
-     * @param Request $request
-     *
-     * @return Application|RedirectResponse|Redirector
-     */
-    public function update($id, Request $request)
-    {
-        $this->moduleSvc->updateModule($id, $request->has('enabled'));
-        flash()->success('Module Status Changed!');
-        return redirect(route('admin.modules.index'));
-    }
-
-    /**
-     * Enabling Module Present in the Modules Folder
-     *
-     * @param Request $request
-     *
-     * @return Application|RedirectResponse|Redirector
-     */
-    public function enable(Request $request)
-    {
-        $this->moduleSvc->addModule($request->input('name'));
-        return redirect(route('admin.modules.index'));
-    }
-
-    /**
-     * Verify and Remove the specified Module from storage.
-     *
-     * @param mixed   $id
-     * @param Request $request
-     *
-     * @return mixed
-     */
-    public function destroy($id, Request $request)
-    {
-        $delete = $this->moduleSvc->deleteModule($id, $request->all());
-        if ($delete == true) {
-            flash()->success('Module Deleted Successfully!');
-            return redirect(route('admin.modules.index'));
-        }
-        flash()->error('Verification Failed!');
-        return redirect(route('admin.modules.edit', $id));
-    }
-}
@@ -8,7 +8,6 @@ use App\Http\Requests\UpdateUserRequest;
 use App\Models\Rank;
 use App\Models\Role;
 use App\Models\User;
-use App\Models\UserAward;
 use App\Repositories\AirlineRepository;
 use App\Repositories\AirportRepository;
 use App\Repositories\PirepRepository;
@@ -21,7 +20,6 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
 use Laracasts\Flash\Flash;
-use League\ISO3166\ISO3166;
 use Prettus\Repository\Exceptions\RepositoryException;

 class UserController extends Controller
@@ -71,7 +69,7 @@ class UserController extends Controller

        return view('admin.users.index', [
            'users'   => $users,
-            'country' => new ISO3166(),
+            'country' => new \League\ISO3166\ISO3166(),
        ]);
    }

@@ -84,18 +82,13 @@ class UserController extends Controller
    {
        $airlines = $this->airlineRepo->selectBoxList();
        $airports = $this->airportRepo->selectBoxList(false);
-        $countries = collect((new ISO3166())->all())
-            ->mapWithKeys(function ($item, $key) {
-                return [strtolower($item['alpha2']) => $item['name']];
-            });

        return view('admin.users.create', [
            'user'      => null,
            'pireps'    => null,
            'airlines'  => $airlines,
            'timezones' => Timezonelist::toArray(),
-            'country'   => new ISO3166(),
-            'countries' => $countries,
+            'country'   => new \League\ISO3166\ISO3166(),
            'airports'  => $airports,
            'ranks'     => Rank::all()->pluck('name', 'id'),
            'roles'     => Role::all()->pluck('name', 'id'),
@@ -129,7 +122,31 @@ class UserController extends Controller
     */
    public function show($id)
    {
-        return $this->edit($id);
+        $user = $this->userRepo->findWithoutFail($id);
+
+        if (empty($user)) {
+            Flash::error('User not found');
+
+            return redirect(route('admin.users.index'));
+        }
+
+        $pireps = $this->pirepRepo
+            ->whereOrder(['user_id' => $id], 'created_at', 'desc')
+            ->paginate();
+
+        $airlines = $this->airlineRepo->selectBoxList();
+        $airports = $this->airportRepo->selectBoxList(false);
+
+        return view('admin.users.show', [
+            'user'      => $user,
+            'pireps'    => $pireps,
+            'airlines'  => $airlines,
+            'timezones' => Timezonelist::toArray(),
+            'country'   => new \League\ISO3166\ISO3166(),
+            'airports'  => $airports,
+            'ranks'     => Rank::all()->pluck('name', 'id'),
+            'roles'     => Role::all()->pluck('name', 'id'),
+        ]);
    }

    /**
@@ -137,14 +154,12 @@ class UserController extends Controller
     *
     * @param int $id
     *
-     * @throws RepositoryException
-     *
     * @return mixed
     */
    public function edit($id)
    {
        $user = $this->userRepo
-            ->with(['awards', 'fields', 'rank'])
+            ->with(['fields', 'rank'])
            ->findWithoutFail($id);

        if (empty($user)) {
@@ -156,7 +171,7 @@ class UserController extends Controller
            ->whereOrder(['user_id' => $id], 'created_at', 'desc')
            ->paginate();

-        $countries = collect((new ISO3166())->all())
+        $countries = collect((new \League\ISO3166\ISO3166())->all())
            ->mapWithKeys(function ($item, $key) {
                return [strtolower($item['alpha2']) => $item['name']];
            });
@@ -167,7 +182,6 @@ class UserController extends Controller
        return view('admin.users.edit', [
            'user'      => $user,
            'pireps'    => $pireps,
-            'country'   => new ISO3166(),
            'countries' => $countries,
            'timezones' => Timezonelist::toArray(),
            'airports'  => $airports,
@@ -266,28 +280,6 @@ class UserController extends Controller
        return redirect(route('admin.users.index'));
    }

-    /**
-     * Remove the award from a user
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param mixed                    $id
-     * @param mixed                    $award_id
-     *
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function destroy_user_award($id, $award_id, Request $request)
-    {
-        $userAward = UserAward::where(['user_id' => $id, 'award_id' => $award_id]);
-        if (empty($userAward)) {
-            Flash::error('The user award could not be found');
-            return redirect()->back();
-        }
-
-        $userAward->delete();
-
-        return redirect()->back();
-    }
-
    /**
     * Regenerate the user's API key
     *
@@ -9,7 +9,6 @@ use App\Http\Resources\Navdata as NavdataResource;
 use App\Models\SimBrief;
 use App\Repositories\Criteria\WhereCriteria;
 use App\Repositories\FlightRepository;
-use App\Services\FareService;
 use App\Services\FlightService;
 use Exception;
 use Illuminate\Http\Request;
@@ -19,26 +18,19 @@ use Prettus\Repository\Exceptions\RepositoryException;

 class FlightController extends Controller
 {
-    /** @var \App\Services\FareService */
-    private $fareSvc;
-
-    /** @var \App\Repositories\FlightRepository */
    private $flightRepo;
-
-    /** @var \App\Services\FlightService */
    private $flightSvc;

    /**
-     * @param FareService      $fareSvc
+     * FlightController constructor.
+     *
     * @param FlightRepository $flightRepo
     * @param FlightService    $flightSvc
     */
    public function __construct(
-        FareService $fareSvc,
        FlightRepository $flightRepo,
        FlightService $flightSvc
    ) {
-        $this->fareSvc = $fareSvc;
        $this->flightRepo = $flightRepo;
        $this->flightSvc = $flightSvc;
    }
@@ -62,13 +54,9 @@ class FlightController extends Controller
     */
    public function get($id)
    {
-        /** @var \App\Models\User $user */
        $user = Auth::user();
-
-        /** @var \App\Models\Flight $flight */
        $flight = $this->flightRepo->with([
            'airline',
-            'fares',
            'subfleets',
            'subfleets.aircraft',
            'subfleets.fares',
@@ -78,8 +66,7 @@ class FlightController extends Controller
            },
        ])->find($id);

-        $flight = $this->flightSvc->filterSubfleets($user, $flight);
-        $flight = $this->fareSvc->getReconciledFaresForFlight($flight);
+        $this->flightSvc->filterSubfleets(Auth::user(), $flight);

        return new FlightResource($flight);
    }
@@ -122,7 +109,6 @@ class FlightController extends Controller
            $flights = $this->flightRepo
                ->with([
                    'airline',
-                    'fares',
                    'subfleets',
                    'subfleets.aircraft',
                    'subfleets.fares',
@@ -138,8 +124,7 @@ class FlightController extends Controller

        // TODO: Remove any flights here that a user doesn't have permissions to
        foreach ($flights as $flight) {
-            $this->flightSvc->filterSubfleets($user, $flight);
-            $this->fareSvc->getReconciledFaresForFlight($flight);
+            $this->flightSvc->filterSubfleets(Auth::user(), $flight);
        }

        return FlightResource::collection($flights);
@@ -61,8 +61,7 @@ class UserController extends Controller
     */
    protected function getUserId(Request $request)
    {
-        $id = $request->get('id');
-        if ($id === null || $id === 'me') {
+        if ($request->get('id') === null) {
            return Auth::user()->id;
        }

@@ -90,7 +89,10 @@ class UserController extends Controller
     */
    public function get($id)
    {
-        $user = $this->userSvc->getUser($id);
+        $user = $this->userRepo
+            ->with(['airline', 'bids', 'rank'])
+            ->find($id);
+
        return new UserResource($user);
    }

@@ -106,7 +108,7 @@ class UserController extends Controller
     */
    public function bids(Request $request)
    {
-        $user = $this->userSvc->getUser($this->getUserId($request));
+        $user = $this->userRepo->find($this->getUserId($request));

        // Add a bid
        if ($request->isMethod('PUT') || $request->isMethod('POST')) {
@@ -42,14 +42,7 @@ class DownloadController extends Controller
            $category = explode('\\', $class);
            $category = end($category);

-            if ($category == 'Aircraft') {
-                $group_name = $category.' > '.$obj->icao.' '.$obj->registration;
-            } elseif ($category == 'Airport') {
-                $group_name = $category.' > '.$obj->icao.' : '.$obj->name.' ('.$obj->country.')';
-            } else {
-                $group_name = $category.' > '.$obj->name;
-            }
-
+            $group_name = $category.' - '.$obj->name;
            $regrouped_files[$group_name] = $files;
        }

@@ -181,9 +181,8 @@ class PirepController extends Controller

        $where = [['user_id', $user->id]];
        $where[] = ['state', '<>', PirepState::CANCELLED];
-        $with = ['airline', 'aircraft', 'dpt_airport', 'arr_airport', 'fares', 'comments'];

-        $this->pirepRepo->with($with)
+        $this->pirepRepo->with(['airline', 'aircraft', 'dpt_airport', 'arr_airport'])
            ->pushCriteria(new WhereCriteria($request, $where));
        $pireps = $this->pirepRepo->orderBy('created_at', 'desc')->paginate();

@@ -61,14 +61,27 @@ class ProfileController extends Controller
    }

    /**
-     * Redirect to show() since only a single page gets shown and the template controls
-     * the other items that are/aren't shown
-     *
     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     */
    public function index()
    {
-        return $this->show(Auth::user()->id);
+        /** @var User $user */
+        $user = Auth::user();
+
+        if (setting('pilots.home_hubs_only')) {
+            $airports = $this->airportRepo->findWhere(['hub' => true]);
+        } else {
+            $airports = $this->airportRepo->all();
+        }
+
+        $userFields = $this->userRepo->getUserFields($user);
+
+        return view('profile.index', [
+            'acars'      => $this->acarsEnabled(),
+            'user'       => $user,
+            'airports'   => $airports,
+            'userFields' => $userFields,
+        ]);
    }

    /**
@@ -78,8 +91,7 @@ class ProfileController extends Controller
     */
    public function show($id)
    {
-        /** @var \App\Models\User $user */
-        $user = User::with(['awards', 'fields', 'fields.field'])
+        $user = User::with(['fields', 'fields.field'])
            ->where('id', $id)
            ->first();

@@ -196,7 +208,6 @@ class ProfileController extends Controller
            });

            $canvas->insert($image);
-            Log::info('Uploading avatar into folder '.public_path('uploads/avatars'));
            $canvas->save(public_path('uploads/avatars/'.$file_name));

            $req_data['avatar'] = $path;
@@ -11,7 +11,7 @@ class PrefileRequest extends FormRequest
        return [
            'airline_id'          => 'required|exists:airlines,id',
            'aircraft_id'         => 'required|exists:aircraft,id',
-            'flight_id'           => 'sometimes|nullable|exists:flights,id',
+            'flight_id'           => 'sometimes|exists:flights,id',
            'flight_number'       => 'required',
            'dpt_airport_id'      => 'required',
            'arr_airport_id'      => 'required',
@@ -15,9 +15,9 @@ class Fare extends Resource
            'id'       => $this->id,
            'code'     => $this->code,
            'name'     => $this->name,
-            'capacity' => $this->capacity,
-            'cost'     => $this->cost,
            'price'    => $this->price,
+            'cost'     => $this->cost,
+            'capacity' => $this->capacity,
            'type'     => $this->type,
            'notes'    => $this->notes,
            'active'   => $this->active,
@@ -18,17 +18,17 @@ class Flight extends Resource
    private function setFields()
    {
        /** @var \Illuminate\Support\Collection $field_values */
-        $return_values = new stdClass();
        $field_values = $this->field_values;
        if (empty($field_values) || $field_values->count() === 0) {
-            return $return_values;
+            return new stdClass();
        }

+        $fields = [];
        foreach ($field_values as $field) {
-            $return_values->{$field->name} = $field->value;
+            $fields[$field->name] = $field->value;
        }

-        return $return_values;
+        return $fields;
    }

    /**
@@ -16,7 +16,6 @@ class User extends Resource
            'pilot_id'      => $this->pilot_id,
            'ident'         => $this->ident,
            'name'          => $this->name,
-            'name_private'  => $this->name_private,
            'email'         => $this->email,
            'avatar'        => $this->resolveAvatarUrl(),
            'rank_id'       => $this->rank_id,
@@ -32,7 +31,6 @@ class User extends Resource
        $res['airline'] = Airline::make($this->whenLoaded('airline'));
        $res['bids'] = UserBid::collection($this->whenLoaded('bids'));
        $res['rank'] = Rank::make($this->whenLoaded('rank'));
-        $res['subfleets'] = Subfleet::make($this->whenLoaded('subfleets'));

        return $res;
    }
@@ -1,71 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use App\Contracts\Listener;
-use App\Events\PirepAccepted;
-use App\Events\UserStateChanged;
-use App\Events\UserStatsChanged;
-use App\Models\Award;
-
-/**
- * Look for and run any of the award classes. Don't modify this.
- * See the documentation on creating awards:
- *
- * @url http://docs.phpvms.net/customizing/awards
- */
-class AwardHandler extends Listener
-{
-    /** The events and the callback */
-    public static $callbacks = [
-        PirepAccepted::class    => 'onPirepAccept',
-        UserStatsChanged::class => 'onUserStatsChanged',
-        UserStateChanged::class => 'onUserStateChanged',
-    ];
-
-    /**
-     * Called when a PIREP is accepted
-     *
-     * @param \App\Events\PirepAccepted $event
-     */
-    public function onPirepAccept(PirepAccepted $event)
-    {
-        $this->checkForAwards($event->pirep->user);
-    }
-
-    /**
-     * When the user's state has changed
-     *
-     * @param \App\Events\UserStateChanged $event
-     */
-    public function onUserStateChanged(UserStateChanged $event): void
-    {
-        $this->checkForAwards($event->user);
-    }
-
-    /**
-     * Called when any of the user's states have changed
-     *
-     * @param UserStatsChanged $event
-     */
-    public function onUserStatsChanged(UserStatsChanged $event): void
-    {
-        $this->checkForAwards($event->user);
-    }
-
-    /**
-     * Check for any awards to be run and test them against the user
-     *
-     * @param \App\Models\User $user
-     */
-    public function checkForAwards($user)
-    {
-        $awards = Award::all();
-        foreach ($awards as $award) {
-            $klass = $award->getReference($award, $user);
-            if ($klass) {
-                $klass->handle();
-            }
-        }
-    }
-}
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Contracts\Listener;
+use App\Events\UserStatsChanged;
+use App\Models\Award;
+
+/**
+ * Look for and run any of the award classes. Don't modify this.
+ * See the documentation on creating awards:
+ *
+ * @url http://docs.phpvms.net/customizing/awards
+ */
+class AwardListener extends Listener
+{
+    /**
+     * Call all of the awards
+     *
+     * @param UserStatsChanged $event
+     */
+    public function handle(UserStatsChanged $event): void
+    {
+        $awards = Award::all();
+        foreach ($awards as $award) {
+            $klass = $award->getReference($award, $event->user);
+            if ($klass) {
+                $klass->handle();
+            }
+        }
+    }
+}
@@ -25,10 +25,6 @@ use Illuminate\Support\Collection;
 * @property int        distance
 * @property int        flight_time
 * @property string     route
- * @property string     dpt_time
- * @property string     arr_time
- * @property string     flight_type
- * @property string     notes
 * @property int        level
 * @property float      load_factor
 * @property float      load_factor_variance
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Contracts\Model;
-use Carbon\Carbon;
-
-/**
- * @property string name
- * @property bool   enabled
- * @property Carbon created_at
- * @property Carbon updated_at
- */
-class Module extends Model
-{
-    public $table = 'modules';
-
-    public $fillable = [
-        'name',
-        'enabled',
-        'created_at',
-        'updated_at',
-    ];
-
-    protected $casts = [
-        'enabled' => 'boolean',
-    ];
-
-    public static $rules = [
-        'name' => 'required',
-    ];
-}
@@ -75,7 +75,6 @@ class Pirep extends Model
        'flight_number',
        'route_code',
        'route_leg',
-        'flight_id',
        'dpt_airport_id',
        'arr_airport_id',
        'alt_airport_id',
@@ -31,6 +31,7 @@ class Subfleet extends Model
        'airline_id',
        'type',
        'name',
+        'turn_time',
        'fuel_type',
        'cost_block_hour',
        'cost_delay_minute',
@@ -36,7 +36,6 @@ use Laratrust\Traits\LaratrustUserTrait;
 * @property int              state
 * @property bool             opt_in
 * @property string           last_pirep_id
- * @property Pirep            last_pirep
 * @property UserFieldValue[] fields
 *
 * @mixin \Illuminate\Database\Eloquent\Builder
@@ -209,12 +208,9 @@ class User extends Authenticatable
        return $this->belongsTo(Airline::class, 'airline_id');
    }

-    /**
-     * @return \App\Models\Award[]|mixed
-     */
    public function awards()
    {
-        return $this->belongsToMany(Award::class, 'user_awards');
+        return $this->hasMany(UserAward::class, 'user_id');
    }

    /**
@@ -5,7 +5,7 @@ namespace App\Providers;
 use App\Events\Expenses;
 use App\Events\PirepFiled;
 use App\Events\UserStatsChanged;
-use App\Listeners\AwardHandler;
+use App\Listeners\AwardListener;
 use App\Listeners\BidEventHandler;
 use App\Listeners\ExpenseListener;
 use App\Listeners\FinanceEventHandler;
@@ -33,7 +33,7 @@ class EventServiceProvider extends ServiceProvider
        ],

        UserStatsChanged::class => [
-
+            AwardListener::class,
        ],

        UpdateAvailable::class => [],
@@ -44,6 +44,5 @@ class EventServiceProvider extends ServiceProvider
        BidEventHandler::class,
        FinanceEventHandler::class,
        EventHandler::class,
-        AwardHandler::class,
    ];
 }
@@ -27,74 +27,6 @@ class RouteServiceProvider extends ServiceProvider
        $this->mapWebRoutes();
        $this->mapAdminRoutes();
        $this->mapApiRoutes();
-        $this->mapImporterRoutes();
-        $this->mapInstallerRoutes();
-        $this->mapUpdaterRoutes();
-    }
-
-    private function mapImporterRoutes()
-    {
-        Route::group([
-            'as'         => 'importer.',
-            'prefix'     => 'importer',
-            'middleware' => ['web'],
-            'namespace'  => 'App\Http\Controllers\System',
-        ], function () {
-            Route::get('/', 'ImporterController@index')->name('index');
-            Route::post('/config', 'ImporterController@config')->name('config');
-            Route::post('/dbtest', 'ImporterController@dbtest')->name('dbtest');
-
-            // Run the actual importer process. Additional middleware
-            Route::post('/run', 'ImporterController@run')->middleware('api')->name('run');
-            Route::post('/complete', 'ImporterController@complete')->name('complete');
-        });
-    }
-
-    private function mapInstallerRoutes()
-    {
-        Route::group([
-            'as'         => 'installer.',
-            'prefix'     => 'install',
-            'middleware' => ['web'],
-            'namespace'  => 'App\Http\Controllers\System',
-        ], function () {
-            Route::get('/', 'InstallerController@index')->name('index');
-            Route::post('/dbtest', 'InstallerController@dbtest')->name('dbtest');
-
-            Route::get('/step1', 'InstallerController@step1')->name('step1');
-            Route::post('/step1', 'InstallerController@step1')->name('step1post');
-
-            Route::get('/step2', 'InstallerController@step2')->name('step2');
-            Route::post('/envsetup', 'InstallerController@envsetup')->name('envsetup');
-            Route::get('/dbsetup', 'InstallerController@dbsetup')->name('dbsetup');
-
-            Route::get('/step3', 'InstallerController@step3')->name('step3');
-            Route::post('/usersetup', 'InstallerController@usersetup')->name('usersetup');
-
-            Route::get('/complete', 'InstallerController@complete')->name('complete');
-        });
-    }
-
-    protected function mapUpdaterRoutes()
-    {
-        Route::group([
-            'as'         => 'update.',
-            'prefix'     => 'update',
-            'middleware' => ['web', 'auth', 'ability:admin,admin-access'],
-            'namespace'  => 'App\Http\Controllers\System',
-        ], function () {
-            Route::get('/', 'UpdateController@index')->name('index');
-
-            Route::get('/step1', 'UpdateController@step1')->name('step1');
-            Route::post('/step1', 'UpdateController@step1')->name('step1post');
-
-            Route::post('/run-migrations', 'UpdateController@run_migrations')->name('run_migrations');
-            Route::get('/complete', 'UpdateController@complete')->name('complete');
-
-            // Routes for the update downloader
-            Route::get('/downloader', 'UpdateController@updater')->name('updater');
-            Route::post('/downloader', 'UpdateController@update_download')->name('update_download');
-        });
    }

    /**
@@ -109,7 +41,7 @@ class RouteServiceProvider extends ServiceProvider
        Route::group([
            'middleware' => ['web'],
            'namespace'  => $this->namespace,
-        ], function () {
+        ], function ($router) {
            Route::group([
                'namespace'  => 'Frontend',
                'prefix'     => '',
@@ -424,17 +356,10 @@ class RouteServiceProvider extends ServiceProvider

            Route::resource('subfleets', 'SubfleetController')->middleware('ability:admin,fleet');

-            /**
-             * USERS
-             */
-            Route::delete('users/{id}/award/{award_id}', 'UserController@destroy_user_award')
-                ->name('users.destroy_user_award')->middleware('ability:admin,users');
-
+            Route::resource('users', 'UserController')->middleware('ability:admin,users');
            Route::get('users/{id}/regen_apikey', 'UserController@regen_apikey')
                ->name('users.regen_apikey')->middleware('ability:admin,users');

-            Route::resource('users', 'UserController')->middleware('ability:admin,users');
-
            // defaults
            Route::get('', ['uses' => 'DashboardController@index'])
                ->middleware('update_pending', 'ability:admin,admin-access');
@@ -453,35 +378,6 @@ class RouteServiceProvider extends ServiceProvider
                'delete',
            ], 'dashboard/news', ['uses' => 'DashboardController@news'])
                ->name('dashboard.news')->middleware('update_pending', 'ability:admin,admin-access');
-
-            //Modules
-            Route::group([
-                'as'         => 'modules.',
-                'prefix'     => 'modules',
-                'middleware' => ['ability:admin, modules'],
-            ], function () {
-
-                //Modules Index
-                Route::get('/', 'ModulesController@index')->name('index');
-
-                //Add Module
-                Route::get('/create', 'ModulesController@create')->name('create');
-
-                //Store Module
-                Route::post('/create', 'ModulesController@store')->name('store');
-
-                //Enable Module
-                Route::post('/enable', 'ModulesController@enable')->name('enable');
-
-                //Edit Module
-                Route::get('/{id}/edit', 'ModulesController@edit')->name('edit');
-
-                //Update Module
-                Route::post('/{id}', 'ModulesController@update')->name('update');
-
-                //Delete Module
-                Route::delete('/{id}', 'ModulesController@destroy')->name('destroy');
-            });
        });
    }

@@ -499,7 +395,7 @@ class RouteServiceProvider extends ServiceProvider
            'namespace'  => $this->namespace.'\\Api',
            'prefix'     => 'api',
            'as'         => 'api.',
-        ], function () {
+        ], function ($router) {
            Route::group([], function () {
                Route::get('acars', 'AcarsController@live_flights');
                Route::get('acars/geojson', 'AcarsController@pireps_geojson');
@@ -580,7 +476,6 @@ class RouteServiceProvider extends ServiceProvider
                Route::post('user/bids', 'UserController@bids');
                Route::delete('user/bids', 'UserController@bids');

-                Route::get('users/me', 'UserController@index');
                Route::get('users/{id}', 'UserController@get');
                Route::get('users/{id}/fleet', 'UserController@fleet');
                Route::get('users/{id}/pireps', 'UserController@pireps');
@@ -8,6 +8,9 @@ use Illuminate\Support\Collection;
 use Prettus\Repository\Contracts\CacheableInterface;
 use Prettus\Repository\Traits\CacheableRepository;

+/**
+ * Class ExpenseRepository
+ */
 class ExpenseRepository extends Repository implements CacheableInterface
 {
    use CacheableRepository;
@@ -21,18 +24,17 @@ class ExpenseRepository extends Repository implements CacheableInterface
     * Get all of the expenses for a given type, and also
     * include expenses for a given airline ID
     *
-     * @param       $type
-     * @param null  $airline_id
-     * @param null  $ref_model
-     * @param mixed $ref_model_id
+     * @param        $type
+     * @param int    $airline_id
+     * @param string $ref_model
+     * @param mixed  $ref_model_id
     *
     * @return Collection
     */
    public function getAllForType($type, $airline_id = null, $ref_model = null, $ref_model_id = null)
    {
        $where = [
-            'type'   => $type,
-            'active' => true,
+            'type' => $type,
            ['airline_id', '=', null],
        ];

@@ -57,7 +59,6 @@ class ExpenseRepository extends Repository implements CacheableInterface
        if ($airline_id) {
            $where = [
                'type'       => $type,
-                'active'     => true,
                'airline_id' => $airline_id,
            ];

@@ -7,9 +7,6 @@ use App\Models\Enums\PirepState;
 use App\Models\Pirep;
 use App\Models\User;

-/**
- * Class PirepRepository
- */
 class PirepRepository extends Repository
 {
    protected $fieldSearchable = [
@@ -4,11 +4,13 @@ namespace App\Services;

 use App\Contracts\Service;
 use App\Models\Aircraft;
+use App\Models\Enums\PirepState;
 use App\Models\Pirep;
 use App\Repositories\PirepRepository;

 class AircraftService extends Service
 {
+    /** @var PirepRepository */
    private $pirepRepo;

    public function __construct(PirepRepository $pirepRepo)
@@ -16,6 +18,26 @@ class AircraftService extends Service
        $this->pirepRepo = $pirepRepo;
    }

+    /**
+     * Get a list of the PIREPs that have been flown by this aircraft
+     *
+     * @param Aircraft $aircraft
+     * @param int      $count
+     *
+     * @return Pirep[] Collection of PIREPs
+     */
+    public function getFlightHistory(Aircraft $aircraft, $count = 5)
+    {
+        return $this->pirepRepo
+            ->orderBy('created_at', 'desc')
+            ->limit($count)
+            ->where([
+                'aircraft_id' => $aircraft->id,
+                'state'       => PirepState::ACCEPTED,
+            ])
+            ->get();
+    }
+
    /**
     * Recalculate all aircraft stats and hours
     */
@@ -13,24 +13,12 @@ use Illuminate\Support\Facades\Log;

 class BidService extends Service
 {
-    /** @var FareService */
-    private $fareSvc;
-
-    /** @var FlightService */
-    private $flightSvc;
-
-    public function __construct(FareService $fareSvc, FlightService $flightSvc)
-    {
-        $this->fareSvc = $fareSvc;
-        $this->flightSvc = $flightSvc;
-    }
-
    /**
     * Get a specific bid for a user
     *
     * @param $bid_id
     *
-     * @return \App\Models\Bid|\Illuminate\Database\Eloquent\Model|tests/ImporterTest.php:521object|null
+     * @return \App\Models\Bid|\Illuminate\Database\Eloquent\Model|object|null
     */
    public function getBid($bid_id)
    {
@@ -47,22 +35,8 @@ class BidService extends Service
     */
    public function findBidsForUser(User $user)
    {
-        $bids = Bid::with([
-            'flight',
-            'flight.fares',
-            'flight.simbrief',
-            'flight.subfleets',
-            'flight.subfleets.aircraft',
-            'flight.subfleets.fares',
-        ])
+        return Bid::with(['flight', 'flight.simbrief'])
            ->where(['user_id' => $user->id])->get();
-
-        foreach ($bids as $bid) {
-            $bid->flight = $this->flightSvc->filterSubfleets($user, $bid->flight);
-            $bid->flight = $this->fareSvc->getReconciledFaresForFlight($bid->flight);
-        }
-
-        return $bids;
    }

    /**
@@ -38,9 +38,10 @@ class CronService extends Service
        }

        $path = [
+            'cd '.base_path(),
+            '&&',
            $php_exec,
-            base_path('artisan'),
-            'schedule:run',
+            'artisan schedule:run',
        ];

        return implode(' ', $path);
@@ -9,99 +9,17 @@ use App\Models\Pirep;
 use App\Models\PirepFare;
 use App\Models\Subfleet;
 use App\Support\Math;
-use function count;
-use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Log;
-use InvalidArgumentException;

 class FareService extends Service
 {
    /**
-     * @param Collection[Fare] $subfleet_fares The fare for a subfleet
-     * @param Collection[Fare] $flight_fares   The fares on a flight
+     * Get the fares for a particular flight, with an optional subfleet
+     * This will go through if there are any fares assigned to the flight,
+     * and then check the fares assigned on the subfleet, and give the
+     * final "authoritative" list of the fares for a flight.
     *
-     * @return Collection[Fare] Collection of Fare
-     */
-    public function getFareWithOverrides($subfleet_fares, $flight_fares): Collection
-    {
-        /**
-         * Make sure we've got something in terms of fares on the subfleet or the flight
-         */
-        if (empty($subfleet_fares) && empty($flight_fares)) {
-            return collect();
-        }
-
-        /**
-         * Check to see if there are any subfleet fares. This might only have fares on the
-         * flight, no matter how rare that might be
-         */
-        if ($subfleet_fares === null || count($subfleet_fares) === 0) {
-            return $flight_fares->map(function ($fare, $_) {
-                return $this->getFareWithPivot($fare, $fare->pivot);
-            });
-        }
-
-        return $subfleet_fares->map(function ($sf_fare, $_) use ($flight_fares) {
-            /**
-             * Get the fare, using the subfleet's pivot values. This will return
-             * the fares with all the costs, etc, that are overridden for the given subfleet
-             */
-            $fare = $this->getFareWithPivot($sf_fare, $sf_fare->pivot);
-
-            /**
-             * Now, using the fares that have already been used from the subfleet
-             * now pass those fares in for the flight to override.
-             *
-             * First look to see that there actually is an override for that fare that's on
-             * the flight
-             */
-            $flight_fare = $flight_fares->whereStrict('id', $fare->id)->first();
-            if ($flight_fare === null) {
-                return $fare;
-            }
-
-            /**
-             * Found an override on the flight for the given fare. Check to see if we
-             * have values there that can be used to override or act as a pivot
-             */
-            $fare = $this->getFareWithPivot($fare, $flight_fare->pivot);
-
-            /**
-             * Finally return the fare that we have, it should have gone through the
-             * multiple levels of reconciliation that were required
-             */
-            return $fare;
-        });
-    }
-
-    /**
-     * This will return the flight but all of the subfleets will have the corrected fares with the
-     * right amounts based on the pivots, and with the correct "inheritence" for the flights
-     *
-     * @param Flight $flight
-     *
-     * @return \App\Models\Flight
-     */
-    public function getReconciledFaresForFlight(Flight $flight): Flight
-    {
-        $subfleets = $flight->subfleets;
-        $flight_fares = $flight->fares;
-
-        /**
-         * @var int      $key
-         * @var Subfleet $subfleet
-         */
-        foreach ($subfleets as $key => $subfleet) {
-            $subfleet->fares = $this->getFareWithOverrides($subfleet->fares, $flight_fares);
-        }
-
-        $flight->subfleets = $subfleets;
-        return $flight;
-    }
-
-    /**
-     * Get the fares for a particular flight, with the subfleet that is in use being passed in
+     * If a subfleet is passed in,
     *
     * @param Flight|null   $flight
     * @param Subfleet|null $subfleet
@@ -113,59 +31,62 @@ class FareService extends Service
        if (!$flight) {
            $flight_fares = collect();
        } else {
-            $flight_fares = $flight->fares;
+            $flight_fares = $this->getForFlight($flight);
        }

        if (empty($subfleet)) {
-            throw new InvalidArgumentException('Subfleet argument missing');
+            return $flight_fares;
        }

-        return $this->getFareWithOverrides($subfleet->fares, $flight_fares);
+        $subfleet_fares = $this->getForSubfleet($subfleet);
+        if (empty($subfleet_fares) || $subfleet_fares->count() === 0) {
+            return $flight_fares;
+        }
+
+        // Go through all of the fares assigned by the subfleet
+        // See if any of the same fares are assigned to the flight
+        $fares = $subfleet_fares->map(function ($fare, $idx) use ($flight_fares) {
+            $flight_fare = $flight_fares->whereStrict('id', $fare->id)->first();
+            if (!$flight_fare) {
+                return $fare;
+            }
+
+            return $flight_fare;
+        });
+
+        return $fares;
    }

    /**
-     * Get a fare with the proper prices/costs populated in the pivot
+     * Get fares
     *
     * @param $fare
     *
     * @return mixed
     */
-    public function getFares($fare)
+    protected function getFares($fare)
    {
-        return $this->getFareWithPivot($fare, $fare->pivot);
-    }
-
-    /**
-     * Get the correct price of something supplied with the correct pivot
-     *
-     * @param Fare  $fare
-     * @param Pivot $pivot
-     *
-     * @return \App\Models\Fare
-     */
-    public function getFareWithPivot(Fare $fare, Pivot $pivot)
-    {
-        if (filled($pivot->price)) {
-            if (strpos($pivot->price, '%', -1) !== false) {
-                $fare->price = Math::getPercent($fare->price, $pivot->price);
+        if (filled($fare->pivot->price)) {
+            if (strpos($fare->pivot->price, '%', -1) !== false) {
+                $fare->price = Math::addPercent($fare->price, $fare->pivot->price);
            } else {
-                $fare->price = $pivot->price;
+                $fare->price = $fare->pivot->price;
            }
        }

-        if (filled($pivot->cost)) {
-            if (strpos($pivot->cost, '%', -1) !== false) {
-                $fare->cost = Math::getPercent($fare->cost, $pivot->cost);
+        if (filled($fare->pivot->cost)) {
+            if (strpos($fare->pivot->cost, '%', -1) !== false) {
+                $fare->cost = Math::addPercent($fare->cost, $fare->pivot->cost);
            } else {
-                $fare->cost = $pivot->cost;
+                $fare->cost = $fare->pivot->cost;
            }
        }

-        if (filled($pivot->capacity)) {
-            if (strpos($pivot->capacity, '%', -1) !== false) {
-                $fare->capacity = floor(Math::getPercent($fare->capacity, $pivot->capacity));
+        if (filled($fare->pivot->capacity)) {
+            if (strpos($fare->pivot->capacity, '%', -1) !== false) {
+                $fare->capacity = Math::addPercent($fare->capacity, $fare->pivot->capacity);
            } else {
-                $fare->capacity = floor($pivot->capacity);
+                $fare->capacity = $fare->pivot->capacity;
            }
        }

@@ -183,12 +104,16 @@ class FareService extends Service
     */
    public function setForFlight(Flight $flight, Fare $fare, array $override = []): Flight
    {
-        Log::info('Setting fare "'.$fare->name.'" to flight "'.$flight->ident.'"');
-
        $flight->fares()->syncWithoutDetaching([$fare->id]);

+        foreach ($override as $key => $item) {
+            if (!$item) {
+                unset($override[$key]);
+            }
+        }
+
        // modify any pivot values?
-        if (count($override) > 0) {
+        if (\count($override) > 0) {
            $flight->fares()->updateExistingPivot($fare->id, $override);
        }

@@ -198,6 +123,24 @@ class FareService extends Service
        return $flight;
    }

+    /**
+     * return all the fares for a flight. check the pivot
+     * table to see if the price/cost/capacity has been overridden
+     * and return the correct amounts.
+     *
+     * @param Flight $flight
+     *
+     * @return Collection
+     */
+    public function getForFlight(Flight $flight)
+    {
+        $fares = $flight->fares->map(function ($fare) {
+            return $this->getFares($fare);
+        });
+
+        return $fares;
+    }
+
    /**
     * @param Flight $flight
     * @param Fare   $fare
@@ -206,8 +149,6 @@ class FareService extends Service
     */
    public function delFareFromFlight(Flight $flight, Fare $fare)
    {
-        Log::info('Removing fare "'.$fare->name.'" to flight "'.$flight->ident.'"');
-
        $flight->fares()->detach($fare->id);
        $flight->refresh();

@@ -225,12 +166,10 @@ class FareService extends Service
     */
    public function setForSubfleet(Subfleet $subfleet, Fare $fare, array $override = []): Subfleet
    {
-        Log::info('Setting fare "'.$fare->name.'" to subfleet "'.$subfleet->name.'"');
-
        $subfleet->fares()->syncWithoutDetaching([$fare->id]);

        // modify any pivot values?
-        if (count($override) > 0) {
+        if (\count($override) > 0) {
            $subfleet->fares()->updateExistingPivot($fare->id, $override);
        }

@@ -268,8 +207,6 @@ class FareService extends Service
     */
    public function delFareFromSubfleet(Subfleet &$subfleet, Fare &$fare)
    {
-        Log::info('Removing fare "'.$fare->name.'" from subfleet "'.$subfleet->name.'"');
-
        $subfleet->fares()->detach($fare->id);
        $subfleet->refresh();

@@ -286,6 +223,7 @@ class FareService extends Service
     */
    public function getForPirep(Pirep $pirep)
    {
+        $fares = [];
        $found_fares = PirepFare::where('pirep_id', $pirep->id)->get();

        return $found_fares;
@@ -152,7 +152,7 @@ class PirepFinanceService extends Service
    public function payFuelCosts(Pirep $pirep): void
    {
        $ap = $pirep->dpt_airport;
-        $fuel_used = $pirep->fuel_used;
+        $fuel_used = $pirep->block_fuel;

        $debit = Money::createFromAmount($fuel_used * $ap->fuel_jeta_cost);
        Log::info('Finance: Fuel cost, (fuel='.$fuel_used.', cost='.$ap->fuel_jeta_cost.') D='
@@ -8,7 +8,6 @@ use App\Models\Bid;
 use App\Models\Enums\Days;
 use App\Models\Flight;
 use App\Models\FlightFieldValue;
-use App\Models\User;
 use App\Repositories\FlightRepository;
 use App\Repositories\NavdataRepository;
 use App\Support\Units\Time;
@@ -16,7 +15,6 @@ use App\Support\Units\Time;
 class FlightService extends Service
 {
    private $airportSvc;
-    private $fareSvc;
    private $flightRepo;
    private $navDataRepo;
    private $userSvc;
@@ -25,20 +23,17 @@ class FlightService extends Service
     * FlightService constructor.
     *
     * @param AirportService    $airportSvc
-     * @param FareService       $fareSvc
     * @param FlightRepository  $flightRepo
     * @param NavdataRepository $navdataRepo
     * @param UserService       $userSvc
     */
    public function __construct(
        AirportService $airportSvc,
-        FareService $fareSvc,
        FlightRepository $flightRepo,
        NavdataRepository $navdataRepo,
        UserService $userSvc
    ) {
        $this->airportSvc = $airportSvc;
-        $this->fareSvc = $fareSvc;
        $this->flightRepo = $flightRepo;
        $this->navDataRepo = $navdataRepo;
        $this->userSvc = $userSvc;
@@ -128,12 +123,12 @@ class FlightService extends Service
    /**
     * Filter out subfleets to only include aircraft that a user has access to
     *
-     * @param User   $user
-     * @param Flight $flight
+     * @param $user
+     * @param $flight
     *
     * @return mixed
     */
-    public function filterSubfleets(User $user, Flight $flight)
+    public function filterSubfleets($user, $flight)
    {
        /** @var \Illuminate\Support\Collection $subfleets */
        $subfleets = $flight->subfleets;
@@ -45,20 +45,8 @@ class AirportImporter extends ImportExport
        $row['id'] = $row['icao'];
        $row['hub'] = get_truth_state($row['hub']);

-        if ($row['ground_handling_cost'] === null && $row['ground_handling_cost'] !== 0.0) {
-            $row['ground_handling_cost'] = (float) setting('airports.default_ground_handling_cost');
-        } else {
-            $row['ground_handling_cost'] = (float) $row['ground_handling_cost'];
-        }
-
-        if ($row['fuel_jeta_cost'] === null && $row['fuel_jeta_cost'] !== 0.0) {
-            $row['fuel_jeta_cost'] = (float) setting('airports.default_jet_a_fuel_cost');
-        } else {
-            $row['fuel_jeta_cost'] = (float) $row['fuel_jeta_cost'];
-        }
-
        try {
-            Airport::updateOrCreate([
+            $airport = Airport::updateOrCreate([
                'id' => $row['icao'],
            ], $row);
        } catch (\Exception $e) {
@@ -44,10 +44,6 @@ class ExpenseExporter extends ImportExport
            $ret['airline'] = $expense->airline->icao;
        }

-        if ($ret['flight_type']) {
-            $ret['flight_type'] = $ret['flight_type'][0];
-        }
-
        // For the different expense types, instead of exporting
        // the ID, export a specific column
        if ($expense->ref_model === Expense::class) {
@@ -71,6 +67,6 @@ class ExpenseExporter extends ImportExport
        // And convert the ref_model into the shorter name
        $ret['ref_model'] = str_replace('App\Models\\', '', $ret['ref_model']);

-        return array_values($ret);
+        return $ret;
    }
 }
@@ -3,7 +3,6 @@
 namespace App\Services\ImportExport;

 use App\Contracts\ImportExport;
-use App\Models\Airport;
 use App\Models\Enums\Days;
 use App\Models\Enums\FlightType;
 use App\Models\Fare;
@@ -12,7 +11,7 @@ use App\Models\Subfleet;
 use App\Services\AirportService;
 use App\Services\FareService;
 use App\Services\FlightService;
-use Illuminate\Support\Facades\Log;
+use Log;

 /**
 * The flight importer can be imported or export. Operates on rows
@@ -78,14 +77,25 @@ class FlightImporter extends ImportExport
        // Get the airline ID from the ICAO code
        $airline = $this->getAirline($row['airline']);

+        // Check if the imported flight is a duplicate
+        /*$temp_flight = new Flight([
+            'airline_id'    => $airline->id,
+            'flight_number' => $row['flight_number'],
+            'route_code'    => $row['route_code'],
+            'route_leg'     => $row['route_leg'],
+        ]);
+
+        if($this->flightSvc->isFlightDuplicate($temp_flight)) {
+            $this->errorLog('Error in row '.$index.': Duplicate flight number detected');
+            return false;
+        }*/
+
        // Try to find this flight
-        /** @var Flight $flight */
        $flight = Flight::firstOrNew([
            'airline_id'    => $airline->id,
            'flight_number' => $row['flight_number'],
            'route_code'    => $row['route_code'],
            'route_leg'     => $row['route_leg'],
-            'visible'       => true,
        ], $row);

        $row['dpt_airport'] = strtoupper($row['dpt_airport']);
@@ -190,9 +200,9 @@ class FlightImporter extends ImportExport
     *
     * @param $airport
     *
-     * @return Airport
+     * @return \Illuminate\Database\Eloquent\Model
     */
-    protected function processAirport($airport): Airport
+    protected function processAirport($airport)
    {
        return $this->airportSvc->lookupAirportIfNotFound($airport);
    }
@@ -19,17 +19,10 @@ class SubfleetImporter extends ImportExport
     * Should match the database fields, for the most part
     */
    public static $columns = [
-        'airline'                    => 'required',
-        'type'                       => 'required',
-        'name'                       => 'required',
-        'fuel_type'                  => 'nullable',
-        'cost_block_hour'            => 'nullable',
-        'cost_delay_minute'          => 'nullable',
-        'ground_handling_multiplier' => 'nullable',
-        'cargo_capacity'             => 'nullable',
-        'fuel_capacity'              => 'nullable',
-        'gross_weight'               => 'nullable',
-        'fares'                      => 'nullable',
+        'airline' => 'required',
+        'type'    => 'required',
+        'name'    => 'required',
+        'fares'   => 'nullable',
    ];

    private $fareSvc;
@@ -47,7 +47,6 @@ class DatabaseService extends Service
        } catch (\PDOException $e) {
            throw $e;
        }
-
        return true;
    }

@@ -4,7 +4,7 @@ namespace App\Services\Installer;

 use App\Contracts\Service;
 use Illuminate\Support\Facades\Artisan;
-use Illuminate\Support\Facades\Log;
+use Nwidart\Modules\Facades\Module;

 class InstallerService extends Service
 {
@@ -28,14 +28,11 @@ class InstallerService extends Service
     */
    public function isUpgradePending(): bool
    {
-        $pendingMigrations = count($this->migrationSvc->migrationsAvailable());
-        if ($pendingMigrations > 0) {
-            Log::info('Found '.$pendingMigrations.' pending migrations, update available');
+        if (count($this->migrationSvc->migrationsAvailable()) > 0) {
            return true;
        }

        if ($this->seederSvc->seedsPending()) {
-            Log::info('Found seeds pending, update available');
            return true;
        }

@@ -47,6 +44,27 @@ class InstallerService extends Service
     */
    public function clearCaches(): void
    {
-        Artisan::call('optimize:clear');
+        $commands = [
+            'clear-compiled',
+            'cache:clear',
+            'route:clear',
+            'view:clear',
+        ];
+
+        foreach ($commands as $cmd) {
+            Artisan::call($cmd);
+        }
+    }
+
+    /**
+     * Disable the installer and importer modules
+     */
+    public function disableInstallerModules()
+    {
+        $module = Module::find('installer');
+        $module->disable();
+
+        $module = Module::find('importer');
+        $module->disable();
    }
 }
@@ -3,16 +3,13 @@
 namespace App\Services\Installer;

 use App\Contracts\Service;
-use Exception;
-use Illuminate\Database\Migrations\Migrator;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Artisan;
-use Illuminate\Support\Facades\Log;
 use Nwidart\Modules\Facades\Module;

 class MigrationService extends Service
 {
-    protected function getMigrator(): Migrator
+    protected function getMigrator()
    {
        $m = app('migrator');
        $m->setConnection(config('database.default'));
@@ -39,6 +36,8 @@ class MigrationService extends Service
            }
        }

+        // Log::info('Update - migration paths', $paths);
+
        return $paths;
    }

@@ -50,25 +49,10 @@ class MigrationService extends Service
        $migrator = $this->getMigrator();
        $migration_dirs = $this->getMigrationPaths();

-        $availMigrations = [];
-        $runFiles = [];
-
-        try {
-            $runFiles = $migrator->getRepository()->getRan();
-        } catch (Exception $e) {
-        } // Skip database run initialized
-
        $files = $migrator->getMigrationFiles(array_values($migration_dirs));
+        $availMigrations = array_diff(array_keys($files), $migrator->getRepository()->getRan());

-        foreach ($files as $filename => $filepath) {
-            if (in_array($filename, $runFiles, true)) {
-                continue;
-            }
-
-            $availMigrations[] = $filepath;
-        }
-
-        Log::info('Migrations available: '.count($availMigrations));
+        // Log::info('Migrations available:', $availMigrations);

        return $availMigrations;
    }
@@ -79,23 +63,11 @@ class MigrationService extends Service
     */
    public function runAllMigrations()
    {
-        // A little ugly, run the main migration first, this makes sure the migration table is there
        $output = '';

        Artisan::call('migrate');
        $output .= trim(Artisan::output());

-        // Then get any remaining migrations that are left over
-        // Due to caching or whatever reason, the migrations are not all loaded when Artisan first
-        // runs. This is likely a side effect of the database being used as the module activator,
-        // and the list of migrations being pulled before the initial modules are populated
-        $migrator = $this->getMigrator();
-        $availMigrations = $this->migrationsAvailable();
-
-        Log::info('Running '.count($availMigrations).' available migrations');
-        $ret = $migrator->run($availMigrations);
-        Log::info('Ran '.count($ret).' migrations');
-
-        return $output."\n".implode("\n", $ret);
+        return $output;
    }
 }
--- a/Show More
+++ b/Show More