@fleetbase/fleetops-engine 0.6.20 → 0.6.22

package/server/src/Models/Device.php

@@ -3,6 +3,11 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\Casts\PolymorphicType;
+use Fleetbase\FleetOps\Casts\Point;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+use Fleetbase\LaravelMysqlSpatial\Types\Point as SpatialPoint;
+use Fleetbase\Models\File;
 use Fleetbase\Models\Model;
 use Fleetbase\Models\User;
 use Fleetbase\Traits\HasApiModelBehavior;
@@ -15,6 +20,8 @@ use Fleetbase\Traits\TracksApiCredential;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Spatie\Sluggable\HasSlug;
@@ -37,6 +44,7 @@ class Device extends Model
     use HasMetaAttributes;
     use Searchable;
     use HasCustomFields;
+    use SpatialTrait;
 
     /**
      * The database table used by the model.
@@ -57,7 +65,7 @@ class Device extends Model
      *
      * @var array
      */
-    protected $searchableColumns = ['name', 'model', 'serial_number', 'public_id'];
+    protected $searchableColumns = ['name', 'model', 'serial_number', 'manufacturer', 'public_id'];
 
     /**
      * The attributes that can be used for filtering.
@@ -74,15 +82,23 @@ class Device extends Model
     protected $fillable = [
         'company_uuid',
         'telematic_uuid',
+        'attachable_uuid',
+        'attachable_type',
         'warranty_uuid',
-        'device_type',
+        'photo_uuid',
+        'type',
         'device_id',
-        'device_provider',
-        'device_name',
-        'device_model',
-        'device_location',
+        'internal_id',
+        'imei',
+        'imsi',
+        'firmware_version',
+        'provider',
+        'name',
+        'model',
+        'location',
         'manufacturer',
         'serial_number',
+        'last_position',
         'installation_date',
         'last_maintenance_date',
         'meta',
@@ -94,8 +110,6 @@ class Device extends Model
         'notes',
         'status',
         'last_online_at',
-        'attachable_type',
-        'attachable_uuid',
         'slug',
     ];
 
@@ -110,6 +124,7 @@ class Device extends Model
         'is_online',
         'attached_to_name',
         'connection_status',
+        'photo_url',
     ];
 
     /**
@@ -117,7 +132,14 @@ class Device extends Model
      *
      * @var array
      */
-    protected $hidden = ['warranty', 'telematic', 'attachable'];
+    protected $hidden = [];
+
+    /**
+     * The attributes that are spatial columns.
+     *
+     * @var array
+     */
+    protected $spatialFields = ['last_position'];
 
     /**
      * The attributes that should be cast to native types.
@@ -125,9 +147,14 @@ class Device extends Model
      * @var array
      */
     protected $casts = [
-        'last_online_at' => 'datetime',
-        'meta'           => Json::class,
-        'options'        => Json::class,
+        'installation_date'                  => 'date',
+        'last_maintenance_date'              => 'date',
+        'last_online_at'                     => 'datetime',
+        'last_position'                      => Point::class,
+        'meta'                               => Json::class,
+        'options'                            => Json::class,
+        'data'                               => Json::class,
+        'attachable_type'                    => PolymorphicType::class,
     ];
 
     /**
@@ -204,6 +231,21 @@ class Device extends Model
         return $this->hasMany(Sensor::class, 'device_uuid', 'uuid');
     }
 
+    public function photo(): BelongsTo
+    {
+        return $this->belongsTo(File::class);
+    }
+
+    /**
+     * Get photo URL attribute.
+     *
+     * @return string
+     */
+    public function getPhotoUrlAttribute()
+    {
+        return data_get($this, 'photo.url', 'https://flb-assets.s3.ap-southeast-1.amazonaws.com/static/image-file-icon.png');
+    }
+
     /**
      * Get the warranty name.
      */
@@ -432,4 +474,29 @@ class Device extends Model
             ->limit($limit)
             ->get();
     }
+
+    /**
+     * Creates a new position for the vehicle.
+     */
+    public function createPosition(array $attributes = [], Model|string|null $destination = null): ?Position
+    {
+        if (!isset($attributes['coordinates']) && isset($attributes['location'])) {
+            $attributes['coordinates'] = $attributes['location'];
+        }
+
+        if (!isset($attributes['coordinates']) && isset($attributes['latitude']) && isset($attributes['longitude'])) {
+            $attributes['coordinates'] = new SpatialPoint($attributes['latitude'], $attributes['longitude']);
+        }
+
+        // handle destination if set
+        $destinationUuid = Str::isUuid($destination) ? $destination : data_get($destination, 'uuid');
+
+        return Position::create([
+            ...Arr::only($attributes, ['coordinates', 'heading', 'bearing', 'speed', 'altitude', 'order_uuid']),
+            'subject_uuid'     => $this->uuid,
+            'subject_type'     => $this->getMorphClass(),
+            'company_uuid'     => $this->company_uuid,
+            'destination_uuid' => $destinationUuid,
+        ]);
+    }
 }

package/server/src/Models/DeviceEvent.php

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
 use Fleetbase\Models\Alert;
+use Fleetbase\Models\Company;
 use Fleetbase\Models\Model;
 use Fleetbase\Models\User;
 use Fleetbase\Traits\HasApiModelBehavior;
@@ -67,6 +68,7 @@ class DeviceEvent extends Model
      * @var array
      */
     protected $fillable = [
+        'company_uuid',
         'device_uuid',
         'payload',
         'meta',
@@ -81,6 +83,7 @@ class DeviceEvent extends Model
         'code',
         'reason',
         'comment',
+        'resolved_at',
         'slug',
     ];
 
@@ -109,9 +112,9 @@ class DeviceEvent extends Model
      * @var array
      */
     protected $casts = [
-        'data'         => Json::class,
-        'occurred_at'  => 'datetime',
-        'processed_at' => 'datetime',
+        'payload'         => Json::class,
+        'meta'            => Json::class,
+        'resolved_at'     => 'datetime',
     ];
 
     /**
@@ -143,6 +146,11 @@ class DeviceEvent extends Model
         return LogOptions::defaults()->logAll();
     }
 
+    public function company(): BelongsTo
+    {
+        return $this->belongsTo(Company::class, 'company_uuid', 'uuid');
+    }
+
     public function device(): BelongsTo
     {
         return $this->belongsTo(Device::class, 'device_uuid', 'uuid');
@@ -498,4 +506,26 @@ class DeviceEvent extends Model
             'created_at'               => $this->created_at?->toISOString(),
         ];
     }
+
+    /**
+     * Create a Position for this event’s device attachable using position data.
+     *
+     * This delegates to the shared DeviceEventHelper utility.
+     */
+    public function createPosition(array $positionData = []): ?Position
+    {
+        if (empty($positionData)) {
+            return null;
+        }
+
+        // Ensure device and attachable are loaded
+        $this->loadMissing('device.attachable');
+        $attachable = $this->device?->attachable;
+
+        if ($attachable && method_exists($attachable, 'createPosition')) {
+            return $attachable->createPosition($positionData);
+        }
+
+        return null;
+    }
 }

package/server/src/Models/Driver.php

@@ -8,6 +8,7 @@ use Fleetbase\FleetOps\Scopes\DriverScope;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\FleetOps\Support\Utils as FleetOpsUtils;
 use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+use Fleetbase\LaravelMysqlSpatial\Types\Point as SpatialPoint;
 use Fleetbase\Models\File;
 use Fleetbase\Models\Model;
 use Fleetbase\Models\User;
@@ -24,6 +25,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
@@ -645,7 +647,7 @@ class Driver extends Model
         $positionData = [
             'company_uuid'     => session('company', $this->company_uuid),
             'subject_uuid'     => $this->uuid,
-            'subject_type'     => get_class($this),
+            'subject_type'     => $this->getMorphClass(),
             'coordinates'      => $this->location,
             'altitude'         => $this->altitude,
             'heading'          => $this->heading,
@@ -661,6 +663,31 @@ class Driver extends Model
         return ($isFirstPosition || $isPast50Meters) ? Position::create($positionData) : null;
     }
 
+    /**
+     * Creates a new position for the vehicle.
+     */
+    public function createPosition(array $attributes = [], Model|string|null $destination = null): ?Position
+    {
+        if (!isset($attributes['coordinates']) && isset($attributes['location'])) {
+            $attributes['coordinates'] = $attributes['location'];
+        }
+
+        if (!isset($attributes['coordinates']) && isset($attributes['latitude']) && isset($attributes['longitude'])) {
+            $attributes['coordinates'] = new SpatialPoint($attributes['latitude'], $attributes['longitude']);
+        }
+
+        // handle destination if set
+        $destinationUuid = Str::isUuid($destination) ? $destination : data_get($destination, 'uuid');
+
+        return Position::create([
+            ...Arr::only($attributes, ['coordinates', 'heading', 'bearing', 'speed', 'altitude', 'order_uuid']),
+            'subject_uuid'     => $this->uuid,
+            'subject_type'     => $this->getMorphClass(),
+            'company_uuid'     => $this->company_uuid,
+            'destination_uuid' => $destinationUuid,
+        ]);
+    }
+
     /**
      * Get the user relationship from the driver.
      */

package/server/src/Models/Maintenance.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\Casts\PolymorphicType;
 use Fleetbase\Models\Model;
 use Fleetbase\Models\User;
 use Fleetbase\Traits\HasApiModelBehavior;
@@ -122,18 +123,20 @@ class Maintenance extends Model
      * @var array
      */
     protected $casts = [
-        'scheduled_at' => 'datetime',
-        'started_at'   => 'datetime',
-        'completed_at' => 'datetime',
-        'odometer'     => 'integer',
-        'engine_hours' => 'integer',
-        'labor_cost'   => 'decimal:2',
-        'parts_cost'   => 'decimal:2',
-        'tax'          => 'decimal:2',
-        'total_cost'   => 'decimal:2',
-        'line_items'   => Json::class,
-        'attachments'  => Json::class,
-        'meta'         => Json::class,
+        'scheduled_at'      => 'datetime',
+        'started_at'        => 'datetime',
+        'completed_at'      => 'datetime',
+        'odometer'          => 'integer',
+        'engine_hours'      => 'integer',
+        'labor_cost'        => 'decimal:2',
+        'parts_cost'        => 'decimal:2',
+        'tax'               => 'decimal:2',
+        'total_cost'        => 'decimal:2',
+        'line_items'        => Json::class,
+        'attachments'       => Json::class,
+        'meta'              => Json::class,
+        'maintainable_type' => PolymorphicType::class,
+        'performed_by_type' => PolymorphicType::class,
     ];
 
     /**

package/server/src/Models/Part.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\Casts\PolymorphicType;
 use Fleetbase\FleetOps\Traits\Maintainable;
 use Fleetbase\Models\Alert;
 use Fleetbase\Models\File;
@@ -129,6 +130,7 @@ class Part extends Model
         'msrp'             => 'decimal:2',
         'specs'            => Json::class,
         'meta'             => Json::class,
+        'asset_type'       => PolymorphicType::class,
     ];
 
     /**

package/server/src/Models/Payload.php

@@ -388,7 +388,6 @@ class Payload extends Model
             } else {
                 $place = Place::createFromMixed($attributes);
 
-
                 // Store temp search UUID for traceability if present and different
                 if ($place instanceof Place && isset($attributes['uuid']) && $place->uuid !== $attributes['uuid']) {
                     $place->updateMeta('search_uuid', $attributes['uuid']);

package/server/src/Models/Place.php

@@ -366,6 +366,7 @@ class Place extends Model
             if ($saveInstance) {
                 $place->save();
             }
+
             return $place;
         }
 
@@ -554,8 +555,10 @@ class Place extends Model
             }
 
             // If has $attributes['address']
+            $address = $place['address'];
             if (!empty($place['address'])) {
-                return static::createFromGeocodingLookup($place['address'], $saveInstance);
+                // return static::createFromGeocodingLookup($place['address'], $saveInstance);
+                return static::create(array_merge($place, static::getValuesFromGeocodingLookup($address)));
             }
 
             // Perform google lookup to fill address

package/server/src/Models/Position.php

@@ -2,11 +2,14 @@
 
 namespace Fleetbase\FleetOps\Models;
 
+use Fleetbase\Casts\PolymorphicType;
 use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\TracksApiCredential;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 class Position extends Model
 {
@@ -48,7 +51,16 @@ class Position extends Model
      *
      * @var array
      */
-    protected $appends = [];
+    protected $appends = ['latitude', 'longitude'];
+
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'subject_type' => PolymorphicType::class,
+    ];
 
     /**
      * Get filter parameters for this model.
@@ -85,35 +97,33 @@ class Position extends Model
      */
     protected static $logName = 'position';
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function company()
+    public function company(): BelongsTo
     {
         return $this->belongsTo(\Fleetbase\Models\Company::class);
     }
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function order()
+    public function order(): BelongsTo
     {
         return $this->belongsTo(Order::class);
     }
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function destination()
+    public function destination(): BelongsTo
     {
         return $this->belongsTo(Place::class);
     }
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
-     */
-    public function subject()
+    public function subject(): MorphTo
     {
         return $this->morphTo(__FUNCTION__, 'subject_type', 'subject_uuid')->withoutGlobalScopes();
     }
+
+    public function getLongitudeAttribute(): float
+    {
+        return $this->coordinates?->getLng() ?? 0;
+    }
+
+    public function getLatitudeAttribute(): float
+    {
+        return $this->coordinates?->getLat() ?? 0;
+    }
 }

package/server/src/Models/Sensor.php

@@ -3,7 +3,11 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\FleetOps\Casts\Point;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+use Fleetbase\LaravelMysqlSpatial\Types\Point as SpatialPoint;
 use Fleetbase\Models\Alert;
+use Fleetbase\Models\File;
 use Fleetbase\Models\Model;
 use Fleetbase\Models\User;
 use Fleetbase\Traits\HasApiModelBehavior;
@@ -16,6 +20,8 @@ use Fleetbase\Traits\TracksApiCredential;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Spatie\Sluggable\HasSlug;
@@ -39,6 +45,7 @@ class Sensor extends Model
     use HasMetaAttributes;
     use Searchable;
     use HasCustomFields;
+    use SpatialTrait;
 
     /**
      * The database table used by the model.
@@ -77,8 +84,16 @@ class Sensor extends Model
         'company_uuid',
         'device_uuid',
         'warranty_uuid',
+        'telematic_uuid',
+        'photo_uuid',
         'name',
-        'sensor_type',
+        'type',
+        'internal_id',
+        'imei',
+        'imsi',
+        'firmware_version',
+        'serial_number',
+        'last_position',
         'unit',
         'min_threshold',
         'max_threshold',
@@ -100,12 +115,9 @@ class Sensor extends Model
      * @var array
      */
     protected $appends = [
-        'device_name',
-        'warranty_name',
-        'attached_to_name',
         'is_active',
         'threshold_status',
-        'last_reading_formatted',
+        'photo_url',
     ];
 
     /**
@@ -113,7 +125,14 @@ class Sensor extends Model
      *
      * @var array
      */
-    protected $hidden = ['device', 'warranty', 'sensorable'];
+    protected $hidden = [];
+
+    /**
+     * The attributes that are spatial columns.
+     *
+     * @var array
+     */
+    protected $spatialFields = ['last_position'];
 
     /**
      * The attributes that should be cast to native types.
@@ -121,13 +140,14 @@ class Sensor extends Model
      * @var array
      */
     protected $casts = [
-        'min_threshold'        => 'float',
-        'max_threshold'        => 'float',
-        'threshold_inclusive'  => 'boolean',
-        'last_reading_at'      => 'datetime',
-        'report_frequency_sec' => 'integer',
-        'calibration'          => Json::class,
-        'meta'                 => Json::class,
+        'min_threshold'               => 'float',
+        'max_threshold'               => 'float',
+        'threshold_inclusive'         => 'boolean',
+        'last_reading_at'             => 'datetime',
+        'report_frequency_sec'        => 'integer',
+        'last_position'               => Point::class,
+        'calibration'                 => Json::class,
+        'meta'                        => Json::class,
     ];
 
     /**
@@ -169,6 +189,11 @@ class Sensor extends Model
         return LogOptions::defaults()->logAll();
     }
 
+    public function telematic(): BelongsTo
+    {
+        return $this->belongsTo(Telematic::class, 'telematic_uuid', 'uuid');
+    }
+
     public function device(): BelongsTo
     {
         return $this->belongsTo(Device::class, 'device_uuid', 'uuid');
@@ -194,12 +219,27 @@ class Sensor extends Model
         return $this->morphTo();
     }
 
+    public function photo(): BelongsTo
+    {
+        return $this->belongsTo(File::class);
+    }
+
     public function alerts(): HasMany
     {
         return $this->hasMany(Alert::class, 'subject_uuid', 'uuid')
             ->where('subject_type', static::class);
     }
 
+    /**
+     * Get photo URL attribute.
+     *
+     * @return string
+     */
+    public function getPhotoUrlAttribute()
+    {
+        return data_get($this, 'photo.url', 'https://flb-assets.s3.ap-southeast-1.amazonaws.com/static/image-file-icon.png');
+    }
+
     /**
      * Get the device name.
      */
@@ -507,4 +547,29 @@ class Sensor extends Model
             ],
         ];
     }
+
+    /**
+     * Creates a new position for the vehicle.
+     */
+    public function createPosition(array $attributes = [], Model|string|null $destination = null): ?Position
+    {
+        if (!isset($attributes['coordinates']) && isset($attributes['location'])) {
+            $attributes['coordinates'] = $attributes['location'];
+        }
+
+        if (!isset($attributes['coordinates']) && isset($attributes['latitude']) && isset($attributes['longitude'])) {
+            $attributes['coordinates'] = new SpatialPoint($attributes['latitude'], $attributes['longitude']);
+        }
+
+        // handle destination if set
+        $destinationUuid = Str::isUuid($destination) ? $destination : data_get($destination, 'uuid');
+
+        return Position::create([
+            ...Arr::only($attributes, ['coordinates', 'heading', 'bearing', 'speed', 'altitude', 'order_uuid']),
+            'subject_uuid'     => $this->uuid,
+            'subject_type'     => $this->getMorphClass(),
+            'company_uuid'     => $this->company_uuid,
+            'destination_uuid' => $destinationUuid,
+        ]);
+    }
 }