@fleetbase/fleetops-engine 0.6.51 → 0.6.52

package/server/src/Jobs/TestTelematicConnectionJob.php

@@ -3,12 +3,13 @@
 namespace Fleetbase\FleetOps\Jobs;
 
 use Fleetbase\FleetOps\Models\Telematic;
+use Fleetbase\FleetOps\Support\Telematics\TelematicProviderRegistry;
+use Fleetbase\FleetOps\Support\Telematics\TelematicService;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 
@@ -25,22 +26,23 @@ class TestTelematicConnectionJob implements ShouldQueue
     use SerializesModels;
 
     public Telematic $telematic;
+    public string $jobId;
     public int $tries   = 1;
     public int $timeout = 30;
 
     /**
      * Create a new job instance.
      */
-    public function __construct(Telematic $telematic)
+    public function __construct(Telematic $telematic, ?string $jobId = null)
     {
         $this->telematic = $telematic;
-        $this->queue     = 'telematics-priority';
+        $this->jobId     = $jobId ?? Str::uuid()->toString();
     }
 
     /**
      * Execute the job.
      */
-    public function handle(ProviderRegistry $registry): void
+    public function handle(TelematicProviderRegistry $registry, TelematicService $service): void
     {
         $correlationId = Str::uuid()->toString();
 
@@ -52,26 +54,11 @@ class TestTelematicConnectionJob implements ShouldQueue
 
         try {
             $provider    = $registry->resolve($this->telematic->provider);
-            $credentials = json_decode(Crypt::decryptString($this->telematic->credentials), true);
+            $credentials = $service->getCredentials($this->telematic);
 
             $result = $provider->testConnection($credentials);
 
-            if ($result['success']) {
-                $this->telematic->status = 'active';
-                $this->telematic->meta   = array_merge($this->telematic->meta ?? [], [
-                    'last_connection_test' => now()->toDateTimeString(),
-                    'last_test_result'     => 'success',
-                ]);
-            } else {
-                $this->telematic->status = 'error';
-                $this->telematic->meta   = array_merge($this->telematic->meta ?? [], [
-                    'last_connection_test' => now()->toDateTimeString(),
-                    'last_test_result'     => 'failed',
-                    'last_error'           => $result['message'],
-                ]);
-            }
-
-            $this->telematic->save();
+            $service->recordConnectionTest($this->telematic, $result);
 
             Log::info('Connection test completed', [
                 'correlation_id' => $correlationId,
@@ -97,6 +84,6 @@ class TestTelematicConnectionJob implements ShouldQueue
      */
     public function getJobId(): string
     {
-        return $this->job->getJobId() ?? Str::uuid()->toString();
+        return $this->jobId;
     }
 }

package/server/src/Models/Asset.php

@@ -197,7 +197,8 @@ class Asset extends Model
     {
         return SlugOptions::create()
             ->generateSlugsFrom(['name', 'code'])
-            ->saveSlugsTo('slug');
+            ->saveSlugsTo('slug')
+            ->doNotGenerateSlugsOnUpdate();
     }
 
     /**

package/server/src/Models/Contact.php

@@ -143,7 +143,8 @@ class Contact extends Model
     {
         return SlugOptions::create()
             ->generateSlugsFrom('name')
-            ->saveSlugsTo('slug');
+            ->saveSlugsTo('slug')
+            ->doNotGenerateSlugsOnUpdate();
     }
 
     public function company(): BelongsTo

package/server/src/Models/Device.php

@@ -67,14 +67,14 @@ class Device extends Model
      *
      * @var array
      */
-    protected $searchableColumns = ['name', 'model', 'serial_number', 'manufacturer', 'public_id'];
+    protected $searchableColumns = ['name', 'model', 'serial_number', 'manufacturer', 'device_id', 'internal_id', 'imei', 'public_id'];
 
     /**
      * The attributes that can be used for filtering.
      *
      * @var array
      */
-    protected $filterParams = ['status', 'warranty_uuid', 'attachable_type'];
+    protected $filterParams = ['status', 'warranty_uuid', 'attachable_type', 'attachable_uuid', 'telematic_uuid', 'provider'];
 
     /**
      * The attributes that are mass assignable.
@@ -187,7 +187,8 @@ class Device extends Model
     {
         return SlugOptions::create()
             ->generateSlugsFrom(['name', 'serial_number'])
-            ->saveSlugsTo('slug');
+            ->saveSlugsTo('slug')
+            ->doNotGenerateSlugsOnUpdate();
     }
 
     /**
@@ -195,7 +196,29 @@ class Device extends Model
      */
     public function getActivitylogOptions(): LogOptions
     {
-        return LogOptions::defaults()->logAll();
+        return LogOptions::defaults()
+            ->logOnly([
+                'company_uuid',
+                'telematic_uuid',
+                'attachable_uuid',
+                'attachable_type',
+                'device_id',
+                'internal_id',
+                'imei',
+                'imsi',
+                'firmware_version',
+                'provider',
+                'name',
+                'model',
+                'manufacturer',
+                'serial_number',
+                'installation_date',
+                'last_maintenance_date',
+                'online',
+                'status',
+                'last_online_at',
+            ])
+            ->logOnlyDirty();
     }
 
     public function telematic(): BelongsTo

package/server/src/Models/DeviceEvent.php

@@ -3,6 +3,8 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\FleetOps\Casts\Point;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Alert;
 use Fleetbase\Models\Company;
 use Fleetbase\Models\Model;
@@ -35,6 +37,7 @@ class DeviceEvent extends Model
     use LogsActivity;
     use HasMetaAttributes;
     use Searchable;
+    use SpatialTrait;
 
     /**
      * The database table used by the model.
@@ -55,14 +58,14 @@ class DeviceEvent extends Model
      *
      * @var array
      */
-    protected $searchableColumns = ['event_type', 'message', 'public_id'];
+    protected $searchableColumns = ['event_type', 'message', 'ident', 'code', 'provider', 'public_id'];
 
     /**
      * The attributes that can be used for filtering.
      *
      * @var array
      */
-    protected $filterParams = ['event_type', 'severity', 'device_uuid'];
+    protected $filterParams = ['event_type', 'severity', 'device_uuid', 'provider', 'code'];
 
     /**
      * The attributes that are mass assignable.
@@ -73,10 +76,12 @@ class DeviceEvent extends Model
         'company_uuid',
         'device_uuid',
         'payload',
+        'data',
         'meta',
         'location',
         'event_type',
         'severity',
+        'message',
         'ident',
         'protocol',
         'provider',
@@ -86,6 +91,8 @@ class DeviceEvent extends Model
         'reason',
         'comment',
         'resolved_at',
+        'occurred_at',
+        'processed_at',
         'slug',
     ];
 
@@ -108,6 +115,13 @@ class DeviceEvent extends Model
      */
     protected $hidden = ['device'];
 
+    /**
+     * The attributes that are spatial columns.
+     *
+     * @var array
+     */
+    protected $spatialFields = ['location'];
+
     /**
      * The attributes that should be cast to native types.
      *
@@ -115,8 +129,12 @@ class DeviceEvent extends Model
      */
     protected $casts = [
         'payload'         => Json::class,
+        'data'            => Json::class,
         'meta'            => Json::class,
+        'location'        => Point::class,
         'resolved_at'     => 'datetime',
+        'occurred_at'     => 'datetime',
+        'processed_at'    => 'datetime',
     ];
 
     /**
@@ -145,7 +163,26 @@ class DeviceEvent extends Model
      */
     public function getActivitylogOptions(): LogOptions
     {
-        return LogOptions::defaults()->logAll();
+        return LogOptions::defaults()
+            ->logOnly([
+                'company_uuid',
+                'device_uuid',
+                'event_type',
+                'severity',
+                'message',
+                'ident',
+                'protocol',
+                'provider',
+                'mileage',
+                'state',
+                'code',
+                'reason',
+                'comment',
+                'resolved_at',
+                'occurred_at',
+                'processed_at',
+            ])
+            ->logOnlyDirty();
     }
 
     public function company(): BelongsTo

package/server/src/Models/Driver.php

@@ -220,7 +220,8 @@ class Driver extends Model
     {
         return SlugOptions::create()
             ->generateSlugsFrom('drivers_license_number')
-            ->saveSlugsTo('slug');
+            ->saveSlugsTo('slug')
+            ->doNotGenerateSlugsOnUpdate();
     }
 
     /**

package/server/src/Models/Equipment.php

@@ -155,7 +155,8 @@ class Equipment extends Model
     {
         return SlugOptions::create()
             ->generateSlugsFrom(['name', 'code'])
-            ->saveSlugsTo('slug');
+            ->saveSlugsTo('slug')
+            ->doNotGenerateSlugsOnUpdate();
     }
 
     /**

package/server/src/Models/Fleet.php

@@ -66,7 +66,8 @@ class Fleet extends Model
     {
         return SlugOptions::create()
             ->generateSlugsFrom('name')
-            ->saveSlugsTo('slug');
+            ->saveSlugsTo('slug')
+            ->doNotGenerateSlugsOnUpdate();
     }
 
     /**

package/server/src/Models/FuelProviderConnection.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Fleetbase\FleetOps\Models;
+
+use Fleetbase\Casts\Json;
+use Fleetbase\Models\Model;
+use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasPublicId;
+use Fleetbase\Traits\HasUuid;
+use Fleetbase\Traits\Searchable;
+use Fleetbase\Traits\TracksApiCredential;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class FuelProviderConnection extends Model
+{
+    use HasUuid;
+    use HasPublicId;
+    use TracksApiCredential;
+    use HasApiModelBehavior;
+    use Searchable;
+
+    protected $table             = 'fuel_provider_connections';
+    protected $publicIdType      = 'fuel_provider_connection';
+    protected $searchableColumns = ['public_id', 'name', 'provider', 'status', 'environment'];
+    protected $filterParams      = ['provider', 'status', 'environment'];
+
+    protected $fillable = [
+        'company_uuid',
+        'provider',
+        'name',
+        'environment',
+        'status',
+        'credentials',
+        'sync_settings',
+        'last_sync_state',
+        'last_synced_at',
+        'last_tested_at',
+        'last_error',
+        'meta',
+    ];
+
+    protected $casts = [
+        'credentials'     => Json::class,
+        'sync_settings'   => Json::class,
+        'last_sync_state' => Json::class,
+        'last_synced_at'  => 'datetime',
+        'last_tested_at'  => 'datetime',
+        'meta'            => Json::class,
+    ];
+
+    public function transactions(): HasMany
+    {
+        return $this->hasMany(FuelProviderTransaction::class, 'fuel_provider_connection_uuid', 'uuid');
+    }
+
+    public function syncRuns(): HasMany
+    {
+        return $this->hasMany(FuelProviderSyncRun::class, 'fuel_provider_connection_uuid', 'uuid');
+    }
+}

package/server/src/Models/FuelProviderSyncRun.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Fleetbase\FleetOps\Models;
+
+use Fleetbase\Casts\Json;
+use Fleetbase\Models\Model;
+use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasPublicId;
+use Fleetbase\Traits\HasUuid;
+use Fleetbase\Traits\Searchable;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class FuelProviderSyncRun extends Model
+{
+    use HasUuid;
+    use HasPublicId;
+    use HasApiModelBehavior;
+    use Searchable;
+
+    protected $table             = 'fuel_provider_sync_runs';
+    protected $publicIdType      = 'fuel_provider_sync_run';
+    protected $searchableColumns = ['public_id', 'provider', 'status'];
+    protected $filterParams      = ['provider', 'status', 'connection'];
+
+    protected $fillable = [
+        'company_uuid',
+        'fuel_provider_connection_uuid',
+        'provider',
+        'status',
+        'from',
+        'to',
+        'imported',
+        'matched',
+        'unmatched',
+        'fuel_reports_created',
+        'liters',
+        'amount',
+        'started_at',
+        'finished_at',
+        'error',
+        'summary',
+        'meta',
+    ];
+
+    protected $casts = [
+        'from'        => 'datetime',
+        'to'          => 'datetime',
+        'started_at'  => 'datetime',
+        'finished_at' => 'datetime',
+        'summary'     => Json::class,
+        'meta'        => Json::class,
+    ];
+
+    public function connection(): BelongsTo
+    {
+        return $this->belongsTo(FuelProviderConnection::class, 'fuel_provider_connection_uuid', 'uuid');
+    }
+}

package/server/src/Models/FuelProviderTransaction.php

@@ -0,0 +1,119 @@
+<?php
+
+namespace Fleetbase\FleetOps\Models;
+
+use Fleetbase\Casts\Json;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\Models\Model;
+use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasPublicId;
+use Fleetbase\Traits\HasUuid;
+use Fleetbase\Traits\Searchable;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class FuelProviderTransaction extends Model
+{
+    use HasUuid;
+    use HasPublicId;
+    use HasApiModelBehavior;
+    use Searchable;
+
+    protected $table             = 'fuel_provider_transactions';
+    protected $publicIdType      = 'fuel_provider_transaction';
+    protected $searchableColumns = ['public_id', 'provider', 'provider_transaction_id', 'vehicle_card_id', 'internal_number', 'plate_number', 'vin', 'serial_number', 'call_sign', 'station_name', 'trip_number'];
+    protected $filterParams      = ['provider', 'sync_status', 'vehicle', 'driver', 'order', 'fuel_report', 'connection'];
+
+    protected $fillable = [
+        'company_uuid',
+        'fuel_provider_connection_uuid',
+        'fuel_report_uuid',
+        'vehicle_uuid',
+        'driver_uuid',
+        'order_uuid',
+        'provider',
+        'provider_transaction_id',
+        'provider_vehicle_id',
+        'vehicle_card_id',
+        'internal_number',
+        'structure_number',
+        'plate_number',
+        'vin',
+        'serial_number',
+        'call_sign',
+        'trip_number',
+        'station_name',
+        'station_latitude',
+        'station_longitude',
+        'transaction_at',
+        'volume',
+        'metric_unit',
+        'amount',
+        'currency',
+        'odometer',
+        'sync_status',
+        'matched_at',
+        'normalized_payload',
+        'raw_payload',
+        'meta',
+    ];
+
+    protected $casts = [
+        'transaction_at'      => 'datetime',
+        'matched_at'          => 'datetime',
+        'normalized_payload'  => Json::class,
+        'raw_payload'         => Json::class,
+        'meta'                => Json::class,
+    ];
+
+    protected $appends = ['vehicle_name', 'driver_name', 'fuel_report_id', 'station_location'];
+    protected $hidden  = ['vehicle', 'driver', 'fuelReport'];
+
+    public function connection(): BelongsTo
+    {
+        return $this->belongsTo(FuelProviderConnection::class, 'fuel_provider_connection_uuid', 'uuid');
+    }
+
+    public function fuelReport(): BelongsTo
+    {
+        return $this->belongsTo(FuelReport::class, 'fuel_report_uuid', 'uuid');
+    }
+
+    public function vehicle(): BelongsTo
+    {
+        return $this->belongsTo(Vehicle::class, 'vehicle_uuid', 'uuid');
+    }
+
+    public function driver(): BelongsTo
+    {
+        return $this->belongsTo(Driver::class, 'driver_uuid', 'uuid');
+    }
+
+    public function order(): BelongsTo
+    {
+        return $this->belongsTo(Order::class, 'order_uuid', 'uuid');
+    }
+
+    public function getVehicleNameAttribute(): ?string
+    {
+        return data_get($this, 'vehicle.display_name');
+    }
+
+    public function getDriverNameAttribute(): ?string
+    {
+        return data_get($this, 'driver.name');
+    }
+
+    public function getFuelReportIdAttribute(): ?string
+    {
+        return data_get($this, 'fuelReport.public_id');
+    }
+
+    public function getStationLocationAttribute(): ?Point
+    {
+        if (!$this->station_latitude || !$this->station_longitude) {
+            return null;
+        }
+
+        return new Point($this->station_latitude, $this->station_longitude);
+    }
+}

package/server/src/Models/FuelReport.php

@@ -91,7 +91,7 @@ class FuelReport extends Model
      *
      * @var array
      */
-    protected $appends = ['vehicle_name', 'driver_name', 'reporter_name'];
+    protected $appends = ['vehicle_name', 'driver_name', 'reporter_name', 'source', 'provider', 'fuel_provider_transaction_uuid'];
 
     /**
      * The attributes excluded from the model's JSON form.
@@ -179,6 +179,21 @@ class FuelReport extends Model
         return data_get($this, 'reportedBy.name');
     }
 
+    public function getSourceAttribute(): ?string
+    {
+        return data_get($this, 'meta.source');
+    }
+
+    public function getProviderAttribute(): ?string
+    {
+        return data_get($this, 'meta.provider');
+    }
+
+    public function getFuelProviderTransactionUuidAttribute(): ?string
+    {
+        return data_get($this, 'meta.fuel_provider_transaction_uuid');
+    }
+
     public static function createFromImport(array $row, bool $saveInstance = false): FuelReport
     {
         // Filter array for null key values

package/server/src/Models/Part.php

@@ -165,7 +165,8 @@ class Part extends Model
     {
         return SlugOptions::create()
             ->generateSlugsFrom(['name', 'sku'])
-            ->saveSlugsTo('slug');
+            ->saveSlugsTo('slug')
+            ->doNotGenerateSlugsOnUpdate();
     }
 
     /**

package/server/src/Models/Sensor.php

@@ -66,14 +66,14 @@ class Sensor extends Model
      *
      * @var array
      */
-    protected $searchableColumns = ['name', 'sensor_type', 'unit', 'public_id'];
+    protected $searchableColumns = ['name', 'type', 'internal_id', 'unit', 'public_id'];
 
     /**
      * The attributes that can be used for filtering.
      *
      * @var array
      */
-    protected $filterParams = ['sensor_type', 'status', 'device_uuid', 'warranty_uuid', 'sensorable_type'];
+    protected $filterParams = ['type', 'sensor_type', 'status', 'device_uuid', 'warranty_uuid', 'sensorable_type', 'telematic_uuid'];
 
     /**
      * The attributes that are mass assignable.
@@ -178,7 +178,8 @@ class Sensor extends Model
     {
         return SlugOptions::create()
             ->generateSlugsFrom(['name', 'sensor_type'])
-            ->saveSlugsTo('slug');
+            ->saveSlugsTo('slug')
+            ->doNotGenerateSlugsOnUpdate();
     }
 
     /**
@@ -186,7 +187,23 @@ class Sensor extends Model
      */
     public function getActivitylogOptions(): LogOptions
     {
-        return LogOptions::defaults()->logAll();
+        return LogOptions::defaults()
+            ->logOnly([
+                'company_uuid',
+                'telematic_uuid',
+                'device_uuid',
+                'sensorable_uuid',
+                'sensorable_type',
+                'type',
+                'sensor_type',
+                'internal_id',
+                'name',
+                'unit',
+                'last_value',
+                'last_reading_at',
+                'status',
+            ])
+            ->logOnlyDirty();
     }
 
     public function telematic(): BelongsTo