@fleetbase/fleetops-engine 0.3.4 → 0.3.5

package/server/migrations/2023_04_27_053456_create_issues_table.php

@@ -19,10 +19,10 @@ return new class extends Migration
             $table->string('uuid', 191)->nullable()->index();
             $table->string('public_id', 191)->nullable()->unique();
             $table->string('issue_id', 191)->nullable()->unique();
-            $table->string('company_uuid', 191)->nullable()->index();
-            $table->string('driver_uuid', 191)->nullable()->index('issues_driver_uuid_foreign');
-            $table->string('vehicle_uuid', 191)->nullable()->index('issues_vehicle_uuid_foreign');
-            $table->string('assigned_to_uuid', 191)->nullable()->index('issues_assigned_to_uuid_foreign');
+            $table->uuid('company_uuid')->nullable()->index();
+            $table->uuid('driver_uuid')->nullable()->index('issues_driver_uuid_foreign');
+            $table->uuid('vehicle_uuid')->nullable()->index('issues_vehicle_uuid_foreign');
+            $table->uuid('assigned_to_uuid')->nullable()->index('issues_assigned_to_uuid_foreign');
             $table->string('odometer')->nullable();
             $table->point('location');
             $table->string('latitude')->nullable();

package/server/migrations/2023_04_27_053456_create_orders_table.php

@@ -18,21 +18,21 @@ return new class extends Migration
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->unique();
             $table->string('public_id', 191)->nullable()->unique();
-            $table->string('company_uuid', 191)->nullable()->index();
+            $table->uuid('company_uuid')->nullable()->index();
             $table->char('created_by_uuid', 36)->nullable()->index();
             $table->char('updated_by_uuid', 36)->nullable()->index();
             $table->string('internal_id')->nullable();
-            $table->string('customer_uuid', 191)->nullable()->index();
+            $table->uuid('customer_uuid')->nullable()->index();
             $table->string('customer_type')->nullable();
             $table->string('facilitator_uuid')->nullable();
             $table->string('facilitator_type')->nullable();
-            $table->string('session_uuid', 191)->nullable()->index('orders_session_uuid_foreign');
-            $table->string('payload_uuid', 191)->nullable()->index('orders_payload_uuid_foreign');
+            $table->uuid('session_uuid')->nullable()->index('orders_session_uuid_foreign');
+            $table->uuid('payload_uuid')->nullable()->index('orders_payload_uuid_foreign');
             $table->char('route_uuid', 36)->nullable()->index('orders_route_uuid_foreign');
-            $table->string('transaction_uuid', 191)->nullable()->index('orders_transaction_uuid_foreign');
-            $table->string('purchase_rate_uuid', 191)->nullable()->index('orders_purchase_rate_uuid_foreign');
-            $table->string('tracking_number_uuid', 191)->nullable()->index('orders_tracking_number_uuid_foreign');
-            $table->string('driver_assigned_uuid', 191)->nullable()->index('orders_driver_assigned_uuid_foreign');
+            $table->uuid('transaction_uuid')->nullable()->index('orders_transaction_uuid_foreign');
+            $table->uuid('purchase_rate_uuid')->nullable()->index('orders_purchase_rate_uuid_foreign');
+            $table->uuid('tracking_number_uuid')->nullable()->index('orders_tracking_number_uuid_foreign');
+            $table->uuid('driver_assigned_uuid')->nullable()->index('orders_driver_assigned_uuid_foreign');
             $table->json('meta')->nullable();
             $table->json('options')->nullable();
             $table->boolean('dispatched')->default(false);

package/server/migrations/2023_04_27_053456_create_payloads_table.php

@@ -18,11 +18,11 @@ return new class extends Migration
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
             $table->string('public_id', 191)->nullable()->index();
-            $table->string('company_uuid', 191)->nullable()->index();
-            $table->string('pickup_uuid', 191)->nullable()->index('payloads_from_place_uuid_index');
-            $table->string('dropoff_uuid', 191)->nullable()->index('payloads_to_place_uuid_index');
-            $table->string('return_uuid', 191)->nullable()->index('payloads_return_uuid_foreign');
-            $table->string('current_waypoint_uuid', 191)->nullable()->index();
+            $table->uuid('company_uuid')->nullable()->index();
+            $table->uuid('pickup_uuid')->nullable()->index('payloads_from_place_uuid_index');
+            $table->uuid('dropoff_uuid')->nullable()->index('payloads_to_place_uuid_index');
+            $table->uuid('return_uuid')->nullable()->index('payloads_return_uuid_foreign');
+            $table->uuid('current_waypoint_uuid')->nullable()->index();
             $table->string('provider', 191)->nullable()->index();
             $table->string('payment_method')->nullable();
             $table->integer('cod_amount')->nullable();

package/server/migrations/2023_04_27_053456_create_places_table.php

@@ -19,7 +19,7 @@ return new class extends Migration
             $table->string('uuid', 191)->nullable()->unique();
             $table->string('public_id', 191)->nullable()->unique();
             $table->string('_import_id', 191)->nullable()->index();
-            $table->string('company_uuid', 191)->nullable()->index();
+            $table->uuid('company_uuid')->nullable()->index();
             $table->char('owner_uuid', 36)->nullable()->index();
             $table->string('owner_type')->nullable();
             $table->string('name')->nullable();

package/server/migrations/2023_04_27_053456_create_purchase_rates_table.php

@@ -21,10 +21,10 @@ return new class extends Migration
             $table->json('meta')->nullable();
             $table->string('customer_uuid')->nullable();
             $table->string('customer_type')->nullable();
-            $table->string('company_uuid', 191)->nullable()->index('purchase_rates_company_uuid_foreign');
-            $table->string('transaction_uuid', 191)->nullable()->index('purchase_rates_transaction_uuid_foreign');
-            $table->string('service_quote_uuid', 191)->nullable()->index('purchase_rates_service_quote_uuid_foreign');
-            $table->string('payload_uuid', 191)->nullable()->index('purchase_rates_payload_uuid_foreign');
+            $table->uuid('company_uuid')->nullable()->index('purchase_rates_company_uuid_foreign');
+            $table->uuid('transaction_uuid')->nullable()->index('purchase_rates_transaction_uuid_foreign');
+            $table->uuid('service_quote_uuid')->nullable()->index('purchase_rates_service_quote_uuid_foreign');
+            $table->uuid('payload_uuid')->nullable()->index('purchase_rates_payload_uuid_foreign');
             $table->string('status')->nullable();
             $table->softDeletes();
             $table->timestamp('created_at')->nullable()->index();

package/server/migrations/2023_04_27_053456_create_service_areas_table.php

@@ -18,14 +18,14 @@ return new class extends Migration
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
             $table->string('public_id', 191)->nullable()->unique();
-            $table->string('company_uuid', 191)->nullable()->index('service_areas_company_uuid_foreign');
+            $table->uuid('company_uuid')->nullable()->index('service_areas_company_uuid_foreign');
             $table->string('name')->nullable();
             $table->string('type')->nullable();
             $table->string('country')->nullable();
             $table->multiPolygon('border')->nullable();
             $table->string('color')->nullable();
             $table->string('stroke_color')->nullable();
-            $table->string('parent_uuid', 191)->nullable()->index('service_areas_parent_uuid_foreign');
+            $table->uuid('parent_uuid')->nullable()->index('service_areas_parent_uuid_foreign');
             $table->string('status')->nullable();
             $table->softDeletes();
             $table->timestamp('created_at')->nullable()->index();

package/server/migrations/2023_04_27_053456_create_service_quote_items_table.php

@@ -17,7 +17,7 @@ return new class extends Migration
             $table->increments('id');
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
-            $table->string('service_quote_uuid', 191)->nullable()->index();
+            $table->uuid('service_quote_uuid')->nullable()->index();
             $table->string('amount')->nullable();
             $table->string('currency')->nullable();
             $table->string('details')->nullable();

package/server/migrations/2023_04_27_053456_create_service_quotes_table.php

@@ -19,9 +19,9 @@ return new class extends Migration
             $table->string('uuid', 191)->nullable()->index();
             $table->string('public_id', 191)->nullable()->unique();
             $table->string('request_id', 191)->nullable()->index('service_quotes_request_id_foreign');
-            $table->string('company_uuid', 191)->nullable()->index('service_quotes_company_uuid_foreign');
-            $table->string('payload_uuid', 191)->nullable()->index('service_quotes_payload_uuid_foreign');
-            $table->string('service_rate_uuid', 191)->nullable()->index();
+            $table->uuid('company_uuid')->nullable()->index('service_quotes_company_uuid_foreign');
+            $table->uuid('payload_uuid')->nullable()->index('service_quotes_payload_uuid_foreign');
+            $table->uuid('service_rate_uuid')->nullable()->index();
             $table->integer('amount')->nullable();
             $table->string('currency')->nullable();
             $table->json('meta')->nullable();

package/server/migrations/2023_04_27_053456_create_service_rate_fees_table.php

@@ -17,7 +17,7 @@ return new class extends Migration
             $table->increments('id');
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
-            $table->string('service_rate_uuid', 191)->nullable()->index();
+            $table->uuid('service_rate_uuid')->nullable()->index();
             $table->integer('distance')->nullable();
             $table->integer('min')->nullable();
             $table->integer('max')->nullable();

package/server/migrations/2023_04_27_053456_create_service_rate_parcel_fees_table.php

@@ -17,7 +17,7 @@ return new class extends Migration
             $table->increments('id');
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
-            $table->string('service_rate_uuid', 191)->nullable()->index();
+            $table->uuid('service_rate_uuid')->nullable()->index();
             $table->string('size')->nullable();
             $table->string('length')->nullable();
             $table->string('width')->nullable();

package/server/migrations/2023_04_27_053456_create_service_rates_table.php

@@ -18,9 +18,9 @@ return new class extends Migration
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
             $table->string('public_id', 191)->nullable()->unique();
-            $table->string('company_uuid', 191)->nullable()->index();
-            $table->string('service_area_uuid', 191)->nullable()->index();
-            $table->string('zone_uuid', 191)->nullable()->index();
+            $table->uuid('company_uuid')->nullable()->index();
+            $table->uuid('service_area_uuid')->nullable()->index();
+            $table->uuid('zone_uuid')->nullable()->index();
             $table->string('service_name')->nullable();
             $table->string('service_type', 191)->nullable()->index();
             $table->integer('base_fee')->default(0)->nullable();

package/server/migrations/2023_04_27_053456_create_tracking_numbers_table.php

@@ -18,10 +18,10 @@ return new class extends Migration
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
             $table->string('public_id', 191)->nullable()->unique();
-            $table->string('company_uuid', 191)->nullable()->index();
-            $table->string('owner_uuid', 191)->nullable()->index('tracking_numbers_owner_uuid_foreign');
+            $table->uuid('company_uuid')->nullable()->index();
+            $table->uuid('owner_uuid')->nullable()->index('tracking_numbers_owner_uuid_foreign');
             $table->string('owner_type')->nullable();
-            $table->string('status_uuid', 191)->nullable()->index('tracking_numbers_status_uuid_foreign');
+            $table->uuid('status_uuid')->nullable()->index('tracking_numbers_status_uuid_foreign');
             $table->string('tracking_number', 191)->nullable()->index();
             $table->string('region')->nullable();
             $table->mediumText('qr_code')->nullable();

package/server/migrations/2023_04_27_053456_create_tracking_statuses_table.php

@@ -18,8 +18,8 @@ return new class extends Migration
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
             $table->string('public_id', 191)->nullable()->index();
-            $table->string('company_uuid', 191)->nullable()->index('tracking_statuses_company_uuid_foreign');
-            $table->string('tracking_number_uuid', 191)->nullable()->index('tracking_statuses_tracking_number_uuid_foreign');
+            $table->uuid('company_uuid')->nullable()->index('tracking_statuses_company_uuid_foreign');
+            $table->uuid('tracking_number_uuid')->nullable()->index('tracking_statuses_tracking_number_uuid_foreign');
             $table->char('proof_uuid', 36)->nullable();
             $table->json('meta')->nullable();
             $table->string('status', 191)->nullable()->index();

package/server/migrations/2023_04_27_053456_create_vehicles_table.php

@@ -18,9 +18,9 @@ return new class extends Migration
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
             $table->string('public_id', 191)->nullable()->index();
-            $table->string('company_uuid', 191)->nullable()->index();
-            $table->string('vendor_uuid', 191)->nullable()->index('vehicles_vendor_uuid_foreign');
-            $table->string('photo_uuid', 191)->nullable()->index('vehicles_photo_uuid_foreign');
+            $table->uuid('company_uuid')->nullable()->index();
+            $table->uuid('vendor_uuid')->nullable()->index('vehicles_vendor_uuid_foreign');
+            $table->uuid('photo_uuid')->nullable()->index('vehicles_photo_uuid_foreign');
             $table->string('avatar_url', 300)->nullable();
             $table->string('make', 191)->nullable()->index();
             $table->string('model', 191)->nullable()->index();

package/server/migrations/2023_04_27_053456_create_vendors_table.php

@@ -18,11 +18,11 @@ return new class extends Migration
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
             $table->string('public_id', 191)->nullable()->unique();
-            $table->string('company_uuid', 191)->nullable()->index();
-            $table->string('place_uuid', 191)->nullable()->index('vendors_place_uuid_foreign');
-            $table->string('type_uuid', 191)->nullable()->index('vendors_type_uuid_foreign');
-            $table->string('connect_company_uuid', 191)->nullable()->index('vendors_connect_company_uuid_foreign');
-            $table->string('logo_uuid', 191)->nullable()->index('vendors_logo_uuid_foreign');
+            $table->uuid('company_uuid')->nullable()->index();
+            $table->uuid('place_uuid')->nullable()->index('vendors_place_uuid_foreign');
+            $table->uuid('type_uuid')->nullable()->index('vendors_type_uuid_foreign');
+            $table->uuid('connect_company_uuid')->nullable()->index('vendors_connect_company_uuid_foreign');
+            $table->uuid('logo_uuid')->nullable()->index('vendors_logo_uuid_foreign');
             $table->string('name')->nullable();
             $table->string('internal_id', 191)->nullable()->index();
             $table->string('business_id')->nullable();

package/server/migrations/2023_04_27_053456_create_waypoints_table.php

@@ -18,10 +18,10 @@ return new class extends Migration
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
             $table->string('public_id')->nullable();
-            $table->string('company_uuid', 191)->nullable()->index('waypoints_company_uuid_foreign');
-            $table->string('place_uuid', 191)->nullable()->index('waypoints_place_uuid_foreign');
-            $table->string('payload_uuid', 191)->nullable()->index('waypoints_payload_uuid_foreign');
-            $table->string('tracking_number_uuid', 191)->nullable()->index();
+            $table->uuid('company_uuid')->nullable()->index('waypoints_company_uuid_foreign');
+            $table->uuid('place_uuid')->nullable()->index('waypoints_place_uuid_foreign');
+            $table->uuid('payload_uuid')->nullable()->index('waypoints_payload_uuid_foreign');
+            $table->uuid('tracking_number_uuid')->nullable()->index();
             $table->string('_import_id', 191)->nullable()->index();
             $table->string('type')->nullable();
             $table->integer('order')->nullable();

package/server/migrations/2023_04_27_053456_create_zones_table.php

@@ -18,8 +18,8 @@ return new class extends Migration
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
             $table->string('public_id', 191)->nullable()->unique();
-            $table->string('company_uuid', 191)->nullable()->index('zones_company_uuid_foreign');
-            $table->string('service_area_uuid', 191)->nullable()->index();
+            $table->uuid('company_uuid')->nullable()->index('zones_company_uuid_foreign');
+            $table->uuid('service_area_uuid')->nullable()->index();
             $table->string('name')->nullable();
             $table->mediumText('description')->nullable();
             $table->polygon('border')->nullable();

package/server/migrations/2023_11_17_053001_add_category_uuid_to_entities_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddCategoryUuidToEntitiesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('entities', function (Blueprint $table) {
+            $table->foreignUuid('category_uuid')->nullable()->after('photo_uuid')->references('uuid')->on('categories');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('entities', function (Blueprint $table) {
+            $table->dropForeign(['category_uuid']);
+            $table->dropColumn(['category_uuid']);
+        });
+    }
+}

package/server/src/Http/Controllers/Api/v1/EntityController.php

@@ -41,6 +41,7 @@ class EntityController extends Controller
             'sku',
             'currency',
             'meta',
+            'supplier_uuid',
         ]);
 
         // payload assignment
@@ -126,6 +127,7 @@ class EntityController extends Controller
             'sku',
             'currency',
             'meta',
+            'supplier_uuid',
         ]);
 
         // payload assignment

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

@@ -13,7 +13,6 @@ use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Models\Invite;
 use Fleetbase\Models\User;
 use Fleetbase\Notifications\UserInvited;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;

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

@@ -17,23 +17,25 @@ class Fleet extends FleetbaseResource
     public function toArray($request)
     {
         return [
-            'id'                   => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid'                 => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id'            => $this->when(Http::isInternalRequest(), $this->public_id),
-            'name'                 => $this->name,
-            'task'                 => $this->task ?? null,
-            'status'               => $this->status ?? null,
-            'drivers_count'        => $this->when(Http::isInternalRequest(), $this->drivers_count),
-            'drivers_online_count' => $this->when(Http::isInternalRequest(), $this->drivers_online_count),
-            'service_area'         => $this->whenLoaded('serviceArea', new ServiceArea($this->serviceArea)),
-            'zone'                 => $this->whenLoaded('zone', new Zone($this->zone)),
-            'vendor'               => $this->whenLoaded('vendor', new Vendor($this->vendor)),
-            'parent_fleet'         => $this->whenLoaded('parentFleet', new ParentFleet($this->parentFleet)),
-            'subfleets'            => $this->whenLoaded('subFleets', SubFleet::collection($this->subFleets)),
-            'drivers'              => $this->whenLoaded('drivers', Driver::collection($this->drivers()->without(['driverAssigned'])->with(Http::isInternalRequest() ? ['jobs'] : [])->get())),
-            'vehicles'             => $this->whenLoaded('vehicles', Vehicle::collection($this->vehicles)),
-            'updated_at'           => $this->updated_at,
-            'created_at'           => $this->created_at,
+            'id'                    => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                  => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'             => $this->when(Http::isInternalRequest(), $this->public_id),
+            'name'                  => $this->name,
+            'task'                  => $this->task ?? null,
+            'status'                => $this->status ?? null,
+            'drivers_count'         => $this->when(Http::isInternalRequest(), $this->drivers_count),
+            'drivers_online_count'  => $this->when(Http::isInternalRequest(), $this->drivers_online_count),
+            'vehicles_count'        => $this->when(Http::isInternalRequest(), $this->vehicles_count),
+            'vehicles_online_count' => $this->when(Http::isInternalRequest(), $this->vehicles_online_count),
+            'service_area'          => $this->whenLoaded('serviceArea', new ServiceArea($this->serviceArea)),
+            'zone'                  => $this->whenLoaded('zone', new Zone($this->zone)),
+            'vendor'                => $this->whenLoaded('vendor', new Vendor($this->vendor)),
+            'parent_fleet'          => $this->whenLoaded('parentFleet', new ParentFleet($this->parentFleet)),
+            'subfleets'             => $this->whenLoaded('subFleets', SubFleet::collection($this->subFleets)),
+            'drivers'               => $this->whenLoaded('drivers', Driver::collection($this->drivers()->without(['driverAssigned'])->with(Http::isInternalRequest() ? ['jobs'] : [])->get())),
+            'vehicles'              => $this->whenLoaded('vehicles', Vehicle::collection($this->vehicles)),
+            'updated_at'            => $this->updated_at,
+            'created_at'            => $this->created_at,
         ];
     }
 

package/server/src/Models/Driver.php

@@ -18,6 +18,7 @@ use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
 use Spatie\Activitylog\Traits\CausesActivity;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Spatie\Sluggable\HasSlug;
@@ -546,4 +547,19 @@ class Driver extends Model
 
         return $position;
     }
+
+    /**
+     * Get the user relationship from the driver.
+     */
+    public function getUser(): ?\Fleetbase\Models\User
+    {
+        // get user
+        $user = $this->load(['user'])->user;
+
+        if (empty($user) && Str::isUuid($this->user_uuid)) {
+            $user = \Fleetbase\Models\User::where('uuid', $this->user_uuid)->first();
+        }
+
+        return $user;
+    }
 }

package/server/src/Models/Entity.php

@@ -68,6 +68,7 @@ class Entity extends Model
         'customer_type',
         'tracking_number_uuid',
         'destination_uuid',
+        'supplier_uuid',
         'photo_uuid',
         '_import_id',
         'internal_id',
@@ -160,9 +161,7 @@ class Entity extends Model
     }
 
     /**
-     * Photo of entity belongs to.
-     *
-     * @var Model
+     * @var \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function photo()
     {
@@ -170,9 +169,7 @@ class Entity extends Model
     }
 
     /**
-     * Files assosciated with entity.
-     *
-     * @var Model
+     * @var \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function files()
     {
@@ -180,7 +177,7 @@ class Entity extends Model
     }
 
     /**
-     * The proofs for this order.
+     * @var \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function proofs()
     {
@@ -188,9 +185,7 @@ class Entity extends Model
     }
 
     /**
-     * The entity destination.
-     *
-     * @var Model
+     * @var \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function destination()
     {
@@ -198,9 +193,7 @@ class Entity extends Model
     }
 
     /**
-     * Payload entity belongs to.
-     *
-     * @var Model
+     * @var \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function payload()
     {
@@ -208,9 +201,15 @@ class Entity extends Model
     }
 
     /**
-     * Driver assigned to order.
-     *
-     * @var Model
+     * @var \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function supplier()
+    {
+        return $this->belongsTo(Vendor::class, 'supplier_uuid');
+    }
+
+    /**
+     * @var \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function driver()
     {
@@ -218,9 +217,7 @@ class Entity extends Model
     }
 
     /**
-     * The company who manages this order.
-     *
-     * @var Model
+     * @var \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function company()
     {
@@ -228,7 +225,7 @@ class Entity extends Model
     }
 
     /**
-     * The tracking number assosicated to the entity.
+     * @var \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function trackingNumber()
     {
@@ -236,9 +233,7 @@ class Entity extends Model
     }
 
     /**
-     * The customer of this order.
-     *
-     * @var Model
+     * @var \Illuminate\Database\Eloquent\Relations\MorphTo
      */
     public function customer()
     {

package/server/src/Models/Vehicle.php

@@ -7,6 +7,7 @@ use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasMetaAttributes;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\Searchable;
@@ -27,6 +28,7 @@ class Vehicle extends Model
     use Searchable;
     use HasSlug;
     use LogsActivity;
+    use HasMetaAttributes;
 
     /**
      * The database table used by the model.
@@ -54,7 +56,7 @@ class Vehicle extends Model
      *
      * @var array
      */
-    protected $filterParams = ['vendor', 'driver', 'driver_uuid'];
+    protected $filterParams = ['vendor', 'driver', 'driver_uuid', 'vehicle_make', 'vehicle_model'];
 
     /**
      * Relationships to auto load with driver.
@@ -165,7 +167,7 @@ class Vehicle extends Model
         'location'   => Point::class,
         'meta'       => Json::class,
         'telematics' => Json::class,
-        'model'      => Json::class,
+        'model_data' => Json::class,
         'vin_data'   => Json::class,
         'online'     => 'boolean',
     ];

package/server/src/Models/VehicleDeviceEvent.php

@@ -44,7 +44,7 @@ class VehicleDeviceEvent extends Model
         'state',
         'code',
         'reason',
-        'comment'
+        'comment',
     ];
     /**
      * The attributes that should be cast to native types.