@fleetbase/fleetops-engine 0.6.54 → 0.6.55

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

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Support\Telematics\Providers;
 
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Http;
 
 /**
@@ -75,19 +76,21 @@ class GeotabProvider extends AbstractProvider
     {
         $limit = $options['limit'] ?? 100;
 
-        $response = Http::post($this->baseUrl, [
-            'method' => 'Get',
-            'params' => [
-                'credentials' => [
-                    'database'  => $this->credentials['database'],
-                    'sessionId' => $this->sessionId,
-                ],
-                'typeName'     => 'Device',
-                'resultsLimit' => $limit,
-            ],
-        ])->json();
+        $response = $this->apiCall('Get', [
+            'typeName'     => 'Device',
+            'resultsLimit' => $limit,
+        ]);
 
-        $devices = $response['result'] ?? [];
+        $devices      = $response['result'] ?? [];
+        $logsByDevice = $this->fetchLatestLogRecords($devices, $options);
+        $devices      = array_map(function ($device) use ($logsByDevice) {
+            $deviceId = $device['id'] ?? null;
+            if ($deviceId && isset($logsByDevice[$deviceId])) {
+                $device['latest_log_record'] = $logsByDevice[$deviceId];
+            }
+
+            return $device;
+        }, $devices);
 
         return [
             'devices'     => $devices,
@@ -98,43 +101,76 @@ class GeotabProvider extends AbstractProvider
 
     public function fetchDeviceDetails(string $externalId): array
     {
-        $response = Http::post($this->baseUrl, [
-            'method' => 'Get',
-            'params' => [
-                'credentials' => [
-                    'database'  => $this->credentials['database'],
-                    'sessionId' => $this->sessionId,
-                ],
-                'typeName' => 'Device',
-                'search'   => ['id' => $externalId],
-            ],
-        ])->json();
+        $response = $this->apiCall('Get', [
+            'typeName' => 'Device',
+            'search'   => ['id' => $externalId],
+        ]);
 
         return $response['result'][0] ?? [];
     }
 
     public function normalizeDevice(array $payload): array
     {
+        $latestLog    = $payload['latest_log_record'] ?? [];
+        $hasTelemetry = isset($latestLog['dateTime']) || isset($latestLog['latitude'], $latestLog['longitude']);
+
         return [
-            'external_id'     => $payload['id'],
-            'device_name'     => $payload['name'] ?? 'Unknown Device',
-            'device_provider' => 'geotab',
-            'device_model'    => $payload['deviceType'] ?? null,
-            'imei'            => $payload['serialNumber'] ?? null,
-            'vin'             => $payload['vehicleIdentificationNumber'] ?? null,
-            'status'          => 'active',
-            'meta'            => $payload,
+            'device_id'     => $payload['id'] ?? null,
+            'external_id'   => $payload['id'] ?? null,
+            'name'          => $payload['name'] ?? 'Unknown Device',
+            'provider'      => 'geotab',
+            'model'         => $payload['deviceType'] ?? null,
+            'imei'          => $payload['serialNumber'] ?? null,
+            'vin'           => $payload['vehicleIdentificationNumber'] ?? null,
+            'serial_number' => $payload['serialNumber'] ?? null,
+            'status'        => 'active',
+            'online'        => $hasTelemetry ? true : null,
+            'last_seen_at'  => $latestLog ? $this->parseTimestamp($latestLog['dateTime'] ?? null) : null,
+            'location'      => [
+                'lat' => $latestLog['latitude'] ?? null,
+                'lng' => $latestLog['longitude'] ?? null,
+            ],
+            'speed'    => $latestLog['speed'] ?? null,
+            'heading'  => $latestLog['bearing'] ?? $latestLog['heading'] ?? null,
+            'altitude' => $latestLog['altitude'] ?? null,
+            'meta'     => [
+                'raw'             => $payload,
+                'provider_status' => array_filter([
+                    'active_from' => $payload['activeFrom'] ?? null,
+                    'active_to'   => $payload['activeTo'] ?? null,
+                    'groups'      => $payload['groups'] ?? null,
+                    'has_log'     => $hasTelemetry,
+                ], fn ($value) => $value !== null),
+            ],
         ];
     }
 
     public function normalizeEvent(array $payload): array
     {
+        $latestLog    = $payload['latest_log_record'] ?? $payload;
+        $deviceId     = data_get($latestLog, 'device.id') ?? $payload['deviceId'] ?? $payload['id'] ?? null;
+        $hasTelemetry = isset($latestLog['dateTime']) || isset($latestLog['latitude'], $latestLog['longitude']);
+
         return [
-            'external_id' => $payload['id'] ?? null,
-            'device_id'   => $payload['device']['id'] ?? $payload['deviceId'] ?? null,
+            'external_id' => $latestLog['id'] ?? $payload['id'] ?? null,
+            'device_id'   => $deviceId,
             'event_type'  => $payload['type'] ?? 'status_data',
-            'occurred_at' => $payload['dateTime'] ?? now(),
-            'meta'        => $payload,
+            'occurred_at' => $this->parseTimestamp($latestLog['dateTime'] ?? null) ?? now(),
+            'online'      => $hasTelemetry ? true : null,
+            'location'    => [
+                'lat' => $latestLog['latitude'] ?? null,
+                'lng' => $latestLog['longitude'] ?? null,
+            ],
+            'speed'    => $latestLog['speed'] ?? null,
+            'heading'  => $latestLog['bearing'] ?? $latestLog['heading'] ?? null,
+            'altitude' => $latestLog['altitude'] ?? null,
+            'meta'     => [
+                'raw'             => $payload,
+                'provider_status' => array_filter([
+                    'has_log' => $hasTelemetry,
+                    'device'  => data_get($latestLog, 'device.id'),
+                ], fn ($value) => $value !== null),
+            ],
         ];
     }
 
@@ -179,4 +215,56 @@ class GeotabProvider extends AbstractProvider
     {
         return false;
     }
+
+    protected function apiCall(string $method, array $params): array
+    {
+        $params['credentials'] = [
+            'database'  => $this->credentials['database'],
+            'sessionId' => $this->sessionId,
+        ];
+
+        return Http::post($this->baseUrl, [
+            'method' => $method,
+            'params' => $params,
+        ])->json() ?? [];
+    }
+
+    protected function fetchLatestLogRecords(array $devices, array $options = []): array
+    {
+        $deviceIds = array_values(array_filter(array_map(fn ($device) => $device['id'] ?? null, $devices)));
+        if (empty($deviceIds)) {
+            return [];
+        }
+
+        $fromDate = $options['from_date'] ?? Carbon::now()->subHours(24)->toIso8601String();
+        $response = $this->apiCall('Get', [
+            'typeName'     => 'LogRecord',
+            'search'       => ['fromDate' => $fromDate],
+            'resultsLimit' => max(count($deviceIds) * 5, 100),
+        ]);
+
+        $logsByDevice = [];
+        foreach ($response['result'] ?? [] as $record) {
+            $deviceId = data_get($record, 'device.id');
+            if (!$deviceId || !in_array($deviceId, $deviceIds, true)) {
+                continue;
+            }
+
+            $current = $logsByDevice[$deviceId] ?? null;
+            if (!$current || Carbon::parse($record['dateTime'] ?? now())->greaterThan(Carbon::parse($current['dateTime'] ?? now()))) {
+                $logsByDevice[$deviceId] = $record;
+            }
+        }
+
+        return $logsByDevice;
+    }
+
+    protected function parseTimestamp($value): ?string
+    {
+        if (!$value) {
+            return null;
+        }
+
+        return Carbon::parse($value)->toDateTimeString();
+    }
 }

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

@@ -110,8 +110,19 @@ class SafeeProvider extends AbstractProvider
                 'lat' => $position['lat'] ?? null,
                 'lng' => $position['lng'] ?? null,
             ],
-            'meta' => [
-                'raw'          => $payload,
+            'speed'      => $payload['speed'] ?? $payload['lastSpeed'] ?? null,
+            'heading'    => $payload['heading'] ?? $payload['angle'] ?? null,
+            'altitude'   => $payload['altitude'] ?? $payload['alt'] ?? null,
+            'odometer'   => $this->extractOdometer($payload),
+            'ignition'   => $this->extractIgnition($payload),
+            'fuel_level' => $this->extractFuelLevel($payload),
+            'meta'       => [
+                'raw'             => $payload,
+                'provider_status' => array_filter([
+                    'status'        => $rawStatus,
+                    'normalized'    => $status,
+                    'vehicleStatus' => $payload['vehicleStatus'] ?? null,
+                ], fn ($value) => $value !== null),
                 'plate_number' => $payload['plateNumber'] ?? $payload['plate_number'] ?? null,
                 'door_number'  => $payload['doorNumber'] ?? null,
                 'driver'       => $payload['driver'] ?? null,
@@ -136,12 +147,14 @@ class SafeeProvider extends AbstractProvider
             'event_type'  => data_get($payload, 'event.code') ?? data_get($payload, 'event.name') ?? 'telemetry_update',
             'message'     => data_get($payload, 'event.name') ?? data_get($payload, 'event.message') ?? null,
             'occurred_at' => $this->parseTimestamp($payload['date'] ?? $payload['deviceTime'] ?? $payload['time'] ?? null),
+            'online'      => $this->resolveOnline($payload),
             'location'    => [
                 'lat' => $position['lat'] ?? null,
                 'lng' => $position['lng'] ?? null,
             ],
             'speed'      => $payload['speed'] ?? $payload['lastSpeed'] ?? null,
             'heading'    => $payload['heading'] ?? $payload['angle'] ?? null,
+            'altitude'   => $payload['altitude'] ?? $payload['alt'] ?? null,
             'odometer'   => $this->extractOdometer($payload),
             'ignition'   => $this->extractIgnition($payload),
             'fuel_level' => $this->extractFuelLevel($payload),
@@ -347,6 +360,17 @@ class SafeeProvider extends AbstractProvider
         return in_array(strtolower($status), ['offline', 'inactive', 'deleted', 'expired'], true) ? 'inactive' : 'active';
     }
 
+    protected function resolveOnline(array $payload): ?bool
+    {
+        if (array_key_exists('online', $payload)) {
+            return filter_var($payload['online'], FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) ?? (bool) $payload['online'];
+        }
+
+        $status = $payload['status'] ?? $payload['vehicleStatus'] ?? null;
+
+        return $status ? $this->normalizeVehicleStatus($status) === 'active' : null;
+    }
+
     protected function extractOdometer(array $payload): mixed
     {
         return data_get($payload, 'canbus.odometer')

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

@@ -2,6 +2,8 @@
 
 namespace Fleetbase\FleetOps\Support\Telematics\Providers;
 
+use Illuminate\Support\Carbon;
+
 /**
  * Class SamsaraProvider.
  *
@@ -78,30 +80,68 @@ class SamsaraProvider extends AbstractProvider
 
     public function normalizeDevice(array $payload): array
     {
+        $position = $this->extractPosition($payload);
+
         return [
-            'external_id'     => $payload['id'],
-            'device_name'     => $payload['name'] ?? 'Unknown Device',
-            'device_provider' => 'samsara',
-            'device_model'    => $payload['make'] ?? null,
-            'vin'             => $payload['vin'] ?? null,
-            'license_plate'   => $payload['licensePlate'] ?? null,
-            'status'          => 'active',
-            'meta'            => $payload,
+            'device_id'      => $payload['id'] ?? null,
+            'external_id'    => $payload['id'] ?? null,
+            'name'           => $payload['name'] ?? 'Unknown Device',
+            'provider'       => 'samsara',
+            'model'          => $payload['make'] ?? $payload['model'] ?? null,
+            'vin'            => $payload['vin'] ?? null,
+            'serial_number'  => $payload['serial'] ?? $payload['serialNumber'] ?? null,
+            'license_plate'  => $payload['licensePlate'] ?? null,
+            'status'         => $this->normalizeStatus($payload),
+            'online'         => $this->resolveOnline($payload),
+            'last_seen_at'   => $this->parseTimestamp($payload['time'] ?? data_get($payload, 'location.time') ?? data_get($payload, 'gps.time') ?? null),
+            'location'       => [
+                'lat' => $position['lat'] ?? null,
+                'lng' => $position['lng'] ?? null,
+            ],
+            'speed'      => $this->extractSpeed($payload),
+            'heading'    => $this->extractHeading($payload),
+            'altitude'   => $this->extractAltitude($payload),
+            'odometer'   => data_get($payload, 'odometerMeters') ?? data_get($payload, 'obdOdometerMeters.value'),
+            'fuel_level' => data_get($payload, 'fuelPercent.value') ?? data_get($payload, 'fuelPercent'),
+            'meta'       => [
+                'raw'             => $payload,
+                'provider_status' => array_filter([
+                    'status'         => $payload['status'] ?? null,
+                    'gateway_status' => data_get($payload, 'gateway.status'),
+                    'online'         => $payload['online'] ?? $payload['isOnline'] ?? data_get($payload, 'gateway.online'),
+                ], fn ($value) => $value !== null),
+            ],
         ];
     }
 
     public function normalizeEvent(array $payload): array
     {
+        $position = $this->extractPosition($payload);
+        $deviceId = data_get($payload, 'vehicle.id') ?? $payload['vehicleId'] ?? $payload['id'] ?? null;
+
         return [
-            'external_id' => $payload['id'] ?? null,
-            'device_id'   => $payload['vehicle']['id'] ?? $payload['vehicleId'] ?? null,
+            'external_id' => $payload['id'] ?? $deviceId,
+            'device_id'   => $deviceId,
             'event_type'  => $payload['eventType'] ?? 'vehicle_update',
-            'occurred_at' => $payload['time'] ?? now(),
+            'occurred_at' => $this->parseTimestamp($payload['time'] ?? data_get($payload, 'location.time') ?? data_get($payload, 'gps.time') ?? null) ?? now(),
+            'online'      => $this->resolveOnline($payload),
             'location'    => [
-                'lat' => $payload['location']['latitude'] ?? null,
-                'lng' => $payload['location']['longitude'] ?? null,
+                'lat' => $position['lat'] ?? null,
+                'lng' => $position['lng'] ?? null,
+            ],
+            'speed'      => $this->extractSpeed($payload),
+            'heading'    => $this->extractHeading($payload),
+            'altitude'   => $this->extractAltitude($payload),
+            'odometer'   => data_get($payload, 'odometerMeters') ?? data_get($payload, 'obdOdometerMeters.value'),
+            'fuel_level' => data_get($payload, 'fuelPercent.value') ?? data_get($payload, 'fuelPercent'),
+            'meta'       => [
+                'raw'             => $payload,
+                'provider_status' => array_filter([
+                    'status'         => $payload['status'] ?? null,
+                    'gateway_status' => data_get($payload, 'gateway.status'),
+                    'online'         => $payload['online'] ?? $payload['isOnline'] ?? data_get($payload, 'gateway.online'),
+                ], fn ($value) => $value !== null),
             ],
-            'meta' => $payload,
         ];
     }
 
@@ -176,4 +216,72 @@ class SamsaraProvider extends AbstractProvider
     {
         return true;
     }
+
+    protected function extractPosition(array $payload): array
+    {
+        $position = $payload['location']
+            ?? $payload['gps']
+            ?? $payload['currentLocation']
+            ?? $payload['lastKnownLocation']
+            ?? data_get($payload, 'vehicle.location')
+            ?? [];
+
+        return [
+            'lat' => $position['latitude'] ?? $position['lat'] ?? null,
+            'lng' => $position['longitude'] ?? $position['lng'] ?? null,
+        ];
+    }
+
+    protected function extractSpeed(array $payload): mixed
+    {
+        return data_get($payload, 'location.speedMilesPerHour')
+            ?? data_get($payload, 'location.speed')
+            ?? data_get($payload, 'gps.speedMilesPerHour')
+            ?? data_get($payload, 'speedMilesPerHour')
+            ?? data_get($payload, 'speed');
+    }
+
+    protected function extractHeading(array $payload): mixed
+    {
+        return data_get($payload, 'location.headingDegrees')
+            ?? data_get($payload, 'location.heading')
+            ?? data_get($payload, 'gps.headingDegrees')
+            ?? data_get($payload, 'headingDegrees')
+            ?? data_get($payload, 'heading');
+    }
+
+    protected function extractAltitude(array $payload): mixed
+    {
+        return data_get($payload, 'location.altitudeMeters')
+            ?? data_get($payload, 'gps.altitudeMeters')
+            ?? data_get($payload, 'altitudeMeters')
+            ?? data_get($payload, 'altitude');
+    }
+
+    protected function parseTimestamp($value): ?string
+    {
+        if (!$value) {
+            return null;
+        }
+
+        return Carbon::parse($value)->toDateTimeString();
+    }
+
+    protected function resolveOnline(array $payload): ?bool
+    {
+        $value = $payload['online'] ?? $payload['isOnline'] ?? data_get($payload, 'gateway.online') ?? null;
+
+        if ($value === null) {
+            return $this->extractPosition($payload)['lat'] !== null;
+        }
+
+        return filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) ?? (bool) $value;
+    }
+
+    protected function normalizeStatus(array $payload): string
+    {
+        $status = strtolower((string) ($payload['status'] ?? data_get($payload, 'gateway.status') ?? 'active'));
+
+        return in_array($status, ['inactive', 'offline', 'deactivated'], true) ? 'inactive' : 'active';
+    }
 }

package/server/src/routes.php

@@ -476,7 +476,6 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                                 $router->delete('bulk-delete', $controller('bulkDelete'));
                                 $router->get('for-route', $controller('getServicesForRoute'));
                                 $router->match(['get', 'post'], 'export', $controller('export'));
-                                $router->get('for-route', $controller('getServicesForRoute'));
                             }
                         );
                         $router->fleetbaseRoutes('tracking-numbers');

package/server/tests/DeviceFilterTest.php

@@ -9,6 +9,8 @@ test('device filter exposes telematics detail filter contract', function () {
         ->toContain("'vehicle'")
         ->toContain("'connection_status'")
         ->toContain("'device_id'")
+        ->toContain("'type'")
+        ->toContain("'serial_number'")
         ->toContain("'last_online_at'")
         ->toContain("'updated_at'");
 
@@ -16,8 +18,13 @@ test('device filter exposes telematics detail filter contract', function () {
         ->toContain('public function query(?string $searchQuery)')
         ->toContain('public function deviceId(?string $deviceId)')
         ->toContain("where('device_id', 'like'")
+        ->toContain('public function type(string|array|null $type)')
+        ->toContain("whereIn('type', \$type)")
+        ->toContain('public function serialNumber(?string $serialNumber)')
+        ->toContain("where('serial_number', 'like'")
         ->toContain('public function vehicle(?string $vehicle)')
         ->toContain("where('attachable_uuid', \$vehicle)")
+        ->toContain("where('public_id', \$vehicle)")
         ->toContain('public function connectionStatus')
         ->toContain("'online'")
         ->toContain("'recently_offline'")
@@ -30,7 +37,9 @@ test('device filter exposes telematics detail filter contract', function () {
         ->toContain('protected function filterDate');
 
     expect($controller)
+        ->toContain("withCount('sensors')")
         ->toContain("filled('connection_status')")
+        ->toContain("filled('serial_number')")
         ->toContain("filled('last_online_at')")
         ->toContain("filled('updated_at')");
 });

package/server/tests/DriverVehicleStatusDefaultTest.php

@@ -1,16 +1,19 @@
 <?php
 
 use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\FleetOps\Models\Equipment;
 use Fleetbase\FleetOps\Models\Vehicle;
 
-test('driver and vehicle statuses default to available', function () {
+test('driver vehicle and equipment statuses default to available', function () {
     expect((new Driver())->status)
         ->toBe('available')
         ->and((new Vehicle())->status)
+        ->toBe('available')
+        ->and((new Equipment())->status)
         ->toBe('available');
 });
 
-test('legacy active and null driver and vehicle statuses normalize to available', function () {
+test('legacy active and null driver vehicle and equipment statuses normalize to available', function () {
     $driver         = new Driver();
     $driver->status = 'active';
     expect($driver->status)->toBe('available');
@@ -24,6 +27,20 @@ test('legacy active and null driver and vehicle statuses normalize to available'
 
     $vehicle->status = null;
     expect($vehicle->status)->toBe('available');
+
+    $equipment         = new Equipment();
+    $equipment->status = 'active';
+    expect($equipment->status)->toBe('available');
+
+    $equipment->status = null;
+    expect($equipment->status)->toBe('available');
+});
+
+test('equipment preserves explicit non default status values', function () {
+    $equipment         = new Equipment();
+    $equipment->status = 'maintenance';
+
+    expect($equipment->status)->toBe('maintenance');
 });
 
 test('dispatch driver availability queries use available status', function () {

package/server/tests/EquipmentAssignmentMorphTypeTest.php

@@ -0,0 +1,35 @@
+<?php
+
+use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\FleetOps\Models\Equipment;
+use Fleetbase\FleetOps\Models\Vehicle;
+use Illuminate\Database\Eloquent\Relations\Relation;
+
+test('equipment assignment type aliases normalize to model classes', function () {
+    $equipment = new Equipment();
+
+    $equipment->equipable_type = 'fleet-ops:vehicle';
+    expect($equipment->equipable_type)->toBe(Vehicle::class);
+
+    $equipment->equipable_type = 'fleet-ops:driver';
+    expect($equipment->equipable_type)->toBe(Driver::class);
+});
+
+test('equipment assignment type preserves null and existing model classes', function () {
+    $equipment = new Equipment();
+
+    $equipment->equipable_type = null;
+    expect($equipment->equipable_type)->toBeNull();
+
+    $equipment->equipable_type = Vehicle::class;
+    expect($equipment->equipable_type)->toBe(Vehicle::class);
+});
+
+test('legacy equipment assignment aliases are registered for morph reads', function () {
+    new Equipment();
+
+    expect(Relation::getMorphedModel('fleet-ops:vehicle'))
+        ->toBe(Vehicle::class)
+        ->and(Relation::getMorphedModel('fleet-ops:driver'))
+        ->toBe(Driver::class);
+});

package/server/tests/ServiceRateRouteValidationTest.php

@@ -0,0 +1,101 @@
+<?php
+
+use Fleetbase\FleetOps\Http\Controllers\Internal\v1\ServiceRateController;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+
+function fleetopsServiceRateRouteRequest(array $query = []): Request
+{
+    $request = Request::create('/int/v1/service-rates/for-route', 'GET', $query);
+    $session = app('session.store');
+    $session->put('company', 'company_test');
+    $request->setLaravelSession($session);
+
+    return $request;
+}
+
+function fleetopsServiceRateRouteController()
+{
+    return new class extends ServiceRateController {
+        public ?Collection $waypoints  = null;
+        public ?Closure $queryCallback = null;
+
+        protected function getServicableForWaypoints(Collection $waypoints, Closure $queryCallback): array
+        {
+            $this->waypoints     = $waypoints;
+            $this->queryCallback = $queryCallback;
+
+            return [['id' => 'service_rate_test']];
+        }
+    };
+}
+
+test('service rates for route requires coordinates', function ($query) {
+    $response = fleetopsServiceRateRouteController()->getServicesForRoute(fleetopsServiceRateRouteRequest($query));
+
+    expect($response->getStatusCode())->toBe(422);
+})->with([
+    'missing coordinates' => [[]],
+    'empty coordinates'   => [['coordinates' => '']],
+]);
+
+test('service rates for route requires at least two coordinates', function () {
+    $response = fleetopsServiceRateRouteController()->getServicesForRoute(fleetopsServiceRateRouteRequest([
+        'coordinates' => '1.3621663,103.8845049',
+    ]));
+
+    expect($response->getStatusCode())->toBe(422);
+});
+
+test('service rates for route rejects malformed coordinates', function ($coordinates) {
+    $response = fleetopsServiceRateRouteController()->getServicesForRoute(fleetopsServiceRateRouteRequest([
+        'coordinates' => $coordinates,
+    ]));
+
+    expect($response->getStatusCode())->toBe(422);
+})->with([
+    'missing longitude' => ['1.3621663;1.353151,103.86458'],
+    'missing latitude'  => [',103.8845049;1.353151,103.86458'],
+    'blank segment'     => ['1.3621663,103.8845049;;1.353151,103.86458'],
+    'non numeric'       => ['north,103.8845049;1.353151,103.86458'],
+]);
+
+test('service rates for route converts coordinate pairs to waypoints', function () {
+    $controller = fleetopsServiceRateRouteController();
+    $response   = $controller->getServicesForRoute(fleetopsServiceRateRouteRequest([
+        'coordinates'  => '1.3621663,103.8845049;1.353151,103.86458',
+        'service_type' => 'delivery',
+    ]));
+
+    expect($response->getStatusCode())->toBe(200)
+        ->and($controller->waypoints)->toHaveCount(2)
+        ->and($controller->waypoints->first()->x())->toBe(103.8845049)
+        ->and($controller->waypoints->first()->y())->toBe(1.3621663);
+});
+
+test('service rates for route ignores placeholder service type values', function ($serviceType) {
+    $controller = fleetopsServiceRateRouteController();
+    $controller->getServicesForRoute(fleetopsServiceRateRouteRequest([
+        'coordinates'  => '1.3621663,103.8845049;1.353151,103.86458',
+        'service_type' => $serviceType,
+    ]));
+
+    $query = new class {
+        public array $wheres = [];
+
+        public function where($column, $value)
+        {
+            $this->wheres[] = [$column, $value];
+
+            return $this;
+        }
+    };
+
+    ($controller->queryCallback)($query);
+
+    expect($query->wheres)->toBe([['company_uuid', 'company_test']]);
+})->with([
+    'undefined' => ['undefined'],
+    'null'      => ['null'],
+    'empty'     => [''],
+]);