@fleetbase/fleetops-engine 0.6.58 → 0.6.59

package/server/src/Observers/TrackingNumberObserver.php

@@ -18,9 +18,9 @@ class TrackingNumberObserver
     public function creating(TrackingNumber $trackingNumber)
     {
         // generate a barcode annd qr code
-        $trackingNumber->tracking_number = TrackingNumber::generateNumber($trackingNumber->region);
-        $trackingNumber->qr_code         = DNS2D::getBarcodePNG($trackingNumber->owner_uuid, 'QRCODE');
-        $trackingNumber->barcode         = DNS2D::getBarcodePNG($trackingNumber->owner_uuid, 'PDF417');
+        $trackingNumber->tracking_number = $this->generateTrackingNumber($trackingNumber);
+        $trackingNumber->qr_code         = $this->generateBarcode($trackingNumber->owner_uuid, 'QRCODE');
+        $trackingNumber->barcode         = $this->generateBarcode($trackingNumber->owner_uuid, 'PDF417');
     }
 
     /**
@@ -30,7 +30,7 @@ class TrackingNumberObserver
      */
     public function created(TrackingNumber $trackingNumber)
     {
-        $trackingStatus = TrackingStatus::create([
+        $trackingStatus = $this->createTrackingStatus([
             'company_uuid'         => session('company'),
             'tracking_number_uuid' => $trackingNumber->uuid,
             'status'               => Str::title($trackingNumber->type . ' created'),
@@ -41,4 +41,19 @@ class TrackingNumberObserver
 
         $trackingNumber->updateOwnerStatus($trackingStatus);
     }
+
+    protected function generateTrackingNumber(TrackingNumber $trackingNumber): string
+    {
+        return TrackingNumber::generateNumber($trackingNumber->region);
+    }
+
+    protected function generateBarcode(string $ownerUuid, string $type): string
+    {
+        return DNS2D::getBarcodePNG($ownerUuid, $type);
+    }
+
+    protected function createTrackingStatus(array $attributes): TrackingStatus
+    {
+        return TrackingStatus::create($attributes);
+    }
 }

package/server/src/Observers/UserObserver.php

@@ -15,6 +15,11 @@ class UserObserver
     public function deleted(User $user)
     {
         // if the user deleted is a driver, delete their driver record to
-        Driver::where('user_uuid', $user->uuid)->delete();
+        $this->deleteDrivers($user->uuid);
+    }
+
+    protected function deleteDrivers(string $userUuid): void
+    {
+        Driver::where('user_uuid', $userUuid)->delete();
     }
 }

package/server/src/Observers/VehicleObserver.php

@@ -16,10 +16,10 @@ class VehicleObserver
     public function created(Vehicle $vehicle)
     {
         // assign this vehicle to a driver if the driver has been set
-        $identifier = request()->or(['driver_uuid', 'vehicle.driver_uuid', 'vehicle.driver.uuid']);
+        $identifier = $this->getDriverIdentifier();
 
         if ($identifier) {
-            $driver = Driver::where('uuid', $identifier)->whereNull('deleted_at')->withoutGlobalScopes()->first();
+            $driver = $this->findDriver($identifier);
 
             if ($driver) {
                 // assign this vehicle to driver
@@ -30,7 +30,7 @@ class VehicleObserver
             }
         }
 
-        LiveCacheService::invalidateMultiple(['vehicles', 'operations-monitor']);
+        $this->invalidateLiveCache();
     }
 
     /**
@@ -41,10 +41,10 @@ class VehicleObserver
     public function updating(Vehicle $vehicle)
     {
         // assign this vehicle to a driver if the driver has been set
-        $identifier = request()->or(['driver_uuid', 'vehicle.driver_uuid', 'vehicle.driver.uuid']);
+        $identifier = $this->getDriverIdentifier();
 
         if ($identifier) {
-            $driver = Driver::where('uuid', $identifier)->whereNull('deleted_at')->withoutGlobalScopes()->first();
+            $driver = $this->findDriver($identifier);
 
             if ($driver) {
                 // assign this vehicle to driver
@@ -55,7 +55,7 @@ class VehicleObserver
             }
         }
 
-        LiveCacheService::invalidateMultiple(['vehicles', 'operations-monitor']);
+        $this->invalidateLiveCache();
     }
 
     /**
@@ -66,8 +66,28 @@ class VehicleObserver
     public function deleted(Vehicle $vehicle)
     {
         // Unassign the deleted vehicle from matching driver/(s)
-        Driver::where(['vehicle_uuid' => $vehicle->uuid])->delete();
+        $this->deleteDriversAssignedTo($vehicle);
+
+        $this->invalidateLiveCache();
+    }
+
+    protected function getDriverIdentifier(): ?string
+    {
+        return request()->or(['driver_uuid', 'vehicle.driver_uuid', 'vehicle.driver.uuid']);
+    }
 
+    protected function findDriver(string $identifier): ?Driver
+    {
+        return Driver::where('uuid', $identifier)->whereNull('deleted_at')->withoutGlobalScopes()->first();
+    }
+
+    protected function deleteDriversAssignedTo(Vehicle $vehicle): mixed
+    {
+        return Driver::where(['vehicle_uuid' => $vehicle->uuid])->delete();
+    }
+
+    protected function invalidateLiveCache(): void
+    {
         LiveCacheService::invalidateMultiple(['vehicles', 'operations-monitor']);
     }
 }

package/server/src/Observers/WorkOrderObserver.php

@@ -35,7 +35,7 @@ class WorkOrderObserver
         $this->createMaintenanceRecord($workOrder);
         $this->resetSchedule($workOrder);
 
-        event('work_order.completed', $workOrder);
+        $this->dispatchCompletedEvent($workOrder);
     }
 
     // -------------------------------------------------------------------------
@@ -45,17 +45,17 @@ class WorkOrderObserver
     /**
      * Create a Maintenance history record from the completed work order.
      */
-    private function createMaintenanceRecord(WorkOrder $workOrder): void
+    protected function createMaintenanceRecord(WorkOrder $workOrder): void
     {
         // Avoid duplicate records if one was already manually created for this WO
-        if (Maintenance::where('work_order_uuid', $workOrder->uuid)->exists()) {
+        if ($this->hasMaintenanceRecord($workOrder)) {
             return;
         }
 
         $meta           = $workOrder->meta ?? [];
         $completionData = $meta['completion_data'] ?? [];
 
-        Maintenance::create([
+        $this->createMaintenance([
             'company_uuid'       => $workOrder->company_uuid,
             'work_order_uuid'    => $workOrder->uuid,
             'maintainable_type'  => $workOrder->target_type,
@@ -84,13 +84,13 @@ class WorkOrderObserver
     /**
      * Reset the linked schedule's next-due thresholds after completion.
      */
-    private function resetSchedule(WorkOrder $workOrder): void
+    protected function resetSchedule(WorkOrder $workOrder): void
     {
         if (!$workOrder->schedule_uuid) {
             return;
         }
 
-        $schedule = MaintenanceSchedule::where('uuid', $workOrder->schedule_uuid)->first();
+        $schedule = $this->findSchedule($workOrder->schedule_uuid);
         if (!$schedule) {
             return;
         }
@@ -99,9 +99,29 @@ class WorkOrderObserver
         $completionData = $meta['completion_data'] ?? [];
 
         $schedule->resetAfterCompletion(
-            odometer: isset($completionData['odometer']) ? (int) $completionData['odometer'] : null,
+            completedOdometer: isset($completionData['odometer']) ? (int) $completionData['odometer'] : null,
             completedEngineHours: isset($completionData['engine_hours']) ? (int) $completionData['engine_hours'] : null,
             completedAt: $workOrder->closed_at ?? now()
         );
     }
+
+    protected function hasMaintenanceRecord(WorkOrder $workOrder): bool
+    {
+        return Maintenance::where('work_order_uuid', $workOrder->uuid)->exists();
+    }
+
+    protected function createMaintenance(array $attributes): Maintenance
+    {
+        return Maintenance::create($attributes);
+    }
+
+    protected function findSchedule(string $uuid): ?MaintenanceSchedule
+    {
+        return MaintenanceSchedule::where('uuid', $uuid)->first();
+    }
+
+    protected function dispatchCompletedEvent(WorkOrder $workOrder): void
+    {
+        event('work_order.completed', $workOrder);
+    }
 }

package/server/src/Orchestration/Engines/DriverAssignmentEngine.php

@@ -40,9 +40,7 @@ class DriverAssignmentEngine
         // Collect all company drivers — online status and vehicle linkage are
         // treated as soft preferences (scored), not hard filters.
         $companyUuid      = $orders->first()?->company_uuid;
-        $availableDrivers = Driver::where('company_uuid', $companyUuid)
-            ->with(['scheduleItems'])
-            ->get();
+        $availableDrivers = $this->availableDriversForCompany($companyUuid);
 
         // Shift-awareness: if require_active_shift is explicitly set, filter
         // to drivers that have an active shift right now. Drivers with NO
@@ -242,6 +240,13 @@ class DriverAssignmentEngine
         return $scored->first()['driver'] ?? null;
     }
 
+    protected function availableDriversForCompany(?string $companyUuid): Collection
+    {
+        return Driver::where('company_uuid', $companyUuid)
+            ->with(['scheduleItems'])
+            ->get();
+    }
+
     /**
      * Aggregate the unique required skills from a collection of orders.
      */

package/server/src/Orchestration/Support/OrchestrationPayloadBuilder.php

@@ -73,8 +73,8 @@ class OrchestrationPayloadBuilder
                 $rawWeight  = (float) ($entity->weight ?? 0);
                 $weightUnit = strtolower($entity->weight_unit ?? 'kg');
                 $weightKg   = match ($weightUnit) {
-                    'g', 'gram', 'grams'              => $rawWeight / 1000,
-                    'lb', 'lbs', 'pound', 'pounds'    => $rawWeight * 0.453592,
+                    'g', 'gram', 'grams'               => $rawWeight / 1000,
+                    'lb', 'lbs', 'pound', 'pounds'     => $rawWeight * 0.453592,
                     'oz', 'ounce', 'ounces'            => $rawWeight * 0.0283495,
                     't', 'ton', 'tonne', 'tonnes'      => $rawWeight * 1000,
                     default                            => $rawWeight, // kg assumed

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -9,9 +9,15 @@ use Fleetbase\Support\NotificationRegistry;
 use Fleetbase\Support\Utils;
 use Illuminate\Database\Eloquent\Relations\Relation;
 
+// Never taken in any environment that can run this file: core-api is a hard
+// composer dependency, so the class is always present by the time the package
+// autoloads. It exists to give a readable failure to anyone assembling the
+// package tree by hand.
+// @codeCoverageIgnoreStart
 if (!Utils::classExists(CoreServiceProvider::class)) {
     throw new \Exception('FleetOps cannot be loaded without `fleetbase/core-api` installed!');
 }
+// @codeCoverageIgnoreEnd
 
 /**
  * FleetOps service provider.
@@ -194,9 +200,15 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         $this->mergeConfigFrom(__DIR__ . '/../../config/dompdf.php', 'dompdf');
 
         // Register the GeometryEngine for GEOSEngine
+        //
+        // The geos extension is installed neither locally nor in CI, so this
+        // registration cannot be exercised here. Tests inject an engine through
+        // GeometryEngineRegistry directly instead.
+        // @codeCoverageIgnoreStart
         if (extension_loaded('geos')) {
             GeometryEngineRegistry::set(new GEOSEngine());
         }
+        // @codeCoverageIgnoreEnd
     }
 
     public function registerMorphMap(): void

package/server/src/Providers/NotificationServiceProvider.php

@@ -6,9 +6,15 @@ use Fleetbase\Providers\CoreServiceProvider;
 use Fleetbase\Support\NotificationRegistry;
 use Fleetbase\Support\Utils;
 
+// Never taken in any environment that can run this file: core-api is a hard
+// composer dependency, so the class is always present by the time the package
+// autoloads. It exists to give a readable failure to anyone assembling the
+// package tree by hand.
+// @codeCoverageIgnoreStart
 if (!Utils::classExists(CoreServiceProvider::class)) {
     throw new \Exception('FleetOps cannot be loaded without `fleetbase/core-api` installed!');
 }
+// @codeCoverageIgnoreEnd
 
 /**
  * NotificationServiceProvider service provider.

package/server/src/Support/Ai/Capabilities/AssetStatusCapability.php

@@ -55,12 +55,8 @@ class AssetStatusCapability extends AbstractFleetOpsAICapability
 
         return [
             'authorized'       => true,
-            'total'            => $modelClass::where('company_uuid', session('company'))->count(),
-            'counts_by_status' => $modelClass::where('company_uuid', session('company'))
-                ->selectRaw('status, count(*) as aggregate')
-                ->groupBy('status')
-                ->pluck('aggregate', 'status')
-                ->all(),
+            'total'            => $this->totalForModel($modelClass),
+            'counts_by_status' => $this->countsByStatusForModel($modelClass),
         ];
     }
 
@@ -72,16 +68,10 @@ class AssetStatusCapability extends AbstractFleetOpsAICapability
 
         return [
             'authorized'       => true,
-            'total'            => Device::where('company_uuid', session('company'))->count(),
-            'online'           => Device::where('company_uuid', session('company'))->where('online', true)->count(),
-            'offline'          => Device::where('company_uuid', session('company'))->where(function ($query) {
-                $query->where('online', false)->orWhereNull('online');
-            })->count(),
-            'counts_by_status' => Device::where('company_uuid', session('company'))
-                ->selectRaw('status, count(*) as aggregate')
-                ->groupBy('status')
-                ->pluck('aggregate', 'status')
-                ->all(),
+            'total'            => $this->totalForModel(Device::class),
+            'online'           => $this->onlineCountForModel(Device::class),
+            'offline'          => $this->offlineCountForModel(Device::class),
+            'counts_by_status' => $this->countsByStatusForModel(Device::class),
         ];
     }
 
@@ -93,16 +83,36 @@ class AssetStatusCapability extends AbstractFleetOpsAICapability
 
         return [
             'authorized'       => true,
-            'total'            => Driver::where('company_uuid', session('company'))->count(),
-            'online'           => Driver::where('company_uuid', session('company'))->where('online', true)->count(),
-            'offline'          => Driver::where('company_uuid', session('company'))->where(function ($query) {
-                $query->where('online', false)->orWhereNull('online');
-            })->count(),
-            'counts_by_status' => Driver::where('company_uuid', session('company'))
-                ->selectRaw('status, count(*) as aggregate')
-                ->groupBy('status')
-                ->pluck('aggregate', 'status')
-                ->all(),
+            'total'            => $this->totalForModel(Driver::class),
+            'online'           => $this->onlineCountForModel(Driver::class),
+            'offline'          => $this->offlineCountForModel(Driver::class),
+            'counts_by_status' => $this->countsByStatusForModel(Driver::class),
         ];
     }
+
+    protected function totalForModel(string $modelClass): int
+    {
+        return $modelClass::where('company_uuid', session('company'))->count();
+    }
+
+    protected function onlineCountForModel(string $modelClass): int
+    {
+        return $modelClass::where('company_uuid', session('company'))->where('online', true)->count();
+    }
+
+    protected function offlineCountForModel(string $modelClass): int
+    {
+        return $modelClass::where('company_uuid', session('company'))->where(function ($query) {
+            $query->where('online', false)->orWhereNull('online');
+        })->count();
+    }
+
+    protected function countsByStatusForModel(string $modelClass): array
+    {
+        return $modelClass::where('company_uuid', session('company'))
+            ->selectRaw('status, count(*) as aggregate')
+            ->groupBy('status')
+            ->pluck('aggregate', 'status')
+            ->all();
+    }
 }

package/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php

@@ -161,15 +161,13 @@ class CreateOrderPreviewCapability extends AbstractFleetOpsAICapability implemen
             'vehicle_query',
         ]);
 
-        /** @var OrderController $controller */
-        $controller = app(OrderController::class);
-        $response   = $controller->createRecord(new Request(['order' => $draft]));
+        $response = $this->orderController()->createRecord(new Request(['order' => $draft]));
 
-        if ($response instanceof JsonResponse && $response->getStatusCode() >= 400) {
+        if ($this->orderResponseFailed($response)) {
             throw new \RuntimeException((string) $response->getContent());
         }
 
-        $order = data_get($response, 'order');
+        $order = $this->orderFromResponse($response);
 
         return [
             'action'   => $this->key(),
@@ -185,6 +183,21 @@ class CreateOrderPreviewCapability extends AbstractFleetOpsAICapability implemen
         ];
     }
 
+    protected function orderController(): OrderController
+    {
+        return app(OrderController::class);
+    }
+
+    protected function orderResponseFailed($response): bool
+    {
+        return $response instanceof JsonResponse && $response->getStatusCode() >= 400;
+    }
+
+    protected function orderFromResponse($response)
+    {
+        return data_get($response, 'order');
+    }
+
     protected function sanitizeDraftForApply(array $draft): array
     {
         foreach (['pickup', 'dropoff', 'return'] as $role) {

package/server/src/Support/Ai/Capabilities/OrderInsightsCapability.php

@@ -37,7 +37,7 @@ class OrderInsightsCapability extends AbstractFleetOpsAICapability
         $prompt = $this->prompt($task);
         $window = $this->dateWindow($prompt);
         $amount = $this->amountThreshold($prompt);
-        $query  = Order::where('company_uuid', session('company'));
+        $query  = $this->orderQuery(session('company'));
 
         if ($window) {
             $query->whereBetween('created_at', [$window['start'], $window['end']]);
@@ -88,6 +88,11 @@ class OrderInsightsCapability extends AbstractFleetOpsAICapability
         return $this->relativeDateResolver()->resolveWindow($prompt);
     }
 
+    protected function orderQuery(?string $companyUuid): mixed
+    {
+        return Order::where('company_uuid', $companyUuid);
+    }
+
     protected function relativeDateResolver(): AiRelativeDateResolver
     {
         return function_exists('app') ? app(AiRelativeDateResolver::class) : new AiRelativeDateResolver(null);

package/server/src/Support/Ai/Capabilities/SearchResourcesCapability.php

@@ -74,8 +74,7 @@ class SearchResourcesCapability extends AbstractFleetOpsAICapability
             return [];
         }
 
-        return Order::with(['transaction', 'trackingNumber'])
-            ->where('company_uuid', session('company'))
+        return $this->orderSearchQuery()
             ->where(function ($query) use ($terms) {
                 $this->whereLikeAny($query, ['public_id', 'internal_id', 'uuid', 'status', 'type'], $terms);
                 $query->orWhereHas('trackingNumber', fn ($tracking) => $this->whereLikeAny($tracking, ['tracking_number', 'barcode'], $terms));
@@ -103,7 +102,7 @@ class SearchResourcesCapability extends AbstractFleetOpsAICapability
             return [];
         }
 
-        return Vehicle::where('company_uuid', session('company'))
+        return $this->vehicleSearchQuery()
             ->where(fn ($query) => $this->whereLikeAny($query, ['name', 'make', 'model', 'plate_number', 'vin', 'public_id', 'internal_id'], $terms))
             ->limit(5)
             ->get()
@@ -126,8 +125,7 @@ class SearchResourcesCapability extends AbstractFleetOpsAICapability
             return [];
         }
 
-        return Driver::with('user')
-            ->where('company_uuid', session('company'))
+        return $this->driverSearchQuery()
             ->where(function ($query) use ($terms) {
                 $this->whereLikeAny($query, ['public_id', 'uuid', 'drivers_license_number', 'status'], $terms);
                 $query->orWhereHas('user', fn ($user) => $this->whereLikeAny($user, ['name', 'email', 'phone'], $terms));
@@ -177,7 +175,7 @@ class SearchResourcesCapability extends AbstractFleetOpsAICapability
             return [];
         }
 
-        return $modelClass::where('company_uuid', session('company'))
+        return $this->genericSearchQuery($modelClass)
             ->where(fn ($query) => $this->whereLikeAny($query, $columns, $terms))
             ->limit(5)
             ->get()
@@ -192,4 +190,26 @@ class SearchResourcesCapability extends AbstractFleetOpsAICapability
             ->values()
             ->all();
     }
+
+    protected function orderSearchQuery()
+    {
+        return Order::with(['transaction', 'trackingNumber'])
+            ->where('company_uuid', session('company'));
+    }
+
+    protected function vehicleSearchQuery()
+    {
+        return Vehicle::where('company_uuid', session('company'));
+    }
+
+    protected function driverSearchQuery()
+    {
+        return Driver::with('user')
+            ->where('company_uuid', session('company'));
+    }
+
+    protected function genericSearchQuery(string $modelClass)
+    {
+        return $modelClass::where('company_uuid', session('company'));
+    }
 }

package/server/src/Support/Analytics/FuelEfficiency.php

@@ -35,9 +35,15 @@ class FuelEfficiency extends AbstractAnalytics
             ->orderBy('wk')
             ->pluck('total_distance', 'wk');
 
-        $labels    = [];
-        $costData  = [];
-        $cpkmData  = [];
+        return $this->buildFuelEfficiencyPayload($fuelByWeek, $distanceByWeek, $currency);
+    }
+
+    protected function buildFuelEfficiencyPayload(iterable $fuelByWeek, iterable $distanceByWeek, string $currency): array
+    {
+        $labels          = [];
+        $costData        = [];
+        $cpkmData        = [];
+        $distanceByWeek  = collect($distanceByWeek);
 
         foreach ($fuelByWeek as $row) {
             $labels[]   = Carbon::parse($row->wk_start)->format('M j');

package/server/src/Support/Analytics/FuelProviderSummary.php

@@ -9,11 +9,8 @@ class FuelProviderSummary extends AbstractAnalytics
 {
     public function get(): array
     {
-        $transactions = FuelProviderTransaction::where('company_uuid', $this->company->uuid)
-            ->whereBetween('transaction_at', [$this->start, $this->end])
-            ->get();
-
-        $connections = FuelProviderConnection::where('company_uuid', $this->company->uuid)->get();
+        $transactions = $this->transactions($this->company->uuid);
+        $connections  = $this->connections($this->company->uuid);
 
         $byProvider = $transactions
             ->groupBy('provider')
@@ -39,4 +36,16 @@ class FuelProviderSummary extends AbstractAnalytics
             'providers' => $byProvider,
         ];
     }
+
+    protected function transactions(string $companyUuid)
+    {
+        return FuelProviderTransaction::where('company_uuid', $companyUuid)
+            ->whereBetween('transaction_at', [$this->start, $this->end])
+            ->get();
+    }
+
+    protected function connections(string $companyUuid)
+    {
+        return FuelProviderConnection::where('company_uuid', $companyUuid)->get();
+    }
 }

package/server/src/Support/Analytics/GeofenceViolations.php

@@ -18,46 +18,66 @@ class GeofenceViolations extends AbstractAnalytics
         $start       = $this->start ?? Carbon::now()->subDays(7)->toDateTime();
         $end         = $this->end ?? Carbon::now()->toDateTime();
 
-        $violationsToday = GeofenceEventLog::where('company_uuid', $companyUuid)
+        $violationsToday = $this->violationsToday($companyUuid);
+
+        $violationsPeriod = $this->violationsPeriod($companyUuid, $start, $end);
+
+        $topDwells = $this->topDwells($companyUuid, $start, $end);
+
+        $byZoneRows = $this->byZoneRows($companyUuid, $start, $end);
+
+        return [
+            'violations_today'  => $violationsToday,
+            'violations_period' => $violationsPeriod,
+            'top_dwells'        => $topDwells->map(fn ($e) => [
+                'driver_uuid'      => $e->driver_uuid,
+                'driver_name'      => $e->subject_name,
+                'zone_name'        => $e->geofence_name,
+                'duration_minutes' => (int) $e->dwell_duration_minutes,
+                'occurred_at'      => $e->occurred_at,
+            ])->all(),
+            'by_zone' => [
+                'labels' => $byZoneRows->pluck('geofence_name')->map(fn ($n) => $n ?: 'Unnamed')->all(),
+                'data'   => $byZoneRows->pluck('total')->map(fn ($v) => (int) $v)->all(),
+            ],
+        ];
+    }
+
+    protected function violationsToday(string $companyUuid): int
+    {
+        return GeofenceEventLog::where('company_uuid', $companyUuid)
             ->where('event_type', 'dwelled')
             ->whereDate('occurred_at', Carbon::today())
             ->count();
+    }
 
-        $violationsPeriod = GeofenceEventLog::where('company_uuid', $companyUuid)
+    protected function violationsPeriod(string $companyUuid, \DateTimeInterface $start, \DateTimeInterface $end): int
+    {
+        return GeofenceEventLog::where('company_uuid', $companyUuid)
             ->where('event_type', 'dwelled')
             ->whereBetween('occurred_at', [$start, $end])
             ->count();
+    }
 
-        $topDwells = GeofenceEventLog::where('company_uuid', $companyUuid)
+    protected function topDwells(string $companyUuid, \DateTimeInterface $start, \DateTimeInterface $end)
+    {
+        return GeofenceEventLog::where('company_uuid', $companyUuid)
             ->where('event_type', 'dwelled')
             ->whereBetween('occurred_at', [$start, $end])
             ->whereNotNull('dwell_duration_minutes')
             ->orderByDesc('dwell_duration_minutes')
             ->limit(8)
             ->get(['subject_name', 'driver_uuid', 'geofence_name', 'dwell_duration_minutes', 'occurred_at']);
+    }
 
-        $byZoneRows = GeofenceEventLog::where('company_uuid', $companyUuid)
+    protected function byZoneRows(string $companyUuid, \DateTimeInterface $start, \DateTimeInterface $end)
+    {
+        return GeofenceEventLog::where('company_uuid', $companyUuid)
             ->whereBetween('occurred_at', [$start, $end])
             ->selectRaw('geofence_name, COUNT(*) as total')
             ->groupBy('geofence_name')
             ->orderByRaw('total DESC')
             ->limit(8)
             ->get();
-
-        return [
-            'violations_today'  => $violationsToday,
-            'violations_period' => $violationsPeriod,
-            'top_dwells'        => $topDwells->map(fn ($e) => [
-                'driver_uuid'      => $e->driver_uuid,
-                'driver_name'      => $e->subject_name,
-                'zone_name'        => $e->geofence_name,
-                'duration_minutes' => (int) $e->dwell_duration_minutes,
-                'occurred_at'      => $e->occurred_at,
-            ])->all(),
-            'by_zone' => [
-                'labels' => $byZoneRows->pluck('geofence_name')->map(fn ($n) => $n ?: 'Unnamed')->all(),
-                'data'   => $byZoneRows->pluck('total')->map(fn ($v) => (int) $v)->all(),
-            ],
-        ];
     }
 }