Include all enums in aliases

#1007

.editorconfig

@@ -1,6 +1,10 @@
 #
 root = true
 
+[*]
+end_of_line = lf
+insert_final_newline = true
+
 [*.js]
 indent_style = space
 indent_size = 2
@@ -23,4 +27,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

.github/scripts/build.sh

@@ -1,52 +1,12 @@
 #!/usr/bin/env bash
 
-if [ "$TRAVIS" != "true" ]; then
-  exit 0
-fi
-
-cd $TRAVIS_BUILD_DIR
-
-if test "$TRAVIS_TAG"; then
-  VERSION=$TRAVIS_TAG
-
-  # Pass in the tag as the version to write out
-  php artisan phpvms:version --write --write-full-version "${VERSION}"
-  FULL_VERSION=$(php artisan phpvms:version)
-else
-  echo "On branch $TRAVIS_BRANCH"
-
-  if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" != "dev" ]; then
-    echo "Not on valid branch, exiting"
-    exit 0
-  fi
-
-  # Write the version out but place the branch ID in there
-  # This is only for the dev branch
-  BASE_VERSION=$(php artisan phpvms:version --base-only)
-
-  # This now includes the pre-release version, so "-dev" by default
-  VERSION=${BASE_VERSION}
-
-  # Don't pass in a version here, just write out the latest hash
-  php artisan phpvms:version --write "${VERSION}"
-  FULL_VERSION=$(php artisan phpvms:version)
-fi
-
-FILE_NAME="phpvms-${VERSION}"
-TAR_NAME="$FILE_NAME.tar.gz"
-ZIP_NAME="$FILE_NAME.zip"
-
 echo "Version: ${VERSION}"
 echo "Full Version: ${FULL_VERSION}"
 echo "Package name: ${TAR_NAME}"
-
-echo "==========================="
+echo "Current directory: ${BASE_DIR}"
 
 echo "Cleaning files"
 
-rm -rf vendor
-composer install --no-dev --prefer-dist --no-interaction --verbose
-
 # Leftover individual files to delete
 declare -a remove_files=(
   .git
@@ -107,44 +67,20 @@ mkdir -p storage/framework/cache
 mkdir -p storage/framework/sessions
 mkdir -p storage/framework/views
 
-# Regenerate the autoloader and classes
-composer dump-autoload
-make clean
-
 cd /tmp
-ls -al $TRAVIS_BUILD_DIR/../
 
-tar -czf $TAR_NAME -C $TRAVIS_BUILD_DIR .
+ls -al $BASE_DIR/../
+
+tar -czf $TAR_NAME -C $BASE_DIR .
 sha256sum $TAR_NAME >"$TAR_NAME.sha256"
 tar2zip $TAR_NAME
 sha256sum $ZIP_NAME >"$ZIP_NAME.sha256"
 
 ls -al /tmp
 
-echo "Uploading to S3"
-mkdir -p $TRAVIS_BUILD_DIR/build
-cd $TRAVIS_BUILD_DIR/build
+echo "Moving to dist"
+mkdir -p $BASE_DIR/dist
+cd $BASE_DIR/dist
 
 mv "/tmp/$TAR_NAME" "/tmp/$ZIP_NAME" "/tmp/$TAR_NAME.sha256" "/tmp/$ZIP_NAME.sha256" .
-artifacts upload --target-paths "/" $ZIP_NAME $TAR_NAME $TRAVIS_BUILD_DIR/VERSION $TAR_NAME.sha256 $ZIP_NAME.sha256
 
-# Upload the version for a tagged release. Move to a version file in different
-# tags. Within phpVMS, we have an option of which version to track in the admin
-if test "$TRAVIS_TAG"; then
-  echo "Uploading release version file"
-  cp "$TRAVIS_BUILD_DIR/VERSION" release_version
-  artifacts upload --target-paths "/" release_version
-else
-  echo "Uploading ${TRAVIS_BRANCH}_version file"
-  cp $TRAVIS_BUILD_DIR/VERSION ${TRAVIS_BRANCH}_version
-  artifacts upload --target-paths "/" ${TRAVIS_BRANCH}_version
-fi
-
-#if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" != "dev" ]; then
-#  echo "Skipping Discord branch update broadcast"
-#else
-  curl -X POST \
-       --data "{\"content\": \"A new build is available at http://downloads.phpvms.net/$TAR_NAME (${FULL_VERSION})\"}" \
-       -H "Content-Type: application/json" \
-       $DISCORD_WEBHOOK_URL
-#fi

.github/scripts/version.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+if test "$GIT_TAG_NAME"; then
+  export VERSION=$GIT_TAG_NAME
+
+  # Pass in the tag as the version to write out
+  php artisan phpvms:version --write --write-full-version "${VERSION}"
+  export FULL_VERSION=$(php artisan phpvms:version)
+else
+  export BRANCH=${GITHUB_REF##*/}
+  echo "On branch $BRANCH"
+
+  # Write the version out but place the branch ID in there
+  # This is only for the dev branch
+  export BASE_VERSION=$(php artisan phpvms:version --base-only)
+
+  # This now includes the pre-release version, so "-dev" by default
+  export VERSION=${BASE_VERSION}
+
+  # Don't pass in a version here, just write out the latest hash
+  php artisan phpvms:version --write "${VERSION}"
+  export FULL_VERSION=$(php artisan phpvms:version)
+fi
+
+export FILE_NAME="phpvms-${VERSION}"
+export TAR_NAME="$FILE_NAME.tar.gz"
+export ZIP_NAME="$FILE_NAME.zip"
+export BASE_DIR=`pwd`
+
+# https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#environment-files
+echo "BRANCH=${BRANCH}" >> $GITHUB_ENV
+echo "FILE_NAME=${FILE_NAME}" >> $GITHUB_ENV
+echo "TAR_NAME=${TAR_NAME}" >> $GITHUB_ENV
+echo "ZIP_NAME=${ZIP_NAME}" >> $GITHUB_ENV
+echo "BASE_DIR=${BASE_DIR}" >> $GITHUB_ENV
+echo "DISCORD_MSG=Version ${FULL_VERSION} is available, download: [zip](http://downloads.phpvms.net/$ZIP_NAME) | [tar](http://downloads.phpvms.net/$TAR_NAME)" >> $GITHUB_ENV

.github/workflows/build.yml

@@ -0,0 +1,252 @@
+name: 'Build'
+on: ['push', 'pull_request', 'workflow_dispatch', 'release']
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+    if: github.repository == 'nabeelio/phpvms'
+    strategy:
+      fail-fast: true
+      matrix:
+        php-versions: ['7.3', '7.4']
+    name: PHP ${{ matrix.php-versions }}
+    env:
+      extensions: intl, pcov, mbstring
+      key: cache-v1
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    # Configure Caching
+    - name: Setup cache environment
+      id: cache-env
+      uses: shivammathur/cache-extensions@v1
+      with:
+        php-version: ${{ matrix.php-versions }}
+        extensions: ${{ env.extensions }}
+        key: ${{ env.key }}
+
+    - name: Cache extensions
+      uses: actions/cache@v1
+      with:
+        path: ${{ steps.cache-env.outputs.dir }}
+        key: ${{ steps.cache-env.outputs.key }}
+        restore-keys: ${{ steps.cache-env.outputs.key }}
+
+    - name: Get composer cache directory
+      id: composer-cache
+      run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+    - name: Cache dependencies
+      uses: actions/cache@v2
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+        restore-keys: ${{ runner.os }}-composer-
+
+    # Configure PHP
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-versions }}
+        extensions: ${{ env.extensions }}
+        ini-values: post_max_size=256M, short_open_tag=On
+        coverage: xdebug
+        tools: php-cs-fixer, phpunit
+
+    - name: Shutdown Ubuntu MySQL
+      run: sudo service mysql stop
+
+    - name: Install MariaDB
+      uses: getong/mariadb-action@v1.1
+      with:
+        character set server: 'utf8'
+        collation server: 'utf8_general_ci'
+        mysql database: 'phpvms'
+        mysql root password: ''
+        mysql user: ''
+        mysql password: ''
+
+    - name: Configure Environment
+      run: |
+        php --version
+        mysql --version
+        # Downgrade composer version to 1.x
+        composer self-update --1
+        composer install --dev --no-interaction --verbose
+        cp .github/scripts/env.php env.php
+        cp .github/scripts/phpunit.xml phpunit.xml
+        php artisan database:create --reset
+        php artisan migrate:refresh --seed
+
+    - name: Run Tests
+      run: |
+        vendor/bin/php-cs-fixer fix --config=.php_cs -v --dry-run --diff --using-cache=no
+        vendor/bin/phpunit --debug --verbose
+
+  # This runs after all of the tests, run have run. Creates a cleaned up version of the
+  # distro, and then creates the artifact to push up to S3 or wherever
+  artifacts:
+    name: 'Create dev build'
+    needs: build
+    runs-on: 'ubuntu-18.04'
+    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+
+      - uses: olegtarasov/get-tag@v2.1
+        id: tagName
+
+      # Configure Caching
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+        # Dependencies
+      - name: 'Install Release Dependencies'
+        run: |
+          rm -rf vendor
+          sudo npm i tar-to-zip -g
+          composer self-update --1
+          composer install --no-dev --prefer-dist --no-interaction --verbose
+          sudo chmod +x ./.github/scripts/*
+
+      - name: Get version
+        run: .github/scripts/version.sh
+
+      - name: Build Distro
+        run: .github/scripts/build.sh
+
+      - name: Upload S3
+        uses: shallwefootball/s3-upload-action@v1.1.3
+        with:
+          aws_key_id: ${{ secrets.S3_BUILD_ARTIFACTS_ACCESS_KEY_ID }}
+          aws_secret_access_key: ${{ secrets.S3_BUILD_ARTIFACTS_SECRET_ACCESS_KEY}}
+          aws_bucket: ${{ secrets.S3_BUCKET_NAME }}
+          source_dir: 'dist'
+          destination_dir: ''
+
+      - name: Discord notification
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+        uses: Ilshidur/action-discord@0.3.0
+        with:
+          # DISCORD_MSG is defined in versions.sh
+          args: '{{ DISCORD_MSG }}'
+
+  # This runs after all of the tests, run have run. Creates a cleaned up version of the
+  # distro, and then creates the artifact to push up to S3 or wherever
+   # https://github.com/actions/create-release
+  release:
+    name: 'Create Release'
+    needs: build
+    runs-on: 'ubuntu-18.04'
+    if: startsWith(github.ref, 'refs/tags/')
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+
+      - uses: olegtarasov/get-tag@v2.1
+        id: tagName
+
+      # Configure Caching
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+        # Dependencies
+      - name: 'Install Release Dependencies'
+        run: |
+          rm -rf vendor
+          sudo npm i tar-to-zip -g
+          composer self-update --1
+          composer install --no-dev --prefer-dist --no-interaction --verbose
+          sudo chmod +x ./.github/scripts/*
+
+      - name: Get version
+        run: .github/scripts/version.sh
+
+      - name: Build Distro
+        run: .github/scripts/build.sh
+
+      - name: Upload S3
+        uses: shallwefootball/s3-upload-action@v1.1.3
+        with:
+          aws_key_id: ${{ secrets.S3_BUILD_ARTIFACTS_ACCESS_KEY_ID }}
+          aws_secret_access_key: ${{ secrets.S3_BUILD_ARTIFACTS_SECRET_ACCESS_KEY}}
+          aws_bucket: ${{ secrets.S3_BUCKET_NAME }}
+          source_dir: 'dist'
+          destination_dir: ''
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Get version
+        run: .github/scripts/version.sh
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          draft: true
+          prerelease: false
+
+      # Upload the tar file to the release
+      - name: Upload Tar Asset
+        id: upload-tar-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: dist/{{TAR_NAME}}
+          asset_name: '{{ TAR_NAME }}'
+          asset_content_type: application/gzip
+
+      # upload the zip file to the release
+      - name: Upload Zip Asset
+        id: upload-zip-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: dist/{{ZIP_NAME}}
+          asset_name: '{{ ZIP_NAME }}'
+          asset_content_type: application/zip
+
+      - name: Discord notification
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+        uses: Ilshidur/action-discord@0.3.0
+        with:
+          # DISCORD_MSG is defined in versions.sh
+          args: '{{ DISCORD_MSG }}'

.travis.yml

@@ -1,160 +0,0 @@
-#
-# Travis CI config file
-#
-
-language: php
-php:
-  - '7.4'
-  - '7.3'
-
-#env:
-#  - DB=mysql
-#  - DB=mariadb
-
-cache:
-  # Cache lives for 10 min
-  # Default of 3m might not be long enough for all the runs
-  timeout: 600
-  directories:
-  - "$HOME/.composer/cache"
-  - "$HOME/.npm"
-
-services:
-- mysql
-
-#addons:
-#  mariadb: '10.2'
-
-install:
-  - php --version
-  - mysql --version
-  - composer install --dev --no-interaction --verbose
-  - npm i tar-to-zip -g
-  - cp .travis/env.travis.php env.php
-  - cp .travis/phpunit.travis.xml phpunit.xml
-
-before_script:
-  - php artisan database:create --reset
-  - php artisan migrate:refresh --seed
-
-script:
-  - vendor/bin/php-cs-fixer fix --config=.php_cs -v --dry-run --diff --using-cache=no
-  - vendor/bin/phpunit --debug --verbose
-
-after_failure:
-  - cat storage/logs/*.log
-
-# Refer to: https://github.com/doctrine/dbal/blob/master/.travis.yml#L39
-jobs:
-  include:
-    # Different test stages
-#    - stage: Test
-#      name: PHP 7.2 + MySQL 5.7
-#      php: 7.2
-#      env: DB=mysql
-#      services:
-#        - mysql
-#    - stage: Test
-#      name: PHP 7.3 + MySQL 5.7
-#      php: 7.3
-#      env: DB=mysql
-#      services:
-#        - mysql
-#    - stage: Test
-#      name: PHP 7.4 + MySQL 5.7
-#      php: 7.4
-#      env: DB=mysql
-#      services:
-#        - mysql
-#    - stage: Test
-#      name: PHP 7.2 + MariaDB 10.1
-#      php: 7.2
-#      env: DB=mariadb
-#      addons:
-#        mariadb: '10.1'
-#    - stage: Test
-#      name: PHP 7.3 + MariaDB 10.1
-#      php: 7.3
-#      env: DB=mariadb
-#      addons:
-#        mariadb: '10.1'
-#    - stage: Test
-#      name: PHP 7.4 + MariaDB 10.1
-#      php: 7.4
-#      env: DB=mariadb MARIADB_VERSION=10.1
-#      addons:
-#        mariadb: '10.1'
-#    - stage: Test
-#      name: PHP 7.2 + MariaDB 10.2
-#      php: 7.2
-#      env: DB=mariadb
-#      addons:
-#        mariadb: '10.2'
-#    - stage: Test
-#      name: PHP 7.3 + MariaDB 10.3
-#      php: 7.3
-#      env: DB=mariadb
-#      addons:
-#        mariadb: '10.2'
-#    - stage: Test
-#      name: PHP 7.4 + MariaDB 10.2
-#      php: 7.4
-#      env: DB=mariadb
-#      addons:
-#        mariadb: '10.2'
-#    - stage: Test
-#      name: PHP 7.2 + MariaDB 10.3
-#      php: 7.2
-#      env: DB=mariadb
-#      addons:
-#        mariadb: '10.3'
-#    - stage: Test
-#      name: PHP 7.3 + MariaDB 10.3
-#      php: 7.3
-#      env: DB=mariadb
-#      addons:
-#        mariadb: '10.3'
-#    - stage: Test
-#      name: PHP 7.4 + MariaDB 10.3
-#      php: 7.4
-#      env: DB=mariadb
-#      addons:
-#        mariadb: '10.3'
-
-    # Just packages up a release
-    - stage: package
-      script: skip
-      before_deploy:
-        - curl -sL https://raw.githubusercontent.com/travis-ci/artifacts/6b10798/install | bash
-
-      # Configure the conditional deployment
-      # https://docs.travis-ci.com/user/deployment/#examples-of-conditional-deployment
-      deploy:
-        - provider: script
-          skip_cleanup: true
-          script: ./.travis/deploy_script.sh
-          on:
-            all_branches: true
-            repo: nabeelio/phpvms
-            php: '7.4'
-            tags: false
-
-    # RELEASE STAGE
-    # Only runs when there's a tag applied to this release (tag should be the version)
-    # This uses Github Releases and posts it there (provider: releases)
-    # https://docs.travis-ci.com/user/deployment/releases
-    - stage: release
-      script: skip
-      before_deploy:
-        - curl -sL https://raw.githubusercontent.com/travis-ci/artifacts/6b10798/install | bash
-        - ./.travis/deploy_script.sh
-      deploy:
-        provider: releases
-        skip_cleanup: true
-        api_key: $GITHUB_TOKEN
-        file_glob: true
-        file: build/*
-        on:
-          tags: true
-          repo: nabeelio/phpvms
-          php: '7.4'

README.md

@@ -1,18 +1,15 @@
-# 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)
+[![Build](https://github.com/nabeelio/phpvms/workflows/Build/badge.svg?branch=dev)](https://github.com/nabeelio/phpvms/actions) [![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](http://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](https://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
@@ -24,16 +21,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](http://docs.phpvms.net/setup/requirements)
+[View more details on requirements](https://docs.phpvms.net/requirements)
 
-## Installer
+### Installer
 
 1. Upload to your server
 1. Visit the site, and follow the link to the installer
 
-[View installation details](http://docs.phpvms.net/setup/installation)
+[View installation details](https://docs.phpvms.net/installation/installation)
 
-# development environment
+## Development Environment
 
 A full development environment can be brought up using Docker:
 
@@ -50,7 +47,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:
 

app/Console/Commands/CreateDatabase.php

@@ -92,8 +92,9 @@ class CreateDatabase extends Command
         }
 
         if ($this->option('reset') === true) {
-            $cmd = ['rm', '-rf', config($dbkey.'database')];
-            $this->runCommand($cmd);
+            if (file_exists($dbPath)) {
+                unlink(config($dbkey.'database'));
+            }
         }
 
         if (!file_exists($dbPath)) {

app/Console/Commands/DevInstall.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Contracts\Command;
-use Modules\Installer\Services\ConfigService;
+use App\Services\Installer\ConfigService;
 
 /**
  * Create a fresh development install

app/Console/Commands/ImportFromClassicCommand.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Modules\Importer\Console\Commands;
+namespace App\Console\Commands;
 
 use App\Contracts\Command;
+use App\Services\ImporterService;
 use Illuminate\Support\Facades\Log;
-use Modules\Importer\Services\ImporterService;
 
 class ImportFromClassicCommand extends Command
 {

app/Console/Commands/YamlExport.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Contracts\Command;
-use DB;
+use Illuminate\Support\Facades\DB;
 use Symfony\Component\Yaml\Yaml;
 
 /**
@@ -25,6 +25,20 @@ 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] = [];

app/Contracts/Award.php

@@ -36,7 +36,10 @@ 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)

app/Contracts/ImportExport.php

@@ -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 \Illuminate\Database\Eloquent\Model
+     * @return Airline
      */
-    public function getAirline($code)
+    public function getAirline($code): Airline
     {
         $airline = Airline::firstOrCreate([
             'icao' => $code,

app/Contracts/Migration.php

@@ -3,8 +3,11 @@
 namespace App\Contracts;
 
 use App\Support\Database;
-use DB;
+use Exception;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
 
 /**
  * Class Migration
@@ -25,6 +28,29 @@ 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
      *
@@ -35,7 +61,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);
         }
@@ -52,7 +78,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;
@@ -60,4 +86,22 @@ 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();
+    }
 }

app/Contracts/Modules/ServiceProvider.php

@@ -0,0 +1,49 @@
+<?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 [];
+    }
+}

app/Contracts/Repository.php

@@ -6,8 +6,7 @@ use Illuminate\Validation\Validator;
 use Prettus\Repository\Eloquent\BaseRepository;
 
 /**
- * @mixin Model
- * @mixin BaseRepository
+ * @mixin \Prettus\Repository\Eloquent\BaseRepository
  */
 abstract class Repository extends BaseRepository
 {

app/Cron/Nightly/SetActiveFlights.php

@@ -42,23 +42,18 @@ class SetActiveFlights extends Listener
                 continue;
             }
 
+            // Set to visible by default
+            $flight->visible = true;
+
             // dates aren't set, so just save if there were any changes above
             // and move onto the next one
             if ($flight->start_date === null || $flight->end_date === null) {
                 if ($flight->days !== null && $flight->days > 0) {
-                    $visible = Days::isToday($flight->days);
-                    if ($flight->visible !== $visible) {
-                        Log::info('Flight '.$flight->ident.' to '.($visible ? 'shown' : 'hidden'));
-
-                        $flight->visible = $visible;
-                        if ($visible === false) {
-                            Log::info('Today='.date('N').', start=no, mask='.$flight->days.', in='
-                                .Days::in($flight->days, Days::$isoDayMap[(int) date('N')]));
-                        }
+                    $flight->visible = Days::isToday($flight->days);
+                    if (!$flight->visible) {
+                        Log::info('Today='.date('N').', start=no, mask='.$flight->days.', in='
+                            .Days::in($flight->days, Days::$isoDayMap[(int) date('N')]));
                     }
-                } else {
-                    Log::info('Toggling flight '.$flight->ident.' to visible');
-                    $flight->visible = true;
                 }
 
                 $flight->save();
@@ -71,20 +66,11 @@ class SetActiveFlights extends Listener
             // and then make sure if days of the week are specified, check that too
             if ($today->gte($flight->start_date) && $today->lte($flight->end_date)) {
                 if ($flight->days !== null && $flight->days > 0) {
-                    $visible = Days::isToday($flight->days);
-                    if ($flight->visible !== $visible) {
-                        Log::info('Toggling flight '.$flight->ident.' to '.($visible ? 'shown' : 'hidden').'');
-
-                        $flight->visible = $visible;
-                        if ($visible === false) {
-                            Log::info('Today='.date('N').', start='.$flight->start_date
-                                .', end='.$flight->end_date.', mask='.$flight->days.', in='
+                    $flight->visible = Days::isToday($flight->days);
+                    if (!$flight->visible) {
+                        Log::info('Today='.date('N').', start=no, mask='.$flight->days.', in='
                                 .Days::in($flight->days, Days::$isoDayMap[(int) date('N')]));
-                        }
                     }
-                } else {
-                    Log::info('Toggling flight '.$flight->ident.' to visible');
-                    $flight->visible = true;
                 }
             } else {
                 $flight->visible = false;

app/Database/migrations/2017_06_08_0001_roles_permissions_tables.php

@@ -5,11 +5,6 @@ use Illuminate\Database\Schema\Blueprint;
 
 class RolesPermissionsTables extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         // Create table for storing roles
@@ -79,11 +74,6 @@ class RolesPermissionsTables extends Migration
         $this->addData('roles', $roles);
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('permission_user');

app/Database/migrations/2017_06_08_0005_create_password_resets_table.php

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

app/Database/migrations/2017_06_08_0006_create_sessions_table.php

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

app/Database/migrations/2017_06_08_191703_create_airlines_table.php

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

app/Database/migrations/2017_06_10_040335_create_fares_table.php

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

app/Database/migrations/2017_06_17_214650_create_flight_tables.php

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

app/Database/migrations/2017_06_21_165410_create_ranks_table.php

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

app/Database/migrations/2017_06_23_011011_create_subfleet_tables.php

@@ -3,9 +3,6 @@
 use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-/**
- * Class CreateSubfleetTables
- */
 class CreateSubfleetTables extends Migration
 {
     public function up()
@@ -48,11 +45,6 @@ class CreateSubfleetTables extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('subfleets');

app/Database/migrations/2017_12_12_174519_create_bids_table.php

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

app/Database/migrations/2017_12_14_225241_create_jobs_table.php

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

app/Database/migrations/2017_12_14_225337_create_failed_jobs_table.php

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

app/Database/migrations/2017_12_20_004147_create_navdata_tables.php

@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateNavdataTables extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         /*
@@ -31,11 +26,6 @@ class CreateNavdataTables extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('navdata');

app/Database/migrations/2017_12_20_005147_create_acars_tables.php

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

app/Database/migrations/2018_01_03_014930_create_stats_table.php

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

app/Database/migrations/2018_01_08_142204_create_news_table.php

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

app/Database/migrations/2018_01_28_180522_create_awards_table.php

@@ -3,14 +3,10 @@
 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) {
@@ -23,7 +19,6 @@ 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();
 
@@ -38,13 +33,20 @@ 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');

app/Database/migrations/2018_02_28_231807_create_journal_transactions_table.php

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

app/Database/migrations/2018_02_28_231813_create_journals_table.php

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

app/Database/migrations/2018_04_01_193443_create_files_table.php

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

app/Database/migrations/2019_06_19_220910_add_readonly_to_roles.php

@@ -1,17 +1,12 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\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) {
@@ -24,11 +19,6 @@ class AddReadonlyToRoles extends Migration
             ->update(['read_only' => true]);
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down(): void
     {
         Schema::table('roles', static function (Blueprint $table) {

app/Database/migrations/2019_07_16_141152_users_add_pilot_id.php

@@ -1,21 +1,19 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\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) {
@@ -29,11 +27,6 @@ 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) {

app/Database/migrations/2019_08_30_132224_create_notifications_table.php

@@ -1,16 +1,11 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\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) {
@@ -23,11 +18,6 @@ class CreateNotificationsTable extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('notifications');

app/Database/migrations/2019_09_16_141152_pireps_change_state_type.php

@@ -1,18 +1,16 @@
 <?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
@@ -25,13 +23,4 @@ class PirepsChangeStateType extends Migration
             $table->unsignedSmallInteger('state')->change();
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    }
 }

app/Database/migrations/2019_10_30_141152_pireps_add_flight_id.php

@@ -5,27 +5,15 @@ 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');
-        });
-    }
 }

app/Database/migrations/2020_02_12_141152_expenses_add_flight_type.php

@@ -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,11 +18,6 @@ class ExpensesAddFlightType extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::table('expenses', function (Blueprint $table) {

app/Database/migrations/2020_02_26_044305_modify_airports_coordinates.php

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

app/Database/migrations/2020_03_04_044305_flight_field_nullable.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Support\Facades\Schema;
 
 /**
@@ -8,24 +8,10 @@ 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()
-    {
-    }
 }

app/Database/migrations/2020_03_05_141152_flights_add_load_factor.php

@@ -1,14 +1,14 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\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,11 +22,6 @@ class FlightsAddLoadFactor extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::table('flights', function (Blueprint $table) {

app/Database/migrations/2020_03_06_141152_flights_add_pilot_pay.php

@@ -1,14 +1,14 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\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,11 +18,6 @@ class FlightsAddPilotPay extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::table('flights', function (Blueprint $table) {

app/Database/migrations/2020_03_06_141153_fares_add_type.php

@@ -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,16 +19,4 @@ class FaresAddType extends Migration
                 ->after('capacity');
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('fares', function (Blueprint $table) {
-            $table->dropColumn('type');
-        });
-    }
 }

app/Database/migrations/2020_03_09_141152_increase_id_lengths.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -33,13 +33,4 @@ class IncreaseIdLengths extends Migration
             });
         }
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    }
 }

app/Database/migrations/2020_03_09_141153_remove_subfleet_type_index.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -15,13 +15,4 @@ class RemoveSubfleetTypeIndex extends Migration
             $table->dropUnique(['type']);
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    }
 }

app/Database/migrations/2020_03_11_141153_add_simbrief_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2020_03_27_174238_create_pages.php

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

app/Database/migrations/2020_03_28_174238_airline_remove_nullable.php

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

app/Database/migrations/2020_03_28_174238_page_icon_nullable.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -12,8 +12,4 @@ class PageIconNullable extends Migration
             $table->string('icon')->change()->nullable();
         });
     }
-
-    public function down()
-    {
-    }
 }

app/Database/migrations/2020_06_09_141153_pages_add_link.php

@@ -1,15 +1,15 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\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,9 +23,6 @@ class PagesAddLink extends Migration
         });
     }
 
-    /**
-     * @return void
-     */
     public function down()
     {
         Schema::table('fares', function (Blueprint $table) {

app/Database/migrations/2020_07_21_141153_create_user_fields.php

@@ -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,11 +39,4 @@ class CreateUserFields extends Migration
             $table->index(['user_field_id', 'user_id']);
         });
     }
-
-    /**
-     * @return void
-     */
-    public function down()
-    {
-    }
 }

app/Database/migrations/2020_09_03_141152_aircraft_add_mtow.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -19,11 +19,6 @@ class AircraftAddMtow extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::table('aircraft', function (Blueprint $table) {

app/Database/migrations/2020_09_30_081536_create_modules_table.php

@@ -0,0 +1,29 @@
+<?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');
+    }
+}

app/Database/migrations/2020_11_20_044305_modify_pages_size.php

@@ -0,0 +1,18 @@
+<?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();
+        });
+    }
+}

app/Database/migrations/2020_11_26_044305_modify_download_link_size.php

@@ -0,0 +1,19 @@
+<?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();
+        });
+    }
+}

app/Database/migrations/2021_01_17_044305_add_hub_to_subfleets.php

@@ -0,0 +1,20 @@
+<?php
+
+use App\Contracts\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Add a hub to the subfleet is
+ */
+class AddHubToSubfleets extends Migration
+{
+    public function up()
+    {
+        Schema::table('subfleets', function (Blueprint $table) {
+            $table->string('hub_id', 4)
+                ->nullable()
+                ->after('airline_id');
+        });
+    }
+}

app/Database/seeds/DatabaseSeeder.php

@@ -1,15 +1,21 @@
 <?php
 
+use App\Services\Installer\MigrationService;
 use App\Services\Installer\SeederService;
 use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder
 {
-    private $seederService;
+    /** @var MigrationService */
+    private $migrationSvc;
+
+    /** @var SeederService */
+    private $seederSvc;
 
     public function __construct()
     {
-        $this->seederService = app(SeederService::class);
+        $this->migrationSvc = app(MigrationService::class);
+        $this->seederSvc = app(SeederService::class);
     }
 
     /**
@@ -19,6 +25,12 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        $this->seederService->syncAllSeeds();
+        // 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();
     }
 }

app/Database/seeds/dev/.gitignore

@@ -1 +1,2 @@
 local.yml
+vmsacars.yml

app/Database/seeds/dev/sample.yml

@@ -1,30 +1,10 @@
 
-#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
@@ -136,34 +116,91 @@ airports:
     ground_handling_cost: 50
 #
 aircraft:
-  - id: 1
+  -
+    id: 1
     subfleet_id: 1
+    icao: null
+    iata: null
     airport_id: KJFK
-    name: Boeing 747-438
+    landing_time: '2020-10-23 07:50:16'
+    name: 'Boeing 747-438'
     registration: 001Z
-    flight_time: 360
+    hex_code: null
+    mtow: '0.00'
+    zfw: '0.00'
+    flight_time: 540
     status: A
-  - id: 2
+    state: 0
+    created_at: null
+    updated_at: '2020-10-23 07:50:16'
+  -
+    id: 2
     subfleet_id: 2
+    icao: null
+    iata: null
     airport_id: LGRP
-    name: Boeing 777-200
+    landing_time: null
+    name: 'Boeing 777-200'
     registration: C202
+    hex_code: null
+    mtow: '0.00'
+    zfw: '0.00'
     flight_time: 260
     status: A
-  - id: 3
+    state: 0
+    created_at: null
+    updated_at: null
+  -
+    id: 3
     subfleet_id: 1
+    icao: null
+    iata: null
     airport_id: KAUS
-    name: Boeing 747-412
+    landing_time: '2020-10-24 08:50:13'
+    name: 'Boeing 747-412'
     registration: S2333
-    flight_time: 0
+    hex_code: null
+    mtow: '0.00'
+    zfw: '0.00'
+    flight_time: 180
     status: A
-  - id: 4
+    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
-    name: Boeing 747-436 RETIRED
-    registration:
+    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'
 
 expenses:
   - name: Per-Flight (no muliplier)
@@ -220,68 +257,192 @@ expenses:
     updated_at: now
 
 fares:
-  - id: 1
-    code: Y
+  -
+    id: 1
+    code: 'Y'
     name: Economy
-    price: 100
+    price: '100.00'
+    cost: '0.00'
     capacity: 200
-  - id: 2
+    type: 0
+    notes: null
+    active: 1
+    created_at: null
+    updated_at: null
+  -
+    id: 2
     code: B
     name: Business
-    price: 500
+    price: '500.00'
+    cost: '0.00'
     capacity: 10
-  - id: 3
+    type: 0
+    notes: null
+    active: 1
+    created_at: null
+    updated_at: null
+  -
+    id: 3
     code: F
     name: First-Class
-    price: 800
+    price: '800.00'
+    cost: '0.00'
     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
-    cost_block_hour: 1000
-    ground_handling_multiplier: 200
-  - id: 2
+    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
     airline_id: 1
-    name: 777-222ER GE90-76B
     type: 772-22ER-GE90-76B
-    cost_block_hour: 500
-    ground_handling_multiplier: 150
-  - id: 3
+    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
     airline_id: 1
-    name: 777-367 ER GE90-115B
     type: 772-36ER-GE90-115B
-    cost_block_hour: 100
-    ground_handling_multiplier: 150
+    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'
 
-# add a few mods to aircraft and fares
 subfleet_fare:
-
-  # Fare classes on the 747
-  - subfleet_id: 1
+  -
+    subfleet_id: 1
     fare_id: 1
-    price: 200
-    capacity: 400
-  - subfleet_id: 1
+    price: '200'
+    cost: null
+    capacity: '400'
+    created_at: null
+    updated_at: null
+  -
+    subfleet_id: 1
     fare_id: 2
     price: 120%
-  - subfleet_id: 1
-    fare_id: 3
-    price: 1000
-    capacity: 110%
-
-  # Fare classes on the 777
-  - subfleet_id: 2
-    fare_id: 1
-  - subfleet_id: 2
-    fare_id: 3
-    capacity: 10
-
-subfleet_rank:
-  - rank_id: 1
+    cost: null
+    capacity: null
+    created_at: null
+    updated_at: null
+  -
     subfleet_id: 1
+    fare_id: 3
+    price: '1000'
+    cost: null
+    capacity: 110%
+    created_at: null
+    updated_at: null
+  -
+    subfleet_id: 2
+    fare_id: 1
+    price: null
+    cost: null
+    capacity: null
+    created_at: null
+    updated_at: null
+  -
+    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
+subfleet_rank:
+  -
+    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
@@ -359,6 +520,35 @@ 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
@@ -389,12 +579,24 @@ flight_subfleet:
     flight_id: flightid_4
 
 bids:
-  - id: 100
+  -
+    id: 100
     user_id: 1
     flight_id: flightid_1
-  - id: 101
+    created_at: now
+    updated_at: now
+  -
+    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

app/Database/seeds/dev/users.yml

@@ -92,3 +92,10 @@ 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

app/Database/seeds/modules.yml

@@ -0,0 +1,10 @@
+- name: 'Awards'
+  enabled: 1
+- name: 'Sample'
+  enabled: 1
+- name: 'VMSAcars'
+  enabled: 1
+- name: 'Vacentral'
+  enabled: 1
+- name: 'TestModule'
+  enabled: 1

app/Database/seeds/permissions.yml

@@ -51,3 +51,6 @@
 - name: maintenance
   display_name: Maintenance
   description: Run maintenance tasks
+- name: modules
+  display_name: Modules
+  description: Add/Edit Modules

app/Database/seeds/settings.yml

@@ -130,6 +130,20 @@
   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

app/Exceptions/Converters/ValidationException.php

@@ -18,7 +18,7 @@ class ValidationException extends AbstractHttpException
 
         parent::__construct(
             400,
-            'Validation exception'
+            'Validation Error'
         );
     }
 

app/Exceptions/ModuleExistsException.php

@@ -0,0 +1,41 @@
+<?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 [];
+    }
+}

app/Exceptions/ModuleInstallationError.php

@@ -0,0 +1,38 @@
+<?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 [];
+    }
+}

app/Exceptions/ModuleInvalidFileType.php

@@ -0,0 +1,38 @@
+<?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 [];
+    }
+}

app/Http/Controllers/Admin/AircraftController.php

@@ -160,6 +160,7 @@ class AircraftController extends Controller
      */
     public function update($id, UpdateAircraftRequest $request)
     {
+        /** @var \App\Models\Aircraft $aircraft */
         $aircraft = $this->aircraftRepo->findWithoutFail($id);
 
         if (empty($aircraft)) {
@@ -171,7 +172,7 @@ class AircraftController extends Controller
         $this->aircraftRepo->update($attrs, $id);
 
         Flash::success('Aircraft updated successfully.');
-        return redirect(route('admin.aircraft.index'));
+        return redirect(route('admin.aircraft.index').'?subfleet='.$aircraft->subfleet_id);
     }
 
     /**
@@ -183,6 +184,7 @@ class AircraftController extends Controller
      */
     public function destroy($id)
     {
+        /** @var \App\Models\Aircraft $aircraft */
         $aircraft = $this->aircraftRepo->findWithoutFail($id);
 
         if (empty($aircraft)) {

app/Http/Controllers/Admin/FareController.php

@@ -12,6 +12,7 @@ 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;
 
@@ -162,6 +163,8 @@ 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.');

app/Http/Controllers/Admin/ModulesController.php

@@ -0,0 +1,122 @@
+<?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));
+    }
+}

app/Http/Controllers/Admin/SubfleetController.php

@@ -7,6 +7,7 @@ use App\Http\Controllers\Admin\Traits\Importable;
 use App\Http\Requests\CreateSubfleetRequest;
 use App\Http\Requests\UpdateSubfleetRequest;
 use App\Models\Airline;
+use App\Models\Airport;
 use App\Models\Enums\FareType;
 use App\Models\Enums\FuelType;
 use App\Models\Enums\ImportExportType;
@@ -133,6 +134,7 @@ class SubfleetController extends Controller
     {
         return view('admin.subfleets.create', [
             'airlines'   => Airline::all()->pluck('name', 'id'),
+            'hubs'       => Airport::where('hub', 1)->pluck('name', 'id'),
             'fuel_types' => FuelType::labels(),
         ]);
     }
@@ -203,6 +205,7 @@ class SubfleetController extends Controller
 
         return view('admin.subfleets.edit', [
             'airlines'    => Airline::all()->pluck('name', 'id'),
+            'hubs'        => Airport::where('hub', 1)->pluck('name', 'id'),
             'fuel_types'  => FuelType::labels(),
             'avail_fares' => $avail_fares,
             'avail_ranks' => $avail_ranks,

app/Http/Controllers/Admin/UserController.php

@@ -8,6 +8,7 @@ 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;
@@ -20,6 +21,7 @@ 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
@@ -69,7 +71,7 @@ class UserController extends Controller
 
         return view('admin.users.index', [
             'users'   => $users,
-            'country' => new \League\ISO3166\ISO3166(),
+            'country' => new ISO3166(),
         ]);
     }
 
@@ -82,13 +84,18 @@ 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 \League\ISO3166\ISO3166(),
+            'country'   => new ISO3166(),
+            'countries' => $countries,
             'airports'  => $airports,
             'ranks'     => Rank::all()->pluck('name', 'id'),
             'roles'     => Role::all()->pluck('name', 'id'),
@@ -122,31 +129,7 @@ class UserController extends Controller
      */
     public function show($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'),
-        ]);
+        return $this->edit($id);
     }
 
     /**
@@ -154,12 +137,14 @@ class UserController extends Controller
      *
      * @param int $id
      *
+     * @throws RepositoryException
+     *
      * @return mixed
      */
     public function edit($id)
     {
         $user = $this->userRepo
-            ->with(['fields', 'rank'])
+            ->with(['awards', 'fields', 'rank'])
             ->findWithoutFail($id);
 
         if (empty($user)) {
@@ -171,7 +156,7 @@ class UserController extends Controller
             ->whereOrder(['user_id' => $id], 'created_at', 'desc')
             ->paginate();
 
-        $countries = collect((new \League\ISO3166\ISO3166())->all())
+        $countries = collect((new ISO3166())->all())
             ->mapWithKeys(function ($item, $key) {
                 return [strtolower($item['alpha2']) => $item['name']];
             });
@@ -182,6 +167,7 @@ class UserController extends Controller
         return view('admin.users.edit', [
             'user'      => $user,
             'pireps'    => $pireps,
+            'country'   => new ISO3166(),
             'countries' => $countries,
             'timezones' => Timezonelist::toArray(),
             'airports'  => $airports,
@@ -280,6 +266,28 @@ 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
      *

app/Http/Controllers/Api/FlightController.php

@@ -4,11 +4,14 @@ namespace App\Http\Controllers\Api;
 
 use App\Contracts\Controller;
 use App\Exceptions\AssetNotFound;
+use App\Exceptions\Unauthorized;
 use App\Http\Resources\Flight as FlightResource;
 use App\Http\Resources\Navdata as NavdataResource;
 use App\Models\SimBrief;
+use App\Models\User;
 use App\Repositories\Criteria\WhereCriteria;
 use App\Repositories\FlightRepository;
+use App\Services\FareService;
 use App\Services\FlightService;
 use Exception;
 use Illuminate\Http\Request;
@@ -18,19 +21,26 @@ 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;
 
     /**
-     * FlightController constructor.
-     *
+     * @param FareService      $fareSvc
      * @param FlightRepository $flightRepo
      * @param FlightService    $flightSvc
      */
     public function __construct(
+        FareService $fareSvc,
         FlightRepository $flightRepo,
         FlightService $flightSvc
     ) {
+        $this->fareSvc = $fareSvc;
         $this->flightRepo = $flightRepo;
         $this->flightSvc = $flightSvc;
     }
@@ -54,9 +64,13 @@ 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',
@@ -66,7 +80,8 @@ class FlightController extends Controller
             },
         ])->find($id);
 
-        $this->flightSvc->filterSubfleets(Auth::user(), $flight);
+        $flight = $this->flightSvc->filterSubfleets($user, $flight);
+        $flight = $this->fareSvc->getReconciledFaresForFlight($flight);
 
         return new FlightResource($flight);
     }
@@ -109,6 +124,7 @@ class FlightController extends Controller
             $flights = $this->flightRepo
                 ->with([
                     'airline',
+                    'fares',
                     'subfleets',
                     'subfleets.aircraft',
                     'subfleets.fares',
@@ -124,7 +140,8 @@ class FlightController extends Controller
 
         // TODO: Remove any flights here that a user doesn't have permissions to
         foreach ($flights as $flight) {
-            $this->flightSvc->filterSubfleets(Auth::user(), $flight);
+            $this->flightSvc->filterSubfleets($user, $flight);
+            $this->fareSvc->getReconciledFaresForFlight($flight);
         }
 
         return FlightResource::collection($flights);
@@ -137,20 +154,25 @@ class FlightController extends Controller
      *
      * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
      */
-    public function briefing($id)
+    public function briefing(string $id)
     {
+        /** @var User $user */
         $user = Auth::user();
         $w = [
-            'user_id'   => $user->id,
-            'flight_id' => $id,
+            'id' => $id,
         ];
 
+        /** @var SimBrief $simbrief */
         $simbrief = SimBrief::where($w)->first();
 
         if ($simbrief === null) {
             throw new AssetNotFound(new Exception('Flight briefing not found'));
         }
 
+        /*if ($simbrief->user_id !== $user->id) {
+            throw new Unauthorized(new Exception('User cannot access another user\'s simbrief'));
+        }*/
+
         return response($simbrief->acars_xml, 200, [
             'Content-Type' => 'application/xml',
         ]);

app/Http/Controllers/Api/PirepController.php

@@ -22,8 +22,6 @@ use App\Models\Acars;
 use App\Models\Enums\AcarsType;
 use App\Models\Enums\PirepFieldSource;
 use App\Models\Enums\PirepSource;
-use App\Models\Enums\PirepState;
-use App\Models\Enums\PirepStatus;
 use App\Models\Pirep;
 use App\Models\PirepComment;
 use App\Repositories\AcarsRepository;
@@ -38,9 +36,6 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 
-/**
- * Class PirepController
- */
 class PirepController extends Controller
 {
     private $acarsRepo;
@@ -93,6 +88,10 @@ class PirepController extends Controller
             $attrs['created_at'] = Carbon::createFromTimeString($attrs['created_at']);
         }
 
+        if (array_key_exists('submitted_at', $attrs)) {
+            $attrs['submitted_at'] = Carbon::createFromTimeString($attrs['submitted_at']);
+        }
+
         if (array_key_exists('updated_at', $attrs)) {
             $attrs['updated_at'] = Carbon::createFromTimeString($attrs['updated_at']);
         }
@@ -306,14 +305,8 @@ class PirepController extends Controller
             }
         }
 
-        $attrs['state'] = PirepState::PENDING;
-        $attrs['status'] = PirepStatus::ARRIVED;
-        $attrs['submitted_at'] = Carbon::now('UTC');
-
-        $pirep = $this->pirepRepo->update($attrs, $pirep_id);
-
         try {
-            $pirep = $this->pirepSvc->create($pirep);
+            $pirep = $this->pirepSvc->file($pirep, $attrs);
             $this->updateFields($pirep, $request);
             $this->updateFares($pirep, $request);
         } catch (\Exception $e) {

app/Http/Controllers/Api/UserController.php

@@ -61,7 +61,8 @@ class UserController extends Controller
      */
     protected function getUserId(Request $request)
     {
-        if ($request->get('id') === null) {
+        $id = $request->get('id');
+        if ($id === null || $id === 'me') {
             return Auth::user()->id;
         }
 
@@ -89,10 +90,7 @@ class UserController extends Controller
      */
     public function get($id)
     {
-        $user = $this->userRepo
-            ->with(['airline', 'bids', 'rank'])
-            ->find($id);
-
+        $user = $this->userSvc->getUser($id);
         return new UserResource($user);
     }
 
@@ -108,7 +106,7 @@ class UserController extends Controller
      */
     public function bids(Request $request)
     {
-        $user = $this->userRepo->find($this->getUserId($request));
+        $user = $this->userSvc->getUser($this->getUserId($request));
 
         // Add a bid
         if ($request->isMethod('PUT') || $request->isMethod('POST')) {

app/Http/Controllers/Frontend/DownloadController.php

@@ -42,7 +42,14 @@ class DownloadController extends Controller
             $category = explode('\\', $class);
             $category = end($category);
 
-            $group_name = $category.' - '.$obj->name;
+            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;
+            }
+
             $regrouped_files[$group_name] = $files;
         }
 

app/Http/Controllers/Frontend/FlightController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Frontend;
 
 use App\Contracts\Controller;
 use App\Models\Bid;
+use App\Models\Enums\FlightType;
 use App\Repositories\AirlineRepository;
 use App\Repositories\AirportRepository;
 use App\Repositories\Criteria\WhereCriteria;
@@ -120,6 +121,8 @@ class FlightController extends Controller
             'saved'         => $saved_flights,
             'subfleets'     => $this->subfleetRepo->selectBoxList(true),
             'flight_number' => $request->input('flight_number'),
+            'flight_types'  => FlightType::select(true),
+            'flight_type'   => $request->input('flight_type'),
             'arr_icao'      => $request->input('arr_icao'),
             'dep_icao'      => $request->input('dep_icao'),
             'subfleet_id'   => $request->input('subfleet_id'),

app/Http/Controllers/Frontend/PirepController.php

@@ -181,8 +181,9 @@ 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(['airline', 'aircraft', 'dpt_airport', 'arr_airport'])
+        $this->pirepRepo->with($with)
             ->pushCriteria(new WhereCriteria($request, $where));
         $pireps = $this->pirepRepo->orderBy('created_at', 'desc')->paginate();
 

app/Http/Controllers/Frontend/ProfileController.php

@@ -61,27 +61,14 @@ 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()
     {
-        /** @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,
-        ]);
+        return $this->show(Auth::user()->id);
     }
 
     /**
@@ -91,7 +78,8 @@ class ProfileController extends Controller
      */
     public function show($id)
     {
-        $user = User::with(['fields', 'fields.field'])
+        /** @var \App\Models\User $user */
+        $user = User::with(['awards', 'fields', 'fields.field'])
             ->where('id', $id)
             ->first();
 
@@ -208,6 +196,7 @@ 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;

app/Http/Controllers/Frontend/SimBriefController.php

@@ -3,22 +3,34 @@
 namespace App\Http\Controllers\Frontend;
 
 use App\Exceptions\AssetNotFound;
+use App\Models\Aircraft;
+use App\Models\Enums\FlightType;
 use App\Models\SimBrief;
 use App\Repositories\FlightRepository;
+use App\Services\FareService;
 use App\Services\SimBriefService;
+use App\Services\UserService;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
 class SimBriefController
 {
+    private $fareSvc;
     private $flightRepo;
     private $simBriefSvc;
+    private $userSvc;
 
-    public function __construct(FlightRepository $flightRepo, SimBriefService $simBriefSvc)
-    {
+    public function __construct(
+        FareService $fareSvc,
+        FlightRepository $flightRepo,
+        SimBriefService $simBriefSvc,
+        UserService $userSvc
+    ) {
+        $this->fareSvc = $fareSvc;
         $this->flightRepo = $flightRepo;
         $this->simBriefSvc = $simBriefSvc;
+        $this->userSvc = $userSvc;
     }
 
     /**
@@ -32,8 +44,14 @@ class SimBriefController
      */
     public function generate(Request $request)
     {
+        /** @var \App\Models\User $user */
+        $user = Auth::user();
+
         $flight_id = $request->input('flight_id');
-        $flight = $this->flightRepo->find($flight_id);
+        $aircraft_id = $request->input('aircraft_id');
+        $flight = $this->flightRepo->with(['subfleets'])->find($flight_id);
+        $flight = $this->fareSvc->getReconciledFaresForFlight($flight);
+
         if (!$flight) {
             flash()->error('Unknown flight');
             return redirect(route('frontend.flights.index'));
@@ -45,7 +63,7 @@ class SimBriefController
             return redirect(route('frontend.flights.index'));
         }
 
-        $user = Auth::user();
+        // Check if a Simbrief profile already exists
         $simbrief = SimBrief::select('id')->where([
             'flight_id' => $flight_id,
             'user_id'   => $user->id,
@@ -55,8 +73,51 @@ class SimBriefController
             return redirect(route('frontend.simbrief.briefing', [$simbrief->id]));
         }
 
+        // Simbrief Profile doesn't exist; prompt the user to create a new one
+        $aircraft = Aircraft::select('registration', 'name', 'icao', 'iata', 'subfleet_id')
+            ->where('id', $aircraft_id)
+            ->get();
+
+        if ($flight->subfleets->count() > 0) {
+            $subfleets = $flight->subfleets;
+        } else {
+            $subfleets = $this->userSvc->getAllowableSubfleets($user);
+        }
+
+        if ($flight->flight_type === FlightType::CHARTER_PAX_ONLY) {
+            $pax_weight = 197;
+        } else {
+            $pax_weight = 208;
+        }
+
+        // No aircraft selected, show that form
+        if (!$aircraft_id) {
+            return view('flights.simbrief_aircraft', [
+                'flight'     => $flight,
+                'aircraft'   => $aircraft,
+                'subfleets'  => $subfleets,
+                'pax_weight' => $pax_weight,
+            ]);
+        }
+
+        // Get the correct load factors
+        $lfactor = $flight->load_factor ?? setting('flights.default_load_factor');
+        $lfactorv = $flight->load_factor_variance ?? setting('flights.load_factor_variance');
+
+        $loadmin = $lfactor - $lfactorv;
+        $loadmin = $loadmin < 0 ? 0 : $loadmin;
+
+        $loadmax = $lfactor + $lfactorv;
+        $loadmax = $loadmax > 100 ? 100 : $loadmax;
+
+        // Show the main simbrief form
         return view('flights.simbrief_form', [
-            'flight' => $flight,
+            'flight'     => $flight,
+            'aircraft'   => $aircraft,
+            'subfleets'  => $subfleets,
+            'pax_weight' => $pax_weight,
+            'loadmin'    => $loadmin,
+            'loadmax'    => $loadmax,
         ]);
     }
 
@@ -75,11 +136,53 @@ class SimBriefController
             return redirect(route('frontend.flights.index'));
         }
 
+        $str = $simbrief->xml->aircraft->equip;
+        $wc = stripos($str, '-');
+        $tr = stripos($str, '/');
+        $wakecat = substr($str, 0, $wc);
+        $equipment = substr($str, $wc + 1, $tr - 2);
+        $transponder = substr($str, $tr + 1);
+
         return view('flights.simbrief_briefing', [
-            'simbrief' => $simbrief,
+            'simbrief'    => $simbrief,
+            'wakecat'     => $wakecat,
+            'equipment'   => $equipment,
+            'transponder' => $transponder,
         ]);
     }
 
+    /**
+     * Remove the flight_id from the SimBrief Briefing (to a create a new one)
+     * or if no pirep_id is attached to the briefing delete it completely
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @throws \Exception
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function generate_new(Request $request)
+    {
+        $simbrief = SimBrief::find($request->id);
+
+        // Invalid Simbrief ID/profile, go back to the main flight index
+        if (!$simbrief) {
+            return redirect(route('frontend.flights.index'));
+        }
+
+        // Cleanup the current Simbrief entry and redirect to the new generation form
+        // If there isn't a PIREP ID, then delete the entry, otherwise, remove the flight
+        $flight_id = $simbrief->flight_id;
+        if (!$simbrief->pirep_id) {
+            $simbrief->delete();
+        } else {
+            $simbrief->flight_id = null;
+            $simbrief->save();
+        }
+
+        return redirect(route('frontend.simbrief.generate').'?flight_id='.$flight_id);
+    }
+
     /**
      * Create a prefile of this PIREP with a given OFP. Then redirect the
      * user to the newly prefiled PIREP
@@ -129,7 +232,7 @@ class SimBriefController
         $ofp_id = $request->input('ofp_id');
         $flight_id = $request->input('flight_id');
 
-        $simbrief = $this->simBriefSvc->checkForOfp(Auth::user()->id, $ofp_id, $flight_id);
+        $simbrief = $this->simBriefSvc->downloadOfp(Auth::user()->id, $ofp_id, $flight_id);
         if ($simbrief === null) {
             $error = new AssetNotFound(new Exception('Simbrief OFP not found'));
             return $error->getResponse();

app/Http/Controllers/System/ImporterController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Modules\Importer\Http\Controllers;
+namespace App\Http\Controllers\System;
 
 use App\Contracts\Controller;
+use App\Services\ImporterService;
 use App\Services\Installer\DatabaseService;
-use App\Services\Installer\InstallerService;
 use App\Support\Utils;
+use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
-use Modules\Importer\Services\ImporterService;
 
 class ImporterController extends Controller
 {
@@ -27,13 +27,11 @@ class ImporterController extends Controller
      * Show the main page for the importer; show form for the admin email
      * and the credentials for the other database
      *
-     * @param \Illuminate\Http\Request $request
-     *
      * @return mixed
      */
-    public function index(Request $request)
+    public function index()
     {
-        return view('importer::step1-configure');
+        return view('system.importer.step1-configure');
     }
 
     protected function testDb(Request $request)
@@ -51,7 +49,7 @@ class ImporterController extends Controller
     /**
      * Check the database connection
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
      * @return mixed
      */
@@ -62,12 +60,12 @@ class ImporterController extends Controller
 
         try {
             $this->testDb($request);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $status = 'danger';
             $message = 'Failed! '.$e->getMessage();
         }
 
-        return view('importer::dbtest', [
+        return view('system.importer.dbtest', [
             'status'  => $status,
             'message' => $message,
         ]);
@@ -76,7 +74,7 @@ class ImporterController extends Controller
     /**
      * The post from the above
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
      * @return mixed
      */
@@ -90,17 +88,17 @@ class ImporterController extends Controller
 
             // Generate the import manifest
             $manifest = $this->importerSvc->generateImportManifest();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             Log::error($e->getMessage());
 
             // Send it to run, step1
-            return view('importer::error', [
+            return view('system.importer.error', [
                 'error' => $e->getMessage(),
             ]);
         }
 
         // Send it to run, step1
-        return view('importer::step2-processing', [
+        return view('system.importer.step2-processing', [
             'manifest' => $manifest,
         ]);
     }
@@ -111,9 +109,9 @@ class ImporterController extends Controller
      * stage=STAGE NAME
      * start=record_start
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
-     * @throws \Exception
+     * @throws Exception
      *
      * @return mixed
      */
@@ -136,9 +134,6 @@ class ImporterController extends Controller
      */
     public function complete()
     {
-        $installerSvc = app(InstallerService::class);
-        $installerSvc->disableInstallerModules();
-
         return redirect('/');
     }
 }

app/Http/Controllers/System/InstallerController.php

@@ -1,25 +1,32 @@
 <?php
 
-namespace Modules\Installer\Http\Controllers;
+namespace App\Http\Controllers\System;
 
 use App\Contracts\Controller;
 use App\Services\AirlineService;
 use App\Services\AnalyticsService;
+use App\Services\Installer\ConfigService;
 use App\Services\Installer\DatabaseService;
-use App\Services\Installer\InstallerService;
 use App\Services\Installer\MigrationService;
+use App\Services\Installer\RequirementsService;
 use App\Services\Installer\SeederService;
 use App\Services\UserService;
 use App\Support\Countries;
 use App\Support\Utils;
+use Exception;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\View\Factory;
 use Illuminate\Database\QueryException;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\View\View;
+use function in_array;
 use Laracasts\Flash\Flash;
-use Modules\Installer\Services\ConfigService;
-use Modules\Installer\Services\RequirementsService;
+use RuntimeException;
 
 class InstallerController extends Controller
 {
@@ -72,10 +79,10 @@ class InstallerController extends Controller
     public function index()
     {
         if (config('app.key') !== 'base64:zdgcDqu9PM8uGWCtMxd74ZqdGJIrnw812oRMmwDF6KY=') {
-            return view('installer::errors/already-installed');
+            return view('system.installer.errors.already-installed');
         }
 
-        return view('installer::install/index-start');
+        return view('system.installer.install.index-start');
     }
 
     protected function testDb(Request $request)
@@ -92,6 +99,10 @@ class InstallerController extends Controller
 
     /**
      * Check the database connection
+     *
+     * @param Request $request
+     *
+     * @return Application|Factory|View
      */
     public function dbtest(Request $request)
     {
@@ -100,12 +111,12 @@ class InstallerController extends Controller
 
         try {
             $this->testDb($request);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $status = 'danger';
             $message = 'Failed! '.$e->getMessage();
         }
 
-        return view('installer::install/dbtest', [
+        return view('system.installer.install.dbtest', [
             'status'  => $status,
             'message' => $message,
         ]);
@@ -132,11 +143,9 @@ class InstallerController extends Controller
     /**
      * Step 1. Check the modules and permissions
      *
-     * @param Request $request
-     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return Factory|View
      */
-    public function step1(Request $request)
+    public function step1()
     {
         $php_version = $this->reqSvc->checkPHPVersion();
         $extensions = $this->reqSvc->checkExtensions();
@@ -150,9 +159,9 @@ class InstallerController extends Controller
         ];
 
         // Make sure there are no false values
-        $passed = !\in_array(false, $statuses, true);
+        $passed = !in_array(false, $statuses, true);
 
-        return view('installer::install/steps/step1-requirements', [
+        return view('system.installer.install.steps.step1-requirements', [
             'php'         => $php_version,
             'extensions'  => $extensions,
             'directories' => $directories,
@@ -163,14 +172,12 @@ class InstallerController extends Controller
     /**
      * Step 2. Database Setup
      *
-     * @param Request $request
-     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return Factory|View
      */
-    public function step2(Request $request)
+    public function step2()
     {
         $db_types = ['mysql' => 'mysql', 'sqlite' => 'sqlite'];
-        return view('installer::install/steps/step2-db', [
+        return view('system.installer.install.steps.step2-db', [
             'db_types' => $db_types,
         ]);
     }
@@ -180,7 +187,7 @@ class InstallerController extends Controller
      *
      * @param Request $request
      *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return RedirectResponse|Redirector
      */
     public function envsetup(Request $request)
     {
@@ -192,7 +199,7 @@ class InstallerController extends Controller
         // Before writing out the env file, test the DB credentials
         try {
             $this->testDb($request);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             Log::error('Testing db before writing configs failed');
             Log::error($e->getMessage());
 
@@ -220,7 +227,7 @@ class InstallerController extends Controller
          */
         try {
             $this->envSvc->createConfigFiles($attrs);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             Log::error('Config files failed to write');
             Log::error($e->getMessage());
 
@@ -236,11 +243,9 @@ class InstallerController extends Controller
     /**
      * Step 2b. Setup the database
      *
-     * @param Request $request
-     *
      * @return mixed
      */
-    public function dbsetup(Request $request)
+    public function dbsetup()
     {
         $console_out = '';
 
@@ -250,7 +255,7 @@ class InstallerController extends Controller
             $this->seederSvc->syncAllSeeds();
         } catch (QueryException $e) {
             Log::error('Error on db setup: '.$e->getMessage());
-            dd($e);
+            //dd($e);
             $this->envSvc->removeConfigFiles();
             Flash::error($e->getMessage());
             return redirect(route('installer.step2'))->withInput();
@@ -258,7 +263,7 @@ class InstallerController extends Controller
 
         $console_out = trim($console_out);
 
-        return view('installer::install/steps/step2a-db_output', [
+        return view('system.installer.install.steps.step2a-db_output', [
             'console_output' => $console_out,
         ]);
     }
@@ -266,9 +271,9 @@ class InstallerController extends Controller
     /**
      * Step 3. Setup the admin user and initial settings
      */
-    public function step3(Request $request)
+    public function step3()
     {
-        return view('installer::install/steps/step3-user', [
+        return view('system.installer.install.steps.step3-user', [
             'countries' => Countries::getSelectList(),
         ]);
     }
@@ -278,9 +283,8 @@ class InstallerController extends Controller
      *
      * @param Request $request
      *
-     * @throws \RuntimeException
-     * @throws \Prettus\Validator\Exceptions\ValidatorException
-     * @throws \Exception
+     * @throws RuntimeException
+     * @throws Exception
      *
      * @return mixed
      */
@@ -337,21 +341,16 @@ class InstallerController extends Controller
         // Try sending telemetry info
         $this->analyticsSvc->sendInstall();
 
-        return view('installer::install/steps/step3a-completed', []);
+        return view('system.installer.install.steps.step3a-completed', []);
     }
 
     /**
      * Final step
      *
-     * @param Request $request
-     *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return RedirectResponse|Redirector
      */
-    public function complete(Request $request)
+    public function complete()
     {
-        $installerSvc = app(InstallerService::class);
-        $installerSvc->disableInstallerModules();
-
         return redirect('/login');
     }
 }

app/Http/Controllers/System/UpdateController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Updater\Http\Controllers;
+namespace App\Http\Controllers\System;
 
 use App\Contracts\Controller;
 use App\Repositories\KvpRepository;
@@ -10,8 +10,10 @@ use App\Services\Installer\MigrationService;
 use App\Services\Installer\SeederService;
 use Codedge\Updater\UpdaterManager;
 use function count;
+use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
+use Illuminate\View\View;
 
 class UpdateController extends Controller
 {
@@ -51,18 +53,16 @@ class UpdateController extends Controller
      */
     public function index()
     {
-        return view('updater::index-start');
+        return view('system.updater.index-start');
     }
 
     /**
      * Step 1. Check if there's an update available. Check if there
      * are any unrun migrations
      *
-     * @param Request $request
-     *
      * @return mixed
      */
-    public function step1(Request $request)
+    public function step1()
     {
         $this->installerSvc->clearCaches();
 
@@ -70,7 +70,7 @@ class UpdateController extends Controller
             Log::info('Upgrade is pending');
         }
 
-        return view('updater::steps/step1-update-available');
+        return view('system.updater.steps.step1-update-available');
     }
 
     /**
@@ -87,13 +87,13 @@ class UpdateController extends Controller
         $migrations = $this->migrationSvc->migrationsAvailable();
         if (count($migrations) === 0) {
             $this->seederSvc->syncAllSeeds();
-            return view('updater::steps/step3-update-complete');
+            return view('system.updater.steps.step3-update-complete');
         }
 
         $output = $this->migrationSvc->runAllMigrations();
         $this->seederSvc->syncAllSeeds();
 
-        return view('updater::steps/step2-migrations-done', [
+        return view('system.updater.steps.step2-migrations-done', [
             'console_output' => $output,
         ]);
     }
@@ -101,27 +101,23 @@ class UpdateController extends Controller
     /**
      * Final step
      *
-     * @param Request $request
-     *
      * @return mixed
      */
-    public function complete(Request $request)
+    public function complete()
     {
-        return redirect('/login');
+        return redirect('/admin');
     }
 
     /**
      * Show the update page with the latest version
      *
-     * @param \Illuminate\Http\Request $request
-     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return Factory|View
      */
-    public function updater(Request $request)
+    public function updater()
     {
         $version = $this->kvpRepo->get('latest_version_tag');
 
-        return view('updater::downloader/downloader', [
+        return view('system.updater.downloader/downloader', [
             'version' => $version,
         ]);
     }
@@ -129,15 +125,13 @@ class UpdateController extends Controller
     /**
      * Download the actual update and then forward the user to the updater page
      *
-     * @param \Illuminate\Http\Request $request
-     *
      * @return mixed
      */
-    public function update_download(Request $request)
+    public function update_download()
     {
         $version = $this->kvpRepo->get('latest_version_tag');
         if (empty($version)) {
-            return view('updater::steps/step1-no-update');
+            return view('system.updater.steps.step1-no-update');
         }
 
         $release = $this->updateManager->source('github')->fetch($version);

app/Http/Requests/Acars/PrefileRequest.php

@@ -11,7 +11,7 @@ class PrefileRequest extends FormRequest
         return [
             'airline_id'          => 'required|exists:airlines,id',
             'aircraft_id'         => 'required|exists:aircraft,id',
-            'flight_id'           => 'sometimes|exists:flights,id',
+            'flight_id'           => 'sometimes|nullable|exists:flights,id',
             'flight_number'       => 'required',
             'dpt_airport_id'      => 'required',
             'arr_airport_id'      => 'required',

app/Http/Resources/Fare.php

@@ -15,9 +15,9 @@ class Fare extends Resource
             'id'       => $this->id,
             'code'     => $this->code,
             'name'     => $this->name,
-            'price'    => $this->price,
-            'cost'     => $this->cost,
             'capacity' => $this->capacity,
+            'cost'     => $this->cost,
+            'price'    => $this->price,
             'type'     => $this->type,
             'notes'    => $this->notes,
             'active'   => $this->active,

app/Http/Resources/Flight.php

@@ -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 new stdClass();
+            return $return_values;
         }
 
-        $fields = [];
         foreach ($field_values as $field) {
-            $fields[$field->name] = $field->value;
+            $return_values->{$field->name} = $field->value;
         }
 
-        return $fields;
+        return $return_values;
     }
 
     /**

app/Http/Resources/SimBrief.php

@@ -13,7 +13,7 @@ class SimBrief extends Resource
     {
         return [
             'id'  => $this->id,
-            'url' => url(route('api.flights.briefing', ['id' => $this->flight_id])),
+            'url' => url(route('api.flights.briefing', ['id' => $this->id])),
         ];
     }
 }

app/Http/Resources/User.php

@@ -16,6 +16,7 @@ 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,
@@ -24,6 +25,7 @@ class User extends Resource
             'last_pirep_id' => $this->last_pirep_id,
             'flights'       => $this->flights,
             'flight_time'   => $this->flight_time,
+            'transfer_time' => $this->transfer_time,
             'timezone'      => $this->timezone,
             'state'         => $this->state,
         ];
@@ -31,6 +33,7 @@ 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;
     }

app/Listeners/AwardHandler.php

@@ -0,0 +1,71 @@
+<?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();
+            }
+        }
+    }
+}

app/Listeners/AwardListener.php

@@ -1,32 +0,0 @@
-<?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();
-            }
-        }
-    }
-}

app/Models/Airline.php

@@ -97,6 +97,11 @@ class Airline extends Model
         $this->attributes['icao'] = strtoupper($icao);
     }
 
+    public function subfleets()
+    {
+        return $this->hasMany(Subfleet::class, 'airline_id');
+    }
+
     public function flights()
     {
         return $this->belongsTo(Flight::class, 'airline_id');

app/Models/Flight.php

@@ -25,6 +25,10 @@ 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

app/Models/Module.php

@@ -0,0 +1,32 @@
+<?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',
+    ];
+}