@fleetbase/fleetops-engine 0.3.1 → 0.3.3

package/server/src/Models/Fleet.php

@@ -75,6 +75,9 @@ class Fleet extends Model
      */
     protected static $logName = 'fleet';
 
+    /**
+     * The flug options for this model.
+     */
     public function getSlugOptions(): SlugOptions
     {
         return SlugOptions::create()
@@ -108,7 +111,7 @@ class Fleet extends Model
      *
      * @var array
      */
-    protected $appends = ['photo_url', 'drivers_count', 'drivers_online_count'];
+    protected $appends = ['photo_url', 'drivers_count', 'drivers_online_count', 'vehicles_count', 'vehicles_online_count'];
 
     /**
      * The attributes excluded from the model's JSON form.
@@ -154,7 +157,15 @@ class Fleet extends Model
      */
     public function parentFleet()
     {
-        return $this->belongsTo(Fleet::class)->select(['uuid', 'public_id', 'name']);
+        return $this->belongsTo(Fleet::class)->without(['subFleets']);
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function subFleets()
+    {
+        return $this->hasMany(Fleet::class, 'parent_fleet_uuid', 'uuid')->without(['parentFleet']);
     }
 
     /**
@@ -180,7 +191,7 @@ class Fleet extends Model
      */
     public function getPhotoUrlAttribute()
     {
-        return data_get($this, 'photo.s3url', 'https://s3.ap-northeast-2.amazonaws.com/fleetbase/public/default-fleet.png');
+        return data_get($this, 'photo.url', 'https://s3.ap-northeast-2.amazonaws.com/fleetbase/public/default-fleet.png');
     }
 
     /**
@@ -194,7 +205,7 @@ class Fleet extends Model
     }
 
     /**
-     * Get the number of drivers in fleet.
+     * Get the number of online drivers in fleet.
      *
      * @return int
      */
@@ -202,4 +213,24 @@ class Fleet extends Model
     {
         return $this->drivers()->where('online', 1)->count();
     }
+
+    /**
+     * Get the number of vehicles in fleet.
+     *
+     * @return int
+     */
+    public function getVehiclesCountAttribute()
+    {
+        return $this->vehicles()->count();
+    }
+
+    /**
+     * Get the number of online vehicles in fleet.
+     *
+     * @return int
+     */
+    public function getVehiclesOnlineCountAttribute()
+    {
+        return $this->vehicles()->where('online', 1)->count();
+    }
 }

package/server/src/Models/FuelReport.php

@@ -2,12 +2,14 @@
 
 namespace Fleetbase\FleetOps\Models;
 
+use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
+use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\TracksApiCredential;
 use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 
@@ -18,6 +20,7 @@ class FuelReport extends Model
     use HasPublicId;
     use HasApiModelBehavior;
     use SpatialTrait;
+    use Searchable;
 
     /**
      * The database table used by the model.
@@ -38,14 +41,27 @@ class FuelReport extends Model
      *
      * @var array
      */
-    protected $searchableColumns = [];
+    protected $searchableColumns = ['report', 'vehicle.name', 'driver.name'];
 
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
-    protected $fillable = ['company_uuid', 'driver_uuid', 'vehicle_uuid', 'odometer', 'latitude', 'longitude', 'location', 'amount', 'currency', 'volume', 'metric_unit'];
+    protected $fillable = [
+        'company_uuid',
+        'driver_uuid',
+        'vehicle_uuid',
+        'reported_by_uuid',
+        'report',
+        'odometer',
+        'location',
+        'amount',
+        'currency',
+        'volume',
+        'metric_unit',
+        'meta',
+    ];
 
     /**
      * The attributes that are spatial columns.
@@ -61,6 +77,7 @@ class FuelReport extends Model
      */
     protected $casts = [
         'location' => Point::class,
+        'meta'     => Json::class,
     ];
 
     /**
@@ -68,7 +85,7 @@ class FuelReport extends Model
      *
      * @var array
      */
-    protected $appends = ['vehicle_name', 'driver_name'];
+    protected $appends = ['vehicle_name', 'driver_name', 'reporter_name'];
 
     /**
      * The attributes excluded from the model's JSON form.
@@ -77,6 +94,13 @@ class FuelReport extends Model
      */
     protected $hidden = ['driver', 'vehicle'];
 
+    /**
+     * Filterable attributes/parameters.
+     *
+     * @var array
+     */
+    protected $filterParams = ['type', 'status', 'reporter'];
+
     /**
      * Set the parcel fee as only numbers.
      *
@@ -103,6 +127,22 @@ class FuelReport extends Model
         return $this->belongsTo(Vehicle::class)->without(['driver']);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function reportedBy()
+    {
+        return $this->belongsTo(\Fleetbase\Models\User::class);
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function reporter()
+    {
+        return $this->belongsTo(\Fleetbase\Models\User::class, 'reported_by_uuid');
+    }
+
     /**
      * Get the driver's name assigned to vehicle.
      *
@@ -122,4 +162,14 @@ class FuelReport extends Model
     {
         return data_get($this, 'vehicle.display_name');
     }
+
+    /**
+     * Get the vehicless name.
+     *
+     * @var Model
+     */
+    public function getReporterNameAttribute()
+    {
+        return data_get($this, 'reportedBy.name');
+    }
 }

package/server/src/Models/Issue.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Models;
 
+use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
@@ -9,6 +10,7 @@ use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\TracksApiCredential;
 use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+use Illuminate\Support\Str;
 
 class Issue extends Model
 {
@@ -46,18 +48,19 @@ class Issue extends Model
      */
     protected $fillable = [
         '_key',
+        'public_id',
         'company_uuid',
         'reported_by_uuid',
-        'vehicle_uuid',
         'assigned_to_uuid',
+        'vehicle_uuid',
+        'driver_uuid',
         'issue_id',
-        'odometer',
         'location',
-        'latitude',
-        'longitude',
+        'category',
         'type',
         'report',
         'priority',
+        'meta',
         'resolved_at',
         'status',
     ];
@@ -67,16 +70,32 @@ class Issue extends Model
      *
      * @var array
      */
-    protected $spatialFields = [
-        'location' => Point::class,
+    protected $spatialFields = ['location'];
+
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'location'        => Point::class,
+        'meta'            => Json::class,
+        'resolved_at'     => 'date',
     ];
 
+    /**
+     * Filterable attributes/parameters.
+     *
+     * @var array
+     */
+    protected $filterParams = ['assignee', 'reporter'];
+
     /**
      * Dynamic attributes that are appended to object.
      *
      * @var array
      */
-    protected $appends = [];
+    protected $appends = ['driver_name', 'vehicle_name', 'assignee_name', 'reporter_name'];
 
     /**
      * The attributes excluded from the model's JSON form.
@@ -93,6 +112,14 @@ class Issue extends Model
         return $this->belongsTo(\Fleetbase\Models\User::class);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function reporter()
+    {
+        return $this->belongsTo(\Fleetbase\Models\User::class, 'reported_by_uuid');
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
@@ -101,6 +128,14 @@ class Issue extends Model
         return $this->belongsTo(\Fleetbase\Models\User::class);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function assignee()
+    {
+        return $this->belongsTo(\Fleetbase\Models\User::class, 'assigned_to_uuid');
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
@@ -108,4 +143,68 @@ class Issue extends Model
     {
         return $this->belongsTo(Vehicle::class);
     }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function driver()
+    {
+        return $this->belongsTo(Driver::class);
+    }
+
+    /**
+     * Set a default status if none is provided, and always dasherize status input.
+     *
+     * @param string $value
+     *
+     * @return void
+     */
+    public function setStatusAttribute($value)
+    {
+        if (empty($value)) {
+            $this->attributes['status'] = 'pending';
+        } else {
+            $this->attributes['status'] = Str::slug($value);
+        }
+    }
+
+    /**
+     * Get the driver's name assigned to vehicle.
+     *
+     * @return string
+     */
+    public function getDriverNameAttribute()
+    {
+        return data_get($this, 'driver.name');
+    }
+
+    /**
+     * Get the vehicless name.
+     *
+     * @return string
+     */
+    public function getVehicleNameAttribute()
+    {
+        return data_get($this, 'vehicle.display_name');
+    }
+
+    /**
+     * Get the reporter name.
+     *
+     * @return string
+     */
+    public function getReporterNameAttribute()
+    {
+        return data_get($this, 'reporter.name');
+    }
+
+    /**
+     * Get the assignee name.
+     *
+     * @return string
+     */
+    public function getAssigneeNameAttribute()
+    {
+        return data_get($this, 'assignee.name');
+    }
 }

package/server/src/Models/Order.php

@@ -947,6 +947,28 @@ class Order extends Model
         $this->customer_type = Utils::getModelClassName($model);
     }
 
+    public function setCustomerTypeAttribute($type)
+    {
+        if (is_string($type)) {
+            if ($type === 'customer' || $type === 'vendor' || !Str::startsWith($type, 'fleet-ops')) {
+                $type = 'fleet-ops:' . $type;
+            }
+
+            $this->attributes['customer_type'] = Utils::getMutationType($type);
+        }
+    }
+
+    public function setFacilitatorTypeAttribute($type)
+    {
+        if (is_string($type)) {
+            if ($type === 'customer' || $type === 'vendor' || !Str::startsWith($type, 'fleet-ops')) {
+                $type = 'fleet-ops:' . $type;
+            }
+
+            $this->attributes['facilitator_type'] = Utils::getMutationType($type);
+        }
+    }
+
     public function setDriverLocationAsPickup($force = false)
     {
         if ($force === true) {

package/server/src/Models/Vehicle.php

@@ -54,7 +54,7 @@ class Vehicle extends Model
      *
      * @var array
      */
-    protected $filterParams = ['vendor'];
+    protected $filterParams = ['vendor', 'driver', 'driver_uuid'];
 
     /**
      * Relationships to auto load with driver.

package/server/src/Models/VehicleDevice.php

@@ -10,7 +10,9 @@ use Fleetbase\Traits\TracksApiCredential;
 
 class VehicleDevice extends Model
 {
-    use HasUuid, TracksApiCredential, HasApiModelBehavior;
+    use HasUuid;
+    use TracksApiCredential;
+    use HasApiModelBehavior;
 
     /**
      * The database table used by the model.
@@ -80,7 +82,7 @@ class VehicleDevice extends Model
      */
     public function vehicle()
     {
-        return $this->belongsTo(Vehicle::class);
+        return $this->belongsTo(Vehicle::class)->without(['events']);
     }
 
     /**

package/server/src/Models/VehicleDeviceEvent.php

@@ -13,7 +13,11 @@ use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 
 class VehicleDeviceEvent extends Model
 {
-    use HasUuid, TracksApiCredential, HasApiModelBehavior, SpatialTrait, Searchable;
+    use HasUuid;
+    use TracksApiCredential;
+    use HasApiModelBehavior;
+    use SpatialTrait;
+    use Searchable;
 
     /**
      * The database table used by the model.
@@ -47,8 +51,8 @@ class VehicleDeviceEvent extends Model
      * @var array
      */
     protected $casts = [
-        'payload' => Json::class,
-        'meta' => Json::class,
+        'payload'  => Json::class,
+        'meta'     => Json::class,
         'location' => Point::class,
     ];
 
@@ -85,6 +89,6 @@ class VehicleDeviceEvent extends Model
      */
     public function device()
     {
-        return $this->belongsTo(VehicleDevice::class);
+        return $this->belongsTo(VehicleDevice::class, 'vehicle_device_uuid');
     }
 }

package/server/src/Notifications/OrderAssigned.php

@@ -32,22 +32,16 @@ class OrderAssigned extends Notification implements ShouldQueue
 
     /**
      * Notification name.
-     *
-     * @var string
      */
     public static string $name = 'Order Assigned';
 
     /**
      * Notification description.
-     *
-     * @var string
      */
     public static string $description = 'Notify when an order has been assigned to a driver.';
 
     /**
      * Notification package.
-     *
-     * @var string
      */
     public static string $package = 'fleet-ops';
 

package/server/src/Notifications/OrderCanceled.php

@@ -32,22 +32,16 @@ class OrderCanceled extends Notification implements ShouldQueue
 
     /**
      * Notification name.
-     *
-     * @var string
      */
     public static string $name = 'Order Canceled';
 
     /**
      * Notification description.
-     *
-     * @var string
      */
     public static string $description = 'Notify when an order has been canceled.';
 
     /**
      * Notification package.
-     *
-     * @var string
      */
     public static string $package = 'fleet-ops';
 

package/server/src/Notifications/OrderDispatchFailed.php

@@ -31,22 +31,16 @@ class OrderDispatchFailed extends Notification implements ShouldQueue
 
     /**
      * Notification name.
-     *
-     * @var string
      */
     public static string $name = 'Order dispatch Failed';
 
     /**
      * Notification description.
-     *
-     * @var string
      */
     public static string $description = 'Notify when an order dispatch has been failed.';
 
     /**
      * Notification package.
-     *
-     * @var string
      */
     public static string $package = 'fleet-ops';
 

package/server/src/Notifications/OrderDispatched.php

@@ -35,22 +35,16 @@ class OrderDispatched extends Notification implements ShouldQueue
 
     /**
      * Notification name.
-     *
-     * @var string
      */
     public static string $name = 'Order Dispatched';
 
     /**
      * Notification description.
-     *
-     * @var string
      */
     public static string $description = 'Notify when an order has been dispatched.';
 
     /**
      * Notification package.
-     *
-     * @var string
      */
     public static string $package = 'fleet-ops';
 

package/server/src/Notifications/OrderPing.php

@@ -39,22 +39,16 @@ class OrderPing extends Notification implements ShouldQueue
 
     /**
      * Notification name.
-     *
-     * @var string
      */
     public static string $name = 'Order Ping';
 
     /**
      * Notification description.
-     *
-     * @var string
      */
     public static string $description = 'Notify when an order has been pinged.';
 
     /**
      * Notification package.
-     *
-     * @var string
      */
     public static string $package = 'fleet-ops';
 

package/server/src/Notifications/OrderSplit.php

@@ -20,22 +20,16 @@ class OrderSplit extends Notification
 
     /**
      * Notification name.
-     *
-     * @var string
      */
     public static string $name = 'Order Split';
 
     /**
      * Notification description.
-     *
-     * @var string
      */
     public static string $description = 'Notify when an order has been splited.';
 
     /**
      * Notification package.
-     *
-     * @var string
      */
     public static string $package = 'fleet-ops';
 

package/server/src/Observers/FleetObserver.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Fleetbase\FleetOps\Observers;
+
+use Fleetbase\FleetOps\Models\Fleet;
+
+class FleetObserver
+{
+    /**
+     * Handle the Driver "deleted" event.
+     *
+     * @return void
+     */
+    public function deleted(Fleet $fleet)
+    {
+        // If the fleet being deleted is set as parent fleet, remove it as the parent fleet
+        $subFleets = Fleet::where(['parent_fleet_uuid' => $fleet->uuid])->update(['parent_fleet_uuid' => null]);
+    }
+}

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -31,6 +31,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         \Fleetbase\FleetOps\Models\TrackingNumber::class => \Fleetbase\FleetOps\Observers\TrackingNumberObserver::class,
         \Fleetbase\FleetOps\Models\Driver::class         => \Fleetbase\FleetOps\Observers\DriverObserver::class,
         \Fleetbase\FleetOps\Models\Vehicle::class        => \Fleetbase\FleetOps\Observers\VehicleObserver::class,
+        \Fleetbase\FleetOps\Models\Fleet::class          => \Fleetbase\FleetOps\Observers\FleetObserver::class,
         \Fleetbase\Models\User::class                    => \Fleetbase\FleetOps\Observers\UserObserver::class,
     ];
 

package/server/src/Providers/NotificationServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace Fleetbase\FleetOps\Providers;
 
-use Fleetbase\Support\NotificationRegistry;
 use Fleetbase\Providers\CoreServiceProvider;
+use Fleetbase\Support\NotificationRegistry;
 
 if (!class_exists(CoreServiceProvider::class)) {
     throw new \Exception('FleetOps cannot be loaded without `fleetbase/core-api` installed!');

package/server/src/routes.php

@@ -23,7 +23,7 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
         | End-user API routes, these are routes that the SDK and applications will interface with, and require API credentials.
         */
         Route::prefix('v1')
-            ->middleware('fleetbase.api')
+            ->middleware(['fleetbase.api', \Fleetbase\FleetOps\Http\Middleware\TransformLocationMiddleware::class])
             ->namespace('Api\v1')
             ->group(function ($router) {
                 // drivers routes
@@ -185,7 +185,7 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
         $router->prefix(config('fleetops.api.routing.internal_prefix', 'int'))->namespace('Internal')->group(
             function ($router) {
                 $router->group(
-                    ['prefix' => 'v1', 'namespace' => 'v1', 'middleware' => ['fleetbase.protected']],
+                    ['prefix' => 'v1', 'namespace' => 'v1', 'middleware' => ['fleetbase.protected', \Fleetbase\FleetOps\Http\Middleware\TransformLocationMiddleware::class]],
                     function ($router) {
                         $router->fleetbaseRoutes(
                             'contacts',

package/addon/components/full-calendar/draggable.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/console/components/full-calendar/draggable';

package/addon/components/full-calendar.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/console/components/full-calendar';