@fleetbase/fleetops-engine 0.2.8 → 0.3.0

package/app/utils/get-leaflet-layer-by-id.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/utils/get-leaflet-layer-by-id';

package/app/utils/layer-can-bind-contextmenu.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/utils/layer-can-bind-contextmenu';

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.2.8",
+    "version": "0.2.9",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -60,6 +60,16 @@
                 "Fleetbase\\FleetOps\\Providers\\FleetOpsServiceProvider",
                 "Fleetbase\\FleetOps\\Providers\\EventServiceProvider"
             ]
+        },
+        "fleetbase/fleetops-api": {
+            "excludes": [
+                "addon",
+                "app",
+                "assets",
+                "config",
+                "tests",
+                "vendor"
+            ]
         }
     },
     "config": {

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.2.8",
+    "version": "0.2.9",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.2.8",
+    "version": "0.3.0",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops",
@@ -39,8 +39,8 @@
         "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
     },
     "dependencies": {
-        "@fleetbase/ember-core": "^0.1.4",
-        "@fleetbase/ember-ui": "^0.2.0",
+        "@fleetbase/ember-core": "^0.1.6",
+        "@fleetbase/ember-ui": "^0.2.1",
         "@fleetbase/fleetops-data": "^0.1.1",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",
         "@fortawesome/ember-fontawesome": "^0.4.1",

package/server/migrations/2023_09_14_074512_update_vehicles_table.php

@@ -6,95 +6,96 @@ use Illuminate\Support\Facades\Schema;
 
 class UpdateVehiclesTable extends Migration
 {
-  public function up()
-  {
-    Schema::table('vehicles', function (Blueprint $table) {
-      if (!Schema::hasColumn('vehicles', 'location')) {
-        $table->point('location')->nullable()->after('avatar_url');
-      }
-      if (!Schema::hasColumn('vehicles', 'model')) {
-        $table->string('model')->nullable()->after('make');
-      }
-      if (!Schema::hasColumn('vehicles', 'model_data')) {
-        $table->json('model_data')->nullable()->after('meta');
-      }
-      if (!Schema::hasColumn('vehicles', 'telematics')) {
-        $table->json('telematics')->nullable()->after('meta');
-      }
+    public function up()
+    {
+        Schema::table('vehicles', function (Blueprint $table) {
+            if (!Schema::hasColumn('vehicles', 'location')) {
+                $table->point('location')->nullable()->after('avatar_url');
+            }
 
-      $table->dropColumn([
-        'model_0_to_100_kph',
-        'model_body',
-        'model_co2',
-        'model_doors',
-        'model_drive',
-        'model_engine_bore_mm',
-        'model_engine_cc',
-        'model_engine_compression',
-        'model_engine_cyl',
-        'model_engine_fuel',
-        'model_engine_position',
-        'model_engine_power_ps',
-        'model_engine_power_rpm',
-        'model_engine_stroke_mm',
-        'model_engine_torque_nm',
-        'model_engine_torque_rpm',
-        'model_engine_valves_per_cyl',
-        'model_fuel_cap_l',
-        'model_length_mm',
-        'model_lkm_city',
-        'model_lkm_hwy',
-        'model_lkm_mixed',
-        'model_make_display',
-        'model_seats',
-        'model_sold_in_us',
-        'model_top_speed_kph',
-        'model_transmission_type',
-        'model_weight_kg',
-        'model_wheelbase_mm',
-        'model_width_mm',
-      ]);
-    });
-  }
+            if (!Schema::hasColumn('vehicles', 'model')) {
+                $table->string('model')->nullable()->after('make');
+            }
+            if (!Schema::hasColumn('vehicles', 'model_data')) {
+                $table->json('model_data')->nullable()->after('meta');
+            }
+            if (!Schema::hasColumn('vehicles', 'telematics')) {
+                $table->json('telematics')->nullable()->after('meta');
+            }
 
-  public function down()
-  {
-    Schema::table('vehicles', function (Blueprint $table) {
-      $table->dropColumn('location');
-      $table->dropColumn('model');
-      $table->dropColumn('model_data');
-      $table->dropColumn('telematics');
+            $table->dropColumn([
+                'model_0_to_100_kph',
+                'model_body',
+                'model_co2',
+                'model_doors',
+                'model_drive',
+                'model_engine_bore_mm',
+                'model_engine_cc',
+                'model_engine_compression',
+                'model_engine_cyl',
+                'model_engine_fuel',
+                'model_engine_position',
+                'model_engine_power_ps',
+                'model_engine_power_rpm',
+                'model_engine_stroke_mm',
+                'model_engine_torque_nm',
+                'model_engine_torque_rpm',
+                'model_engine_valves_per_cyl',
+                'model_fuel_cap_l',
+                'model_length_mm',
+                'model_lkm_city',
+                'model_lkm_hwy',
+                'model_lkm_mixed',
+                'model_make_display',
+                'model_seats',
+                'model_sold_in_us',
+                'model_top_speed_kph',
+                'model_transmission_type',
+                'model_weight_kg',
+                'model_wheelbase_mm',
+                'model_width_mm',
+            ]);
+        });
+    }
 
-      $table->string('model_0_to_100_kph')->nullable();
-      $table->string('model_body')->nullable();
-      $table->string('model_co2')->nullable();
-      $table->string('model_doors')->nullable();
-      $table->string('model_drive')->nullable();
-      $table->string('model_engine_bore_mm')->nullable();
-      $table->string('model_engine_cc')->nullable();
-      $table->string('model_engine_compression')->nullable();
-      $table->string('model_engine_cyl')->nullable();
-      $table->string('model_engine_fuel')->nullable();
-      $table->string('model_engine_position')->nullable();
-      $table->string('model_engine_power_ps')->nullable();
-      $table->string('model_engine_power_rpm')->nullable();
-      $table->string('model_engine_stroke_mm')->nullable();
-      $table->string('model_engine_torque_nm')->nullable();
-      $table->string('model_engine_torque_rpm')->nullable();
-      $table->string('model_engine_valves_per_cyl')->nullable();
-      $table->string('model_fuel_cap_l')->nullable();
-      $table->string('model_length_mm')->nullable();
-      $table->string('model_lkm_city')->nullable();
-      $table->string('model_lkm_hwy')->nullable();
-      $table->string('model_lkm_mixed')->nullable();
-      $table->string('model_make_display')->nullable();
-      $table->string('model_seats')->nullable();
-      $table->string('model_sold_in_us')->nullable();
-      $table->string('model_top_speed_kph')->nullable();
-      $table->string('model_transmission_type')->nullable();
-      $table->string('model_weight_kg')->nullable();
-      $table->string('model_wheelbase_mm')->nullable();
-      $table->string('model_width_mm')->nullable();
-    });
-  }
+    public function down()
+    {
+        Schema::table('vehicles', function (Blueprint $table) {
+            $table->dropColumn('location');
+            $table->dropColumn('model');
+            $table->dropColumn('model_data');
+            $table->dropColumn('telematics');
+
+            $table->string('model_0_to_100_kph')->nullable();
+            $table->string('model_body')->nullable();
+            $table->string('model_co2')->nullable();
+            $table->string('model_doors')->nullable();
+            $table->string('model_drive')->nullable();
+            $table->string('model_engine_bore_mm')->nullable();
+            $table->string('model_engine_cc')->nullable();
+            $table->string('model_engine_compression')->nullable();
+            $table->string('model_engine_cyl')->nullable();
+            $table->string('model_engine_fuel')->nullable();
+            $table->string('model_engine_position')->nullable();
+            $table->string('model_engine_power_ps')->nullable();
+            $table->string('model_engine_power_rpm')->nullable();
+            $table->string('model_engine_stroke_mm')->nullable();
+            $table->string('model_engine_torque_nm')->nullable();
+            $table->string('model_engine_torque_rpm')->nullable();
+            $table->string('model_engine_valves_per_cyl')->nullable();
+            $table->string('model_fuel_cap_l')->nullable();
+            $table->string('model_length_mm')->nullable();
+            $table->string('model_lkm_city')->nullable();
+            $table->string('model_lkm_hwy')->nullable();
+            $table->string('model_lkm_mixed')->nullable();
+            $table->string('model_make_display')->nullable();
+            $table->string('model_seats')->nullable();
+            $table->string('model_sold_in_us')->nullable();
+            $table->string('model_top_speed_kph')->nullable();
+            $table->string('model_transmission_type')->nullable();
+            $table->string('model_weight_kg')->nullable();
+            $table->string('model_wheelbase_mm')->nullable();
+            $table->string('model_width_mm')->nullable();
+        });
+    }
 }

package/server/migrations/2023_10_25_093014_create_vehicle_device_events_table.php

@@ -0,0 +1,56 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateVehicleDeviceEventsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // fix indexes on vehicle_devices table
+        Schema::table('vehicle_devices', function (Blueprint $table) {
+            $table->index('uuid');
+        });
+
+        // create events table
+        Schema::create('vehicle_device_events', function (Blueprint $table) {
+            $table->increments('id');
+            $table->uuid('uuid')->nullable();
+            $table->uuid('vehicle_device_uuid');
+            $table->foreign('vehicle_device_uuid')->references('uuid')->on('vehicle_devices');
+            $table->json('payload')->nullable();
+            $table->json('meta')->nullable();
+            $table->string('ident')->nullable();
+            $table->string('protocol')->nullable();
+            $table->string('provider')->nullable();
+            $table->point('location')->nullable();
+            $table->string('mileage')->nullable();
+            $table->string('state')->nullable();
+            $table->string('code')->nullable();
+            $table->string('reason')->nullable();
+            $table->softDeletes();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('vehicle_device_events');
+
+        // fix indexes on vehicle_devices table
+        Schema::table('vehicle_devices', function (Blueprint $table) {
+            $table->dropIndex(['uuid']);
+        });
+    }
+}

package/server/src/Http/Controllers/Internal/v1/LiveController.php

@@ -3,7 +3,10 @@
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
 use Fleetbase\FleetOps\Http\Filter\PlaceFilter;
+use Fleetbase\FleetOps\Http\Resources\v1\Driver as DriverResource;
 use Fleetbase\FleetOps\Http\Resources\v1\Order as OrderResource;
+use Fleetbase\FleetOps\Http\Resources\v1\Place as PlaceResource;
+use Fleetbase\FleetOps\Http\Resources\v1\Vehicle as VehicleResource;
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\Place;
@@ -94,7 +97,7 @@ class LiveController extends Controller
             )
             ->get();
 
-        return response()->json($drivers);
+        return DriverResource::collection($drivers);
     }
 
     /**
@@ -105,9 +108,9 @@ class LiveController extends Controller
     public function vehicles()
     {
         // Fetch vehicles that are online
-        $vehicles = Vehicle::where(['company_uuid' => session('company'), 'online' => 1])->get();
+        $vehicles = Vehicle::where(['company_uuid' => session('company')])->with(['devices'])->get();
 
-        return response()->json($vehicles);
+        return VehicleResource::collection($vehicles);
     }
 
     /**
@@ -122,6 +125,6 @@ class LiveController extends Controller
             ->filter(new PlaceFilter($request))
             ->get();
 
-        return response()->json($places);
+        return PlaceResource::collection($places);
     }
 }

package/server/src/Http/Filter/VehicleFilter.php

@@ -88,4 +88,11 @@ class VehicleFilter extends Filter
             }
         );
     }
+
+    public function assignedFleet(string $assignedFleet)
+    {
+        if ($assignedFleet === 'false') {
+            $this->builder->whereDoesntHave('fleets');
+        }
+    }
 }

package/server/src/Http/Resources/v1/Vehicle.php

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
+use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class Vehicle extends FleetbaseResource
 {
@@ -19,27 +20,34 @@ class Vehicle extends FleetbaseResource
         return array_merge(
             $this->getInternalIds(),
             [
-                'id'           => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-                'uuid'         => $this->when(Http::isInternalRequest(), $this->uuid),
-                'public_id'    => $this->when(Http::isInternalRequest(), $this->public_id),
-                'internal_id'  => $this->internal_id,
-                'name'         => $this->display_name,
-                'display_name' => $this->when(Http::isInternalRequest(), $this->display_name),
-                'vin'          => $this->vin ?? null,
-                'driver'       => $this->whenLoaded('driver', new Driver($this->driver)),
-                'photo'        => $this->photoUrl,
-                'make'         => $this->make,
-                'model'        => $this->model,
-                'year'         => $this->year,
-                'trim'         => $this->trim,
-                'type'         => $this->type,
-                'plate_number' => $this->plate_number,
-                'vin_data'     => $this->vin_data,
-                'status'       => $this->status,
-                'online'       => $this->online,
-                'meta'         => $this->meta ?? [],
-                'updated_at'   => $this->updated_at,
-                'created_at'   => $this->created_at,
+                'id'                     => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+                'uuid'                   => $this->when(Http::isInternalRequest(), $this->uuid),
+                'public_id'              => $this->when(Http::isInternalRequest(), $this->public_id),
+                'internal_id'            => $this->internal_id,
+                'name'                   => $this->display_name,
+                'display_name'           => $this->when(Http::isInternalRequest(), $this->display_name),
+                'vin'                    => $this->vin ?? null,
+                'driver'                 => $this->whenLoaded('driver', new Driver($this->driver)),
+                'devices'                => $this->whenLoaded('devices', $this->devices),
+                'photo'                  => $this->photoUrl,
+                'avatar_url'             => $this->avatar_url,
+                'make'                   => $this->make,
+                'model'                  => $this->model,
+                'year'                   => $this->year,
+                'trim'                   => $this->trim,
+                'type'                   => $this->type,
+                'plate_number'           => $this->plate_number,
+                'vin'                    => $this->vin,
+                'vin_data'               => $this->vin_data,
+                'status'                 => $this->status,
+                'online'                 => $this->online,
+                'location'               => data_get($this, 'location', new Point(0, 0)),
+                'heading'                => (int) data_get($this, 'heading', 0),
+                'altitude'               => (int) data_get($this, 'altitude', 0),
+                'speed'                  => (int) data_get($this, 'speed', 0),
+                'meta'                   => $this->meta ?? [],
+                'updated_at'             => $this->updated_at,
+                'created_at'             => $this->created_at,
             ]
         );
     }
@@ -52,24 +60,29 @@ class Vehicle extends FleetbaseResource
     public function toWebhookPayload()
     {
         return [
-            'id'           => $this->public_id,
-            'internal_id'  => $this->internal_id,
-            'name'         => $this->name,
-            'vin'          => $this->vin ?? null,
-            'driver'       => $this->whenLoaded('driver', new Driver($this->driver)),
-            'photo'        => $this->photoUrl,
-            'make'         => $this->make,
-            'model'        => $this->model,
-            'year'         => $this->year,
-            'trim'         => $this->trim,
-            'type'         => $this->type,
-            'plate_number' => $this->plate_number,
-            'vin_data'     => $this->vin_data,
-            'status'       => $this->status,
-            'online'       => $this->online,
-            'meta'         => $this->meta ?? [],
-            'updated_at'   => $this->updated_at,
-            'created_at'   => $this->created_at,
+            'id'                         => $this->public_id,
+            'internal_id'                => $this->internal_id,
+            'name'                       => $this->name,
+            'vin'                        => $this->vin ?? null,
+            'driver'                     => $this->whenLoaded('driver', new Driver($this->driver)),
+            'photo'                      => $this->photoUrl,
+            'make'                       => $this->make,
+            'model'                      => $this->model,
+            'year'                       => $this->year,
+            'trim'                       => $this->trim,
+            'type'                       => $this->type,
+            'plate_number'               => $this->plate_number,
+            'vin'                        => $this->vin,
+            'vin_data'                   => $this->vin_data,
+            'status'                     => $this->status,
+            'online'                     => $this->online,
+            'location'                   => data_get($this, 'location', new Point(0, 0)),
+            'heading'                    => (int) data_get($this, 'heading', 0),
+            'altitude'                   => (int) data_get($this, 'altitude', 0),
+            'speed'                      => (int) data_get($this, 'speed', 0),
+            'meta'                       => $this->meta ?? [],
+            'updated_at'                 => $this->updated_at,
+            'created_at'                 => $this->created_at,
         ];
     }
 }

package/server/src/Models/VehicleDevice.php

@@ -10,9 +10,7 @@ use Fleetbase\Traits\TracksApiCredential;
 
 class VehicleDevice extends Model
 {
-    use HasUuid;
-    use TracksApiCredential;
-    use HasApiModelBehavior;
+    use HasUuid, TracksApiCredential, HasApiModelBehavior;
 
     /**
      * The database table used by the model.
@@ -76,4 +74,20 @@ class VehicleDevice extends Model
      * @var array
      */
     protected $hidden = [];
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function vehicle()
+    {
+        return $this->belongsTo(Vehicle::class);
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function events()
+    {
+        return $this->hasMany(VehicleDeviceEvent::class);
+    }
 }

package/server/src/Models/VehicleDeviceEvent.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace Fleetbase\FleetOps\Models;
+
+use Fleetbase\Casts\Json;
+use Fleetbase\FleetOps\Casts\Point;
+use Fleetbase\Models\Model;
+use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasUuid;
+use Fleetbase\Traits\Searchable;
+use Fleetbase\Traits\TracksApiCredential;
+use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+
+class VehicleDeviceEvent extends Model
+{
+    use HasUuid, TracksApiCredential, HasApiModelBehavior, SpatialTrait, Searchable;
+
+    /**
+     * The database table used by the model.
+     *
+     * @var string
+     */
+    protected $table = 'vehicle_device_events';
+
+    /**
+     * Attributes that is filterable on this model.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'uuid',
+        'vehicle_device_uuid',
+        'payload',
+        'meta',
+        'location',
+        'ident',
+        'protocol',
+        'provider',
+        'mileage',
+        'state',
+        'code',
+        'reason',
+    ];
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'payload' => Json::class,
+        'meta' => Json::class,
+        'location' => Point::class,
+    ];
+
+    /**
+     * The attributes that are spatial columns.
+     *
+     * @var array
+     */
+    protected $spatialFields = ['location'];
+
+    /**
+     * Dynamic attributes that are appended to object.
+     *
+     * @var array
+     */
+    protected $appends = [];
+
+    /**
+     * Filterable params.
+     *
+     * @var array
+     */
+    protected $filterParams = [];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    protected $hidden = [];
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function device()
+    {
+        return $this->belongsTo(VehicleDevice::class);
+    }
+}

package/addon/services/map-manager.js

@@ -1,3 +0,0 @@
-import Service from '@ember/service';
-
-export default class MapManagerService extends Service {}

package/app/services/map-manager.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/fleetops-engine/services/map-manager';