@fleetbase/fleetops-engine 0.6.18 → 0.6.20

package/server/src/Models/Vehicle.php

@@ -3,10 +3,12 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\Casts\Money;
 use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\FleetOps\Support\VehicleData;
 use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+use Fleetbase\LaravelMysqlSpatial\Types\Point as SpatialPoint;
 use Fleetbase\Models\Category;
 use Fleetbase\Models\File;
 use Fleetbase\Models\Model;
@@ -22,6 +24,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity;
@@ -60,7 +63,7 @@ class Vehicle extends Model
      *
      * @var array
      */
-    protected $searchableColumns = ['make', 'model', 'year', 'plate_number', 'vin', 'public_id'];
+    protected $searchableColumns = ['name', 'description', 'make', 'model', 'trim', 'model_type', 'body_type', 'body_sub_type', 'year', 'plate_number', 'vin', 'call_sign', 'public_id'];
 
     /**
      * Attributes that is filterable on this model.
@@ -106,23 +109,51 @@ class Vehicle extends Model
         'warranty_uuid',
         'photo_uuid',
         'avatar_url',
+        'name',
+        'description',
         'make',
+        'model',
+        'model_type',
+        'year',
+        'color',
         'location',
         'speed',
         'heading',
         'altitude',
-        'model',
-        'year',
+        'odometer',
+        'odometer_unit',
+        'fuel_type',
+        'fuel_volume_unit',
         'trim',
+        'transmission',
+        'measurement_system',
+        'body_type',
+        'body_sub_type',
+        'usage_type',
+        'ownership_type',
         'type',
+        'class',
         'plate_number',
+        'call_sign',
+        'serial_number',
+        'financing_status',
+        'currency',
+        'insurance_value',
+        'depreciation_rate',
+        'current_value',
+        'acquisition_cost',
         'vin',
         'vin_data',
+        'specs',
+        'details',
+        'notes',
         'meta',
         'telematics',
         'status',
         'online',
         'slug',
+        'purchased_at',
+        'lease_expires_at',
     ];
 
     /**
@@ -164,12 +195,18 @@ class Vehicle extends Model
      * @var array
      */
     protected $casts = [
-        'location'   => Point::class,
-        'meta'       => Json::class,
-        'telematics' => Json::class,
-        'model_data' => Json::class,
-        'vin_data'   => Json::class,
-        'online'     => 'boolean',
+        'current_value'          => Money::class,
+        'insurance_value'        => Money::class,
+        'acquisition_cost'       => Money::class,
+        'location'               => Point::class,
+        'meta'                   => Json::class,
+        'telematics'             => Json::class,
+        'specs'                  => Json::class,
+        'details'                => Json::class,
+        'vin_data'               => Json::class,
+        'online'                 => 'boolean',
+        'purchased_at'           => 'datetime',
+        'lease_expires_at'       => 'datetime',
     ];
 
     public function photo(): BelongsTo
@@ -179,7 +216,7 @@ class Vehicle extends Model
 
     public function driver(): HasOne
     {
-        return $this->hasOne(Driver::class)->without(['vehicle']);
+        return $this->hasOne(Driver::class, 'vehicle_uuid', 'uuid')->without(['vehicle']);
     }
 
     public function category(): BelongsTo
@@ -219,20 +256,17 @@ class Vehicle extends Model
 
     public function equipments(): HasMany
     {
-        return $this->hasMany(Equipment::class, 'equipable_uuid', 'uuid')
-            ->where('equipable_type', static::class);
+        return $this->hasMany(Equipment::class, 'equipable_uuid', 'uuid')->where('equipable_type', static::class);
     }
 
     public function maintenances(): HasMany
     {
-        return $this->hasMany(Maintenance::class, 'maintainable_uuid', 'uuid')
-            ->where('maintainable_type', static::class);
+        return $this->hasMany(Maintenance::class, 'maintainable_uuid', 'uuid')->where('maintainable_type', static::class);
     }
 
     public function sensors(): HasMany
     {
-        return $this->hasMany(Sensor::class, 'sensorable_uuid', 'uuid')
-            ->where('sensorable_type', static::class);
+        return $this->hasMany(Sensor::class, 'sensorable_uuid', 'uuid')->where('sensorable_type', static::class);
     }
 
     public function parts(): MorphMany
@@ -261,7 +295,7 @@ class Vehicle extends Model
         $nameSegments = [];
 
         // Populate the nameSegments array with the values of the attributes
-        $keys = ['year', 'make', 'model', 'trim', 'plate_number'];
+        $keys = ['year', 'make', 'model', 'trim'];
         foreach ($keys as $key) {
             if (!empty($this->{$key})) {
                 $nameSegments[] = $this->{$key};
@@ -501,6 +535,34 @@ class Vehicle extends Model
         return ($isFirstPosition || $isPast50Meters) ? Position::create($positionData) : null;
     }
 
+    /**
+     * Creates a new position for the vehicle
+     *
+     * @param array $attributes
+     * @return Position|null
+     */
+    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']),
+            'subject_uuid' => $this->uuid,
+            'subject_type' => $this->getMorphClass(),
+            'company_uuid' => $this->company_uuid,
+            'destination_uuid' => $destinationUuid
+        ]);
+    }
+
     public static function createFromImport(array $row, bool $saveInstance = false): Vehicle
     {
         // Filter array for null key values
@@ -584,8 +646,124 @@ class Vehicle extends Model
             $query->where('public_id', $vehicleName)
                     ->orWhere('plate_number', $vehicleName)
                     ->orWhere('vin', $vehicleName)
+                    ->orWhere('serial_number', $vehicleName)
+                    ->orWhere('call_sign', $vehicleName)
                     ->orWhereRaw("CONCAT(make, ' ', model, ' ', year) LIKE ?", ["%{$vehicleName}%"])
                     ->orWhereRaw("CONCAT(year, ' ', make, ' ', model) LIKE ?", ["%{$vehicleName}%"]);
         })->first();
     }
+
+    /**
+     * Set or update a single key/value pair in the `details` JSON column.
+     *
+     * Uses Laravel's `data_set` helper to allow dot notation for nested keys.
+     *
+     * @param string|array $key   the key (or array path) to set within the details
+     * @param mixed        $value the value to assign to the given key
+     *
+     * @return array the updated details array
+     */
+    public function setDetail(string|array $key, mixed $value): array
+    {
+        $details = is_array($this->details) ? $this->details : (array) $this->details;
+        data_set($details, $key, $value);
+        $this->details = $details;
+
+        return $details;
+    }
+
+    /**
+     * Merge multiple values into the `details` JSON column.
+     *
+     * By default this performs a shallow merge (overwrites duplicate keys).
+     * Use `array_replace_recursive` if you need nested merges.
+     *
+     * @param array $newDetails key/value pairs to merge into details
+     *
+     * @return array the updated details array
+     */
+    public function setDetails(array $newDetails = []): array
+    {
+        $details       = is_array($this->details) ? $this->details : (array) $this->details;
+        $details       = array_merge($details, $newDetails);
+        $this->details = $details;
+
+        return $details;
+    }
+
+    /**
+     * Set or update a single key/value pair in the `specs` JSON column.
+     *
+     * Uses Laravel's `data_set` helper to allow dot notation for nested keys.
+     *
+     * @param string|array $key   the key (or array path) to set within the specs
+     * @param mixed        $value the value to assign to the given key
+     *
+     * @return array the updated specs array
+     */
+    public function setSpec(string|array $key, mixed $value): array
+    {
+        $specs = is_array($this->specs) ? $this->specs : (array) $this->specs;
+        data_set($specs, $key, $value);
+        $this->specs = $specs;
+
+        return $specs;
+    }
+
+    /**
+     * Merge multiple values into the `specs` JSON column.
+     *
+     * By default this performs a shallow merge (overwrites duplicate keys).
+     * Use `array_replace_recursive` if you need nested merges.
+     *
+     * @param array $newSpecs key/value pairs to merge into specs
+     *
+     * @return array the updated specs array
+     */
+    public function setSpecs(array $newSpecs = []): array
+    {
+        $specs       = is_array($this->specs) ? $this->specs : (array) $this->specs;
+        $specs       = array_merge($specs, $newSpecs);
+        $this->specs = $specs;
+
+        return $specs;
+    }
+
+    /**
+     * Set or update a single key/value pair in the `vin_data` JSON column.
+     *
+     * Uses Laravel's `data_set` helper to allow dot notation for nested keys.
+     *
+     * @param string|array $key   the key (or array path) to set within the VIN data
+     * @param mixed        $value the value to assign to the given key
+     *
+     * @return array the updated vin_data array
+     */
+    public function setVinData(string|array $key, mixed $value): array
+    {
+        $vinData = is_array($this->vin_data) ? $this->vin_data : (array) $this->vin_data;
+        data_set($vinData, $key, $value);
+        $this->vin_data = $vinData;
+
+        return $vinData;
+    }
+
+    /**
+     * Merge multiple values into the `vin_data` JSON column.
+     *
+     * By default this performs a shallow merge (overwrites duplicate keys).
+     * Use `array_replace_recursive` if you need nested merges.
+     *
+     * @param array $newVinData key/value pairs to merge into vin_data
+     *
+     * @return array the updated vin_data array
+     */
+    public function setVinDatas(array $newVinData = []): array
+    {
+        $vinData       = is_array($this->vin_data) ? $this->vin_data : (array) $this->vin_data;
+        $vinData       = array_merge($vinData, $newVinData);
+        $this->vin_data = $vinData;
+
+        return $vinData;
+    }
 }

package/server/src/Models/VehicleDeviceEvent.php

@@ -24,7 +24,7 @@ class VehicleDeviceEvent extends Model
      *
      * @var string
      */
-    protected $table = 'vehicle_device_events';
+    protected $table = 'device_events';
 
     /**
      * Attributes that is filterable on this model.

package/server/src/Models/Vendor.php

@@ -59,6 +59,7 @@ class Vendor extends Model
         'public_id',
         'internal_id',
         'company_uuid',
+        'place_uuid',
         'logo_uuid',
         'type_uuid',
         'connect_company_uuid',
@@ -72,6 +73,7 @@ class Vendor extends Model
         'place_uuid',
         'country',
         'status',
+        'notes',
         'type',
         'slug',
     ];
@@ -186,6 +188,11 @@ class Vendor extends Model
         return $this->hasMany(Order::class, 'customer_uuid')->whereNull('deleted_at')->withoutGlobalScopes();
     }
 
+    public function files(): HasMany
+    {
+        return $this->hasMany(\Fleetbase\Models\File::class, 'subject_uuid')->latest();
+    }
+
     /**
      * Get the vendor logo url.
      *
@@ -233,6 +240,9 @@ class Vendor extends Model
      */
     public function setTypeAttribute(?string $type)
     {
+        if (!$type && isset($this->type)) {
+            return;
+        }
         $this->attributes['type'] = $type ?? 'vendor';
     }
 
@@ -243,6 +253,9 @@ class Vendor extends Model
      */
     public function setStatusAttribute(?string $status = 'active')
     {
+        if (!$status && isset($this->status)) {
+            return;
+        }
         $this->attributes['status'] = $status ?? 'active';
     }
 

package/server/src/Models/Waypoint.php

@@ -15,6 +15,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Str;
 
 class Waypoint extends Model
 {
@@ -236,4 +237,61 @@ class Waypoint extends Model
 
         return $this->place ?? Place::where('uuid', $this->place_uuid)->first();
     }
+
+    /**
+     * Find the first waypoint for a given place and order/payload.
+     *
+     * This method attempts to locate a waypoint belonging to the provided order's payload
+     * that is associated with the given place. It supports lookup by:
+     * - `Place` model instance (direct UUID match),
+     * - UUID string (direct lookup on `place_uuid`),
+     * - or public identifier string (fallback through `whereHas('place')`).
+     *
+     * @param \Fleetbase\Models\Place|string                    $place   the place instance or identifier (UUID or public_id)
+     * @param \Fleetbase\Models\Order|\Fleetbase\Models\Payload $order   the order or payload model to scope the search
+     * @param array                                             $with    optional relationships to eager load
+     * @param array                                             $columns columns to select from the waypoints table
+     *
+     * @return static|null the matching waypoint, or null if none is found
+     *
+     * @throws \InvalidArgumentException if the provided order or payload is missing a payload UUID
+     */
+    public static function findByPlace(
+        Place|string $place,
+        Order|Payload $order,
+        array $with = [],
+        array $columns = ['*'],
+    ): ?self {
+        $payloadId = match (true) {
+            $order instanceof Order   => $order->payload_uuid,
+            $order instanceof Payload => $order->uuid,
+            default                   => null,
+        };
+
+        if (!$payloadId) {
+            throw new \InvalidArgumentException('Missing payload UUID for lookup.');
+        }
+
+        if ($place instanceof Place) {
+            return static::with($with)
+                ->select($columns)
+                ->where('payload_uuid', $payloadId)
+                ->where('place_uuid', $place->uuid)
+                ->first();
+        }
+
+        if (Str::isUuid($place)) {
+            return static::with($with)
+                ->select($columns)
+                ->where('payload_uuid', $payloadId)
+                ->where('place_uuid', $place)
+                ->first();
+        }
+
+        return static::with($with)
+            ->select($columns)
+            ->where('payload_uuid', $payloadId)
+            ->whereHas('place', fn ($q) => $q->where('public_id', $place))
+            ->first();
+    }
 }

package/server/src/Models/Zone.php

@@ -10,6 +10,7 @@ use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\LaravelMysqlSpatial\Types\Polygon;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasCustomFields;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\SendsWebhooks;
@@ -24,6 +25,7 @@ class Zone extends Model
     use TracksApiCredential;
     use SpatialTrait;
     use HasApiModelBehavior;
+    use HasCustomFields;
 
     /**
      * The type of public Id to generate.

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -77,6 +77,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
     public function register()
     {
         $this->app->register(CoreServiceProvider::class);
+        $this->app->register(ReportSchemaServiceProvider::class);
     }
 
     /**

package/server/src/Providers/ReportSchemaServiceProvider.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Fleetbase\FleetOps\Providers;
+
+use Fleetbase\FleetOps\Support\Reporting\FleetOpsReportSchema;
+use Fleetbase\Support\Reporting\ReportSchemaRegistry;
+use Illuminate\Support\ServiceProvider;
+
+class ReportSchemaServiceProvider extends ServiceProvider
+{
+    /**
+     * Register services.
+     */
+    public function register(): void
+    {
+        // Register the FleetOps report schema
+        $this->callAfterResolving(ReportSchemaRegistry::class, function (ReportSchemaRegistry $registry) {
+            $schema = new FleetOpsReportSchema();
+            $schema->registerReportSchema($registry);
+        });
+    }
+}