@fleetbase/fleetops-engine 0.6.51 → 0.6.52

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/TelematicWebhookController.php

@@ -41,9 +41,10 @@ class TelematicWebhookController extends Controller
         $correlationId = Str::uuid()->toString();
 
         Log::info('Webhook received', [
-            'correlation_id' => $correlationId,
-            'provider'       => $providerKey,
-            'headers'        => $request->headers->all(),
+            'correlation_id'      => $correlationId,
+            'provider'            => $providerKey,
+            'has_signature'       => $request->headers->has('X-Webhook-Signature'),
+            'has_idempotency_key' => $request->headers->has('X-Idempotency-Key'),
         ]);
 
         // Check idempotency
@@ -60,20 +61,42 @@ class TelematicWebhookController extends Controller
         // Get provider
         $provider = $this->registry->resolve($providerKey);
 
-        // Find telematic for this provider
-        $telematic = Telematic::where('provider', $providerKey)->first();
+        // Find telematic for this provider. Native provider payloads are
+        // resolved by provider identifiers first; Fleetbase URL/header ids are
+        // optional configuration affordances where provider dashboards allow it.
+        $telematicId = $request->query('telematic') ?? $request->query('integration') ?? $request->header('X-Fleetbase-Telematic');
+        $signature   = $request->header('X-Webhook-Signature');
+        $telematic   = $this->service->resolveWebhookTelematic($providerKey, $request->all(), $request->headers->all(), $telematicId);
+
+        if (!$telematic && !$telematicId && $signature) {
+            $signatureMatches = Telematic::where('provider', $providerKey)
+                ->get()
+                ->filter(fn (Telematic $candidate) => $provider->validateWebhookSignature($request->getContent(), $signature, $this->service->getCredentials($candidate)));
+
+            if ($signatureMatches->count() === 1) {
+                $telematic = $signatureMatches->first();
+            } elseif ($signatureMatches->count() > 1) {
+                Log::warning('Ambiguous telematic webhook signature match', [
+                    'correlation_id' => $correlationId,
+                    'provider'       => $providerKey,
+                    'matches'        => $signatureMatches->count(),
+                ]);
+
+                return response()->json(['error' => 'Ambiguous telematic integration'], 409);
+            }
+        }
 
         if (!$telematic) {
-            Log::warning('No telematic found for provider', [
-                'correlation_id' => $correlationId,
-                'provider'       => $providerKey,
+            Log::warning('Unable to resolve telematic for provider webhook', [
+                'correlation_id'     => $correlationId,
+                'provider'           => $providerKey,
+                'has_integration_id' => (bool) $telematicId,
             ]);
 
-            return response()->json(['error' => 'No telematic configured'], 404);
+            return response()->json(['error' => 'Unable to resolve telematic integration'], 422);
         }
 
         // Validate signature
-        $signature   = $request->header('X-Webhook-Signature');
         $credentials = $this->service->getCredentials($telematic);
 
         if ($signature && !$provider->validateWebhookSignature($request->getContent(), $signature, $credentials)) {
@@ -87,15 +110,45 @@ class TelematicWebhookController extends Controller
 
         // Process webhook
         try {
-            $result = $provider->processWebhook($request->all(), $request->headers->all());
+            $result  = $provider->processWebhook($request->all(), $request->headers->all());
+            $devices = $result['devices'] ?? [];
+            $events  = $result['events'] ?? [];
+            $sensors = $result['sensors'] ?? [];
+
+            $devicesByExternalId = [];
 
             // Link devices
-            foreach ($result['devices'] as $deviceData) {
-                $this->service->linkDevice($telematic, $deviceData);
+            foreach ($devices as $deviceData) {
+                try {
+                    $device     = $this->service->linkDevice($telematic, $deviceData);
+                    $externalId = $deviceData['external_id'] ?? $deviceData['device_id'] ?? $deviceData['unit_id'] ?? $deviceData['vehicle_id'] ?? $deviceData['imei'] ?? null;
+                    if ($externalId) {
+                        $devicesByExternalId[$externalId] = $device;
+                    }
+                } catch (\Illuminate\Validation\ValidationException) {
+                    Log::warning('Skipping webhook device without provider identity', [
+                        'correlation_id' => $correlationId,
+                        'provider'       => $providerKey,
+                    ]);
+                }
             }
 
-            // Store events (TODO: implement event storage)
-            // Store sensors (TODO: implement sensor storage)
+            foreach ($events as $eventData) {
+                $externalId = $eventData['device_id'] ?? $eventData['external_id'] ?? $eventData['ident'] ?? $eventData['unit_id'] ?? $eventData['vehicle_id'] ?? $eventData['imei'] ?? null;
+                $this->service->storeDeviceEvent($telematic, $eventData, $externalId ? ($devicesByExternalId[$externalId] ?? null) : null);
+            }
+
+            foreach ($sensors as $sensorData) {
+                try {
+                    $externalId = $sensorData['device_id'] ?? $sensorData['external_id'] ?? $sensorData['ident'] ?? $sensorData['unit_id'] ?? $sensorData['vehicle_id'] ?? $sensorData['imei'] ?? null;
+                    $this->service->storeSensor($telematic, $sensorData, $externalId ? ($devicesByExternalId[$externalId] ?? null) : null);
+                } catch (\Illuminate\Validation\ValidationException) {
+                    Log::warning('Skipping webhook sensor without provider or device identity', [
+                        'correlation_id' => $correlationId,
+                        'provider'       => $providerKey,
+                    ]);
+                }
+            }
 
             // Mark as processed
             if ($idempotencyKey) {
@@ -104,8 +157,9 @@ class TelematicWebhookController extends Controller
 
             Log::info('Webhook processed successfully', [
                 'correlation_id' => $correlationId,
-                'devices_count'  => count($result['devices']),
-                'events_count'   => count($result['events']),
+                'devices_count'  => count($devices),
+                'events_count'   => count($events),
+                'sensors_count'  => count($sensors),
             ]);
 
             return response()->json(['status' => 'processed'], 200);
@@ -124,7 +178,7 @@ class TelematicWebhookController extends Controller
      */
     public function ingest(Request $request, string $id): JsonResponse
     {
-        $telematic     = Telematic::where('uuid', $id)->orWhere('public_id', $id)->firstOrFail();
+        $telematic     = Telematic::where('public_id', $id)->orWhere('uuid', $id)->firstOrFail();
         $correlationId = Str::uuid()->toString();
 
         Log::info('Custom ingest received', [
@@ -139,10 +193,38 @@ class TelematicWebhookController extends Controller
         }
 
         try {
+            $devicesByExternalId = [];
+
             // Process devices
             if ($request->has('devices')) {
                 foreach ($request->input('devices') as $deviceData) {
-                    $this->service->linkDevice($telematic, $deviceData);
+                    try {
+                        $device     = $this->service->linkDevice($telematic, $deviceData);
+                        $externalId = $deviceData['external_id'] ?? $deviceData['device_id'] ?? $deviceData['unit_id'] ?? $deviceData['vehicle_id'] ?? $deviceData['imei'] ?? null;
+                        if ($externalId) {
+                            $devicesByExternalId[$externalId] = $device;
+                        }
+                    } catch (\Illuminate\Validation\ValidationException) {
+                        Log::warning('Skipping custom ingest device without provider identity', [
+                            'correlation_id' => $correlationId,
+                        ]);
+                    }
+                }
+            }
+
+            foreach ($request->input('events', []) as $eventData) {
+                $externalId = $eventData['device_id'] ?? $eventData['external_id'] ?? $eventData['ident'] ?? $eventData['unit_id'] ?? $eventData['vehicle_id'] ?? $eventData['imei'] ?? null;
+                $this->service->storeDeviceEvent($telematic, $eventData, $externalId ? ($devicesByExternalId[$externalId] ?? null) : null);
+            }
+
+            foreach ($request->input('sensors', []) as $sensorData) {
+                try {
+                    $externalId = $sensorData['device_id'] ?? $sensorData['external_id'] ?? $sensorData['ident'] ?? $sensorData['unit_id'] ?? $sensorData['vehicle_id'] ?? $sensorData['imei'] ?? null;
+                    $this->service->storeSensor($telematic, $sensorData, $externalId ? ($devicesByExternalId[$externalId] ?? null) : null);
+                } catch (\Illuminate\Validation\ValidationException) {
+                    Log::warning('Skipping custom ingest sensor without provider or device identity', [
+                        'correlation_id' => $correlationId,
+                    ]);
                 }
             }
 
@@ -154,6 +236,8 @@ class TelematicWebhookController extends Controller
             Log::info('Custom ingest processed', [
                 'correlation_id' => $correlationId,
                 'devices_count'  => count($request->input('devices', [])),
+                'events_count'   => count($request->input('events', [])),
+                'sensors_count'  => count($request->input('sensors', [])),
             ]);
 
             return response()->json(['status' => 'ingested'], 200);

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

@@ -0,0 +1,33 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\Http\Filter\Filter;
+
+class FuelProviderConnectionFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function query(?string $searchQuery)
+    {
+        $this->builder->search($searchQuery);
+    }
+
+    public function provider(?string $provider)
+    {
+        $this->builder->where('provider', $provider);
+    }
+
+    public function status(?string $status)
+    {
+        $this->builder->where('status', $status);
+    }
+
+    public function environment(?string $environment)
+    {
+        $this->builder->where('environment', $environment);
+    }
+}

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

@@ -0,0 +1,28 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\Http\Filter\Filter;
+
+class FuelProviderSyncRunFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function provider(?string $provider)
+    {
+        $this->builder->where('provider', $provider);
+    }
+
+    public function status(?string $status)
+    {
+        $this->builder->where('status', $status);
+    }
+
+    public function connection(?string $connection)
+    {
+        $this->builder->where('fuel_provider_connection_uuid', $connection);
+    }
+}