@fleetbase/fleetops-engine 0.6.53 → 0.6.55

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/Models/Sensor.php

@@ -66,14 +66,27 @@ class Sensor extends Model
      *
      * @var array
      */
-    protected $searchableColumns = ['name', 'type', 'internal_id', 'unit', 'public_id'];
+    protected $searchableColumns = ['name', 'type', 'internal_id', 'serial_number', 'imei', 'unit', 'public_id'];
 
     /**
      * The attributes that can be used for filtering.
      *
      * @var array
      */
-    protected $filterParams = ['type', 'sensor_type', 'status', 'device_uuid', 'warranty_uuid', 'sensorable_type', 'telematic_uuid'];
+    protected $filterParams = [
+        'type',
+        'sensor_type',
+        'status',
+        'device_uuid',
+        'serial_number',
+        'imei',
+        'warranty_uuid',
+        'sensorable_type',
+        'telematic_uuid',
+        'last_reading_at',
+        'created_at',
+        'updated_at',
+    ];
 
     /**
      * The attributes that are mass assignable.

package/server/src/Models/Telematic.php

@@ -63,7 +63,7 @@ class Telematic extends Model
      *
      * @var array
      */
-    protected $filterParams = ['provider', 'status', 'warranty_uuid'];
+    protected $filterParams = ['public_id', 'provider', 'status', 'warranty_uuid'];
 
     /**
      * The attributes that are mass assignable.

package/server/src/Models/Vehicle.php

@@ -72,7 +72,7 @@ class Vehicle extends Model
      *
      * @var array
      */
-    protected $filterParams = ['vendor', 'driver', 'driver_uuid', 'vehicle_make', 'vehicle_model'];
+    protected $filterParams = ['vendor', 'driver', 'driver_uuid', 'vehicle_make', 'vehicle_model', 'telematic_uuid'];
 
     /**
      * Relationships to auto load with driver.
@@ -407,6 +407,10 @@ class Vehicle extends Model
      */
     public function getDisplayNameAttribute()
     {
+        if (isset($this->name) && strlen($this->name)) {
+            return $this->name;
+        }
+
         // Initialize an empty array to hold the name segments
         $nameSegments = [];
 

package/server/src/Models/WorkOrder.php

@@ -59,14 +59,14 @@ class WorkOrder extends Model
      *
      * @var array
      */
-    protected $searchableColumns = ['code', 'subject', 'instructions', 'public_id'];
+    protected $searchableColumns = ['code', 'subject', 'category', 'instructions', 'public_id'];
 
     /**
      * The attributes that can be used for filtering.
      *
      * @var array
      */
-    protected $filterParams = ['status', 'priority', 'target_type', 'assignee_type'];
+    protected $filterParams = ['category', 'status', 'priority', 'target_type', 'assignee_type'];
 
     /**
      * The attributes that are mass assignable.
@@ -77,6 +77,7 @@ class WorkOrder extends Model
         'company_uuid',
         'code',
         'subject',
+        'category',
         'status',
         'priority',
         'target_type',
@@ -575,6 +576,7 @@ class WorkOrder extends Model
         $row = array_filter($row);
 
         $subject        = Utils::or($row, ['subject', 'title', 'name']);
+        $category       = Utils::or($row, ['category', 'work_order_category', 'work_type', 'type']);
         $status         = Utils::or($row, ['status'], 'open');
         $priority       = Utils::or($row, ['priority'], 'normal');
         $instructions   = Utils::or($row, ['instructions', 'description', 'notes']);
@@ -592,6 +594,7 @@ class WorkOrder extends Model
         $workOrder = new static([
             'company_uuid'    => session('company'),
             'subject'         => $subject,
+            'category'        => $category,
             'status'          => $status,
             'priority'        => $priority,
             'instructions'    => $instructions,

package/server/src/Observers/DriverObserver.php

@@ -30,7 +30,7 @@ class DriverObserver
      */
     public function created(Driver $driver)
     {
-        LiveCacheService::invalidate('drivers');
+        LiveCacheService::invalidateMultiple(['drivers', 'operations-monitor']);
     }
 
     /**
@@ -40,7 +40,7 @@ class DriverObserver
      */
     public function updated(Driver $driver)
     {
-        LiveCacheService::invalidate('drivers');
+        LiveCacheService::invalidateMultiple(['drivers', 'operations-monitor']);
     }
 
     /**
@@ -70,6 +70,6 @@ class DriverObserver
             $user->delete();
         }
 
-        LiveCacheService::invalidate('drivers');
+        LiveCacheService::invalidateMultiple(['drivers', 'operations-monitor']);
     }
 }

package/server/src/Observers/FleetObserver.php

@@ -3,9 +3,30 @@
 namespace Fleetbase\FleetOps\Observers;
 
 use Fleetbase\FleetOps\Models\Fleet;
+use Fleetbase\FleetOps\Support\LiveCacheService;
 
 class FleetObserver
 {
+    /**
+     * Handle the Fleet "created" event.
+     *
+     * @return void
+     */
+    public function created(Fleet $fleet)
+    {
+        LiveCacheService::invalidate('operations-monitor');
+    }
+
+    /**
+     * Handle the Fleet "updated" event.
+     *
+     * @return void
+     */
+    public function updated(Fleet $fleet)
+    {
+        LiveCacheService::invalidate('operations-monitor');
+    }
+
     /**
      * Handle the Driver "deleted" event.
      *
@@ -15,5 +36,7 @@ class FleetObserver
     {
         // 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]);
+
+        LiveCacheService::invalidate('operations-monitor');
     }
 }

package/server/src/Observers/VehicleObserver.php

@@ -30,7 +30,7 @@ class VehicleObserver
             }
         }
 
-        LiveCacheService::invalidate('vehicles');
+        LiveCacheService::invalidateMultiple(['vehicles', 'operations-monitor']);
     }
 
     /**
@@ -55,7 +55,7 @@ class VehicleObserver
             }
         }
 
-        LiveCacheService::invalidate('vehicles');
+        LiveCacheService::invalidateMultiple(['vehicles', 'operations-monitor']);
     }
 
     /**
@@ -68,6 +68,6 @@ class VehicleObserver
         // Unassign the deleted vehicle from matching driver/(s)
         Driver::where(['vehicle_uuid' => $vehicle->uuid])->delete();
 
-        LiveCacheService::invalidate('vehicles');
+        LiveCacheService::invalidateMultiple(['vehicles', 'operations-monitor']);
     }
 }

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -69,6 +69,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         \Fleetbase\FleetOps\Console\Commands\ProcessMaintenanceTriggers::class,
         \Fleetbase\FleetOps\Console\Commands\SendMaintenanceReminders::class,
         \Fleetbase\FleetOps\Console\Commands\ProcessOperationalAlerts::class,
+        \Fleetbase\FleetOps\Console\Commands\SyncTelematics::class,
     ];
 
     /**
@@ -141,6 +142,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
             $schedule->command('fleetops:process-maintenance-triggers')->daily()->withoutOverlapping()->storeOutputInDb();
             $schedule->command('fleetops:send-maintenance-reminders')->daily()->withoutOverlapping()->storeOutputInDb();
             $schedule->command('fleetops:process-operational-alerts')->everyMinute()->withoutOverlapping()->storeOutputInDb();
+            $schedule->command('fleetops:sync-telematics')->everyMinute()->withoutOverlapping()->storeOutputInDb();
         });
         $this->registerNotifications();
         $this->registerExpansionsFrom(__DIR__ . '/../Expansions');

package/server/src/Support/LiveCacheService.php

@@ -108,7 +108,7 @@ class LiveCacheService
             }
         } else {
             // Invalidate all endpoints
-            $endpoints = ['orders', 'routes', 'coordinates', 'drivers', 'vehicles', 'places'];
+            $endpoints = ['orders', 'routes', 'coordinates', 'drivers', 'vehicles', 'places', 'operations-monitor'];
             foreach ($endpoints as $ep) {
                 static::incrementVersion($ep);
             }

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

@@ -2,6 +2,9 @@
 
 namespace Fleetbase\FleetOps\Support\Telematics\Providers;
 
+use Fleetbase\FleetOps\Exceptions\TelematicProviderException;
+use Illuminate\Http\Client\ConnectionException;
+use Illuminate\Http\Client\Response;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
@@ -14,20 +17,23 @@ use Illuminate\Support\Facades\Log;
  */
 class AfaqyProvider extends AbstractProvider
 {
-    protected string $baseUrl        = 'https://api.afaqy.sa';
-    protected int $requestsPerMinute = 60;
+    protected string $baseUrl                   = 'https://api.afaqy.sa';
+    protected int $requestsPerMinute            = 60;
+    protected int $dataTimeout                  = 120;
+    protected int $connectTimeout               = 15;
+    protected int $connectionTestTimeout        = 30;
+    protected int $connectionTestConnectTimeout = 10;
 
     protected function prepareAuthentication(): void
     {
         $this->baseUrl = rtrim($this->credentials['base_url'] ?? $this->baseUrl, '/');
-        $token         = $this->credentials['token'] ?? $this->authenticate();
+        $token         = $this->canRefreshToken() ? $this->authenticate() : ($this->credentials['token'] ?? null);
 
-        $this->credentials['token'] = $token;
-        $this->headers              = [
-            'Accept'        => 'application/json',
-            'Content-Type'  => 'application/json',
-            'Authorization' => 'Bearer ' . $token,
-        ];
+        if (!$token) {
+            throw new \InvalidArgumentException('AFAQY username/password or token is required.');
+        }
+
+        $this->setToken($token);
     }
 
     public function testConnection(array $credentials): array
@@ -41,7 +47,7 @@ class AfaqyProvider extends AbstractProvider
                     'projection' => ['_id', 'name', 'imei', 'last_update'],
                     'filters'    => new \stdClass(),
                 ],
-            ], true);
+            ], true, $this->connectionTestTimeout, $this->connectionTestConnectTimeout);
 
             return [
                 'success'  => true,
@@ -55,7 +61,7 @@ class AfaqyProvider extends AbstractProvider
             return [
                 'success'  => false,
                 'message'  => $e->getMessage(),
-                'metadata' => [],
+                'metadata' => method_exists($e, 'context') ? $e->context() : [],
             ];
         }
     }
@@ -145,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,
@@ -187,12 +194,14 @@ class AfaqyProvider extends AbstractProvider
             'event_type'  => $payload['event'] ?? $payload['event_type'] ?? 'telemetry_update',
             'message'     => $payload['message'] ?? $payload['event'] ?? null,
             'occurred_at' => $this->parseTimestamp($lastUpdate['dtt'] ?? $lastUpdate['dts'] ?? null),
+            'online'      => $payload['active'] ?? null,
             'location'    => [
                 'lat' => $lastUpdate['lat'] ?? data_get($lastUpdate, 'loc.coordinates.1'),
                 'lng' => $lastUpdate['lng'] ?? data_get($lastUpdate, 'loc.coordinates.0'),
             ],
             'speed'      => $lastUpdate['speed'] ?? $lastUpdate['spd'] ?? null,
             'heading'    => $lastUpdate['angle'] ?? $lastUpdate['ang'] ?? null,
+            'altitude'   => $lastUpdate['alt'] ?? null,
             'odometer'   => data_get($payload, 'counters.odometer'),
             'ignition'   => $this->extractIgnition($payload),
             'fuel_level' => $this->extractFuelLevel($payload),
@@ -271,19 +280,64 @@ class AfaqyProvider extends AbstractProvider
             ]);
 
         if ($response->failed()) {
-            throw new \RuntimeException('AFAQY authentication failed with status ' . $response->status());
+            throw new TelematicProviderException('AFAQY authentication failed with status ' . $response->status(), $this->providerErrorContext('/auth/login', $response, false));
         }
 
         $token = data_get($response->json(), 'data.token');
 
         if (!$token) {
-            throw new \RuntimeException('AFAQY authentication did not return a token.');
+            throw new TelematicProviderException('AFAQY authentication did not return a token.', $this->providerErrorContext('/auth/login', $response, false));
         }
 
         return $token;
     }
 
-    protected function afaqyPost(string $endpoint, array $payload = [], bool $tokenInQuery = false): array
+    protected function afaqyPost(string $endpoint, array $payload = [], bool $tokenInQuery = false, ?int $timeout = null, ?int $connectTimeout = null): array
+    {
+        return $this->authenticatedPost($endpoint, $payload, $tokenInQuery, true, $timeout, $connectTimeout);
+    }
+
+    protected function authenticatedPost(string $endpoint, array $payload = [], bool $tokenInQuery = false, bool $allowRetry = true, ?int $timeout = null, ?int $connectTimeout = null): array
+    {
+        [$url, $body] = $this->buildAuthenticatedRequest($endpoint, $payload, $tokenInQuery);
+
+        $startedAt = microtime(true);
+        $timeout ??= $this->dataTimeout;
+        $connectTimeout ??= $this->connectTimeout;
+
+        try {
+            $response = Http::withHeaders($this->headers)
+                ->timeout($timeout)
+                ->connectTimeout($connectTimeout)
+                ->post($url, $body);
+        } catch (ConnectionException $e) {
+            throw new TelematicProviderException('AFAQY API request timed out while waiting for provider response.', $this->transportErrorContext($endpoint, $payload, $e, !$allowRetry, $startedAt, $timeout, $connectTimeout), previous: $e);
+        }
+
+        if ($this->isTokenRejected($response)) {
+            if (!$allowRetry || !$this->canRefreshToken()) {
+                $message = $this->canRefreshToken()
+                    ? 'AFAQY token rejected after refresh with status ' . $response->status()
+                    : 'AFAQY token rejected and username/password credentials are required to refresh it.';
+
+                throw new TelematicProviderException($message, $this->providerErrorContext($endpoint, $response, !$allowRetry));
+            }
+
+            Log::warning('AFAQY token rejected; refreshing token and retrying request', $this->providerErrorContext($endpoint, $response, true));
+
+            $this->refreshToken();
+
+            return $this->authenticatedPost($endpoint, $payload, $tokenInQuery, false, $timeout, $connectTimeout);
+        }
+
+        if ($response->failed()) {
+            throw new TelematicProviderException('AFAQY API request failed with status ' . $response->status(), $this->providerErrorContext($endpoint, $response, !$allowRetry));
+        }
+
+        return $response->json() ?? [];
+    }
+
+    protected function buildAuthenticatedRequest(string $endpoint, array $payload = [], bool $tokenInQuery = false): array
     {
         $url  = $this->baseUrl . $endpoint;
         $body = $tokenInQuery ? $payload : array_merge(['token' => $this->credentials['token']], $payload);
@@ -292,15 +346,84 @@ class AfaqyProvider extends AbstractProvider
             $url .= (str_contains($url, '?') ? '&' : '?') . http_build_query(['token' => $this->credentials['token']]);
         }
 
-        $response = Http::withHeaders($this->headers)
-            ->timeout(30)
-            ->post($url, $body);
+        return [$url, $body];
+    }
 
-        if ($response->failed()) {
-            throw new \RuntimeException('AFAQY API request failed with status ' . $response->status());
+    protected function setToken(string $token): void
+    {
+        $this->credentials['token'] = $token;
+        $this->headers              = [
+            'Accept'        => 'application/json',
+            'Content-Type'  => 'application/json',
+            'Authorization' => 'Bearer ' . $token,
+        ];
+    }
+
+    protected function refreshToken(): void
+    {
+        unset($this->credentials['token']);
+
+        $this->setToken($this->authenticate());
+    }
+
+    protected function canRefreshToken(): bool
+    {
+        return !empty($this->credentials['username']) && !empty($this->credentials['password']);
+    }
+
+    protected function isTokenRejected(Response $response): bool
+    {
+        return in_array($response->status(), [401, 403], true);
+    }
+
+    protected function providerErrorContext(string $endpoint, Response $response, bool $retryAttempted): array
+    {
+        $json = $response->json() ?? [];
+        $json = is_array($json) ? $json : [];
+
+        return array_filter([
+            'provider'         => 'afaqy',
+            'endpoint'         => $endpoint,
+            'status_code'      => $response->status(),
+            'provider_code'    => data_get($json, 'code') ?? data_get($json, 'error.code') ?? data_get($json, 'error_code'),
+            'provider_message' => $this->providerErrorMessage($json),
+            'retry_attempted'  => $retryAttempted,
+        ], fn ($value) => $value !== null);
+    }
+
+    protected function providerErrorMessage(array $json): ?string
+    {
+        $message = data_get($json, 'message')
+            ?? data_get($json, 'error.message')
+            ?? data_get($json, 'error_description')
+            ?? data_get($json, 'error');
+
+        return is_scalar($message) ? (string) $message : null;
+    }
+
+    protected function transportErrorContext(string $endpoint, array $payload, ConnectionException $e, bool $retryAttempted, float $startedAt, int $timeout, int $connectTimeout): array
+    {
+        return array_filter([
+            'provider'         => 'afaqy',
+            'endpoint'         => $endpoint,
+            'requested_limit'  => data_get($payload, 'data.limit'),
+            'requested_offset' => data_get($payload, 'data.offset'),
+            'timeout'          => $timeout,
+            'connect_timeout'  => $connectTimeout,
+            'elapsed_ms'       => (int) ((microtime(true) - $startedAt) * 1000),
+            'bytes_received'   => $this->extractBytesReceived($e->getMessage()),
+            'retry_attempted'  => $retryAttempted,
+            'transport_error'  => 'connection_exception',
+        ], fn ($value) => $value !== null);
+    }
+
+    protected function extractBytesReceived(string $message): ?int
+    {
+        if (preg_match('/with\s+(\d+)\s+bytes\s+received/i', $message, $matches)) {
+            return (int) $matches[1];
         }
 
-        return $response->json() ?? [];
+        return null;
     }
 
     protected function compactLastUpdate(array $lastUpdate): array