@fleetbase/fleetops-engine 0.6.53 → 0.6.55

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

@@ -115,7 +115,7 @@ class ServiceQuoteController extends FleetOpsController
                     ]);
                 });
 
-                $quote->setRelation('items', $items);
+                $quote->setRelation('items', $quote->items()->get());
 
                 // if single quotation requested
                 if ($single) {
@@ -161,7 +161,7 @@ class ServiceQuoteController extends FleetOpsController
                 ]);
             });
 
-            $quote->setRelation('items', $items);
+            $quote->setRelation('items', $quote->items()->get());
             $serviceQuotes->push($quote);
         }
 
@@ -298,7 +298,7 @@ class ServiceQuoteController extends FleetOpsController
                     ]);
                 });
 
-                $quote->setRelation('items', $items);
+                $quote->setRelation('items', $quote->items()->get());
                 $serviceQuotes->push($quote);
 
                 // if requesting single
@@ -346,7 +346,7 @@ class ServiceQuoteController extends FleetOpsController
                 ]);
             });
 
-            $quote->setRelation('items', $items);
+            $quote->setRelation('items', $quote->items()->get());
             $serviceQuotes->push($quote);
         }
 

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

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

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

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

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Filter;
 
+use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Filter\Filter;
 
@@ -31,6 +32,29 @@ class DeviceFilter extends Filter
         }
     }
 
+    public function deviceId(?string $deviceId)
+    {
+        if ($deviceId) {
+            $this->builder->where('device_id', 'like', '%' . $deviceId . '%');
+        }
+    }
+
+    public function type(string|array|null $type)
+    {
+        $type = Utils::arrayFrom($type);
+
+        if ($type) {
+            $this->builder->whereIn('type', $type);
+        }
+    }
+
+    public function serialNumber(?string $serialNumber)
+    {
+        if ($serialNumber) {
+            $this->builder->where('serial_number', 'like', '%' . $serialNumber . '%');
+        }
+    }
+
     public function telematic(?string $telematic)
     {
         $this->builder->where('telematic_uuid', $telematic);
@@ -61,6 +85,41 @@ class DeviceFilter extends Filter
         $this->builder->where('attachable_uuid', $attachable);
     }
 
+    public function vehicle(?string $vehicle)
+    {
+        if ($vehicle) {
+            $this->builder->where(function ($query) use ($vehicle) {
+                $query->where('attachable_uuid', $vehicle)
+                    ->orWhereIn('attachable_uuid', Vehicle::query()
+                        ->where('company_uuid', $this->session->get('company'))
+                        ->where('public_id', $vehicle)
+                        ->pluck('uuid'));
+            });
+        }
+    }
+
+    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') {
@@ -71,4 +130,25 @@ class DeviceFilter extends Filter
             $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/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;
 
@@ -131,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/Index/Vehicle.php

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

package/server/src/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));
+    }
+}