Merge branch 'dev' of https://github.com/nabeelio/phpvms into dev

app/Http/Controllers/Api/AcarsController.php

@@ -58,7 +58,7 @@ class AcarsController extends Controller
      */
     protected function checkCancelled(Pirep $pirep)
     {
-        if (!$pirep->allowedUpdates()) {
+        if ($pirep->cancelled) {
             throw new PirepCancelled();
         }
     }

app/Http/Controllers/Api/PirepController.php

@@ -102,7 +102,7 @@ class PirepController extends Controller
      */
     protected function checkCancelled(Pirep $pirep)
     {
-        if (!$pirep->allowedUpdates()) {
+        if ($pirep->cancelled) {
             throw new PirepCancelled();
         }
     }

app/Models/Acars.php

@@ -12,11 +12,16 @@ use PhpUnitsOfMeasure\Exception\NonStringUnitName;
 /**
  * Class Acars
  * @param string id
- * @property mixed gs
- * @property mixed lat
- * @property mixed lon
- * @property mixed altitude
- * @property mixed heading
+ * @property string pirep_id
+ * @property int    type
+ * @property string name
+ * @property double lat
+ * @property double lon
+ * @property double altitude
+ * @property int    gs
+ * @property int    heading
+ * @property int    order
+ * @property int    nav_type
  * @package App\Models
  */
 class Acars extends Model
@@ -64,15 +69,15 @@ class Acars extends Model
         'fuel'        => 'float',
         'fuel_flow'   => 'float',
     ];
+    /*public static $sanitize = [
+        'sim_time' => 'carbon',
+        'created_at' => '',
+    ];*/
 
     public static $rules = [
         'pirep_id' => 'required',
     ];
 
-    /*public static $sanitize = [
-        'sim_time' => 'carbon',
-        'created_at' => '',
-    ];*/
 
     /**
      * Return a new Length unit so conversions can be made

app/Models/Pirep.php

@@ -33,8 +33,9 @@ use PhpUnitsOfMeasure\Exception\NonStringUnitName;
  * @property integer     block_time
  * @property integer     flight_time    In minutes
  * @property integer     planned_flight_time
- * @property mixed       planned_distance
- * @property mixed       distance
+ * @property double      distance
+ * @property double      planned_distance
+ * @property string      route
  * @property integer     score
  * @property User        user
  * @property Flight|null flight
@@ -361,6 +362,14 @@ class Pirep extends Model
         $this->attributes['route'] = $route;
     }
 
+    /**
+     * Return if this is cancelled or not
+     */
+    public function getCancelledAttribute()
+    {
+        return $this->state === PirepState::CANCELLED;
+    }
+
     /**
      * Check if this PIREP is allowed to be updated
      * @return bool

app/Services/PirepService.php

@@ -32,35 +32,23 @@ use Log;
  */
 class PirepService extends Service
 {
-    private $acarsRepo,
-            $flightRepo,
-            $geoSvc,
-            $navRepo,
+    private $geoSvc,
             $pilotSvc,
             $pirepRepo;
 
     /**
      * PirepService constructor.
-     * @param AcarsRepository   $acarsRepo
-     * @param FlightRepository  $flightRepo
      * @param GeoService        $geoSvc
-     * @param NavdataRepository $navRepo
      * @param PirepRepository   $pirepRepo
      * @param UserService       $pilotSvc
      */
     public function __construct(
-        AcarsRepository $acarsRepo,
-        FlightRepository $flightRepo,
         GeoService $geoSvc,
-        NavdataRepository $navRepo,
         PirepRepository $pirepRepo,
         UserService $pilotSvc
     ) {
-        $this->acarsRepo = $acarsRepo;
-        $this->flightRepo = $flightRepo;
         $this->geoSvc = $geoSvc;
         $this->pilotSvc = $pilotSvc;
-        $this->navRepo = $navRepo;
         $this->pirepRepo = $pirepRepo;
     }