@fleetbase/fleetops-engine 0.6.52 → 0.6.54

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

@@ -16,6 +16,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 
@@ -179,12 +180,31 @@ class VehicleController extends FleetOpsController
     {
         $request->validate(['device' => 'required|string']);
 
-        $vehicle = $this->findVehicle($id);
-        $device  = $this->findDevice($request->input('device'));
+        $deviceId = $request->input('device');
+        $vehicle  = $this->resolveVehicle($id);
+        $device   = $this->resolveDevice($deviceId);
 
-        $device->attachTo($vehicle);
-        $device->load(['telematic', 'warranty', 'attachable']);
-        $vehicle->load(['driver', 'devices']);
+        if (!$vehicle) {
+            $this->logDeviceAttachmentLookupFailure('attach-device', 'vehicle', $id, $deviceId);
+
+            return response()->error('Vehicle not found or not available for this organization.', 404);
+        }
+
+        if (!$device) {
+            $this->logDeviceAttachmentLookupFailure('attach-device', 'device', $id, $deviceId);
+
+            return response()->error('Device not found or not available for this organization.', 404);
+        }
+
+        try {
+            $device->attachTo($vehicle);
+            $device->load(['telematic', 'warranty', 'attachable']);
+            $vehicle->load(['driver', 'devices']);
+        } catch (\Throwable $e) {
+            $this->logDeviceAttachmentFailure('attach-device', $vehicle, $device, $e);
+
+            return response()->error('Unable to attach device to vehicle. Please try again or contact support.', 500);
+        }
 
         return response()->json([
             'status'  => 'ok',
@@ -198,16 +218,35 @@ class VehicleController extends FleetOpsController
     {
         $request->validate(['device' => 'required|string']);
 
-        $vehicle = $this->findVehicle($id);
-        $device  = $this->findDevice($request->input('device'));
+        $deviceId = $request->input('device');
+        $vehicle  = $this->resolveVehicle($id);
+        $device   = $this->resolveDevice($deviceId);
+
+        if (!$vehicle) {
+            $this->logDeviceAttachmentLookupFailure('detach-device', 'vehicle', $id, $deviceId);
+
+            return response()->error('Vehicle not found or not available for this organization.', 404);
+        }
+
+        if (!$device) {
+            $this->logDeviceAttachmentLookupFailure('detach-device', 'device', $id, $deviceId);
+
+            return response()->error('Device not found or not available for this organization.', 404);
+        }
 
         if ($device->attachable_uuid !== $vehicle->uuid) {
             return response()->error('This device is not attached to the selected vehicle.');
         }
 
-        $device->detach();
-        $device->load(['telematic', 'warranty', 'attachable']);
-        $vehicle->load(['driver', 'devices']);
+        try {
+            $device->detach();
+            $device->load(['telematic', 'warranty', 'attachable']);
+            $vehicle->load(['driver', 'devices']);
+        } catch (\Throwable $e) {
+            $this->logDeviceAttachmentFailure('detach-device', $vehicle, $device, $e);
+
+            return response()->error('Unable to detach device from vehicle. Please try again or contact support.', 500);
+        }
 
         return response()->json([
             'status'  => 'ok',
@@ -226,6 +265,15 @@ class VehicleController extends FleetOpsController
             ->firstOrFail();
     }
 
+    protected function resolveVehicle(string $id): ?Vehicle
+    {
+        return Vehicle::where(function ($query) use ($id) {
+            $query->where('uuid', $id)->orWhere('public_id', $id);
+        })
+            ->where('company_uuid', session('company'))
+            ->first();
+    }
+
     protected function findDriver(string $id): Driver
     {
         return Driver::where(function ($query) use ($id) {
@@ -235,6 +283,42 @@ class VehicleController extends FleetOpsController
             ->firstOrFail();
     }
 
+    protected function resolveDevice(string $id): ?Device
+    {
+        return Device::where(function ($query) use ($id) {
+            $query->where('uuid', $id)->orWhere('public_id', $id);
+        })
+            ->where('company_uuid', session('company'))
+            ->first();
+    }
+
+    protected function logDeviceAttachmentLookupFailure(string $action, string $missingResource, string $vehicleId, ?string $deviceId): void
+    {
+        Log::warning('Vehicle device attachment lookup failed', [
+            'action'           => $action,
+            'missing_resource' => $missingResource,
+            'vehicle_id'       => $vehicleId,
+            'device_id'        => $deviceId,
+            'company_uuid'     => session('company'),
+            'request_id'       => request()->headers->get('X-Request-ID') ?? request()->headers->get('X-Correlation-ID'),
+        ]);
+    }
+
+    protected function logDeviceAttachmentFailure(string $action, Vehicle $vehicle, Device $device, \Throwable $exception): void
+    {
+        Log::error('Vehicle device attachment failed', [
+            'action'          => $action,
+            'vehicle_uuid'    => $vehicle->uuid,
+            'vehicle_id'      => $vehicle->public_id,
+            'device_uuid'     => $device->uuid,
+            'device_id'       => $device->public_id,
+            'company_uuid'    => session('company'),
+            'request_id'      => request()->headers->get('X-Request-ID') ?? request()->headers->get('X-Correlation-ID'),
+            'exception_class' => get_class($exception),
+            'exception'       => $exception->getMessage(),
+        ]);
+    }
+
     protected function activeOrderUuid(Vehicle $vehicle): ?string
     {
         $vehicle->loadMissing('driver.currentOrder');

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

@@ -44,6 +44,50 @@ class DeviceEventFilter extends Filter
         });
     }
 
+    public function deviceUuid(?string $device)
+    {
+        $this->device($device);
+    }
+
+    public function severity(string|array $severity)
+    {
+        $severity = Utils::arrayFrom($severity);
+
+        if ($severity) {
+            $this->builder->whereIn('severity', $severity);
+        }
+    }
+
+    public function processed(string|array $processed)
+    {
+        $states = Utils::arrayFrom($processed);
+
+        if (!$states) {
+            return;
+        }
+
+        $this->builder->where(function ($query) use ($states) {
+            foreach ($states as $state) {
+                match ($state) {
+                    'processed'   => $query->orWhereNotNull('processed_at'),
+                    'unprocessed' => $query->orWhereNull('processed_at'),
+                    default       => null,
+                };
+            }
+        });
+    }
+
+    public function occurredAt($occurredAt)
+    {
+        $occurredAt = Utils::dateRange($occurredAt);
+
+        if (is_array($occurredAt)) {
+            $this->builder->whereBetween('occurred_at', $occurredAt);
+        } else {
+            $this->builder->whereDate('occurred_at', $occurredAt);
+        }
+    }
+
     public function createdAt($createdAt)
     {
         $createdAt = Utils::dateRange($createdAt);

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

@@ -0,0 +1,131 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Filter\Filter;
+
+class DeviceFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function queryForPublic()
+    {
+        $this->queryForInternal();
+    }
+
+    public function query(?string $searchQuery)
+    {
+        $this->builder->search($searchQuery);
+    }
+
+    public function status(string|array $status)
+    {
+        $status = Utils::arrayFrom($status);
+
+        if ($status) {
+            $this->builder->whereIn('status', $status);
+        }
+    }
+
+    public function deviceId(?string $deviceId)
+    {
+        if ($deviceId) {
+            $this->builder->where('device_id', 'like', '%' . $deviceId . '%');
+        }
+    }
+
+    public function telematic(?string $telematic)
+    {
+        $this->builder->where('telematic_uuid', $telematic);
+    }
+
+    public function telematicUuid(?string $telematic)
+    {
+        $this->telematic($telematic);
+    }
+
+    public function provider(?string $provider)
+    {
+        $this->builder->where('provider', $provider);
+    }
+
+    public function warrantyUuid(?string $warranty)
+    {
+        $this->builder->where('warranty_uuid', $warranty);
+    }
+
+    public function attachableType(?string $attachableType)
+    {
+        $this->builder->where('attachable_type', $attachableType);
+    }
+
+    public function attachableUuid(?string $attachable)
+    {
+        $this->builder->where('attachable_uuid', $attachable);
+    }
+
+    public function vehicle(?string $vehicle)
+    {
+        if ($vehicle) {
+            $this->builder->where('attachable_uuid', $vehicle);
+        }
+    }
+
+    public function connectionStatus(string|array $connectionStatus)
+    {
+        $statuses = Utils::arrayFrom($connectionStatus);
+
+        if (!$statuses) {
+            return;
+        }
+
+        $this->builder->where(function ($query) use ($statuses) {
+            foreach ($statuses as $status) {
+                match ($status) {
+                    'online'           => $query->orWhere('last_online_at', '>=', now()->subMinutes(10)),
+                    'recently_offline' => $query->orWhereBetween('last_online_at', [now()->subMinutes(60), now()->subMinutes(10)]),
+                    'offline'          => $query->orWhereBetween('last_online_at', [now()->subDay(), now()->subMinutes(60)]),
+                    'long_offline'     => $query->orWhere('last_online_at', '<', now()->subDay()),
+                    'never_connected'  => $query->orWhereNull('last_online_at'),
+                    default            => null,
+                };
+            }
+        });
+    }
+
+    public function attachmentState(?string $attachmentState)
+    {
+        if ($attachmentState === 'attached') {
+            $this->builder->whereNotNull('attachable_uuid');
+        }
+
+        if ($attachmentState === 'unattached') {
+            $this->builder->whereNull('attachable_uuid');
+        }
+    }
+
+    public function lastOnlineAt(string|array $lastOnlineAt)
+    {
+        $this->filterDate('last_online_at', $lastOnlineAt);
+    }
+
+    public function updatedAt(string|array $updatedAt)
+    {
+        $this->filterDate('updated_at', $updatedAt);
+    }
+
+    protected function filterDate(string $column, string|array $value): void
+    {
+        $dates = Utils::dateRange($value);
+
+        if (is_array($dates)) {
+            $this->builder->whereBetween($column, $dates);
+        } else {
+            $this->builder->whereDate($column, $dates);
+        }
+    }
+}

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

@@ -70,6 +70,12 @@ class DriverFilter extends Filter
 
     public function vehicle(string $vehicle)
     {
+        if ($vehicle === 'unassigned') {
+            $this->builder->whereNull('vehicle_uuid');
+
+            return;
+        }
+
         if (Str::isUuid($vehicle)) {
             $this->builder->where('vehicle_uuid', $vehicle);
         } else {

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

@@ -0,0 +1,125 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Filter\Filter;
+
+class SensorFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function queryForPublic()
+    {
+        $this->queryForInternal();
+    }
+
+    public function query(?string $searchQuery)
+    {
+        $this->builder->search($searchQuery);
+    }
+
+    public function type(string|array $type)
+    {
+        $types = Utils::arrayFrom($type);
+
+        if ($types) {
+            $this->builder->whereIn('type', $types);
+        }
+    }
+
+    public function sensorType(string|array $type)
+    {
+        $this->type($type);
+    }
+
+    public function status(string|array $status)
+    {
+        $statuses = Utils::arrayFrom($status);
+
+        if ($statuses) {
+            $this->builder->whereIn('status', $statuses);
+        }
+    }
+
+    public function device(?string $device)
+    {
+        if ($device) {
+            $this->builder->where('device_uuid', $device);
+        }
+    }
+
+    public function deviceUuid(?string $device)
+    {
+        $this->device($device);
+    }
+
+    public function telematic(?string $telematic)
+    {
+        if ($telematic) {
+            $this->builder->where('telematic_uuid', $telematic);
+        }
+    }
+
+    public function telematicUuid(?string $telematic)
+    {
+        $this->telematic($telematic);
+    }
+
+    public function warrantyUuid(?string $warranty)
+    {
+        if ($warranty) {
+            $this->builder->where('warranty_uuid', $warranty);
+        }
+    }
+
+    public function sensorableType(?string $sensorableType)
+    {
+        if ($sensorableType) {
+            $this->builder->where('sensorable_type', $sensorableType);
+        }
+    }
+
+    public function serialNumber(?string $serialNumber)
+    {
+        if ($serialNumber) {
+            $this->builder->where('serial_number', 'like', '%' . $serialNumber . '%');
+        }
+    }
+
+    public function imei(?string $imei)
+    {
+        if ($imei) {
+            $this->builder->where('imei', 'like', '%' . $imei . '%');
+        }
+    }
+
+    public function lastReadingAt(string|array $lastReadingAt)
+    {
+        $this->filterDate('last_reading_at', $lastReadingAt);
+    }
+
+    public function createdAt(string|array $createdAt)
+    {
+        $this->filterDate('created_at', $createdAt);
+    }
+
+    public function updatedAt(string|array $updatedAt)
+    {
+        $this->filterDate('updated_at', $updatedAt);
+    }
+
+    protected function filterDate(string $column, string|array $value): void
+    {
+        $dates = Utils::dateRange($value);
+
+        if (is_array($dates)) {
+            $this->builder->whereBetween($column, $dates);
+        } else {
+            $this->builder->whereDate($column, $dates);
+        }
+    }
+}

package/server/src/Http/Filter/VehicleFilter.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;
 
@@ -59,6 +60,12 @@ class VehicleFilter extends Filter
 
     public function driver(?string $driverId)
     {
+        if ($driverId === 'unassigned') {
+            $this->builder->whereDoesntHave('driver');
+
+            return;
+        }
+
         $this->builder->whereHas(
             'driver',
             function ($query) use ($driverId) {
@@ -125,4 +132,16 @@ class VehicleFilter extends Filter
             $this->builder->whereDoesntHave('fleets');
         }
     }
+
+    public function telematicUuid(?string $telematic)
+    {
+        if (!$telematic) {
+            return;
+        }
+
+        $this->builder->whereHas('devices', function ($query) use ($telematic) {
+            $query->where('telematic_uuid', $telematic);
+            $query->whereIn('attachable_type', ['fleet-ops:vehicle', Vehicle::class]);
+        });
+    }
 }

package/server/src/Http/Requests/CreateDriverRequest.php

@@ -28,19 +28,20 @@ class CreateDriverRequest extends FleetbaseRequest
         $isCreating = $this->isMethod('POST');
 
         return [
-            'name'      => [Rule::requiredIf($isCreating)],
-            'email'     => [Rule::requiredIf($isCreating), Rule::when($this->filled('email'), ['email']), Rule::when($isCreating, [Rule::unique('users')->whereNull('deleted_at')])],
-            'phone'     => [Rule::requiredIf($isCreating), Rule::when($isCreating, [Rule::unique('users')->whereNull('deleted_at')])],
-            'password'  => 'nullable|string',
-            'country'   => 'nullable|size:2',
-            'city'      => 'nullable|string',
-            'vehicle'   => 'nullable|string|starts_with:vehicle_|exists:vehicles,public_id',
-            'status'    => 'nullable|string|in:active,available,inactive',
-            'vendor'    => 'nullable|exists:vendors,public_id',
-            'job'       => 'nullable|exists:orders,public_id',
-            'location'  => ['nullable', new ResolvablePoint()],
-            'latitude'  => ['nullable', 'required_with:longitude'],
-            'longitude' => ['nullable', 'required_with:latitude'],
+            'name'           => [Rule::requiredIf($isCreating)],
+            'email'          => [Rule::requiredIf($isCreating), Rule::when($this->filled('email'), ['email']), Rule::when($isCreating, [Rule::unique('users')->whereNull('deleted_at')])],
+            'phone'          => [Rule::requiredIf($isCreating), Rule::when($isCreating, [Rule::unique('users')->whereNull('deleted_at')])],
+            'password'       => 'nullable|string',
+            'country'        => 'nullable|size:2',
+            'city'           => 'nullable|string',
+            'vehicle'        => 'nullable|string|starts_with:vehicle_|exists:vehicles,public_id',
+            'license_expiry' => 'nullable|date',
+            'status'         => 'nullable|string|in:active,available,inactive',
+            'vendor'         => 'nullable|exists:vendors,public_id',
+            'job'            => 'nullable|exists:orders,public_id',
+            'location'       => ['nullable', new ResolvablePoint()],
+            'latitude'       => ['nullable', 'required_with:longitude'],
+            'longitude'      => ['nullable', 'required_with:latitude'],
         ];
     }
 

package/server/src/Http/Requests/Internal/CreateDriverRequest.php

@@ -51,6 +51,7 @@ class CreateDriverRequest extends CreateDriverApiRequest
             'country'                => 'nullable|string|size:2',
             'city'                   => 'nullable|string|max:255',
             'vehicle'                => ['nullable', new ResolvableVehicle()],
+            'license_expiry'         => 'nullable|date',
             'status'                 => 'nullable|string|in:active,available,inactive',
             'vendor'                 => 'nullable|exists:vendors,public_id',
             'job'                    => 'nullable|exists:orders,public_id',

package/server/src/Http/Resources/v1/Driver.php

@@ -38,7 +38,7 @@ class Driver extends FleetbaseResource
             'email'                         => $this->email,
             'phone'                         => $this->phone,
             'drivers_license_number'        => $this->drivers_license_number,
-            'license_expiry'                => $this->license_expiry,
+            'license_expiry'                => $this->formatDateOnly($this->license_expiry),
             'photo_url'                     => $this->photo_url,
             'avatar_url'                    => $this->avatar_url,
             'avatar_value'                  => $this->when(Http::isInternalRequest(), $this->getOriginal('avatar_url')),
@@ -96,6 +96,15 @@ class Driver extends FleetbaseResource
         );
     }
 
+    protected function formatDateOnly($date): ?string
+    {
+        if (!$date) {
+            return null;
+        }
+
+        return method_exists($date, 'toDateString') ? $date->toDateString() : (string) $date;
+    }
+
     /**
      * Transform the resource into an webhook payload.
      *
@@ -110,7 +119,7 @@ class Driver extends FleetbaseResource
             'email'                  => $this->email,
             'phone'                  => $this->phone,
             'photo_url'              => $this->photo_url,
-            'license_expiry'         => $this->license_expiry,
+            'license_expiry'         => $this->formatDateOnly($this->license_expiry),
             'vehicle'                => data_get($this, 'vehicle.public_id'),
             'current_job'            => data_get($this, 'currentJob.public_id'),
             'vendor'                 => data_get($this, 'vendor.public_id'),

package/server/src/Http/Resources/v1/WorkOrder.php

@@ -41,6 +41,7 @@ class WorkOrder extends FleetbaseResource
             // Core attributes
             'code'                    => $this->code,
             'subject'                 => $this->subject,
+            'category'                => $this->category,
             'status'                  => $this->status,
             'priority'                => $this->priority,
             'instructions'            => $this->instructions,

package/server/src/Jobs/FinalizeApiOrderCreation.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Fleetbase\FleetOps\Jobs;
+
+use Fleetbase\FleetOps\Events\OrderReady;
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\ServiceQuote;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class FinalizeApiOrderCreation implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    public function __construct(
+        public string $orderUuid,
+        public ?string $serviceQuoteUuid = null,
+        public bool $shouldDispatch = false,
+    ) {
+    }
+
+    public function handle(): void
+    {
+        $order = Order::where('uuid', $this->orderUuid)->first();
+        if (!$order) {
+            return;
+        }
+
+        $serviceQuote = $this->serviceQuoteUuid ? ServiceQuote::where('uuid', $this->serviceQuoteUuid)->first() : null;
+
+        $order->notifyDriverAssigned();
+        $order->setPreliminaryDistanceAndTime();
+        $order->purchaseServiceQuote($serviceQuote);
+
+        if ($this->shouldDispatch) {
+            $order->dispatchWithActivity();
+        }
+
+        event(new OrderReady($order));
+    }
+}

package/server/src/Jobs/FinalizeInternalOrderCreation.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Fleetbase\FleetOps\Jobs;
+
+use Fleetbase\FleetOps\Events\OrderReady;
+use Fleetbase\FleetOps\Models\Order;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class FinalizeInternalOrderCreation implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    public function __construct(public string $orderUuid)
+    {
+    }
+
+    public function handle(): void
+    {
+        $order = Order::where('uuid', $this->orderUuid)->first();
+        if (!$order) {
+            return;
+        }
+
+        $order->notifyDriverAssigned();
+
+        event(new OrderReady($order));
+    }
+}