@fleetbase/fleetops-engine 0.6.54 → 0.6.55

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

@@ -8,6 +8,7 @@ use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Models\ServiceRate;
 use Fleetbase\Http\Requests\ExportRequest;
 use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 
@@ -27,24 +28,30 @@ class ServiceRateController extends FleetOpsController
      */
     public function getServicesForRoute(Request $request)
     {
-        $coordinates = explode(';', $request->input('coordinates')); // ex. 1.3621663,103.8845049;1.353151,103.86458
+        $coordinates = $request->input('coordinates');
 
-        // convert coordinates to points
-        $waypoints = collect($coordinates)->map(
-            function ($coord) {
-                $coord                  = explode(',', $coord);
-                [$latitude, $longitude] = $coord;
+        if (!is_string($coordinates) || trim($coordinates) === '') {
+            return response()->error('Route coordinates are required to query service rates.', 422);
+        }
 
-                return Point::fromText("POINT($longitude $latitude)", 4326);
-            }
-        );
+        $waypoints = $this->parseRouteCoordinates($coordinates);
+
+        if ($waypoints === null) {
+            return response()->error('Invalid route coordinates provided.', 422);
+        }
+
+        if ($waypoints->count() < 2) {
+            return response()->error('At least two route coordinates are required to query service rates.', 422);
+        }
 
-        $applicableServiceRates = ServiceRate::getServicableForWaypoints(
+        $serviceType = $this->normalizeOptionalQueryValue($request->input('service_type'));
+
+        $applicableServiceRates = $this->getServicableForWaypoints(
             $waypoints,
-            function ($query) use ($request) {
+            function ($query) use ($request, $serviceType) {
                 $query->where('company_uuid', $request->session()->get('company'));
-                if ($request->filled('service_type')) {
-                    $query->where('service_type', $request->input('service_type'));
+                if ($serviceType) {
+                    $query->where('service_type', $serviceType);
                 }
             }
         );
@@ -52,6 +59,68 @@ class ServiceRateController extends FleetOpsController
         return response()->json($applicableServiceRates);
     }
 
+    /**
+     * Parse semicolon-delimited latitude,longitude coordinate pairs.
+     */
+    protected function parseRouteCoordinates(string $coordinates): ?Collection
+    {
+        $coordinates = collect(explode(';', $coordinates))
+            ->map(fn ($coordinate) => trim($coordinate));
+
+        if ($coordinates->contains('')) {
+            return null;
+        }
+
+        $waypoints = $coordinates
+            ->map(function ($coordinate) {
+                $parts = array_map('trim', explode(',', $coordinate));
+
+                if (count($parts) !== 2) {
+                    return null;
+                }
+
+                [$latitude, $longitude] = $parts;
+
+                if (!is_numeric($latitude) || !is_numeric($longitude)) {
+                    return null;
+                }
+
+                return Point::fromText("POINT($longitude $latitude)", 4326);
+            });
+
+        if ($waypoints->contains(null)) {
+            return null;
+        }
+
+        return $waypoints->values();
+    }
+
+    /**
+     * Treat placeholder query-string values from the UI as absent.
+     */
+    protected function normalizeOptionalQueryValue($value): ?string
+    {
+        if (!is_string($value)) {
+            return null;
+        }
+
+        $value = trim($value);
+
+        if ($value === '' || in_array(strtolower($value), ['null', 'undefined'], true)) {
+            return null;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Resolve applicable service rates for route waypoints.
+     */
+    protected function getServicableForWaypoints(Collection $waypoints, \Closure $queryCallback): array
+    {
+        return ServiceRate::getServicableForWaypoints($waypoints, $queryCallback);
+    }
+
     /**
      * Export the service rate to excel or csv.
      *

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

@@ -26,6 +26,27 @@ class DeviceEventFilter extends Filter
         $this->builder->search($searchQuery);
     }
 
+    public function eventType(?string $eventType)
+    {
+        if ($eventType) {
+            $this->builder->where('event_type', 'like', '%' . $eventType . '%');
+        }
+    }
+
+    public function provider(?string $provider)
+    {
+        if ($provider) {
+            $this->builder->where('provider', 'like', '%' . $provider . '%');
+        }
+    }
+
+    public function code(?string $code)
+    {
+        if ($code) {
+            $this->builder->where('code', 'like', '%' . $code . '%');
+        }
+    }
+
     public function telematic(?string $telematic)
     {
         $this->builder->whereHas('device', function ($query) use ($telematic) {

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

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Filter;
 
+use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Filter\Filter;
 
@@ -38,6 +39,22 @@ class DeviceFilter extends Filter
         }
     }
 
+    public function type(string|array|null $type)
+    {
+        $type = Utils::arrayFrom($type);
+
+        if ($type) {
+            $this->builder->whereIn('type', $type);
+        }
+    }
+
+    public function serialNumber(?string $serialNumber)
+    {
+        if ($serialNumber) {
+            $this->builder->where('serial_number', 'like', '%' . $serialNumber . '%');
+        }
+    }
+
     public function telematic(?string $telematic)
     {
         $this->builder->where('telematic_uuid', $telematic);
@@ -71,7 +88,13 @@ class DeviceFilter extends Filter
     public function vehicle(?string $vehicle)
     {
         if ($vehicle) {
-            $this->builder->where('attachable_uuid', $vehicle);
+            $this->builder->where(function ($query) use ($vehicle) {
+                $query->where('attachable_uuid', $vehicle)
+                    ->orWhereIn('attachable_uuid', Vehicle::query()
+                        ->where('company_uuid', $this->session->get('company'))
+                        ->where('public_id', $vehicle)
+                        ->pluck('uuid'));
+            });
         }
     }
 

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

@@ -46,6 +46,7 @@ class Vehicle extends FleetbaseResource
             'altitude'              => (int) data_get($this, 'altitude', 0),
             'speed'                 => (int) data_get($this, 'speed', 0),
             'online'                => (bool) data_get($this, 'online', false),
+            'devices'               => $this->whenLoaded('devices', fn () => $this->compactDevices()),
             'assigned_orders_count' => $this->when($isInternal, $this->assignedOrdersCount()),
 
             // Meta flag to indicate this is an index resource
@@ -65,6 +66,24 @@ class Vehicle extends FleetbaseResource
         return Order::where('vehicle_assigned_uuid', $this->uuid)->count();
     }
 
+    protected function compactDevices(): array
+    {
+        return $this->devices->map(
+            fn ($device) => [
+                'id'            => $device->uuid,
+                'uuid'          => $device->uuid,
+                'public_id'     => $device->public_id,
+                'name'          => $device->name,
+                'display_name'  => $device->display_name,
+                'device_id'     => $device->device_id,
+                'serial_number' => $device->serial_number,
+                'imei'          => $device->imei,
+                'provider'      => $device->provider,
+                'status'        => $device->status,
+            ]
+        )->values()->all();
+    }
+
     protected function currentOrderReference(): ?string
     {
         $this->loadMissing('driver.currentOrder');

package/server/src/Models/Device.php

@@ -80,6 +80,8 @@ class Device extends Model
         'vehicle',
         'connection_status',
         'device_id',
+        'type',
+        'serial_number',
         'last_online_at',
         'updated_at',
         'warranty_uuid',

package/server/src/Models/DeviceEvent.php

@@ -103,6 +103,15 @@ class DeviceEvent extends Model
      */
     protected $appends = [
         'device_name',
+        'device_id',
+        'device_imei',
+        'device_serial_number',
+        'device_connection_status',
+        'device_status',
+        'device_photo_url',
+        'telematic_uuid',
+        'telematic_name',
+        'provider_descriptor',
         'is_processed',
         'age_minutes',
         'processing_delay_minutes',
@@ -208,6 +217,78 @@ class DeviceEvent extends Model
         return $this->device?->name;
     }
 
+    /**
+     * Get the provider device identifier.
+     */
+    public function getDeviceIdAttribute(): ?string
+    {
+        return $this->device?->device_id ?? $this->ident;
+    }
+
+    /**
+     * Get the device IMEI.
+     */
+    public function getDeviceImeiAttribute(): ?string
+    {
+        return $this->device?->imei;
+    }
+
+    /**
+     * Get the device serial number.
+     */
+    public function getDeviceSerialNumberAttribute(): ?string
+    {
+        return $this->device?->serial_number;
+    }
+
+    /**
+     * Get the device connection status.
+     */
+    public function getDeviceConnectionStatusAttribute(): ?string
+    {
+        return $this->device?->connection_status;
+    }
+
+    /**
+     * Get the device operational status.
+     */
+    public function getDeviceStatusAttribute(): ?string
+    {
+        return $this->device?->status;
+    }
+
+    /**
+     * Get the device photo URL.
+     */
+    public function getDevicePhotoUrlAttribute(): ?string
+    {
+        return $this->device?->photo_url;
+    }
+
+    /**
+     * Get the related telematic UUID.
+     */
+    public function getTelematicUuidAttribute(): ?string
+    {
+        return $this->device?->telematic_uuid;
+    }
+
+    /**
+     * Get the related telematic name.
+     */
+    public function getTelematicNameAttribute(): ?string
+    {
+        return $this->device?->telematic?->name;
+    }
+
+    /**
+     * Get the related telematic provider descriptor.
+     */
+    public function getProviderDescriptorAttribute(): array
+    {
+        return $this->device?->telematic?->provider_descriptor ?? [];
+    }
+
     /**
      * Check if the event has been processed.
      */

package/server/src/Models/Equipment.php

@@ -18,6 +18,7 @@ use Fleetbase\Traits\TracksApiCredential;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Database\Eloquent\Relations\Relation;
 use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Spatie\Sluggable\HasSlug;
@@ -94,6 +95,15 @@ class Equipment extends Model
         'slug',
     ];
 
+    /**
+     * Set attributes and defaults.
+     *
+     * @var array
+     */
+    protected $attributes = [
+        'status' => 'available',
+    ];
+
     /**
      * Dynamic attributes that are appended to object.
      *
@@ -148,6 +158,19 @@ class Equipment extends Model
      */
     protected static $logName = 'equipment';
 
+    /**
+     * Enforce assignment morph aliases for existing short type values.
+     */
+    public static function boot(): void
+    {
+        parent::boot();
+
+        Relation::morphMap([
+            'fleet-ops:vehicle' => Vehicle::class,
+            'fleet-ops:driver'  => Driver::class,
+        ]);
+    }
+
     /**
      * Get the options for generating the slug.
      */
@@ -192,6 +215,38 @@ class Equipment extends Model
         return $this->morphTo(__FUNCTION__, 'equipable_type', 'equipable_uuid');
     }
 
+    /**
+     * Set the equipment status attribute.
+     */
+    public function setStatusAttribute(?string $status = 'available'): void
+    {
+        $this->attributes['status'] = $status === null || $status === 'active' ? 'available' : $status;
+    }
+
+    /**
+     * Normalize equipment assignment type aliases to Eloquent morph classes.
+     */
+    public function setEquipableTypeAttribute(?string $type): void
+    {
+        if ($type === null || $type === '') {
+            $this->attributes['equipable_type'] = null;
+
+            return;
+        }
+
+        if (str_contains($type, '\\')) {
+            $this->attributes['equipable_type'] = $type;
+
+            return;
+        }
+
+        $this->attributes['equipable_type'] = match ($type) {
+            'fleet-ops:vehicle', 'vehicle' => Utils::getMutationType('fleet-ops:vehicle'),
+            'fleet-ops:driver', 'driver'   => Utils::getMutationType('fleet-ops:driver'),
+            default                       => $type,
+        };
+    }
+
     public function maintenances(): HasMany
     {
         return $this->hasMany(Maintenance::class, 'maintainable_uuid', 'uuid')

package/server/src/Support/Telematics/Providers/AfaqyProvider.php

@@ -151,6 +151,7 @@ class AfaqyProvider extends AbstractProvider
 
         return [
             'device_id'    => $payload['_id'] ?? $payload['id'] ?? null,
+            'external_id'  => $payload['_id'] ?? $payload['id'] ?? null,
             'name'         => $payload['name'] ?? data_get($payload, 'profile.plate_number') ?? 'Unknown Unit',
             'provider'     => 'afaqy',
             'model'        => data_get($payload, 'profile.model') ?? $payload['device'] ?? null,

package/server/src/Support/Telematics/Providers/FlespiProvider.php

@@ -2,6 +2,8 @@
 
 namespace Fleetbase\FleetOps\Support\Telematics\Providers;
 
+use Illuminate\Support\Carbon;
+
 /**
  * Class FlespiProvider.
  *
@@ -77,34 +79,71 @@ class FlespiProvider extends AbstractProvider
 
     public function normalizeDevice(array $payload): array
     {
+        $telemetry  = $payload['telemetry'] ?? $payload;
+        $externalId = $payload['id'] ?? $payload['device.id'] ?? null;
+        $occurredAt = $this->parseTimestamp($telemetry['timestamp'] ?? $payload['last_active'] ?? null);
+
         return [
-            'external_id'     => $payload['id'],
-            'device_name'     => $payload['name'] ?? 'Unknown Device',
-            'device_provider' => 'flespi',
-            'device_model'    => $payload['device_type_id'] ?? null,
-            'imei'            => $payload['configuration']['ident'] ?? null,
-            'phone'           => $payload['configuration']['phone'] ?? null,
-            'status'          => isset($payload['telemetry']) ? 'active' : 'inactive',
-            'location'        => [
-                'lat' => $payload['telemetry']['position.latitude'] ?? null,
-                'lng' => $payload['telemetry']['position.longitude'] ?? null,
+            'device_id'     => $externalId,
+            'external_id'   => $externalId,
+            'name'          => $payload['name'] ?? $telemetry['device.name'] ?? 'Unknown Device',
+            'provider'      => 'flespi',
+            'model'         => $payload['device_type_id'] ?? $payload['device_type_name'] ?? null,
+            'imei'          => $payload['configuration']['ident'] ?? $payload['ident'] ?? $telemetry['ident'] ?? null,
+            'serial_number' => $payload['configuration']['serial'] ?? $payload['serial'] ?? null,
+            'phone'         => $payload['configuration']['phone'] ?? null,
+            'status'        => isset($payload['telemetry']) ? 'active' : 'inactive',
+            'online'        => $this->resolveOnline($telemetry),
+            'last_seen_at'  => $occurredAt,
+            'location'      => [
+                'lat' => $telemetry['position.latitude'] ?? null,
+                'lng' => $telemetry['position.longitude'] ?? null,
+            ],
+            'speed'      => $telemetry['position.speed'] ?? $telemetry['vehicle.speed'] ?? null,
+            'heading'    => $telemetry['position.direction'] ?? $telemetry['position.heading'] ?? null,
+            'altitude'   => $telemetry['position.altitude'] ?? null,
+            'odometer'   => $telemetry['vehicle.mileage'] ?? $telemetry['vehicle.odometer'] ?? null,
+            'ignition'   => $this->extractIgnition($telemetry),
+            'fuel_level' => $telemetry['fuel.level'] ?? $telemetry['can.fuel.level'] ?? null,
+            'meta'       => [
+                'raw'             => $payload,
+                'provider_status' => array_filter([
+                    'status'    => $payload['status'] ?? $telemetry['status'] ?? null,
+                    'online'    => $telemetry['online'] ?? null,
+                    'connected' => $telemetry['device.connected'] ?? $telemetry['connected'] ?? null,
+                ], fn ($value) => $value !== null),
             ],
-            'meta' => $payload,
         ];
     }
 
     public function normalizeEvent(array $payload): array
     {
+        $deviceId = $payload['device.id'] ?? $payload['id'] ?? null;
+
         return [
-            'external_id' => $payload['id'] ?? null,
-            'device_id'   => $payload['device.id'] ?? null,
+            'external_id' => $payload['id'] ?? $deviceId,
+            'device_id'   => $deviceId,
             'event_type'  => $payload['event.enum'] ?? 'telemetry_update',
-            'occurred_at' => isset($payload['timestamp']) ? date('Y-m-d H:i:s', $payload['timestamp']) : now(),
+            'occurred_at' => $this->parseTimestamp($payload['timestamp'] ?? null) ?? now(),
+            'online'      => $this->resolveOnline($payload),
             'location'    => [
                 'lat' => $payload['position.latitude'] ?? null,
                 'lng' => $payload['position.longitude'] ?? null,
             ],
-            'meta' => $payload,
+            'speed'      => $payload['position.speed'] ?? $payload['vehicle.speed'] ?? null,
+            'heading'    => $payload['position.direction'] ?? $payload['position.heading'] ?? null,
+            'altitude'   => $payload['position.altitude'] ?? null,
+            'odometer'   => $payload['vehicle.mileage'] ?? $payload['vehicle.odometer'] ?? null,
+            'ignition'   => $this->extractIgnition($payload),
+            'fuel_level' => $payload['fuel.level'] ?? $payload['can.fuel.level'] ?? null,
+            'meta'       => [
+                'raw'             => $payload,
+                'provider_status' => array_filter([
+                    'status'    => $payload['status'] ?? null,
+                    'online'    => $payload['online'] ?? null,
+                    'connected' => $payload['device.connected'] ?? $payload['connected'] ?? null,
+                ], fn ($value) => $value !== null),
+            ],
         ];
     }
 
@@ -180,4 +219,39 @@ class FlespiProvider extends AbstractProvider
     {
         return true;
     }
+
+    protected function parseTimestamp($value): ?string
+    {
+        if (!$value) {
+            return null;
+        }
+
+        if (is_numeric($value)) {
+            return Carbon::createFromTimestamp((float) $value)->toDateTimeString();
+        }
+
+        return Carbon::parse($value)->toDateTimeString();
+    }
+
+    protected function resolveOnline(array $payload): ?bool
+    {
+        $value = $payload['online'] ?? $payload['device.connected'] ?? $payload['connected'] ?? null;
+
+        if ($value === null) {
+            return isset($payload['timestamp']);
+        }
+
+        return filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) ?? (bool) $value;
+    }
+
+    protected function extractIgnition(array $payload): ?bool
+    {
+        $value = $payload['engine.ignition.status'] ?? $payload['ignition.status'] ?? null;
+
+        if ($value === null) {
+            return null;
+        }
+
+        return filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) ?? (bool) $value;
+    }
 }