@fleetbase/fleetops-engine 0.6.28 → 0.6.30

package/server/src/Models/Issue.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;
@@ -22,6 +23,7 @@ class Issue extends Model
     use TracksApiCredential;
     use SpatialTrait;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use HasCustomFields;
 
     /**

package/server/src/Models/Order.php

@@ -17,6 +17,7 @@ use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Models\Model;
 use Fleetbase\Models\Transaction;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasCustomFields;
 use Fleetbase\Traits\HasInternalId;
 use Fleetbase\Traits\HasMetaAttributes;
@@ -45,6 +46,7 @@ class Order extends Model
     use HasInternalId;
     use SendsWebhooks;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use HasOptionsAttributes;
     use HasMetaAttributes;
     use TracksApiCredential;
@@ -492,7 +494,7 @@ class Order extends Model
      */
     public function getFacilitatorIsVendorAttribute()
     {
-        return $this->facilitator_type === 'Fleetbase\\FleetOps\\Models\\Vendor';
+        return $this->facilitator_type === Vendor::class;
     }
 
     /**
@@ -502,7 +504,7 @@ class Order extends Model
      */
     public function getFacilitatorIsIntegratedVendorAttribute()
     {
-        return $this->facilitator_type === 'Fleetbase\\FleetOps\\Models\\IntegratedVendor';
+        return $this->facilitator_type === IntegratedVendor::class;
     }
 
     /**
@@ -512,7 +514,7 @@ class Order extends Model
      */
     public function getFacilitatorIsContactAttribute()
     {
-        return $this->facilitator_type === 'Fleetbase\\FleetOps\\Models\\Contact';
+        return $this->facilitator_type === Contact::class;
     }
 
     /**
@@ -522,7 +524,7 @@ class Order extends Model
      */
     public function getCustomerIsVendorAttribute()
     {
-        return $this->customer_type === 'Fleetbase\\FleetOps\\Models\\Vendor';
+        return $this->customer_type === Vendor::class;
     }
 
     /**
@@ -532,7 +534,7 @@ class Order extends Model
      */
     public function getCustomerIsContactAttribute()
     {
-        return $this->customer_type === 'Fleetbase\\FleetOps\\Models\\Contact';
+        return $this->customer_type === Contact::class;
     }
 
     /**
@@ -1830,6 +1832,11 @@ class Order extends Model
                 });
             })
             ->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/Place.php

@@ -12,6 +12,7 @@ use Fleetbase\LaravelMysqlSpatial\Types\Point as SpatialPoint;
 use Fleetbase\Models\File;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasCustomFields;
 use Fleetbase\Traits\HasMetaAttributes;
 use Fleetbase\Traits\HasPublicId;
@@ -28,6 +29,7 @@ class Place extends Model
     use HasUuid;
     use HasPublicId;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use Searchable;
     use SendsWebhooks;
     use TracksApiCredential;

package/server/src/Models/Position.php

@@ -6,6 +6,7 @@ use Fleetbase\Casts\PolymorphicType;
 use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\TracksApiCredential;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -16,6 +17,7 @@ class Position extends Model
     use HasUuid;
     use TracksApiCredential;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use SpatialTrait;
 
     /**

package/server/src/Models/ServiceArea.php

@@ -11,6 +11,7 @@ use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\LaravelMysqlSpatial\Types\Polygon;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasCustomFields;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
@@ -30,6 +31,7 @@ class ServiceArea extends Model
     use TracksApiCredential;
     use SpatialTrait;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use HasCustomFields;
 
     /**

package/server/src/Models/ServiceRate.php

@@ -238,7 +238,7 @@ class ServiceRate extends Model
      */
     public function isParcelService(): bool
     {
-        return $this->service_type === 'parcel';
+        return $this->rate_calculation_method === 'parcel';
     }
 
     /**
@@ -339,6 +339,8 @@ class ServiceRate extends Model
                 $updateableAttributes = collect($serviceRateFees[$i])->except(['uuid', 'created_at', 'updated_at'])->toArray();
 
                 if ($updateableAttributes) {
+                    // Apply casts before update
+                    $updateableAttributes = ServiceRateFee::onRowInsert($updateableAttributes);
                     ServiceRateFee::where('uuid', $id)->update($updateableAttributes);
                 }
 
@@ -377,6 +379,8 @@ class ServiceRate extends Model
                 $updateableAttributes = collect($serviceRateParcelFees[$i])->except(['uuid', 'created_at', 'updated_at'])->toArray();
 
                 if ($updateableAttributes) {
+                    // Apply casts before update
+                    $updateableAttributes = ServiceRateParcelFee::onRowInsert($updateableAttributes);
                     ServiceRateParcelFee::where('uuid', $id)->update($updateableAttributes);
                 }
 

package/server/src/Models/ServiceRateFee.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Models;
 
+use Fleetbase\Casts\Money;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasUuid;
@@ -41,7 +42,7 @@ class ServiceRateFee extends Model
     protected $casts = [
         'min'      => 'integer',
         'max'      => 'integer',
-        'fee'      => 'integer',
+        'fee'      => Money::class,
         'distance' => 'integer',
     ];
 
@@ -61,7 +62,7 @@ class ServiceRateFee extends Model
 
     public static function onRowInsert($row)
     {
-        $row['fee']      = Utils::numbersOnly($row['fee'] ?? null);
+        $row['fee']      = Money::apply($row['fee'] ?? 0);
         $row['distance'] = Utils::numbersOnly($row['distance'] ?? null);
         $row['min']      = Utils::numbersOnly($row['min'] ?? null);
         $row['max']      = Utils::numbersOnly($row['max'] ?? null);
@@ -69,21 +70,6 @@ class ServiceRateFee extends Model
         return $row;
     }
 
-    /**
-     * Set the fee as only numbers.
-     *
-     * @void
-     */
-    public function setFeeAttribute($value)
-    {
-        $this->attributes['fee'] = Utils::numbersOnly($value);
-    }
-
-    /**
-     * Set the distance as numbers only.
-     *
-     * @void
-     */
     public function setDistanceAttribute($value)
     {
         $this->attributes['distance'] = Utils::numbersOnly($value);

package/server/src/Models/ServiceRateParcelFee.php

@@ -3,7 +3,6 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Money;
-use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasUuid;
 use PhpUnitsOfMeasure\PhysicalQuantity\Length;
@@ -59,21 +58,11 @@ class ServiceRateParcelFee extends Model
 
     public static function onRowInsert($row)
     {
-        $row['fee'] = Utils::numbersOnly($row['fee']);
+        $row['fee'] = Money::apply($row['fee'] ?? 0);
 
         return $row;
     }
 
-    /**
-     * Set the fee as only numbers.
-     *
-     * @void
-     */
-    public function setFeeAttribute($value)
-    {
-        $this->attributes['fee'] = Utils::numbersOnly($value);
-    }
-
     /**
      * The length the entity belongs to.
      *

package/server/src/Models/Vehicle.php

@@ -13,6 +13,7 @@ use Fleetbase\Models\Category;
 use Fleetbase\Models\File;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasCustomFields;
 use Fleetbase\Traits\HasMetaAttributes;
 use Fleetbase\Traits\HasPublicId;
@@ -37,6 +38,7 @@ class Vehicle extends Model
     use HasPublicId;
     use TracksApiCredential;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use SpatialTrait;
     use Searchable;
     use HasSlug;

package/server/src/Models/Vendor.php

@@ -6,6 +6,7 @@ use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasCustomFields;
 use Fleetbase\Traits\HasInternalId;
 use Fleetbase\Traits\HasPublicId;
@@ -27,6 +28,7 @@ class Vendor extends Model
     use HasUuid;
     use HasPublicId;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use HasInternalId;
     use TracksApiCredential;
     use Searchable;

package/server/src/Models/Zone.php

@@ -10,6 +10,7 @@ use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\LaravelMysqlSpatial\Types\Polygon;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasCustomFields;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
@@ -25,6 +26,7 @@ class Zone extends Model
     use TracksApiCredential;
     use SpatialTrait;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use HasCustomFields;
 
     /**

package/server/src/Observers/DriverObserver.php

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Observers;
 
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Support\LiveCacheService;
 use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Models\User;
 
@@ -22,6 +23,26 @@ class DriverObserver
         }
     }
 
+    /**
+     * Handle the Driver "created" event.
+     *
+     * @return void
+     */
+    public function created(Driver $driver)
+    {
+        LiveCacheService::invalidate('drivers');
+    }
+
+    /**
+     * Handle the Driver "updated" event.
+     *
+     * @return void
+     */
+    public function updated(Driver $driver)
+    {
+        LiveCacheService::invalidate('drivers');
+    }
+
     /**
      * Handle the Driver "deleting" event.
      *
@@ -48,5 +69,7 @@ class DriverObserver
         if ($user && $user->hasRole('Driver')) {
             $user->delete();
         }
+
+        LiveCacheService::invalidate('drivers');
     }
 }

package/server/src/Observers/OrderObserver.php

@@ -3,9 +3,21 @@
 namespace Fleetbase\FleetOps\Observers;
 
 use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Support\LiveCacheService;
+use Illuminate\Support\Facades\Cache;
 
 class OrderObserver
 {
+    /**
+     * Handle the Order "created" event.
+     *
+     * @return void
+     */
+    public function created(Order $order)
+    {
+        $this->invalidateCache($order);
+    }
+
     /**
      * Handle the Order "updated" event.
      *
@@ -18,6 +30,8 @@ class OrderObserver
         if ($order->wasChanged('driver_assigned_uuid')) {
             $order->notifyDriverAssigned();
         }
+
+        $this->invalidateCache($order);
     }
 
     /**
@@ -30,5 +44,22 @@ class OrderObserver
         if ($order->isIntegratedVendorOrder()) {
             $order->facilitator->provider()->callback('onDeleted', $order);
         }
+
+        $this->invalidateCache($order);
+    }
+
+    /**
+     * Invalidate relevant cache tags for live endpoints.
+     *
+     * @param Order|null $order Optional order to invalidate specific tracker cache
+     */
+    protected function invalidateCache(?Order $order = null): void
+    {
+        LiveCacheService::invalidateMultiple(['orders', 'routes', 'coordinates']);
+
+        // Invalidate order-specific tracker cache if order is provided
+        if ($order && $order->uuid) {
+            Cache::forget("order:{$order->uuid}:tracker");
+        }
     }
 }

package/server/src/Observers/PlaceObserver.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Observers;
 
 use Fleetbase\FleetOps\Models\Place;
+use Fleetbase\FleetOps\Support\LiveCacheService;
 
 class PlaceObserver
 {
@@ -23,4 +24,34 @@ class PlaceObserver
             }
         }
     }
+
+    /**
+     * Handle the Place "created" event.
+     *
+     * @return void
+     */
+    public function created(Place $place)
+    {
+        LiveCacheService::invalidate('places');
+    }
+
+    /**
+     * Handle the Place "updated" event.
+     *
+     * @return void
+     */
+    public function updated(Place $place)
+    {
+        LiveCacheService::invalidate('places');
+    }
+
+    /**
+     * Handle the Place "deleted" event.
+     *
+     * @return void
+     */
+    public function deleted(Place $place)
+    {
+        LiveCacheService::invalidate('places');
+    }
 }

package/server/src/Observers/ServiceRateObserver.php

@@ -7,24 +7,6 @@ use Fleetbase\FleetOps\Support\Utils;
 
 class ServiceRateObserver
 {
-    /**
-     * Handle the ServiceRate "creating" event.
-     *
-     * @return void
-     */
-    public function creating(ServiceRate $serviceRate)
-    {
-        // convert these attributes to numbers only
-        $toNumbers = ['base_fee', 'per_km_flat_rate_fee', 'peak_hours_flat_fee', 'peak_hours_percent', 'cod_flat_fee', 'cod_percent'];
-
-        // convert to numbers for all attributes above
-        foreach ($toNumbers as $attribute) {
-            if (isset($serviceRate->{$attribute})) {
-                $serviceRate->{$attribute} = Utils::numbersOnly($serviceRate->{$attribute});
-            }
-        }
-    }
-
     /**
      * Handle the ServiceRate "created" event.
      *

package/server/src/Observers/VehicleObserver.php

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Observers;
 
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Vehicle;
+use Fleetbase\FleetOps\Support\LiveCacheService;
 
 class VehicleObserver
 {
@@ -28,6 +29,8 @@ class VehicleObserver
                 $vehicle->setRelation('driver', $driver);
             }
         }
+
+        LiveCacheService::invalidate('vehicles');
     }
 
     /**
@@ -51,6 +54,8 @@ class VehicleObserver
                 $vehicle->setRelation('driver', $driver);
             }
         }
+
+        LiveCacheService::invalidate('vehicles');
     }
 
     /**
@@ -62,5 +67,7 @@ class VehicleObserver
     {
         // Unassign the deleted vehicle from matching driver/(s)
         Driver::where(['vehicle_uuid' => $vehicle->uuid])->delete();
+
+        LiveCacheService::invalidate('vehicles');
     }
 }

package/server/src/Support/LiveCacheService.php

@@ -0,0 +1,165 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support;
+
+use Illuminate\Support\Facades\Cache;
+
+/**
+ * Service class to manage caching for LiveController endpoints.
+ */
+class LiveCacheService
+{
+    /**
+     * Default cache TTL in seconds (30 seconds).
+     */
+    public const DEFAULT_TTL = 30;
+
+    /**
+     * Generate a cache key for a specific endpoint and parameters.
+     * Includes version number for automatic invalidation.
+     *
+     * @param string $endpoint The endpoint name (e.g., 'orders', 'drivers')
+     * @param array  $params   Request parameters to include in the key
+     *
+     * @return string The generated cache key with version
+     */
+    public static function getCacheKey(string $endpoint, array $params = []): string
+    {
+        $company    = session('company');
+        $version    = static::getVersion($endpoint);
+        $paramsHash = md5(json_encode($params));
+
+        return "live:{$company}:{$endpoint}:v{$version}:{$paramsHash}";
+    }
+
+    /**
+     * Get the current version number for an endpoint.
+     *
+     * @param string $endpoint The endpoint name
+     *
+     * @return int The current version number
+     */
+    public static function getVersion(string $endpoint): int
+    {
+        $company    = session('company');
+        $versionKey = "live:{$company}:{$endpoint}:version";
+
+        return (int) Cache::get($versionKey, 0);
+    }
+
+    /**
+     * Increment the version number for an endpoint to invalidate all caches.
+     *
+     * @param string $endpoint The endpoint name
+     *
+     * @return int The new version number
+     */
+    public static function incrementVersion(string $endpoint): int
+    {
+        $company    = session('company');
+        $versionKey = "live:{$company}:{$endpoint}:version";
+
+        return Cache::increment($versionKey);
+    }
+
+    /**
+     * Get cache tags for the current company.
+     *
+     * @return array Array of cache tags
+     */
+    public static function getTags(): array
+    {
+        $company = session('company');
+
+        return ["live:{$company}"];
+    }
+
+    /**
+     * Get cache tags for a specific endpoint.
+     *
+     * @param string $endpoint The endpoint name
+     *
+     * @return array Array of cache tags including company and endpoint
+     */
+    public static function getEndpointTags(string $endpoint): array
+    {
+        $company = session('company');
+
+        return ["live:{$company}", "live:{$company}:{$endpoint}"];
+    }
+
+    /**
+     * Invalidate cache for a specific endpoint or all live endpoints.
+     * Uses version increment for cache driver compatibility.
+     *
+     * @param string|null $endpoint The endpoint to invalidate, or null for all
+     */
+    public static function invalidate(?string $endpoint = null): void
+    {
+        if ($endpoint) {
+            // Increment version to invalidate all caches for this endpoint
+            static::incrementVersion($endpoint);
+
+            // Also flush tags if supported (Redis/Memcached)
+            try {
+                Cache::tags(static::getEndpointTags($endpoint))->flush();
+            } catch (\Exception $e) {
+                // Tags not supported, version increment is sufficient
+            }
+        } else {
+            // Invalidate all endpoints
+            $endpoints = ['orders', 'routes', 'coordinates', 'drivers', 'vehicles', 'places'];
+            foreach ($endpoints as $ep) {
+                static::incrementVersion($ep);
+            }
+
+            // Also flush tags if supported
+            try {
+                Cache::tags(static::getTags())->flush();
+            } catch (\Exception $e) {
+                // Tags not supported, version increment is sufficient
+            }
+        }
+    }
+
+    /**
+     * Invalidate multiple endpoints at once.
+     *
+     * @param array $endpoints Array of endpoint names to invalidate
+     */
+    public static function invalidateMultiple(array $endpoints): void
+    {
+        // Increment versions for all endpoints
+        foreach ($endpoints as $endpoint) {
+            static::incrementVersion($endpoint);
+        }
+
+        // Also flush tags if supported
+        try {
+            foreach ($endpoints as $endpoint) {
+                Cache::tags(static::getEndpointTags($endpoint))->flush();
+            }
+        } catch (\Exception $e) {
+            // Tags not supported, version increment is sufficient
+        }
+    }
+
+    /**
+     * Remember a value in cache with tags.
+     *
+     * @param string   $endpoint The endpoint name
+     * @param array    $params   Request parameters
+     * @param \Closure $callback The callback to execute if cache miss
+     * @param int|null $ttl      Time to live in seconds (default: 30)
+     *
+     * @return mixed The cached or freshly computed value
+     */
+    public static function remember(string $endpoint, array $params, \Closure $callback, ?int $ttl = null)
+    {
+        $cacheKey = static::getCacheKey($endpoint, $params);
+        $tags     = static::getEndpointTags($endpoint);
+        $ttl      = $ttl ?? static::DEFAULT_TTL;
+
+        return Cache::tags($tags)->remember($cacheKey, $ttl, $callback);
+    }
+}