Don't allow cancels from certain states (#396)

* Don't allow cancels from certain states

* Unused imports

* Don't reset the state doubly

* Move SetUserActive into listener; code cleanup

* Unused imports

* Add missing files into htaccess

* Move Command contract to correct folder

.htaccess

@@ -20,6 +20,7 @@ RedirectMatch 403 ^/storage/.*?$
 RedirectMatch 403 ^/tests/.*?$
 RedirectMatch 403 ^/vendor/.*?$
 RedirectMatch 403 ^/.bowerrc$
+RedirectMatch 403 ^/.env
 RedirectMatch 403 ^/artisan$
 RedirectMatch 403 ^/composer.json
 RedirectMatch 403 ^/composer.lock
@@ -32,6 +33,7 @@ RedirectMatch 403 ^/package.json
 RedirectMatch 403 ^/package-lock.json
 RedirectMatch 403 ^/phpunit.xml
 RedirectMatch 403 ^/webpack.mix.js
+RedirectMatch 403 ^/yarn.lock
 
 # Redirect Trailing Slashes If Not A Folder...
 RewriteCond %{REQUEST_FILENAME} !-d

app/Console/Commands/AcarsReplay.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Console\Command;
+use App\Contracts\Command;
 use App\Facades\Utils;
 use GuzzleHttp\Client;
 use Illuminate\Database\Eloquent\Collection;

app/Console/Commands/ComposerCommand.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Console\Command;
+use App\Contracts\Command;
 use Illuminate\Support\Facades\Artisan;
 
 class ComposerCommand extends Command

app/Console/Commands/CreateDatabase.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Console\Command;
+use App\Contracts\Command;
 use Illuminate\Support\Facades\Log;
 use Tivie\OS\Detector;
 

app/Console/Commands/DevCommands.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Console\Command;
+use App\Contracts\Command;
 use App\Models\Acars;
 use App\Models\Airline;
 use App\Models\Pirep;

app/Console/Commands/DevInstall.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Console\Command;
+use App\Contracts\Command;
 use Modules\Installer\Services\ConfigService;
 
 /**

app/Console/Commands/ImportCsv.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Console\Command;
+use App\Contracts\Command;
 use App\Services\ImportService;
 
 class ImportCsv extends Command

app/Console/Commands/ImportFromClassic.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Console\Command;
+use App\Contracts\Command;
 
 class ImportFromClassic extends Command
 {

app/Console/Commands/NavdataImport.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Console\Command;
+use App\Contracts\Command;
 use App\Models\Enums\NavaidType;
 use App\Models\Navdata;
 

app/Console/Commands/TestApi.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Console\Command;
+use App\Contracts\Command;
 use GuzzleHttp\Client;
 
 class TestApi extends Command

app/Console/Commands/Version.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Console\Command;
+use App\Contracts\Command;
 use App\Services\VersionService;
 use Symfony\Component\Yaml\Yaml;
 

app/Console/Commands/YamlExport.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Console\Command;
+use App\Contracts\Command;
 use DB;
 use Symfony\Component\Yaml\Yaml;
 

app/Console/Commands/YamlImport.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Console\Command;
+use App\Contracts\Command;
 use App\Services\DatabaseService;
 
 /**

app/Console/Cron/Hourly.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Cron;
 
-use App\Console\Command;
+use App\Contracts\Command;
 use App\Events\CronHourly;
 
 /**

app/Console/Cron/Monthly.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Cron;
 
-use App\Console\Command;
+use App\Contracts\Command;
 use App\Events\CronMonthly;
 
 /**

app/Console/Cron/Nightly.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Cron;
 
-use App\Console\Command;
+use App\Contracts\Command;
 use App\Events\CronNightly;
 
 /**

app/Console/Cron/Weekly.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Cron;
 
-use App\Console\Command;
+use App\Contracts\Command;
 use App\Events\CronWeekly;
 
 /**

app/Console/Command.php → app/Contracts/Command.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console;
+namespace App\Contracts;
 
 use Illuminate\Support\Facades\Log;
 use Symfony\Component\Process\Process;
@@ -10,6 +10,14 @@
  */
 abstract class Command extends \Illuminate\Console\Command
 {
+    /**
+     * @return mixed
+     */
+    abstract public function handle();
+
+    /**
+     * Adjust the logging depending on where we're running from
+     */
     public function __construct()
     {
         parent::__construct();
@@ -20,11 +28,6 @@ public function __construct()
         }
     }
 
-    /**
-     * @return mixed
-     */
-    abstract public function handle();
-
     /**
      * Splice the logger and replace the active handlers with the handlers from the
      * a stack in config/logging.php

app/Contracts/Model.php

@@ -7,6 +7,8 @@
  *
  * @property mixed $id
  * @property bool  $skip_mutator
+ *
+ * @method static where(array $array)
  */
 abstract class Model extends \Illuminate\Database\Eloquent\Model
 {

app/Database/migrations/2019_09_16_141152_pireps_change_state_type.php

@@ -0,0 +1,36 @@
+<?php
+
+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;
+
+class PirepsChangeStateType extends Migration
+{
+    /**
+     * Change the PIREP state column to be a TINYINT
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // Migrate the old rejected state
+        DB::update('UPDATE `pireps` SET `state`='.PirepState::REJECTED
+                  .' WHERE state=-1');
+
+        // Change the column type to an unsigned small int (tinyint not supported on all)
+        Schema::table('pireps', function (Blueprint $table) {
+            $table->unsignedSmallInteger('state')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
+}

app/Exceptions/PirepCancelNotAllowed.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Exceptions;
+
+use App\Models\Pirep;
+
+class PirepCancelNotAllowed extends HttpException
+{
+    private $pirep;
+
+    public function __construct(Pirep $pirep)
+    {
+        $this->pirep = $pirep;
+        parent::__construct(
+            400,
+            'This PIREP can\'t be cancelled'
+        );
+    }
+
+    /**
+     * Return the RFC 7807 error type (without the URL root)
+     */
+    public function getErrorType(): string
+    {
+        return 'pirep-cancel-not-allowed';
+    }
+
+    public function getErrorDetails(): string
+    {
+        return $this->getMessage();
+    }
+
+    public function getErrorMetadata(): array
+    {
+        return [
+            'pirep_id' => $this->pirep->id,
+            'state'    => $this->pirep->state,
+        ];
+    }
+}

app/Http/Controllers/Api/PirepController.php

@@ -363,10 +363,8 @@ public function cancel($pirep_id, Request $request)
     {
         Log::info('PIREP Cancel, user '.Auth::id(), $request->post());
 
-        $pirep = $this->pirepRepo->update([
-            'state'  => PirepState::CANCELLED,
-            'status' => PirepStatus::CANCELLED,
-        ], $pirep_id);
+        $pirep = Pirep::find($pirep_id);
+        $this->pirepSvc->cancel($pirep);
 
         return new PirepResource($pirep);
     }

app/Http/Routes/api.php

@@ -46,6 +46,7 @@
     Route::post('pireps/{pirep_id}/update', 'PirepController@update');
     Route::post('pireps/{pirep_id}/file', 'PirepController@file');
     Route::post('pireps/{pirep_id}/comments', 'PirepController@comments_post');
+    Route::put('pireps/{pirep_id}/cancel', 'PirepController@cancel');
     Route::delete('pireps/{pirep_id}/cancel', 'PirepController@cancel');
 
     Route::get('pireps/{pirep_id}/fields', 'PirepController@fields_get');

app/Listeners/SetUserActive.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Contracts\Listener;
+use App\Events\PirepFiled;
+use App\Events\UserStateChanged;
+use App\Models\Enums\UserState;
+
+class SetUserActive extends Listener
+{
+    public function handle(PirepFiled $event): void
+    {
+        // Check the user state, set them to ACTIVE if on leave
+        if ($event->pirep->user->state !== UserState::ACTIVE) {
+            $old_state = $event->pirep->user->state;
+            $event->pirep->user->state = UserState::ACTIVE;
+            $event->pirep->user->save();
+
+            event(new UserStateChanged($event->pirep->user, $old_state));
+        }
+    }
+}

app/Models/Aircraft.php

@@ -10,14 +10,17 @@
 /**
  * @property int      id
  * @property mixed    subfleet_id
+ * @property string   airport_id   The apt where the aircraft is
  * @property string   name
  * @property string   icao
  * @property string   registration
+ * @property int      flight_time
  * @property string   hex_code
  * @property Airport  airport
  * @property Subfleet subfleet
  * @property int      status
  * @property int      state
+ * @property Carbon   landing_time
  */
 class Aircraft extends Model
 {

app/Models/Enums/AcarsType.php

@@ -4,9 +4,6 @@
 
 use App\Contracts\Enum;
 
-/**
- * Class AcarsType
- */
 class AcarsType extends Enum
 {
     public const FLIGHT_PATH = 0;

app/Models/Enums/ActiveState.php

@@ -4,9 +4,6 @@
 
 use App\Contracts\Enum;
 
-/**
- * Class ActiveState
- */
 class ActiveState extends Enum
 {
     public const INACTIVE = 0;

app/Models/Enums/AircraftState.php

@@ -4,9 +4,6 @@
 
 use App\Contracts\Enum;
 
-/**
- * Class AircraftState
- */
 class AircraftState extends Enum
 {
     public const PARKED = 0;

app/Models/Enums/AircraftStatus.php

@@ -4,9 +4,6 @@
 
 use App\Contracts\Enum;
 
-/**
- * Class AircraftState
- */
 class AircraftStatus extends Enum
 {
     public const ACTIVE = 'A';

app/Models/Enums/AnalyticsDimensions.php

@@ -4,9 +4,6 @@
 
 use App\Contracts\Enum;
 
-/**
- * Class AnalyticsDimensions
- */
 class AnalyticsDimensions extends Enum
 {
     public const PHP_VERSION = 1;