@fleetbase/fleetops-engine 0.6.28 → 0.6.30

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

@@ -0,0 +1,127 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1\Index;
+
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+/**
+ * Lightweight Order resource optimized for index/list views.
+ * This resource includes only the essential data needed to display orders in a table,
+ * significantly reducing payload size and improving response times.
+ */
+class Order 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),
+            'internal_id'          => $this->internal_id,
+            'company_uuid'         => $this->when($isInternal, $this->company_uuid),
+            'payload_uuid'         => $this->when($isInternal, $this->payload_uuid),
+            'driver_assigned_uuid' => $this->when($isInternal, $this->driver_assigned_uuid),
+            'vehicle_assigned_uuid'=> $this->when($isInternal, $this->vehicle_assigned_uuid),
+            'customer_uuid'        => $this->when($isInternal, $this->customer_uuid),
+            'customer_type'        => $this->when($isInternal, $this->customer_type),
+            'facilitator_uuid'     => $this->when($isInternal, $this->facilitator_uuid),
+            'facilitator_type'     => $this->when($isInternal, $this->facilitator_type),
+            'tracking_number_uuid' => $this->when($isInternal, $this->tracking_number_uuid),
+            'order_config_uuid'    => $this->when($isInternal, $this->order_config_uuid),
+            'tracking'             => $this->trackingNumber ? $this->trackingNumber->tracking_number : null,
+
+            // Minimal order config - only essential fields
+            'order_config'         => $this->when(
+                $isInternal,
+                $this->whenLoaded('orderConfig', function () {
+                    return [
+                        'id'   => $this->orderConfig->public_id,
+                        'name' => $this->orderConfig->name,
+                        'key'  => $this->orderConfig->key,
+                    ];
+                })
+            ),
+
+            // Lightweight customer
+            'customer'             => $this->whenLoaded('customer', function () {
+                $resource = new Customer($this->customer);
+                $data     = $resource->resolve();
+                data_set($data, 'type', 'customer');
+                data_set($data, 'customer_type', 'customer-' . Utils::toEmberResourceType($this->customer_type));
+
+                return $data;
+            }),
+
+            // Lightweight payload
+            'payload'              => $this->whenLoaded('payload', function () {
+                return new Payload($this->payload);
+            }),
+
+            // Lightweight facilitator
+            'facilitator'          => $this->whenLoaded('facilitator', function () {
+                $resource = new Facilitator($this->facilitator);
+                $data     = $resource->resolve();
+                data_set($data, 'type', 'facilitator');
+                data_set($data, 'facilitator_type', 'facilitator-' . Utils::toEmberResourceType($this->facilitator_type));
+
+                return $data;
+            }),
+
+            // Lightweight driver
+            'driver_assigned'      => $this->whenLoaded('driverAssigned', function () {
+                return new Driver($this->driverAssigned);
+            }),
+
+            // Lightweight vehicle
+            'vehicle_assigned'     => $this->whenLoaded('vehicleAssigned', function () {
+                return new Vehicle($this->vehicleAssigned);
+            }),
+
+            // Lightweight tracking number with QR code
+            'tracking_number'      => $this->whenLoaded('trackingNumber', function () {
+                return new TrackingNumber($this->trackingNumber);
+            }),
+
+            // Latest status only, not full array
+            'latest_status'        => $this->whenLoaded('trackingStatuses', function () {
+                $latest = $this->trackingStatuses->first();
+
+                return $latest ? $latest->status : 'created';
+            }),
+            'latest_status_code'   => $this->whenLoaded('trackingStatuses', function () {
+                $latest = $this->trackingStatuses->first();
+
+                return $latest ? $latest->code : null;
+            }),
+
+            // Essential scalar fields
+            'type'                 => $this->type,
+            'status'               => $this->status,
+            'adhoc'                => (bool) data_get($this, 'adhoc', false),
+            'dispatched'           => (bool) data_get($this, 'dispatched', false),
+            'has_driver_assigned'  => $this->when($isInternal, $this->has_driver_assigned),
+            'is_scheduled'         => $this->when($isInternal, $this->is_scheduled),
+
+            // Timestamps
+            'scheduled_at'         => $this->scheduled_at,
+            'dispatched_at'        => $this->dispatched_at,
+            'started_at'           => $this->started_at,
+            'created_at'           => $this->created_at,
+            'updated_at'           => $this->updated_at,
+
+            // Meta flag to indicate this is an index resource
+            'meta'                 => [
+                '_index_resource' => true,
+            ],
+        ];
+    }
+}

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

@@ -0,0 +1,57 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1\Index;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+/**
+ * Lightweight Payload resource for index views.
+ * Only includes essential pickup/dropoff information and entity count.
+ */
+class Payload 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),
+            'pickup_uuid'  => $this->when($isInternal, $this->pickup_uuid),
+            'dropoff_uuid' => $this->when($isInternal, $this->dropoff_uuid),
+            'return_uuid'  => $this->when($isInternal, $this->return_uuid),
+
+            // Minimal pickup - only what's displayed in the table
+            'pickup'     => $this->whenLoaded('pickup', function () {
+                return new Place($this->pickup);
+            }),
+
+            // Minimal dropoff - only what's displayed in the table
+            'dropoff'    => $this->whenLoaded('dropoff', function () {
+                return new Place($this->dropoff);
+            }),
+
+            // Entity count instead of full entities
+            'entities_count' => $this->whenLoaded('entities', function () {
+                return $this->entities->count();
+            }),
+
+            // Waypoint count instead of full waypoints
+            'waypoints_count' => $this->whenLoaded('waypoints', function () {
+                return $this->waypoints->count();
+            }),
+
+            'type'       => $this->type,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ];
+    }
+}

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

@@ -0,0 +1,45 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1\Index;
+
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+/**
+ * Lightweight Place resource for index views.
+ * Only includes name, address, and location coordinates.
+ */
+class Place 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),
+            'owner_uuid'   => $this->when($isInternal, $this->owner_uuid),
+            'owner_type'   => $this->when($isInternal, $this->owner_type),
+            'name'         => $this->name,
+            'address'      => $this->address,
+            'street1'      => $this->street1,
+            'city'         => $this->city,
+            'country'      => $this->country,
+            'avatar_url'   => $this->avatar_url,
+            'location'     => Utils::getPointFromMixed($this->location),
+
+            // Meta flag to indicate this is an index resource
+            'meta'         => [
+                '_index_resource' => true,
+            ],
+        ];
+    }
+}

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

@@ -0,0 +1,25 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1\Index;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+
+class TrackingNumber extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id'              => $this->when($this->id, $this->id),
+            'uuid'            => $this->when($this->uuid, $this->uuid),
+            'tracking_number' => $this->when($this->tracking_number, $this->tracking_number),
+            'qr_code'         => $this->when($this->qr_code, $this->qr_code),
+        ];
+    }
+}

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

@@ -0,0 +1,50 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1\Index;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\Support\Http;
+
+/**
+ * Lightweight Vehicle resource for index views.
+ * Only includes essential identification and display information.
+ */
+class Vehicle 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),
+            'vendor_uuid'     => $this->when($isInternal, $this->vendor_uuid),
+            'photo_uuid'      => $this->when($isInternal, $this->photo_uuid),
+            'display_name'    => $this->display_name,
+            'plate_number'    => $this->plate_number,
+            'make'            => $this->make,
+            'model'           => $this->model,
+            'year'            => $this->year,
+            'photo_url'       => $this->photo_url,
+            'status'          => $this->status,
+            'location'        => 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'          => (bool) data_get($this, 'online', false),
+
+            // Meta flag to indicate this is an index resource
+            'meta'            => [
+                '_index_resource' => true,
+            ],
+        ];
+    }
+}

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

@@ -7,7 +7,6 @@ use Fleetbase\Http\Resources\Comment;
 use Fleetbase\Http\Resources\File;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
-use Fleetbase\Support\Resolve;
 
 class Order extends FleetbaseResource
 {
@@ -19,15 +18,10 @@ class Order extends FleetbaseResource
     public function toArray($request): array
     {
         $isInternal = Http::isInternalRequest();
-        $isPublic   = Http::isPublicRequest();
 
         // Precompute expensive bits safely
         $orderConfigPublicId = data_get($this->orderConfig, 'public_id');
 
-        // Driver / vehicle relations (prevent eager noise)
-        $driverAssignedModel  = $this->driverAssigned()->without(['jobs', 'currentJob'])->first();
-        $vehicleAssignedModel = $this->vehicleAssigned()->without(['fleets', 'vendor'])->first();
-
         // Tracker helpers (avoid calling ->tracker() twice)
         $withTrackerData = $request->has('with_tracker_data') || !empty($this->resource->tracker_data);
         $withEta         = $request->has('with_eta') || !empty($this->resource->eta);
@@ -41,9 +35,9 @@ class Order extends FleetbaseResource
             'company_uuid'         => $this->when($isInternal, $this->company_uuid),
             'transaction_uuid'     => $this->when($isInternal, $this->transaction_uuid),
             'customer_uuid'        => $this->when($isInternal, $this->customer_uuid),
-            'customer_type'        => $this->when($isInternal, $this->customer_type),
+            'customer_type'        => $this->when($isInternal, $this->customer_type ? Utils::toEmberResourceType($this->customer_type) : null),
             'facilitator_uuid'     => $this->when($isInternal, $this->facilitator_uuid),
-            'facilitator_type'     => $this->when($isInternal, $this->facilitator_type),
+            'facilitator_type'     => $this->when($isInternal, $this->facilitator_type ? Utils::toEmberResourceType($this->facilitator_type) : null),
             'payload_uuid'         => $this->when($isInternal, $this->payload_uuid),
             'route_uuid'           => $this->when($isInternal, $this->route_uuid),
             'purchase_rate_uuid'   => $this->when($isInternal, $this->purchase_rate_uuid),
@@ -61,11 +55,19 @@ class Order extends FleetbaseResource
                 }),
                 $orderConfigPublicId
             ),
-            'customer'             => $this->setCustomerType(Resolve::resourceForMorph($this->customer_type, $this->customer_uuid)),
+            'customer'             => $this->whenLoaded('customer', function () {
+                return $this->setCustomerType($this->transformMorphResource($this->customer));
+            }),
             'payload'              => new Payload($this->payload),
-            'facilitator'          => $this->setFacilitatorType(Resolve::resourceForMorph($this->facilitator_type, $this->facilitator_uuid)),
-            'driver_assigned'      => new Driver($driverAssignedModel),
-            'vehicle_assigned'     => new Vehicle($vehicleAssignedModel),
+            'facilitator'          => $this->whenLoaded('facilitator', function () {
+                return $this->setFacilitatorType($this->transformMorphResource($this->facilitator));
+            }),
+            'driver_assigned'      => $this->whenLoaded('driverAssigned', function () {
+                return new Driver($this->driverAssigned);
+            }),
+            'vehicle_assigned'     => $this->whenLoaded('vehicleAssigned', function () {
+                return new Vehicle($this->vehicleAssigned);
+            }),
             'tracking_number'      => new TrackingNumber($this->trackingNumber),
             'tracking_statuses'    => $this->whenLoaded('trackingStatuses', function () {
                 return TrackingStatus::collection($this->trackingStatuses);
@@ -139,6 +141,31 @@ class Order extends FleetbaseResource
         return $resolved;
     }
 
+    /**
+     * Transform a polymorphic relationship into its appropriate resource.
+     * This method dynamically resolves the resource class based on the model type.
+     *
+     * @param \Illuminate\Database\Eloquent\Model|null $model
+     *
+     * @return array|null
+     */
+    protected function transformMorphResource($model)
+    {
+        if (!$model) {
+            return null;
+        }
+
+        // Use Find to get the appropriate resource class for this model
+        $resourceClass = \Fleetbase\Support\Find::httpResourceForModel($model);
+
+        if ($resourceClass) {
+            return (new $resourceClass($model))->resolve();
+        }
+
+        // Fallback to generic resource
+        return (new \Illuminate\Http\Resources\Json\JsonResource($model))->resolve();
+    }
+
     /**
      * Transform the resource into an webhook payload.
      *
@@ -149,9 +176,9 @@ class Order extends FleetbaseResource
         return [
             'id'              => $this->public_id,
             'internal_id'     => $this->internal_id,
-            'customer'        => Resolve::resourceForMorph($this->customer_type, $this->customer_uuid),
+            'customer'        => $this->transformMorphResource($this->customer),
             'payload'         => new Payload($this->payload),
-            'facilitator'     => Resolve::resourceForMorph($this->facilitator_type, $this->facilitator_uuid),
+            'facilitator'     => $this->transformMorphResource($this->facilitator),
             'driver_assigned' => new Driver($this->driverAssigned),
             'tracking_number' => new TrackingNumber($this->trackingNumber),
             'purchase_rate'   => new PurchaseRate($this->purchaseRate),

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

@@ -26,7 +26,7 @@ class Place extends FleetbaseResource
             'public_id'             => $this->when(Http::isInternalRequest(), $this->public_id),
             'company_uuid'          => $this->when(Http::isInternalRequest(), $this->company_uuid),
             'owner_uuid'            => $this->when(Http::isInternalRequest(), $this->owner_uuid),
-            'owner_type'            => $this->when(Http::isInternalRequest(), $this->owner_type),
+            'owner_type'            => $this->when(Http::isInternalRequest(), $this->owner_type ? Utils::toEmberResourceType($this->owner_type) : null),
             'name'                  => $this->name,
             'location'              => Utils::getPointFromMixed($this->location),
             'address'               => $this->address,

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

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
+use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
@@ -26,7 +27,7 @@ class Position extends FleetbaseResource
             'company_uuid'                    => $this->when(Http::isInternalRequest(), $this->company_uuid),
             'destination_uuid'                => $this->when(Http::isInternalRequest(), $this->destination_uuid),
             'subject_uuid'                    => $this->when(Http::isInternalRequest(), $this->subject_uuid),
-            'subject_type'                    => $this->subject_type,
+            'subject_type'                    => $this->subject_type ? Utils::toEmberResourceType($this->subject_type) : null,
             'subject'                         => $this->whenLoaded('subject', fn () => Resolve::httpResourceForModel($this->subject)),
             'order'                           => $this->whenLoaded('order', fn () => new Order($this->order)),
             'destination'                     => $this->whenLoaded('destination', fn () => new Place($this->destination)),

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

@@ -45,8 +45,8 @@ class ServiceRate extends FleetbaseResource
             'per_meter_unit'                                => $this->per_meter_unit,
             'max_distance_unit'                             => $this->max_distance_unit,
             'max_distance'                                  => $this->max_distance,
-            'meter_fees'                                    => ServiceRateFee::collection($this->rateFees ?? []),
-            'parcel_fees'                                   => ServiceRateParcelFee::collection($this->rateFees ?? []),
+            'rate_fees'                                     => ServiceRateFee::collection($this->rateFees ?? []),
+            'parcel_fees'                                   => ServiceRateParcelFee::collection($this->parcelFees ?? []),
             'algorithm'                                     => $this->algorithm,
             'has_cod_fee'                                   => Utils::castBoolean($this->has_cod_fee),
             'cod_calculation_method'                        => $this->cod_calculation_method,
@@ -82,8 +82,8 @@ class ServiceRate extends FleetbaseResource
             'base_fee'                      => $this->base_fee,
             'rate_calculation_method'       => $this->rate_calculation_method,
             'per_km_flat_rate_fee'          => $this->per_km_flat_rate_fee,
-            'meter_fees'                    => ServiceRateFee::collection($this->rateFees ?? []),
-            'parcel_fees'                   => ServiceRateParcelFee::collection($this->rateFees ?? []),
+            'rate_fees'                     => ServiceRateFee::collection($this->rateFees ?? []),
+            'parcel_fees'                   => ServiceRateParcelFee::collection($this->parcelFees ?? []),
             'algorithm'                     => $this->algorithm,
             'has_cod_fee'                   => Utils::castBoolean($this->has_cod_fee),
             'cod_calculation_method'        => $this->cod_calculation_method,

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

@@ -17,18 +17,18 @@ class ServiceRateFee extends FleetbaseResource
     public function toArray($request)
     {
         return [
-            'id'              => $this->when(Http::isInternalRequest(), $this->id),
-            'uuid'            => $this->when(Http::isInternalRequest(), $this->uuid),
-            'fee'             => $this->fee,
-            'currency'        => $this->currency,
-            'size'            => $this->size,
-            'length'          => $this->length,
-            'height'          => $this->height,
-            'dimensions_unit' => $this->dimensions_unit,
-            'weight'          => $this->weight,
-            'weight_unit'     => $this->weight_unit,
-            'updated_at'      => $this->updated_at,
-            'created_at'      => $this->created_at,
+            'id'                      => $this->when(Http::isInternalRequest(), $this->id),
+            'uuid'                    => $this->when(Http::isInternalRequest(), $this->uuid),
+            'service_rate_uuid'       => $this->when(Http::isInternalRequest(), $this->service_rate_uuid),
+            'fee'                     => $this->fee,
+            'currency'                => $this->currency,
+            'min'                     => $this->min,
+            'max'                     => $this->max,
+            'unit'                    => $this->unit,
+            'distance'                => $this->distance,
+            'distance_unit'           => $this->distance_unit,
+            'updated_at'              => $this->updated_at,
+            'created_at'              => $this->created_at,
         ];
     }
 

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

@@ -17,13 +17,20 @@ class ServiceRateParcelFee extends FleetbaseResource
     public function toArray($request)
     {
         return [
-            'id'         => $this->when(Http::isInternalRequest(), $this->id),
-            'uuid'       => $this->when(Http::isInternalRequest(), $this->uuid),
-            'fee'        => $this->fee,
-            'currency'   => $this->currency,
-            'distance'   => $this->distance,
-            'updated_at' => $this->updated_at,
-            'created_at' => $this->created_at,
+            'id'                      => $this->when(Http::isInternalRequest(), $this->id),
+            'uuid'                    => $this->when(Http::isInternalRequest(), $this->uuid),
+            'service_rate_uuid'       => $this->when(Http::isInternalRequest(), $this->service_rate_uuid),
+            'fee'                     => $this->fee,
+            'currency'                => $this->currency,
+            'size'                    => $this->size,
+            'length'                  => $this->length,
+            'width'                   => $this->width,
+            'height'                  => $this->height,
+            'dimensions_unit'         => $this->dimensions_unit,
+            'weight'                  => $this->weight,
+            'weight_unit'             => $this->weight_unit,
+            'updated_at'              => $this->updated_at,
+            'created_at'              => $this->created_at,
         ];
     }
 

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

@@ -23,7 +23,7 @@ class TrackingNumber extends FleetbaseResource
             'public_id'       => $this->when(Http::isInternalRequest(), $this->public_id),
             'status_uuid'     => $this->when(Http::isInternalRequest(), $this->status_uuid),
             'owner_uuid'      => $this->when(Http::isInternalRequest(), $this->owner_uuid),
-            'owner_type'      => $this->when(Http::isInternalRequest(), $this->owner_type),
+            'owner_type'      => $this->when(Http::isInternalRequest(), $this->owner_type ? Utils::toEmberResourceType($this->owner_type) : null),
             'tracking_number' => $this->tracking_number,
             'subject'         => Utils::get($this->owner, 'public_id'),
             'region'          => $this->region,

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

@@ -33,7 +33,7 @@ class Waypoint extends FleetbaseResource
             'public_id'              => $this->when(Http::isInternalRequest(), $this->public_id),
             'waypoint_public_id'     => $this->when(Http::isInternalRequest(), $waypoint->public_id),
             'customer_uuid'          => $this->when(Http::isInternalRequest(), $waypoint->customer_uuid),
-            'customer_type'          => $this->when(Http::isInternalRequest(), $waypoint->customer_type),
+            'customer_type'          => $this->when(Http::isInternalRequest(), $waypoint->customer_type ? Utils::toEmberResourceType($waypoint->customer_type) : null),
             'order'                  => $waypoint->order,
             'tracking'               => $waypoint->tracking,
             'status'                 => $waypoint->status,

package/server/src/Listeners/HandleOrderDispatched.php

@@ -79,6 +79,11 @@ class HandleOrderDispatched implements ShouldQueue
                     });
                 })
                 ->whereNull('deleted_at')
+                ->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)
+            ')
                 ->distanceSphere('location', $pickup, $distance)
                 ->distanceSphereValue('location', $pickup)
                 ->withoutGlobalScopes()

package/server/src/Models/Contact.php

@@ -10,6 +10,7 @@ use Fleetbase\Models\Model;
 use Fleetbase\Models\User;
 use Fleetbase\Notifications\UserInvited;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasCustomFields;
 use Fleetbase\Traits\HasInternalId;
 use Fleetbase\Traits\HasMetaAttributes;
@@ -34,6 +35,7 @@ class Contact extends Model
     use HasUuid;
     use HasPublicId;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use HasMetaAttributes;
     use HasInternalId;
     use TracksApiCredential;

package/server/src/Models/Device.php

@@ -11,6 +11,7 @@ use Fleetbase\Models\File;
 use Fleetbase\Models\Model;
 use Fleetbase\Models\User;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasCustomFields;
 use Fleetbase\Traits\HasMetaAttributes;
 use Fleetbase\Traits\HasPublicId;
@@ -39,6 +40,7 @@ class Device extends Model
     use HasPublicId;
     use TracksApiCredential;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use HasSlug;
     use LogsActivity;
     use HasMetaAttributes;

package/server/src/Models/DeviceEvent.php

@@ -8,6 +8,7 @@ use Fleetbase\Models\Company;
 use Fleetbase\Models\Model;
 use Fleetbase\Models\User;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasMetaAttributes;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
@@ -30,6 +31,7 @@ class DeviceEvent extends Model
     use HasPublicId;
     use TracksApiCredential;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use LogsActivity;
     use HasMetaAttributes;
     use Searchable;

package/server/src/Models/Driver.php

@@ -13,6 +13,7 @@ use Fleetbase\Models\File;
 use Fleetbase\Models\Model;
 use Fleetbase\Models\User;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasCustomFields;
 use Fleetbase\Traits\HasInternalId;
 use Fleetbase\Traits\HasPublicId;
@@ -43,6 +44,7 @@ class Driver extends Model
     use HasInternalId;
     use TracksApiCredential;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use Notifiable;
     use SendsWebhooks;
     use SpatialTrait;

package/server/src/Models/FuelReport.php

@@ -9,6 +9,7 @@ use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Models\User;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasCustomFields;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
@@ -21,6 +22,7 @@ class FuelReport extends Model
     use TracksApiCredential;
     use HasPublicId;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use SpatialTrait;
     use Searchable;
     use HasCustomFields;