@fleetbase/fleetops-engine 0.6.29 → 0.6.30

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

@@ -4,14 +4,15 @@ namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
 use Fleetbase\FleetOps\Http\Filter\PlaceFilter;
 use Fleetbase\FleetOps\Http\Resources\v1\Driver as DriverResource;
-use Fleetbase\FleetOps\Http\Resources\v1\Order as OrderResource;
-use Fleetbase\FleetOps\Http\Resources\v1\Place as PlaceResource;
-use Fleetbase\FleetOps\Http\Resources\v1\Vehicle as VehicleResource;
+use Fleetbase\FleetOps\Http\Resources\v1\Index\Order as OrderIndexResource;
+use Fleetbase\FleetOps\Http\Resources\v1\Index\Place as PlaceIndexResource;
+use Fleetbase\FleetOps\Http\Resources\v1\Index\Vehicle as VehicleIndexResource;
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\FleetOps\Models\Route;
 use Fleetbase\FleetOps\Models\Vehicle;
+use Fleetbase\FleetOps\Support\LiveCacheService;
 use Fleetbase\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
@@ -27,20 +28,23 @@ class LiveController extends Controller
      */
     public function coordinates()
     {
-        $coordinates = [];
+        return LiveCacheService::remember('coordinates', [], function () {
+            $coordinates = [];
 
-        // Fetch active orders for the current company
-        $orders = Order::where('company_uuid', session('company'))
-            ->whereNotIn('status', ['canceled', 'completed'])
-            ->applyDirectivesForPermissions('fleet-ops list order')
-            ->get();
+            // Fetch active orders for the current company
+            $orders = Order::where('company_uuid', session('company'))
+                ->whereNotIn('status', ['canceled', 'completed'])
+                ->with(['payload.dropoff', 'payload.pickup'])
+                ->applyDirectivesForPermissions('fleet-ops list order')
+                ->get();
 
-        // Loop through each order to get its current destination location
-        foreach ($orders as $order) {
-            $coordinates[] = $order->getCurrentDestinationLocation();
-        }
+            // Loop through each order to get its current destination location
+            foreach ($orders as $order) {
+                $coordinates[] = $order->getCurrentDestinationLocation();
+            }
 
-        return response()->json($coordinates);
+            return response()->json($coordinates);
+        });
     }
 
     /**
@@ -50,31 +54,34 @@ class LiveController extends Controller
      */
     public function routes()
     {
-        // Fetch routes that are not canceled or completed and have an assigned driver
-        $routes = Route::where('company_uuid', session('company'))
-            ->whereHas(
-                'order',
-                function ($q) {
-                    $q->whereNotIn('status', ['canceled', 'completed', 'expired']);
-                    $q->whereNotNull('driver_assigned_uuid');
-                    $q->whereNull('deleted_at');
-                    $q->whereHas('trackingNumber');
-                    $q->whereHas('trackingStatuses');
-                    $q->whereHas('payload', function ($query) {
-                        $query->where(
-                            function ($q) {
-                                $q->whereHas('waypoints');
-                                $q->orWhereHas('pickup');
-                                $q->orWhereHas('dropoff');
-                            }
-                        );
-                    });
-                }
-            )
-            ->applyDirectivesForPermissions('fleet-ops list route')
-            ->get();
-
-        return response()->json($routes);
+        return LiveCacheService::remember('routes', [], function () {
+            // Fetch routes that are not canceled or completed and have an assigned driver
+            $routes = Route::where('company_uuid', session('company'))
+                ->whereHas(
+                    'order',
+                    function ($q) {
+                        $q->whereNotIn('status', ['canceled', 'completed', 'expired']);
+                        $q->whereNotNull('driver_assigned_uuid');
+                        $q->whereNull('deleted_at');
+                        $q->whereHas('trackingNumber');
+                        $q->whereHas('trackingStatuses');
+                        $q->whereHas('payload', function ($query) {
+                            $query->where(
+                                function ($q) {
+                                    $q->whereHas('waypoints');
+                                    $q->orWhereHas('pickup');
+                                    $q->orWhereHas('dropoff');
+                                }
+                            );
+                        });
+                    }
+                )
+                ->with(['order.payload', 'order.trackingNumber', 'order.trackingStatuses', 'order.driverAssigned'])
+                ->applyDirectivesForPermissions('fleet-ops list route')
+                ->get();
+
+            return response()->json($routes);
+        });
     }
 
     /**
@@ -84,11 +91,19 @@ class LiveController extends Controller
      */
     public function orders(Request $request)
     {
-        $exclude    = $request->array('exclude');
-        $active     = $request->boolean('active');
-        $unassigned = $request->boolean('unassigned');
+        $exclude     = $request->array('exclude');
+        $active      = $request->boolean('active');
+        $unassigned  = $request->boolean('unassigned');
+
+        // Cache key includes all parameters that affect the query
+        $cacheParams = [
+            'exclude'      => $exclude,
+            'active'       => $active,
+            'unassigned'   => $unassigned,
+        ];
 
-        $query = Order::where('company_uuid', session('company'))
+        return LiveCacheService::remember('orders', $cacheParams, function () use ($exclude, $active, $unassigned) {
+            $query = Order::where('company_uuid', session('company'))
             ->whereHas('payload', function ($query) {
                 $query->where(
                     function ($q) {
@@ -97,7 +112,6 @@ class LiveController extends Controller
                         $q->orWhereHas('dropoff');
                     }
                 );
-                $query->with(['entities', 'waypoints', 'dropoff', 'pickup', 'return']);
             })
             ->whereNotIn('status', ['canceled', 'completed', 'expired'])
             ->whereHas('trackingNumber')
@@ -105,35 +119,39 @@ class LiveController extends Controller
             ->whereNotIn('public_id', $exclude)
             ->whereNull('deleted_at')
             ->applyDirectivesForPermissions('fleet-ops list order')
-            ->with(['payload', 'trackingNumber', 'trackingStatuses']);
-
-        if ($active) {
-            $query->whereHas('driverAssigned');
-        }
-
-        if ($unassigned) {
-            $query->whereNull('driver_assigned_uuid');
-        }
+            ->with([
+                'payload.entities',
+                'payload.waypoints',
+                'payload.dropoff',
+                'payload.pickup',
+                'payload.return',
+                'trackingNumber',
+                'trackingStatuses',
+                'driverAssigned' => function ($query) {
+                    $query->without(['jobs', 'currentJob']);
+                },
+                'vehicleAssigned' => function ($query) {
+                    $query->without(['fleets', 'vendor']);
+                },
+                'customer',
+                'facilitator',
+            ]);
 
-        $orders = $query->get();
+            if ($active) {
+                $query->whereHas('driverAssigned');
+            }
 
-        // Get additional data or load missing if necessary
-        $orders->map(
-            function ($order) use ($request) {
-                // load required relations
-                $order->loadMissing(['trackingNumber', 'payload', 'trackingStatuses']);
+            if ($unassigned) {
+                $query->whereNull('driver_assigned_uuid');
+            }
 
-                // load tracker data
-                if ($request->has('with_tracker_data')) {
-                    $order->tracker_data = $order->tracker()->toArray();
-                    $order->eta          = $order->tracker()->eta();
-                }
+            $query->limit(60); // max 60 latest
+            $query->latest();
 
-                return $order;
-            }
-        );
+            $orders = $query->get();
 
-        return OrderResource::collection($orders);
+            return OrderIndexResource::collection($orders);
+        });
     }
 
     /**
@@ -141,13 +159,40 @@ class LiveController extends Controller
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function drivers()
+    public function drivers(Request $request)
     {
-        $drivers = Driver::where(['company_uuid' => session('company')])
-            ->applyDirectivesForPermissions('fleet-ops list driver')
-            ->get();
+        $bounds      = $request->input('bounds'); // Map viewport bounds: [south, west, north, east]
+        $cacheParams = ['bounds' => $bounds];
+
+        return LiveCacheService::remember('drivers', $cacheParams, function () use ($bounds) {
+            $query = Driver::where(['company_uuid' => session('company')])
+                ->with(['user', 'vehicle', 'currentJob'])
+                ->applyDirectivesForPermissions('fleet-ops list driver');
+
+            // Filter out drivers with invalid coordinates
+            $query->whereNotNull('location')
+                ->whereRaw('
+                    ST_Y(location) BETWEEN -90 AND 90
+                    AND ST_X(location) BETWEEN -180 AND 180
+                    AND NOT (ST_X(location) = 0 AND ST_Y(location) = 0)
+                ');
+
+            // Apply spatial filtering if bounds are provided
+            if ($bounds && is_array($bounds) && count($bounds) === 4) {
+                [$south, $west, $north, $east] = $bounds;
+
+                // Use MySQL spatial functions for POINT column
+                // ST_Within checks if location is within the bounding box
+                $query->whereRaw(
+                    'ST_Within(location, ST_MakeEnvelope(POINT(?, ?), POINT(?, ?)))',
+                    [$west, $south, $east, $north]
+                );
+            }
+
+            $drivers = $query->get();
 
-        return DriverResource::collection($drivers);
+            return DriverResource::collection($drivers);
+        });
     }
 
     /**
@@ -155,15 +200,41 @@ class LiveController extends Controller
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function vehicles()
+    public function vehicles(Request $request)
     {
-        // Fetch vehicles that are online
-        $vehicles = Vehicle::where(['company_uuid' => session('company')])
-            ->with(['devices'])
-            ->applyDirectivesForPermissions('fleet-ops list vehicle')
-            ->get();
+        $bounds      = $request->input('bounds'); // Map viewport bounds: [south, west, north, east]
+        $cacheParams = ['bounds' => $bounds];
+
+        return LiveCacheService::remember('vehicles', $cacheParams, function () use ($bounds) {
+            // Fetch vehicles that are online
+            $query = Vehicle::where(['company_uuid' => session('company')])
+                ->with(['devices', 'driver'])
+                ->applyDirectivesForPermissions('fleet-ops list vehicle');
+
+            // Filter out vehicles with invalid coordinates
+            $query->whereNotNull('location')
+                ->whereRaw('
+                    ST_Y(location) BETWEEN -90 AND 90
+                    AND ST_X(location) BETWEEN -180 AND 180
+                    AND NOT (ST_X(location) = 0 AND ST_Y(location) = 0)
+                ');
+
+            // Apply spatial filtering if bounds are provided
+            if ($bounds && is_array($bounds) && count($bounds) === 4) {
+                [$south, $west, $north, $east] = $bounds;
+
+                // Use MySQL spatial functions for POINT column
+                // ST_Within checks if location is within the bounding box
+                $query->whereRaw(
+                    'ST_Within(location, ST_MakeEnvelope(POINT(?, ?), POINT(?, ?)))',
+                    [$west, $south, $east, $north]
+                );
+            }
 
-        return VehicleResource::collection($vehicles);
+            $vehicles = $query->get();
+
+            return VehicleIndexResource::collection($vehicles);
+        });
     }
 
     /**
@@ -173,12 +244,39 @@ class LiveController extends Controller
      */
     public function places(Request $request)
     {
-        // Query places based on filters
-        $places = Place::where(['company_uuid' => session('company')])
-            ->filter(new PlaceFilter($request))
-            ->applyDirectivesForPermissions('fleet-ops list place')
-            ->get();
+        // Cache key includes filter parameters
+        $cacheParams = $request->only(['query', 'type', 'country', 'limit', 'bounds']);
+
+        return LiveCacheService::remember('places', $cacheParams, function () use ($request) {
+            // Query places based on filters
+            $query = Place::where(['company_uuid' => session('company')])
+                ->filter(new PlaceFilter($request))
+                ->applyDirectivesForPermissions('fleet-ops list place');
+
+            // Filter out places with invalid coordinates
+            $query->whereNotNull('location')
+                ->whereRaw('
+                    ST_Y(location) BETWEEN -90 AND 90
+                    AND ST_X(location) BETWEEN -180 AND 180
+                    AND NOT (ST_X(location) = 0 AND ST_Y(location) = 0)
+                ');
+
+            // Apply spatial filtering if bounds are provided
+            $bounds = $request->input('bounds');
+            if ($bounds && is_array($bounds) && count($bounds) === 4) {
+                [$south, $west, $north, $east] = $bounds;
+
+                // Use MySQL spatial functions for POINT column
+                // ST_Within checks if location is within the bounding box
+                $query->whereRaw(
+                    'ST_Within(location, ST_MakeEnvelope(POINT(?, ?), POINT(?, ?)))',
+                    [$west, $south, $east, $north]
+                );
+            }
+
+            $places = $query->get();
 
-        return PlaceResource::collection($places);
+            return PlaceIndexResource::collection($places);
+        });
     }
 }

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

@@ -12,6 +12,7 @@ use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Http\Requests\BulkDispatchRequest;
 use Fleetbase\FleetOps\Http\Requests\CancelOrderRequest;
 use Fleetbase\FleetOps\Http\Requests\Internal\CreateOrderRequest;
+use Fleetbase\FleetOps\Http\Resources\v1\Index\Order as OrderIndexResource;
 use Fleetbase\FleetOps\Http\Resources\v1\Order as OrderResource;
 use Fleetbase\FleetOps\Http\Resources\v1\Proof as ProofResource;
 use Fleetbase\FleetOps\Imports\OrdersImport;
@@ -36,6 +37,7 @@ use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
@@ -50,6 +52,13 @@ class OrderController extends FleetOpsController
      */
     public $resource = 'order';
 
+    /**
+     * The lightweight resource for index/list views.
+     *
+     * @var string
+     */
+    public $indexResource = OrderIndexResource::class;
+
     /**
      * Handle order waypoint changes if any.
      */
@@ -760,7 +769,11 @@ class OrderController extends FleetOpsController
             return response()->error('No order found.');
         }
 
-        $trackerInfo = $order->tracker()->toArray();
+        // Cache tracker data for 30 seconds with order-specific key
+        $cacheKey    = "order:{$order->uuid}:tracker";
+        $trackerInfo = Cache::remember($cacheKey, 30, function () use ($order) {
+            return $order->tracker()->toArray();
+        });
 
         return response()->json($trackerInfo);
     }

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

@@ -56,6 +56,11 @@ class PlaceController extends FleetOpsController
 
         if ($latitude && $longitude) {
             $point = new Point($latitude, $longitude);
+            $query->whereNotNull('location')->whereRaw('
+                ST_Y(location) BETWEEN -90 AND 90
+                AND ST_X(location) BETWEEN -180 AND 180
+                AND NOT (ST_X(location) = 0 AND ST_Y(location) = 0)
+            ');
             $query->orderByDistanceSphere('location', $point, 'asc');
         } else {
             $query->orderBy('name', 'desc');

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

@@ -169,6 +169,11 @@ class DriverFilter extends Filter
         if (Utils::isCoordinates($nearby)) {
             $location = Utils::getPointFromMixed($nearby);
 
+            $this->builder->whereNotNull('location')->whereRaw('
+                ST_Y(location) BETWEEN -90 AND 90
+                AND ST_X(location) BETWEEN -180 AND 180
+                AND NOT (ST_X(location) = 0 AND ST_Y(location) = 0)
+            ');
             $this->builder->distanceSphere('location', $location, $distance);
             $this->builder->distanceSphereValue('location', $location);
 
@@ -181,6 +186,11 @@ class DriverFilter extends Filter
             $place = Place::createFromMixed($nearby, [], false);
 
             if ($nearby instanceof Place) {
+                $this->builder->whereNotNull('location')->whereRaw('
+                ST_Y(location) BETWEEN -90 AND 90
+                AND ST_X(location) BETWEEN -180 AND 180
+                AND NOT (ST_X(location) = 0 AND ST_Y(location) = 0)
+            ');
                 $this->builder->distanceSphere('location', $place->location, $distance);
                 $this->builder->distanceSphereValue('location', $place->location);
 

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

@@ -50,7 +50,14 @@ class OrderFilter extends Filter
             'payload.return',
             'trackingNumber',
             'trackingStatuses',
-            'driverAssigned',
+            'driverAssigned' => function ($query) {
+                $query->without(['jobs', 'currentJob']);
+            },
+            'vehicleAssigned' => function ($query) {
+                $query->without(['fleets', 'vendor']);
+            },
+            'customer',
+            'facilitator',
         ]);
     }
 

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

@@ -42,8 +42,8 @@ class Contact extends FleetbaseResource
             'address'                       => $this->when(Http::isInternalRequest(), data_get($this, 'place.address')),
             'address_street'                => $this->when(Http::isInternalRequest(), data_get($this, 'place.street1')),
             'type'                          => $this->type ?? null,
-            'customer_type'                 => $this->when(isset($this->customer_type), $this->customer_type),
-            'facilitator_type'              => $this->when(isset($this->facilitator_type), $this->facilitator_type),
+            'customer_type'                 => $this->when(isset($this->customer_type), Utils::toEmberResourceType($this->customer_type)),
+            'facilitator_type'              => $this->when(isset($this->facilitator_type), Utils::toEmberResourceType($this->facilitator_type)),
             'meta'                          => data_get($this, 'meta', Utils::createObject()),
             'slug'                          => $this->slug ?? null,
             'updated_at'                    => $this->updated_at,

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

@@ -24,7 +24,7 @@ class Entity extends FleetbaseResource
             'photo_uuid'        => $this->when(Http::isInternalRequest(), $this->photo_uuid),
             'public_id'         => $this->when(Http::isInternalRequest(), $this->public_id),
             'customer_uuid'     => $this->when(Http::isInternalRequest(), $this->customer_uuid),
-            'customer_type'     => $this->when(Http::isInternalRequest(), $this->customer_type),
+            'customer_type'     => $this->when(Http::isInternalRequest(), $this->customer_type ? Utils::toEmberResourceType($this->customer_type) : null),
             'supplier_uuid'     => $this->when(Http::isInternalRequest(), $this->supplier_uuid),
             'destination_uuid'  => $this->when(Http::isInternalRequest(), $this->destination_uuid),
             'payload_uuid'      => $this->when(Http::isInternalRequest(), $this->payload_uuid),

package/server/src/Http/Resources/v1/Index/Customer.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1\Index;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+/**
+ * Lightweight Customer resource for index views.
+ * Handles polymorphic customer types (Contact, Vendor, etc.) with minimal data.
+ */
+class Customer extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     */
+    public function toArray($request): array
+    {
+        $isInternal = Http::isInternalRequest();
+
+        return [
+            'id'           => $this->when($isInternal, $this->id, $this->public_id),
+            'uuid'         => $this->when($isInternal, $this->uuid),
+            'public_id'    => $this->when($isInternal, $this->public_id),
+            'company_uuid' => $this->when($isInternal, $this->company_uuid),
+            'name'         => $this->name,
+            'phone'        => $this->phone ?? null,
+            'email'        => $this->email ?? null,
+        ];
+    }
+}

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

@@ -0,0 +1,45 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1\Index;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\Support\Http;
+
+/**
+ * Lightweight Driver resource for index views.
+ * Only includes essential identification and display information.
+ */
+class Driver extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     */
+    public function toArray($request): array
+    {
+        $isInternal = Http::isInternalRequest();
+
+        return [
+            'id'              => $this->when($isInternal, $this->id, $this->public_id),
+            'uuid'            => $this->when($isInternal, $this->uuid),
+            'public_id'       => $this->when($isInternal, $this->public_id),
+            'company_uuid'    => $this->when($isInternal, $this->company_uuid),
+            'user_uuid'       => $this->when($isInternal, $this->user_uuid),
+            'vehicle_uuid'    => $this->when($isInternal, $this->vehicle_uuid),
+            'vendor_uuid'     => $this->when($isInternal, $this->vendor_uuid),
+            'current_job_uuid'=> $this->when($isInternal, $this->current_job_uuid),
+            'name'            => $this->name,
+            'vehicle_name'    => $this->when($isInternal, $this->vehicle_name),
+            'phone'           => $this->phone,
+            'photo_url'       => $this->photo_url,
+            'status'          => $this->status,
+            'location'        => $this->wasRecentlyCreated ? new Point(0, 0) : data_get($this, 'location', new Point(0, 0)),
+            'heading'         => (int) data_get($this, 'heading', 0),
+            'altitude'        => (int) data_get($this, 'altitude', 0),
+            'speed'           => (int) data_get($this, 'speed', 0),
+            'online'          => data_get($this, 'online', false),
+        ];
+    }
+}

package/server/src/Http/Resources/v1/Index/Facilitator.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1\Index;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+/**
+ * Lightweight Facilitator resource for index views.
+ * Handles polymorphic facilitator types (Contact, Vendor, IntegratedVendor) with minimal data.
+ */
+class Facilitator extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     */
+    public function toArray($request): array
+    {
+        $isInternal = Http::isInternalRequest();
+
+        return [
+            'id'           => $this->when($isInternal, $this->id, $this->public_id),
+            'uuid'         => $this->when($isInternal, $this->uuid),
+            'public_id'    => $this->when($isInternal, $this->public_id),
+            'company_uuid' => $this->when($isInternal, $this->company_uuid),
+            'name'         => $this->name,
+            'phone'        => $this->phone ?? null,
+            'email'        => $this->email ?? null,
+        ];
+    }
+}