@fleetbase/fleetops-engine 0.6.58 → 0.6.59

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

@@ -15,7 +15,6 @@ use Fleetbase\FleetOps\Support\LiveCacheService;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
 use Illuminate\Http\Request;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 
@@ -52,7 +51,7 @@ class FleetController extends FleetOpsController
             $query->with('drivers', function ($query) use ($excludeJobs) {
                 $query->with('jobs', function ($query) use ($excludeJobs) {
                     if (is_array($excludeJobs)) {
-                        $isUuids = Arr::every($excludeJobs, function ($id) {
+                        $isUuids = collect($excludeJobs)->every(function ($id) {
                             return Str::isUuid($id);
                         });
 
@@ -101,7 +100,7 @@ class FleetController extends FleetOpsController
         $selections   = $request->array('selections');
         $fileName     = trim(Str::slug('fleets-' . date('Y-m-d-H:i')) . '.' . $format);
 
-        return Excel::download(new FleetExport($selections), $fileName);
+        return static::downloadExport(new FleetExport($selections), $fileName);
     }
 
     /**
@@ -113,21 +112,15 @@ class FleetController extends FleetOpsController
      */
     public static function removeDriver(FleetActionRequest $request)
     {
-        $fleet  = Fleet::where('uuid', $request->input('fleet'))->first();
-        $driver = Driver::where('uuid', $request->input('driver'))->first();
+        $fleet  = static::findFleetByUuid($request->input('fleet'));
+        $driver = static::findDriverByUuid($request->input('driver'));
 
         // check if driver is already in this fleet
-        $deleted = FleetDriver::where([
-            'fleet_uuid'  => $fleet->uuid,
-            'driver_uuid' => $driver->uuid,
-        ])->delete();
+        $deleted = static::deleteFleetDriverAssignment($fleet->uuid, $driver->uuid);
 
-        LiveCacheService::invalidate('operations-monitor');
+        static::invalidateOperationsMonitor();
 
-        return response()->json([
-            'status'  => 'ok',
-            'deleted' => $deleted,
-        ]);
+        return static::jsonResponse(static::removedAssignmentPayload($deleted));
     }
 
     /**
@@ -139,30 +132,20 @@ class FleetController extends FleetOpsController
      */
     public static function assignDriver(FleetActionRequest $request)
     {
-        $fleet  = Fleet::where('uuid', $request->input('fleet'))->first();
-        $driver = Driver::where('uuid', $request->input('driver'))->first();
+        $fleet  = static::findFleetByUuid($request->input('fleet'));
+        $driver = static::findDriverByUuid($request->input('driver'));
         $added  = false;
 
         // check if driver is already in this fleet
-        $exists = FleetDriver::where([
-            'fleet_uuid'  => $fleet->uuid,
-            'driver_uuid' => $driver->uuid,
-        ])->exists();
+        $exists = static::fleetDriverAssignmentExists($fleet->uuid, $driver->uuid);
 
         if (!$exists) {
-            $added = FleetDriver::create([
-                'fleet_uuid'  => $fleet->uuid,
-                'driver_uuid' => $driver->uuid,
-            ]);
+            $added = static::createFleetDriverAssignment($fleet->uuid, $driver->uuid);
         }
 
-        LiveCacheService::invalidate('operations-monitor');
+        static::invalidateOperationsMonitor();
 
-        return response()->json([
-            'status' => 'ok',
-            'exists' => $exists,
-            'added'  => (bool) $added,
-        ]);
+        return static::jsonResponse(static::assignmentPayload($exists, $added));
     }
 
     /**
@@ -174,21 +157,15 @@ class FleetController extends FleetOpsController
      */
     public static function removeVehicle(FleetActionRequest $request)
     {
-        $fleet   = Fleet::where('uuid', $request->input('fleet'))->first();
-        $vehicle = Vehicle::where('uuid', $request->input('vehicle'))->first();
+        $fleet   = static::findFleetByUuid($request->input('fleet'));
+        $vehicle = static::findVehicleByUuid($request->input('vehicle'));
 
         // check if vehicle is already in this fleet
-        $deleted = FleetVehicle::where([
-            'fleet_uuid'   => $fleet->uuid,
-            'vehicle_uuid' => $vehicle->uuid,
-        ])->delete();
+        $deleted = static::deleteFleetVehicleAssignment($fleet->uuid, $vehicle->uuid);
 
-        LiveCacheService::invalidate('operations-monitor');
+        static::invalidateOperationsMonitor();
 
-        return response()->json([
-            'status'  => 'ok',
-            'deleted' => $deleted,
-        ]);
+        return static::jsonResponse(static::removedAssignmentPayload($deleted));
     }
 
     /**
@@ -200,30 +177,20 @@ class FleetController extends FleetOpsController
      */
     public static function assignVehicle(FleetActionRequest $request)
     {
-        $fleet   = Fleet::where('uuid', $request->input('fleet'))->first();
-        $vehicle = Vehicle::where('uuid', $request->input('vehicle'))->first();
+        $fleet   = static::findFleetByUuid($request->input('fleet'));
+        $vehicle = static::findVehicleByUuid($request->input('vehicle'));
         $added   = false;
 
         // check if vehicle is already in this fleet
-        $exists = FleetVehicle::where([
-            'fleet_uuid'   => $fleet->uuid,
-            'vehicle_uuid' => $vehicle->uuid,
-        ])->exists();
+        $exists = static::fleetVehicleAssignmentExists($fleet->uuid, $vehicle->uuid);
 
         if (!$exists) {
-            $added = FleetVehicle::create([
-                'fleet_uuid'   => $fleet->uuid,
-                'vehicle_uuid' => $vehicle->uuid,
-            ]);
+            $added = static::createFleetVehicleAssignment($fleet->uuid, $vehicle->uuid);
         }
 
-        LiveCacheService::invalidate('operations-monitor');
+        static::invalidateOperationsMonitor();
 
-        return response()->json([
-            'status' => 'ok',
-            'exists' => $exists,
-            'added'  => (bool) $added,
-        ]);
+        return static::jsonResponse(static::assignmentPayload($exists, $added));
     }
 
     public function import(ImportRequest $request)
@@ -234,14 +201,124 @@ class FleetController extends FleetOpsController
 
         foreach ($files as $file) {
             try {
-                $import = new FleetImport();
-                Excel::import($import, $file->path, $disk);
+                $import = $this->createImport();
+                $this->importFile($import, $file->path, $disk);
                 $importedCount += $import->imported;
             } catch (\Throwable $e) {
                 return response()->error('Invalid file, unable to proccess.');
             }
         }
 
-        return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
+        return static::jsonResponse(static::importCompletedPayload($importedCount));
+    }
+
+    protected static function downloadExport(FleetExport $export, string $fileName)
+    {
+        return Excel::download($export, $fileName);
+    }
+
+    protected static function findFleetByUuid(string $uuid): ?Fleet
+    {
+        return Fleet::where('uuid', $uuid)->first();
+    }
+
+    protected static function findDriverByUuid(string $uuid): ?Driver
+    {
+        return Driver::where('uuid', $uuid)->first();
+    }
+
+    protected static function findVehicleByUuid(string $uuid): ?Vehicle
+    {
+        return Vehicle::where('uuid', $uuid)->first();
+    }
+
+    protected static function fleetDriverAssignmentExists(string $fleetUuid, string $driverUuid): bool
+    {
+        return FleetDriver::where([
+            'fleet_uuid'  => $fleetUuid,
+            'driver_uuid' => $driverUuid,
+        ])->exists();
+    }
+
+    protected static function createFleetDriverAssignment(string $fleetUuid, string $driverUuid): FleetDriver
+    {
+        return FleetDriver::create([
+            'fleet_uuid'  => $fleetUuid,
+            'driver_uuid' => $driverUuid,
+        ]);
+    }
+
+    protected static function deleteFleetDriverAssignment(string $fleetUuid, string $driverUuid): mixed
+    {
+        return FleetDriver::where([
+            'fleet_uuid'  => $fleetUuid,
+            'driver_uuid' => $driverUuid,
+        ])->delete();
+    }
+
+    protected static function fleetVehicleAssignmentExists(string $fleetUuid, string $vehicleUuid): bool
+    {
+        return FleetVehicle::where([
+            'fleet_uuid'   => $fleetUuid,
+            'vehicle_uuid' => $vehicleUuid,
+        ])->exists();
+    }
+
+    protected static function createFleetVehicleAssignment(string $fleetUuid, string $vehicleUuid): FleetVehicle
+    {
+        return FleetVehicle::create([
+            'fleet_uuid'   => $fleetUuid,
+            'vehicle_uuid' => $vehicleUuid,
+        ]);
+    }
+
+    protected static function deleteFleetVehicleAssignment(string $fleetUuid, string $vehicleUuid): mixed
+    {
+        return FleetVehicle::where([
+            'fleet_uuid'   => $fleetUuid,
+            'vehicle_uuid' => $vehicleUuid,
+        ])->delete();
+    }
+
+    protected static function invalidateOperationsMonitor(): void
+    {
+        LiveCacheService::invalidate('operations-monitor');
+    }
+
+    protected function createImport(): FleetImport
+    {
+        return new FleetImport();
+    }
+
+    protected function importFile(FleetImport $import, string $path, string $disk): void
+    {
+        Excel::import($import, $path, $disk);
+    }
+
+    protected static function jsonResponse(array $payload)
+    {
+        return response()->json($payload);
+    }
+
+    protected static function assignmentPayload(bool $exists, mixed $added): array
+    {
+        return [
+            'status' => 'ok',
+            'exists' => $exists,
+            'added'  => (bool) $added,
+        ];
+    }
+
+    protected static function removedAssignmentPayload(mixed $deleted): array
+    {
+        return [
+            'status'  => 'ok',
+            'deleted' => $deleted,
+        ];
+    }
+
+    protected static function importCompletedPayload(int $importedCount): array
+    {
+        return ['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount];
     }
 }

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

@@ -27,15 +27,9 @@ class FleetOpsLookupController extends Controller
         $type         = Str::lower(Arr::last($request->segments()));
         $resourceType = Str::lower(Str::singular($type));
 
-        $contacts = Contact::where('name', 'like', '%' . $query . '%')
-            ->where('company_uuid', session('company'))
-            ->limit($limit)
-            ->get();
+        $contacts = $this->searchContacts($query, $limit);
 
-        $vendors = Vendor::where('name', 'like', '%' . $query . '%')
-            ->where('company_uuid', session('company'))
-            ->limit($limit)
-            ->get();
+        $vendors = $this->searchVendors($query, $limit);
 
         $results = collect([...$contacts, ...$vendors])
             ->sortBy('name')
@@ -50,7 +44,7 @@ class FleetOpsLookupController extends Controller
 
         // insert integrated vendors if user has any
         if ($resourceType === 'facilitator') {
-            $integratedVendors = IntegratedVendor::where('company_uuid', session('company'))->get();
+            $integratedVendors = $this->integratedVendors();
 
             if ($integratedVendors->count()) {
                 $integratedVendors->each(
@@ -77,4 +71,25 @@ class FleetOpsLookupController extends Controller
 
         return response()->json([$type => $results]);
     }
+
+    protected function searchContacts(?string $query, int|string $limit)
+    {
+        return Contact::where('name', 'like', '%' . $query . '%')
+            ->where('company_uuid', session('company'))
+            ->limit($limit)
+            ->get();
+    }
+
+    protected function searchVendors(?string $query, int|string $limit)
+    {
+        return Vendor::where('name', 'like', '%' . $query . '%')
+            ->where('company_uuid', session('company'))
+            ->limit($limit)
+            ->get();
+    }
+
+    protected function integratedVendors()
+    {
+        return IntegratedVendor::where('company_uuid', session('company'))->get();
+    }
 }

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

@@ -43,7 +43,7 @@ class FuelReportController extends FleetOpsController
         $selections   = $request->array('selections');
         $fileName     = trim(Str::slug('fuel_report-' . date('Y-m-d-H:i')) . '.' . $format);
 
-        return Excel::download(new FuelReportExport($selections), $fileName);
+        return $this->downloadExport(new FuelReportExport($selections), $fileName);
     }
 
     public function import(ImportRequest $request)
@@ -54,8 +54,8 @@ class FuelReportController extends FleetOpsController
 
         foreach ($files as $file) {
             try {
-                $import = new FuelReportImport();
-                Excel::import($import, $file->path, $disk);
+                $import = $this->createImport();
+                $this->importFile($import, $file->path, $disk);
                 $importedCount += $import->imported;
             } catch (\Throwable $e) {
                 return response()->error('Invalid file, unable to proccess.');
@@ -64,4 +64,19 @@ class FuelReportController extends FleetOpsController
 
         return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
     }
+
+    protected function downloadExport(FuelReportExport $export, string $fileName)
+    {
+        return Excel::download($export, $fileName);
+    }
+
+    protected function createImport(): FuelReportImport
+    {
+        return new FuelReportImport();
+    }
+
+    protected function importFile(FuelReportImport $import, string $path, string $disk): void
+    {
+        Excel::import($import, $path, $disk);
+    }
 }

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

@@ -22,8 +22,11 @@ class GeocoderController extends Controller
         $query  = $request->or(['coordinates', 'query']);
         $single = $request->boolean('single');
 
-        /** @var \Fleetbase\LaravelMysqlSpatial\Types\Point $coordinates */
-        $coordinates = Utils::getPointFromCoordinates($query);
+        // Resolve strictly: getPointFromCoordinates() is typed `: Point` and
+        // falls back to Point(0, 0) for unusable input, which would silently
+        // reverse-geocode Null Island instead of reporting the bad request
+        /** @var \Fleetbase\LaravelMysqlSpatial\Types\Point|null $coordinates */
+        $coordinates = Utils::getPointFromCoordinatesStrict($query);
 
         // if not a valid point error
         if (!$coordinates instanceof \Fleetbase\LaravelMysqlSpatial\Types\Point) {
@@ -31,19 +34,19 @@ class GeocoderController extends Controller
         }
 
         // get results
-        $results = Geocoder::reverse($coordinates->getLat(), $coordinates->getLng())->get();
+        $results = $this->reverseGeocode($coordinates->getLat(), $coordinates->getLng());
 
         if ($results->count()) {
             if ($single) {
                 $googleAddress = $results->first();
 
-                return response()->json(Place::createFromGoogleAddress($googleAddress));
+                return response()->json($this->placeFromGoogleAddress($googleAddress));
             }
 
             return response()->json(
                 $results->map(
                     function ($googleAddress) {
-                        return Place::createFromGoogleAddress($googleAddress);
+                        return $this->placeFromGoogleAddress($googleAddress);
                     }
                 )
                     ->values()
@@ -71,19 +74,19 @@ class GeocoderController extends Controller
         }
 
         // lookup
-        $results = Geocoder::geocode($query)->get();
+        $results = $this->forwardGeocode($query);
 
         if ($results->count()) {
             if ($single) {
                 $googleAddress = $results->first();
 
-                return response()->json(Place::createFromGoogleAddress($googleAddress));
+                return response()->json($this->placeFromGoogleAddress($googleAddress));
             }
 
             return response()->json(
                 $results->map(
                     function ($googleAddress) {
-                        return Place::createFromGoogleAddress($googleAddress);
+                        return $this->placeFromGoogleAddress($googleAddress);
                     }
                 )
                     ->values()
@@ -93,4 +96,19 @@ class GeocoderController extends Controller
 
         return response()->json([]);
     }
+
+    protected function reverseGeocode(float $latitude, float $longitude)
+    {
+        return Geocoder::reverse($latitude, $longitude)->get();
+    }
+
+    protected function forwardGeocode(string $query)
+    {
+        return Geocoder::geocode($query)->get();
+    }
+
+    protected function placeFromGoogleAddress($googleAddress)
+    {
+        return Place::createFromGoogleAddress($googleAddress);
+    }
 }

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

@@ -10,8 +10,18 @@ class GettingStartedController extends Controller
 {
     public function status(Request $request)
     {
-        return response()->json(
-            GettingStarted::forCompany($request->user()->company)->get()
+        return $this->jsonResponse(
+            $this->getStatusForCompany($request->user()->company)
         );
     }
+
+    protected function getStatusForCompany($company): array
+    {
+        return GettingStarted::forCompany($company)->get();
+    }
+
+    protected function jsonResponse(array $payload)
+    {
+        return response()->json($payload);
+    }
 }

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

@@ -24,7 +24,7 @@ class IntegratedVendorController extends FleetOpsController
      */
     public function getSupported(Request $request)
     {
-        $supported = IntegratedVendors::all()->map(function ($vendor) {
+        $supported = $this->supportedIntegratedVendors()->map(function ($vendor) {
             return $vendor->toArray();
         });
 
@@ -41,18 +41,19 @@ class IntegratedVendorController extends FleetOpsController
         $ids = $request->input('ids', []);
 
         if (!$ids) {
-            return response()->error('Nothing to delete.');
+            return $this->errorResponse('Nothing to delete.');
         }
 
         /** @var \Fleetbase\Models\IntegratedVendor */
-        $count   = IntegratedVendor::whereIn('uuid', $ids)->count();
-        $deleted = IntegratedVendor::whereIn('uuid', $ids)->delete();
+        $query   = $this->integratedVendorQuery($ids);
+        $count   = $query->count();
+        $deleted = $query->delete();
 
         if (!$deleted) {
-            return response()->error('Failed to bulk delete vendors.');
+            return $this->errorResponse('Failed to bulk delete vendors.');
         }
 
-        return response()->json(
+        return $this->jsonResponse(
             [
                 'status'  => 'OK',
                 'message' => 'Deleted ' . $count . ' integrated vendors',
@@ -60,4 +61,24 @@ class IntegratedVendorController extends FleetOpsController
             200
         );
     }
+
+    protected function supportedIntegratedVendors()
+    {
+        return IntegratedVendors::all();
+    }
+
+    protected function integratedVendorQuery(array $ids)
+    {
+        return IntegratedVendor::whereIn('uuid', $ids);
+    }
+
+    protected function jsonResponse(array $payload, int $status = 200)
+    {
+        return response()->json($payload, $status);
+    }
+
+    protected function errorResponse(string $message)
+    {
+        return response()->error($message);
+    }
 }