@fleetbase/fleetops-engine 0.6.51 → 0.6.53

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

@@ -0,0 +1,74 @@
+<?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 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 attachmentState(?string $attachmentState)
+    {
+        if ($attachmentState === 'attached') {
+            $this->builder->whereNotNull('attachable_uuid');
+        }
+
+        if ($attachmentState === 'unattached') {
+            $this->builder->whereNull('attachable_uuid');
+        }
+    }
+}

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

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

@@ -0,0 +1,59 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Filter\Filter;
+use Illuminate\Support\Str;
+
+class FuelProviderTransactionFilter 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 syncStatus($status)
+    {
+        if (Str::contains($status, ',')) {
+            $status = explode(',', $status);
+        }
+
+        if (is_array($status)) {
+            $this->builder->whereIn('sync_status', $status);
+        } else {
+            $this->builder->where('sync_status', $status);
+        }
+    }
+
+    public function vehicle(?string $vehicle)
+    {
+        $this->builder->where('vehicle_uuid', $vehicle);
+    }
+
+    public function connection(?string $connection)
+    {
+        $this->builder->where('fuel_provider_connection_uuid', $connection);
+    }
+
+    public function transactionAt($transactionAt)
+    {
+        $transactionAt = Utils::dateRange($transactionAt);
+
+        if (is_array($transactionAt)) {
+            $this->builder->whereBetween('transaction_at', $transactionAt);
+        } else {
+            $this->builder->whereDate('transaction_at', $transactionAt);
+        }
+    }
+}

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

@@ -111,4 +111,14 @@ class FuelReportFilter extends Filter
             $this->builder->where('status', $status);
         }
     }
+
+    public function source(?string $source)
+    {
+        $this->builder->where('meta->source', $source);
+    }
+
+    public function provider(?string $provider)
+    {
+        $this->builder->where('meta->provider', $provider);
+    }
 }

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

@@ -59,6 +59,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) {

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

@@ -45,6 +45,8 @@ class Driver extends FleetbaseResource
             'vehicle_name'                  => $this->when(Http::isInternalRequest(), $this->vehicle_name),
             'vehicle_avatar'                => $this->vehicle_avatar,
             'vendor_name'                   => $this->when(Http::isInternalRequest(), $this->vendor_name),
+            'assigned_orders_count'         => $this->when(Http::isInternalRequest(), $this->assignedOrdersCount()),
+            'current_order_reference'       => $this->when(Http::isInternalRequest(), $this->currentOrderReference()),
             'vehicle'                       => $this->whenLoaded('vehicle', fn () => new VehicleWithoutDriver($this->vehicle)),
             'current_job'                   => $this->whenLoaded('currentJob', fn () => new Order($this->currentJob)),
             'current_job_id'                => $this->when(Http::isInternalRequest(), data_get($this, 'currentJob.tracking')),
@@ -68,6 +70,19 @@ class Driver extends FleetbaseResource
         ]);
     }
 
+    protected function assignedOrdersCount(): int
+    {
+        return $this->orders()->count();
+    }
+
+    protected function currentOrderReference(): ?string
+    {
+        $this->loadMissing('currentOrder');
+        $order = data_get($this, 'currentOrder');
+
+        return data_get($order, 'tracking') ?? data_get($order, 'public_id');
+    }
+
     public function getJobs(): AnonymousResourceCollection|FleetbaseResourceCollection
     {
         return Order::collection(

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

@@ -0,0 +1,30 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+class FuelProviderConnection extends FleetbaseResource
+{
+    public function toArray($request)
+    {
+        return [
+            'id'              => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'            => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'       => $this->when(Http::isInternalRequest(), $this->public_id),
+            'provider'        => $this->provider,
+            'name'            => $this->name,
+            'environment'     => $this->environment,
+            'status'          => $this->status,
+            'sync_settings'   => $this->sync_settings,
+            'last_sync_state' => $this->last_sync_state,
+            'last_synced_at'  => $this->last_synced_at,
+            'last_tested_at'  => $this->last_tested_at,
+            'last_error'      => $this->last_error,
+            'meta'            => $this->meta,
+            'updated_at'      => $this->updated_at,
+            'created_at'      => $this->created_at,
+        ];
+    }
+}

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

@@ -0,0 +1,36 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+class FuelProviderSyncRun extends FleetbaseResource
+{
+    public function toArray($request)
+    {
+        return [
+            'id'                            => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                          => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'                     => $this->when(Http::isInternalRequest(), $this->public_id),
+            'fuel_provider_connection_uuid' => $this->when(Http::isInternalRequest(), $this->fuel_provider_connection_uuid),
+            'provider'                      => $this->provider,
+            'status'                        => $this->status,
+            'from'                          => $this->from,
+            'to'                            => $this->to,
+            'imported'                      => $this->imported,
+            'matched'                       => $this->matched,
+            'unmatched'                     => $this->unmatched,
+            'fuel_reports_created'          => $this->fuel_reports_created,
+            'liters'                        => $this->liters,
+            'amount'                        => $this->amount,
+            'started_at'                    => $this->started_at,
+            'finished_at'                   => $this->finished_at,
+            'error'                         => $this->error,
+            'summary'                       => $this->summary,
+            'meta'                          => $this->meta,
+            'updated_at'                    => $this->updated_at,
+            'created_at'                    => $this->created_at,
+        ];
+    }
+}

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

@@ -0,0 +1,54 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+class FuelProviderTransaction extends FleetbaseResource
+{
+    public function toArray($request)
+    {
+        return [
+            'id'                            => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                          => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'                     => $this->when(Http::isInternalRequest(), $this->public_id),
+            'fuel_provider_connection_uuid' => $this->when(Http::isInternalRequest(), $this->fuel_provider_connection_uuid),
+            'fuel_report_uuid'              => $this->when(Http::isInternalRequest(), $this->fuel_report_uuid),
+            'fuel_report_id'                => $this->when(Http::isInternalRequest(), $this->fuel_report_id),
+            'vehicle_uuid'                  => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
+            'driver_uuid'                   => $this->when(Http::isInternalRequest(), $this->driver_uuid),
+            'order_uuid'                    => $this->when(Http::isInternalRequest(), $this->order_uuid),
+            'provider'                      => $this->provider,
+            'provider_transaction_id'       => $this->provider_transaction_id,
+            'provider_vehicle_id'           => $this->provider_vehicle_id,
+            'vehicle_card_id'               => $this->vehicle_card_id,
+            'internal_number'               => $this->internal_number,
+            'structure_number'              => $this->structure_number,
+            'plate_number'                  => $this->plate_number,
+            'vin'                           => $this->vin,
+            'serial_number'                 => $this->serial_number,
+            'call_sign'                     => $this->call_sign,
+            'trip_number'                   => $this->trip_number,
+            'station_name'                  => $this->station_name,
+            'station_latitude'              => $this->station_latitude,
+            'station_longitude'             => $this->station_longitude,
+            'station_location'              => $this->station_location,
+            'transaction_at'                => $this->transaction_at,
+            'volume'                        => $this->volume,
+            'metric_unit'                   => $this->metric_unit,
+            'amount'                        => $this->amount,
+            'currency'                      => $this->currency,
+            'odometer'                      => $this->odometer,
+            'sync_status'                   => $this->sync_status,
+            'matched_at'                    => $this->matched_at,
+            'vehicle_name'                  => $this->when(Http::isInternalRequest(), $this->vehicle_name),
+            'driver_name'                   => $this->when(Http::isInternalRequest(), $this->driver_name),
+            'normalized_payload'            => $this->when(Http::isInternalRequest(), $this->normalized_payload),
+            'raw_payload'                   => $this->when(Http::isInternalRequest(), $this->raw_payload),
+            'meta'                          => $this->when(Http::isInternalRequest(), $this->meta),
+            'updated_at'                    => $this->updated_at,
+            'created_at'                    => $this->created_at,
+        ];
+    }
+}

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

@@ -18,28 +18,32 @@ class FuelReport extends FleetbaseResource
     public function toArray($request)
     {
         return $this->withCustomFields([
-            'id'                => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid'              => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id'         => $this->when(Http::isInternalRequest(), $this->public_id),
-            'reported_by_uuid'  => $this->when(Http::isInternalRequest(), $this->reported_by_uuid),
-            'driver_uuid'       => $this->when(Http::isInternalRequest(), $this->driver_uuid),
-            'vehicle_uuid'      => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
-            'reporter_name'     => $this->when(Http::isInternalRequest(), $this->reporter_name),
-            'driver_name'       => $this->when(Http::isInternalRequest(), $this->driver_name),
-            'vehicle_name'      => $this->when(Http::isInternalRequest(), $this->vehicle_name),
-            'reporter'          => $this->whenLoaded('reporter', fn () => $this->reporter),
-            'vehicle'           => $this->whenLoaded('vehicle', fn () => new Vehicle($this->vehicle)),
-            'driver'            => $this->whenLoaded('driver', fn () => new Driver($this->driver)),
-            'odometer'          => $this->odometer,
-            'amount'            => $this->amount,
-            'currency'          => $this->currency,
-            'volume'            => $this->volume,
-            'metric_unit'       => $this->metric_unit,
-            'type'              => $this->type,
-            'status'            => $this->status,
-            'location'          => $this->location ?? new Point(0, 0),
-            'updated_at'        => $this->updated_at,
-            'created_at'        => $this->created_at,
+            'id'                             => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                           => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'                      => $this->when(Http::isInternalRequest(), $this->public_id),
+            'reported_by_uuid'               => $this->when(Http::isInternalRequest(), $this->reported_by_uuid),
+            'driver_uuid'                    => $this->when(Http::isInternalRequest(), $this->driver_uuid),
+            'vehicle_uuid'                   => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
+            'reporter_name'                  => $this->when(Http::isInternalRequest(), $this->reporter_name),
+            'driver_name'                    => $this->when(Http::isInternalRequest(), $this->driver_name),
+            'vehicle_name'                   => $this->when(Http::isInternalRequest(), $this->vehicle_name),
+            'reporter'                       => $this->whenLoaded('reporter', fn () => $this->reporter),
+            'vehicle'                        => $this->whenLoaded('vehicle', fn () => new Vehicle($this->vehicle)),
+            'driver'                         => $this->whenLoaded('driver', fn () => new Driver($this->driver)),
+            'odometer'                       => $this->odometer,
+            'amount'                         => $this->amount,
+            'currency'                       => $this->currency,
+            'volume'                         => $this->volume,
+            'metric_unit'                    => $this->metric_unit,
+            'type'                           => $this->type,
+            'status'                         => $this->status,
+            'source'                         => $this->when(Http::isInternalRequest(), $this->source),
+            'provider'                       => $this->when(Http::isInternalRequest(), $this->provider),
+            'fuel_provider_transaction_uuid' => $this->when(Http::isInternalRequest(), $this->fuel_provider_transaction_uuid),
+            'meta'                           => $this->when(Http::isInternalRequest(), $this->meta),
+            'location'                       => $this->location ?? new Point(0, 0),
+            'updated_at'                     => $this->updated_at,
+            'created_at'                     => $this->created_at,
         ]);
     }
 
@@ -63,6 +67,8 @@ class FuelReport extends FleetbaseResource
             'metric_unit'        => $this->metric_unit,
             'type'               => $this->type,
             'status'             => $this->status,
+            'source'             => $this->source,
+            'provider'           => $this->provider,
             'location'           => $this->location ?? new Point(0, 0),
             'updated_at'         => $this->updated_at,
             'created_at'         => $this->created_at,