@fleetbase/fleetops-engine 0.6.50 → 0.6.52

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

@@ -7,10 +7,9 @@ use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Http\Resources\v1\Place as PlaceResource;
 use Fleetbase\FleetOps\Imports\PlaceImport;
 use Fleetbase\FleetOps\Models\Place;
-use Fleetbase\FleetOps\Support\Geocoding;
+use Fleetbase\FleetOps\Support\PlaceSearch;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
-use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
@@ -50,50 +49,15 @@ class PlaceController extends FleetOpsController
 
         $query = Place::where('company_uuid', session('company'))
             ->whereNull('deleted_at')
-            ->applyDirectivesForPermissions('fleet-ops list place')
-            ->search($searchQuery);
-
-        if ($latitude && $longitude) {
-            $point = new Point($latitude, $longitude);
-            $query->whereNotNull('location')->whereRaw('
-                ST_Y(location) BETWEEN -90 AND 90
-                AND ST_X(location) BETWEEN -180 AND 180
-                AND NOT (ST_X(location) = 0 AND ST_Y(location) = 0)
-            ');
-            $query->orderByDistanceSphere('location', $point, 'asc');
-        } else {
-            $query->orderBy('name', 'desc');
-        }
-
-        if ($limit) {
-            $query->limit($limit);
-        }
+            ->applyDirectivesForPermissions('fleet-ops list place');
 
-        $results = $query->get();
-
-        if ($geo && Geocoding::canGoogleGeocode()) {
-            if ($searchQuery) {
-                try {
-                    $geocodingResults = Geocoding::query($searchQuery, $latitude, $longitude);
-
-                    foreach ($geocodingResults as $result) {
-                        $results->prepend($result);
-                    }
-                } catch (\Throwable $e) {
-                    return response()->error($e->getMessage());
-                }
-            } elseif ($latitude && $longitude) {
-                try {
-                    $geocodingResults = Geocoding::reverseFromCoordinates($latitude, $longitude, $searchQuery);
-
-                    foreach ($geocodingResults as $result) {
-                        $results->prepend($result);
-                    }
-                } catch (\Throwable $e) {
-                    return response()->error($e->getMessage());
-                }
-            }
-        }
+        $results = PlaceSearch::search($query, $searchQuery, [
+            'limit'          => $limit,
+            'geo'            => $geo,
+            'latitude'       => $latitude,
+            'longitude'      => $longitude,
+            'no_query_order' => 'name_desc',
+        ]);
 
         return PlaceResource::collection($results);
     }
@@ -108,29 +72,7 @@ class PlaceController extends FleetOpsController
         $searchQuery = $request->searchQuery();
         $latitude    = $request->input('latitude', false);
         $longitude   = $request->input('longitude', false);
-        $results     = collect();
-
-        if ($searchQuery && Geocoding::canGoogleGeocode()) {
-            try {
-                $geocodingResults = Geocoding::query($searchQuery, $latitude, $longitude);
-
-                foreach ($geocodingResults as $result) {
-                    $results->push($result);
-                }
-            } catch (\Throwable $e) {
-                return response()->error($e->getMessage());
-            }
-        } elseif ($latitude && $longitude) {
-            try {
-                $geocodingResults = Geocoding::reverseFromCoordinates($latitude, $longitude, $searchQuery);
-
-                foreach ($geocodingResults as $result) {
-                    $results->push($result);
-                }
-            } catch (\Throwable $e) {
-                return response()->error($e->getMessage());
-            }
-        }
+        $results     = PlaceSearch::geocode($searchQuery, $latitude, $longitude);
 
         return response()->json($results)->withHeaders(['Cache-Control' => 'no-cache']);
     }

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

@@ -21,6 +21,6 @@ class SensorController extends FleetOpsController
      */
     public static function onQueryRecord($query, $request): void
     {
-        $query->with(['telematic', 'warranty']);
+        $query->with(['telematic', 'device', 'warranty']);
     }
 }

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

@@ -6,6 +6,7 @@ use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Models\Telematic;
 use Fleetbase\FleetOps\Support\Telematics\TelematicProviderRegistry;
 use Fleetbase\FleetOps\Support\Telematics\TelematicService;
+use Fleetbase\Models\Activity;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -54,9 +55,7 @@ class TelematicController extends FleetOpsController
      */
     public function testConnection(Request $request, string $id): JsonResponse
     {
-        $telematic = Telematic::where('uuid', $id)
-            ->where('company_uuid', session('company'))
-            ->firstOrFail();
+        $telematic = $this->findTelematic($id);
 
         $async = $request->input('async', false);
 
@@ -82,7 +81,16 @@ class TelematicController extends FleetOpsController
             if (!$provider) {
                 return response()->error('Unable to resolve telematic provider.');
             }
-            $result   = $provider->testConnection($credentials);
+            $result      = $provider->testConnection($credentials);
+            $telematicId = $request->input('telematic_id');
+
+            if ($telematicId) {
+                $telematic = $this->findTelematic($telematicId);
+
+                if ($telematic->provider === $key) {
+                    $this->telematicService->recordConnectionTest($telematic, $result);
+                }
+            }
         } catch (\Exception $e) {
             return response()->error($e->getMessage());
         }
@@ -99,9 +107,7 @@ class TelematicController extends FleetOpsController
      */
     public function discover(Request $request, string $id): JsonResponse
     {
-        $telematic = Telematic::where('uuid', $id)
-            ->where('company_uuid', session('company'))
-            ->firstOrFail();
+        $telematic = $this->findTelematic($id);
 
         $jobId = $this->telematicService->discoverDevices($telematic, [
             'limit'   => $request->input('limit', 100),
@@ -119,9 +125,7 @@ class TelematicController extends FleetOpsController
      */
     public function devices(Request $request, string $id): JsonResponse
     {
-        $telematic = Telematic::where('uuid', $id)
-            ->where('company_uuid', session('company'))
-            ->firstOrFail();
+        $telematic = $this->findTelematic($id);
 
         $devices = $this->telematicService->getDevices($telematic, [
             'status' => $request->input('status'),
@@ -133,18 +137,44 @@ class TelematicController extends FleetOpsController
         ]);
     }
 
+    /**
+     * Get persisted logs and audit entries for a telematic.
+     */
+    public function logs(Request $request, string $id): JsonResponse
+    {
+        $telematic = $this->findTelematic($id);
+        $limit     = min((int) $request->input('limit', 50), 100);
+
+        $activityLogs = Activity::with(['causer'])
+            ->where('subject_type', Telematic::class)
+            ->where('subject_id', $telematic->uuid)
+            ->latest()
+            ->limit($limit)
+            ->get()
+            ->map(fn (Activity $activity) => $this->makeActivityLogEntry($activity));
+
+        $logs = $this->makeTelematicMetadataLogs($telematic)
+            ->merge($activityLogs)
+            ->sortByDesc(fn ($log) => $log['created_at'] ?? '')
+            ->values();
+
+        return response()->json([
+            'logs' => $logs,
+        ]);
+    }
+
     /**
      * Link a device to a telematic.
      */
     public function linkDevice(Request $request, string $id): JsonResponse
     {
-        $telematic = Telematic::where('uuid', $id)
-            ->where('company_uuid', session('company'))
-            ->firstOrFail();
+        $telematic = $this->findTelematic($id);
 
         $request->validate([
-            'external_id' => 'required|string',
-            'device_name' => 'required|string',
+            'external_id' => 'required_without:device_id|nullable|string',
+            'device_id'   => 'required_without:external_id|nullable|string',
+            'device_name' => 'nullable|string',
+            'name'        => 'nullable|string',
         ]);
 
         $device = $this->telematicService->linkDevice($telematic, $request->all());
@@ -153,4 +183,137 @@ class TelematicController extends FleetOpsController
             'device' => $device,
         ], 201);
     }
+
+    protected function findTelematic(string $id): Telematic
+    {
+        return Telematic::where(function ($query) use ($id) {
+            $query->where('uuid', $id)->orWhere('public_id', $id);
+        })
+            ->where('company_uuid', session('company'))
+            ->firstOrFail();
+    }
+
+    protected function makeTelematicMetadataLogs(Telematic $telematic)
+    {
+        $meta = $telematic->meta ?? [];
+        $logs = collect();
+
+        if (data_get($meta, 'last_sync_result')) {
+            $result = data_get($meta, 'last_sync_result');
+            $failed = $result === 'failed';
+
+            $logs->push([
+                'id'          => 'sync-' . (data_get($meta, 'last_sync_job_id') ?? data_get($meta, 'last_sync_completed_at') ?? data_get($meta, 'last_sync_failed_at') ?? $telematic->uuid),
+                'type'        => 'sync_' . $result,
+                'label'       => $failed ? 'Device sync failed' : ($result === 'queued' ? 'Device sync queued' : 'Device sync completed'),
+                'description' => $failed
+                    ? $this->userFacingIssueMessage(data_get($meta, 'last_sync_error'), 'Device sync failed. Review the provider connection and server logs, then try again.')
+                    : $this->syncSuccessDescription($meta),
+                'status'      => $failed ? 'warning' : ($result === 'queued' ? 'info' : 'success'),
+                'icon'        => $failed ? 'circle-exclamation' : 'satellite-dish',
+                'created_at'  => data_get($meta, 'last_sync_failed_at') ?? data_get($meta, 'last_sync_completed_at') ?? data_get($meta, 'last_sync_started_at'),
+                'actor_name'  => null,
+                'metadata'    => [
+                    'job_id'       => data_get($meta, 'last_sync_job_id'),
+                    'result'       => $result,
+                    'total'        => data_get($meta, 'last_sync_total'),
+                    'error_type'   => data_get($meta, 'last_sync_error_type'),
+                    'started_at'   => data_get($meta, 'last_sync_started_at'),
+                    'completed_at' => data_get($meta, 'last_sync_completed_at'),
+                    'failed_at'    => data_get($meta, 'last_sync_failed_at'),
+                ],
+            ]);
+        }
+
+        if (data_get($meta, 'last_test_result')) {
+            $result = data_get($meta, 'last_test_result');
+            $failed = $result === 'failed';
+
+            $logs->push([
+                'id'          => 'connection-test-' . (data_get($meta, 'last_connection_test') ?? $telematic->uuid),
+                'type'        => 'connection_test_' . $result,
+                'label'       => $failed ? 'Connection test failed' : 'Connection test verified',
+                'description' => $failed
+                    ? $this->userFacingIssueMessage(data_get($meta, 'last_error'), 'Connection test failed. Review the provider credentials and try again.')
+                    : 'Provider credentials were verified successfully.',
+                'status'      => $failed ? 'warning' : 'success',
+                'icon'        => 'plug',
+                'created_at'  => data_get($meta, 'last_connection_test'),
+                'actor_name'  => null,
+                'metadata'    => [
+                    'result' => $result,
+                ],
+            ]);
+        }
+
+        return $logs;
+    }
+
+    protected function makeActivityLogEntry(Activity $activity): array
+    {
+        return [
+            'id'          => $activity->uuid ?? $activity->id,
+            'type'        => 'activity_' . ($activity->event ?? 'updated'),
+            'label'       => $this->activityLogLabel($activity),
+            'description' => $this->activityLogDescription($activity),
+            'status'      => $activity->event === 'deleted' ? 'warning' : 'default',
+            'icon'        => $activity->event === 'created' ? 'plus' : 'history',
+            'created_at'  => $activity->created_at,
+            'actor_name'  => data_get($activity, 'causer.name'),
+            'metadata'    => [
+                'event' => $activity->event,
+            ],
+        ];
+    }
+
+    protected function activityLogLabel(Activity $activity): string
+    {
+        return match ($activity->event) {
+            'created' => 'Provider connection created',
+            'deleted' => 'Provider connection deleted',
+            default   => 'Provider connection updated',
+        };
+    }
+
+    protected function activityLogDescription(Activity $activity): string
+    {
+        return match ($activity->event) {
+            'created' => 'Provider connection details were created.',
+            'deleted' => 'Provider connection details were removed.',
+            default   => 'Provider connection details were updated.',
+        };
+    }
+
+    protected function syncSuccessDescription(array $meta): string
+    {
+        $total = data_get($meta, 'last_sync_total');
+
+        if (is_numeric($total)) {
+            return "{$total} provider devices were synced.";
+        }
+
+        return 'Provider device sync completed successfully.';
+    }
+
+    protected function userFacingIssueMessage($message, string $fallback): string
+    {
+        if (!$message || $this->isSensitiveIssueMessage($message)) {
+            return $fallback;
+        }
+
+        return (string) $message;
+    }
+
+    protected function isSensitiveIssueMessage($message): bool
+    {
+        $value = strtolower((string) $message);
+
+        foreach (['sqlstate', 'insert into', 'update `', 'select ', 'schema', 'stack trace', 'connection:', 'pdoexception'] as $fragment) {
+            if (str_contains($value, $fragment)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

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

@@ -4,11 +4,15 @@ namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
 use Fleetbase\FleetOps\Exports\VehicleExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+use Fleetbase\FleetOps\Http\Resources\v1\Index\Order as IndexOrderResource;
 use Fleetbase\FleetOps\Imports\VehicleImport;
+use Fleetbase\FleetOps\Models\Device;
 use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
@@ -86,6 +90,167 @@ class VehicleController extends FleetOpsController
         }
     }
 
+    public function assignDriver(Request $request, string $id): JsonResponse
+    {
+        $request->validate(['driver' => 'required|string']);
+
+        $vehicle = $this->findVehicle($id);
+        $driver  = $this->findDriver($request->input('driver'));
+
+        $vehicle->assignDriver($driver);
+        $vehicle->load(['driver', 'devices']);
+
+        return response()->json([
+            'status'  => 'ok',
+            'message' => 'Driver assigned to vehicle.',
+            'vehicle' => $vehicle,
+        ]);
+    }
+
+    public function unassignDriver(string $id): JsonResponse
+    {
+        $vehicle = $this->findVehicle($id);
+        $vehicle->unassignDriver();
+        $vehicle->load(['driver', 'devices']);
+
+        return response()->json([
+            'status'  => 'ok',
+            'message' => 'Driver unassigned from vehicle.',
+            'vehicle' => $vehicle,
+        ]);
+    }
+
+    public function assignedOrders(string $id): JsonResponse
+    {
+        $vehicle = $this->findVehicle($id);
+        $orders  = Order::where('vehicle_assigned_uuid', $vehicle->uuid)
+            ->where('company_uuid', session('company'))
+            ->with(['payload', 'trackingNumber', 'orderConfig', 'driverAssigned', 'vehicleAssigned'])
+            ->orderByRaw('uuid = ? desc', [$this->activeOrderUuid($vehicle)])
+            ->latest()
+            ->get();
+
+        return response()->json([
+            'status'  => 'ok',
+            'vehicle' => $vehicle->fresh(['driver', 'devices']),
+            'orders'  => IndexOrderResource::collection($orders)->resolve(),
+            'current' => $this->activeOrderUuid($vehicle),
+            'count'   => $orders->count(),
+        ]);
+    }
+
+    public function unassignOrders(Request $request, string $id): JsonResponse
+    {
+        $request->validate([
+            'orders'   => 'required|array|min:1',
+            'orders.*' => 'required|string',
+        ]);
+
+        $vehicle = $this->findVehicle($id);
+        $ids     = collect($request->input('orders'))->filter()->unique()->values();
+        $orders  = Order::where('vehicle_assigned_uuid', $vehicle->uuid)
+            ->where('company_uuid', session('company'))
+            ->where(function ($query) use ($ids) {
+                $query->whereIn('uuid', $ids)->orWhereIn('public_id', $ids);
+            })
+            ->get();
+
+        if ($orders->isEmpty()) {
+            return response()->error('No assigned orders were selected for this vehicle.');
+        }
+
+        DB::transaction(function () use ($orders): void {
+            Order::whereIn('uuid', $orders->pluck('uuid'))->update([
+                'vehicle_assigned_uuid' => null,
+                'updated_at'            => now(),
+            ]);
+        });
+
+        return response()->json([
+            'status'  => 'ok',
+            'message' => 'Vehicle unassigned from selected orders.',
+            'vehicle' => $vehicle->fresh(['driver', 'devices']),
+            'orders'  => IndexOrderResource::collection($orders->fresh(['driverAssigned', 'vehicleAssigned']))->resolve(),
+            'count'   => $orders->count(),
+        ]);
+    }
+
+    public function attachDevice(Request $request, string $id): JsonResponse
+    {
+        $request->validate(['device' => 'required|string']);
+
+        $vehicle = $this->findVehicle($id);
+        $device  = $this->findDevice($request->input('device'));
+
+        $device->attachTo($vehicle);
+        $device->load(['telematic', 'warranty', 'attachable']);
+        $vehicle->load(['driver', 'devices']);
+
+        return response()->json([
+            'status'  => 'ok',
+            'message' => 'Device attached to vehicle.',
+            'device'  => $device,
+            'vehicle' => $vehicle,
+        ]);
+    }
+
+    public function detachDevice(Request $request, string $id): JsonResponse
+    {
+        $request->validate(['device' => 'required|string']);
+
+        $vehicle = $this->findVehicle($id);
+        $device  = $this->findDevice($request->input('device'));
+
+        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']);
+
+        return response()->json([
+            'status'  => 'ok',
+            'message' => 'Device detached from vehicle.',
+            'device'  => $device,
+            'vehicle' => $vehicle,
+        ]);
+    }
+
+    protected function findVehicle(string $id): Vehicle
+    {
+        return Vehicle::where(function ($query) use ($id) {
+            $query->where('uuid', $id)->orWhere('public_id', $id);
+        })
+            ->where('company_uuid', session('company'))
+            ->firstOrFail();
+    }
+
+    protected function findDriver(string $id): Driver
+    {
+        return Driver::where(function ($query) use ($id) {
+            $query->where('uuid', $id)->orWhere('public_id', $id);
+        })
+            ->where('company_uuid', session('company'))
+            ->firstOrFail();
+    }
+
+    protected function activeOrderUuid(Vehicle $vehicle): ?string
+    {
+        $vehicle->loadMissing('driver.currentOrder');
+
+        return data_get($vehicle, 'driver.currentOrder.uuid') ?? data_get($vehicle->lastKnownPosition(), 'order_uuid');
+    }
+
+    protected function findDevice(string $id): Device
+    {
+        return Device::where(function ($query) use ($id) {
+            $query->where('uuid', $id)->orWhere('public_id', $id);
+        })
+            ->where('company_uuid', session('company'))
+            ->firstOrFail();
+    }
+
     /**
      * Get all status options for an vehicle.
      *

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

@@ -4,9 +4,12 @@ namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
 use Fleetbase\FleetOps\Exports\VendorExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+use Fleetbase\FleetOps\Http\Resources\v1\Contact as ContactResource;
 use Fleetbase\FleetOps\Imports\VendorImport;
+use Fleetbase\FleetOps\Models\Contact;
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Vendor;
+use Fleetbase\FleetOps\Models\VendorPersonnel;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
 use Illuminate\Http\Request;
@@ -190,4 +193,90 @@ class VendorController extends FleetOpsController
             'status' => 'ok',
         ]);
     }
+
+    public function vendorPersonnels(string $vendorId)
+    {
+        $vendor = Vendor::findByIdOrFail($vendorId);
+
+        $personnels = VendorPersonnel::where('vendor_uuid', $vendor->uuid)
+            ->with('contact')
+            ->latest()
+            ->get()
+            ->map(fn (VendorPersonnel $personnel) => $this->vendorPersonnelPayload($personnel));
+
+        return response()->json(['personnels' => $personnels->values()]);
+    }
+
+    public function addVendorPersonnel(Request $request, string $vendorId)
+    {
+        $vendor  = Vendor::findByIdOrFail($vendorId);
+        $contact = $this->resolveOrCreatePersonnelContact($request);
+
+        $personnel = VendorPersonnel::updateOrCreate(
+            ['vendor_uuid' => $vendor->uuid, 'contact_uuid' => $contact->uuid],
+            [
+                'role'            => $request->input('role', 'member'),
+                'status'          => $request->input('status', 'active'),
+                'invited_by_uuid' => session('user'),
+            ]
+        );
+
+        if ($request->boolean('create_login', true)) {
+            $contact->createUser();
+        }
+
+        return response()->json([
+            'personnel' => $this->vendorPersonnelPayload($personnel->load('contact')),
+        ]);
+    }
+
+    public function removeVendorPersonnel(string $vendorId, string $contactId)
+    {
+        $vendor  = Vendor::findByIdOrFail($vendorId);
+        $contact = Contact::findByIdOrFail($contactId);
+
+        VendorPersonnel::where(['vendor_uuid' => $vendor->uuid, 'contact_uuid' => $contact->uuid])->delete();
+
+        return response()->json(['status' => 'ok']);
+    }
+
+    protected function resolveOrCreatePersonnelContact(Request $request): Contact
+    {
+        $contactId = $request->input('contact');
+        if ($contactId) {
+            return Contact::where('company_uuid', session('company'))
+                ->where(function ($query) use ($contactId) {
+                    $query->where('uuid', $contactId)->orWhere('public_id', $contactId);
+                })
+                ->firstOrFail();
+        }
+
+        return Contact::create([
+            'company_uuid' => session('company'),
+            'name'         => $request->input('name'),
+            'email'        => $request->input('email'),
+            'phone'        => $request->input('phone'),
+            'type'         => 'customer',
+        ]);
+    }
+
+    protected function vendorPersonnelPayload(VendorPersonnel $personnel): array
+    {
+        $contact = $personnel->contact;
+
+        return [
+            'id'              => $contact?->public_id,
+            'uuid'            => $contact?->uuid,
+            'contact_uuid'    => $contact?->uuid,
+            'public_id'       => $contact?->public_id,
+            'name'            => $contact?->name,
+            'email'           => $contact?->email,
+            'phone'           => $contact?->phone,
+            'photo_url'       => $contact?->photo_url,
+            'role'            => $personnel->role ?? 'member',
+            'status'          => $personnel->status ?? 'active',
+            'invited_by_uuid' => $personnel->invited_by_uuid,
+            'contact'         => $contact ? (new ContactResource($contact))->resolve() : null,
+        ];
+    }
 }