@fleetbase/fleetops-engine 0.3.3 → 0.3.5

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

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
 
 class VehicleDevice extends FleetbaseResource
 {
@@ -15,30 +16,27 @@ class VehicleDevice extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return array_merge(
-            $this->getInternalIds(),
-            [
-                'id'                    => $this->id,
-                'uuid'                  => $this->uuid,
-                'vehicle_uuid'          => $this->vehicle_uuid,
-                'device_id'             => $this->device_id,
-                'device_provider'       => $this->device_provider,
-                'device_type'           => $this->device_type,
-                'device_name'           => $this->device_name,
-                'device_model'          => $this->device_model,
-                'device_location'       => $this->device_location,
-                'manufacturer'          => $this->manufacturer,
-                'serial_number'         => $this->serial_number,
-                'installation_date'     => $this->installation_date,
-                'last_maintenance_date' => $this->last_maintenance_date,
-                'meta'                  => $this->meta ?? [],
-                'data'                  => $this->data ?? [],
-                'status'                => $this->status,
-                'data_frequency'        => $this->data_frequency,
-                'notes'                 => $this->notes,
-                'updated_at'            => $this->updated_at,
-                'created_at'            => $this->created_at,
-            ]
-        );
+        return [
+            'id'                    => $this->when(Http::isInternalRequest(), $this->id),
+            'uuid'                  => $this->when(Http::isInternalRequest(), $this->uuid),
+            'vehicle_uuid'          => $this->vehicle_uuid,
+            'device_id'             => $this->device_id,
+            'device_provider'       => $this->device_provider,
+            'device_type'           => $this->device_type,
+            'device_name'           => $this->device_name,
+            'device_model'          => $this->device_model,
+            'device_location'       => $this->device_location,
+            'manufacturer'          => $this->manufacturer,
+            'serial_number'         => $this->serial_number,
+            'installation_date'     => $this->installation_date,
+            'last_maintenance_date' => $this->last_maintenance_date,
+            'meta'                  => $this->meta ?? [],
+            'data'                  => $this->data ?? [],
+            'status'                => $this->status,
+            'data_frequency'        => $this->data_frequency,
+            'notes'                 => $this->notes,
+            'updated_at'            => $this->updated_at,
+            'created_at'            => $this->created_at,
+        ];
     }
 }

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

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
+use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class VehicleWithoutDriver extends FleetbaseResource
 {
@@ -16,30 +17,35 @@ class VehicleWithoutDriver extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return array_merge(
-            $this->getInternalIds(),
-            [
-                '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),
-                'internal_id'  => $this->internal_id,
-                'name'         => $this->name,
-                'vin'          => $this->vin ?? null,
-                'photo'        => $this->photoUrl ?? null,
-                'make'         => $this->make ?? null,
-                'model'        => $this->model ?? null,
-                'year'         => $this->year ?? null,
-                'trim'         => $this->trim ?? null,
-                'type'         => $this->type ?? null,
-                'plate_number' => $this->plate_number ?? null,
-                'vin_data'     => $this->vin_data,
-                'status'       => $this->status,
-                'online'       => $this->online,
-                'meta'         => $this->meta,
-                'updated_at'   => $this->updated_at,
-                'created_at'   => $this->created_at,
-            ]
-        );
+        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),
+            'internal_id'            => $this->internal_id,
+            'name'                   => $this->display_name,
+            'display_name'           => $this->when(Http::isInternalRequest(), $this->display_name),
+            'vin'                    => $this->vin ?? null,
+            'devices'                => $this->whenLoaded('devices', $this->devices),
+            'photo_url'              => $this->photo_url,
+            'avatar_url'             => $this->avatar_url,
+            'make'                   => $this->make,
+            'model'                  => $this->model,
+            'year'                   => $this->year,
+            'trim'                   => $this->trim,
+            'type'                   => $this->type,
+            'plate_number'           => $this->plate_number,
+            'vin'                    => $this->vin,
+            'vin_data'               => $this->vin_data,
+            'status'                 => $this->status,
+            'online'                 => $this->online,
+            '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),
+            'meta'                   => data_get($this, 'meta', []),
+            'updated_at'             => $this->updated_at,
+            'created_at'             => $this->created_at,
+        ];
     }
 
     /**
@@ -53,14 +59,14 @@ class VehicleWithoutDriver extends FleetbaseResource
             'id'           => $this->public_id,
             'internal_id'  => $this->internal_id,
             'name'         => $this->name,
-            'vin'          => $this->vin ?? null,
-            'photo'        => $this->photoUrl ?? null,
-            'make'         => $this->make ?? null,
-            'model'        => $this->model ?? null,
-            'year'         => $this->year ?? null,
-            'trim'         => $this->trim ?? null,
-            'type'         => $this->type ?? null,
-            'plate_number' => $this->plate_number ?? null,
+            'vin'          => data_get($this, 'vin'),
+            'photo'        => data_get($this, 'photoUrl'),
+            'make'         => data_get($this, 'make'),
+            'model'        => data_get($this, 'model'),
+            'year'         => data_get($this, 'year'),
+            'trim'         => data_get($this, 'trim'),
+            'type'         => data_get($this, 'type'),
+            'plate_number' => data_get($this, 'plate_number'),
             'vin_data'     => $this->vin_data,
             'status'       => $this->status,
             'online'       => $this->online,

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

@@ -17,32 +17,33 @@ class Vendor extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return array_merge(
-            $this->getInternalIds(),
-            [
-                '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),
-                'place_uuid'           => $this->when(Http::isInternalRequest(), $this->place_uuid),
-                'connect_company_uuid' => $this->when(Http::isInternalRequest(), $this->connect_company_uuid),
-                'logo_uuid'            => $this->when(Http::isInternalRequest(), $this->logo_uuid),
-                'type_uuid'            => $this->when(Http::isInternalRequest(), $this->type_uuid),
-                'internal_id'          => $this->internal_id,
-                'business_id'          => $this->business_id,
-                'name'                 => $this->name,
-                'email'                => $this->email,
-                'phone'                => $this->phone,
-                'photo_url'            => Utils::or($this, ['logo_url', 'photo_url']),
-                'place'                => $this->whenLoaded('place', new Place($this->place)),
-                'address'              => $this->when(Http::isInternalRequest(), data_get($this, 'place.address')),
-                'address_street'       => $this->when(Http::isInternalRequest(), data_get($this, 'place.street1')),
-                'type'                 => $this->type,
-                'meta'                 => $this->meta ?? [],
-                'slug'                 => $this->slug,
-                'updated_at'           => $this->updated_at,
-                'created_at'           => $this->created_at,
-            ]
-        );
+        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),
+            'place_uuid'           => $this->when(Http::isInternalRequest(), $this->place_uuid),
+            'connect_company_uuid' => $this->when(Http::isInternalRequest(), $this->connect_company_uuid),
+            'logo_uuid'            => $this->when(Http::isInternalRequest(), $this->logo_uuid),
+            'type_uuid'            => $this->when(Http::isInternalRequest(), $this->type_uuid),
+            'internal_id'          => $this->internal_id,
+            'business_id'          => $this->business_id,
+            'name'                 => $this->name,
+            'email'                => $this->email,
+            'phone'                => $this->phone,
+            'logo_url'             => $this->logo_url,
+            'photo_url'            => Utils::or($this, ['logo_url', 'photo_url']),
+            'place'                => $this->whenLoaded('place', new Place($this->place)),
+            'address'              => $this->when(Http::isInternalRequest(), data_get($this, 'place.address')),
+            'address_street'       => $this->when(Http::isInternalRequest(), data_get($this, 'place.street1')),
+            'country'              => $this->country,
+            'type'                 => $this->type,
+            'meta'                 => $this->meta ?? [],
+            'status'               => $this->status,
+            'slug'                 => $this->slug,
+            'updated_at'           => $this->updated_at,
+            'created_at'           => $this->created_at,
+            'website_url'          => $this->website_url,
+        ];
     }
 
     /**
@@ -58,15 +59,19 @@ class Vendor extends FleetbaseResource
             'name'           => $this->name,
             'email'          => $this->email,
             'phone'          => $this->phone,
+            'logo_url'       => $this->logo_url,
             'photo_url'      => Utils::or($this, ['logo_url', 'photo_url']),
             'place'          => $this->whenLoaded('place', new Place($this->place)),
             'address'        => data_get($this, 'place.address'),
             'address_street' => data_get($this, 'place.street1'),
+            'country'        => $this->country,
             'type'           => $this->type,
             'meta'           => $this->meta ?? [],
+            'status'         => $this->status,
             'slug'           => $this->slug,
             'updated_at'     => $this->updated_at,
             'created_at'     => $this->created_at,
+            'website_url'    => $this->website_url,
         ];
     }
 }

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

@@ -18,23 +18,20 @@ class Zone extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return array_merge(
-            $this->getInternalIds(),
-            [
-                '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,
-                'description'  => $this->description,
-                'coordinates'  => $this->when($this->border instanceof Polygon, Utils::getCoordinatesFromPolygon($this->border), []),
-                'border'       => $this->border,
-                'color'        => $this->color,
-                'stroke_color' => $this->stroke_color,
-                'status'       => $this->status,
-                'updated_at'   => $this->updated_at,
-                'created_at'   => $this->created_at,
-            ]
-        );
+        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,
+            'description'  => $this->description,
+            'coordinates'  => $this->when($this->border instanceof Polygon, Utils::getCoordinatesFromPolygon($this->border), []),
+            'border'       => $this->border,
+            'color'        => $this->color,
+            'stroke_color' => $this->stroke_color,
+            'status'       => $this->status,
+            '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;
@@ -88,6 +89,13 @@ class Driver extends Model
         'status',
     ];
 
+    /**
+     * The attributes that are guarded and not mass assignable.
+     *
+     * @var array
+     */
+    protected $guarded = [];
+
     /**
      * The attributes that are spatial columns.
      *
@@ -101,7 +109,6 @@ class Driver extends Model
      * @var array
      */
     protected $casts = [
-        'meta'     => Json::class,
         'location' => Point::class,
         'online'   => 'boolean',
     ];
@@ -540,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/FuelReport.php

@@ -61,6 +61,7 @@ class FuelReport extends Model
         'volume',
         'metric_unit',
         'meta',
+        'status',
     ];
 
     /**

package/server/src/Models/IntegratedVendor.php

@@ -69,7 +69,7 @@ class IntegratedVendor extends Model
      *
      * @var array
      */
-    protected $appends = ['name', 'status', 'type', 'photo_url', 'service_types', 'supported_countries', 'provider_settings'];
+    protected $appends = ['name', 'status', 'type', 'photo_url', 'logo_url', 'service_types', 'supported_countries', 'provider_settings'];
 
     /**
      * The attributes excluded from the model's JSON form.
@@ -207,6 +207,11 @@ class IntegratedVendor extends Model
         return $this->provider()->getLogo();
     }
 
+    public function getLogoUrlAttribute()
+    {
+        return $this->provider()->getLogo();
+    }
+
     public function getStatusAttribute()
     {
         return 'active';

package/server/src/Models/Order.php

@@ -312,7 +312,7 @@ class Order extends Model
      */
     public function driverAssigned()
     {
-        return $this->belongsTo(Driver::class)->without(['devices', 'vehicle', 'vendor'])->withoutGlobalScopes();
+        return $this->belongsTo(Driver::class)->without(['devices', 'vendor']);
     }
 
     /**
@@ -320,7 +320,7 @@ class Order extends Model
      */
     public function driver()
     {
-        return $this->belongsTo(Driver::class)->without(['devices', 'vehicle', 'vendor'])->withoutGlobalScopes();
+        return $this->belongsTo(Driver::class)->without(['devices', 'vendor']);
     }
 
     /**

package/server/src/Models/Place.php

@@ -213,7 +213,7 @@ class Place extends Model
         }
 
         if (empty($this->country) && $address) {
-            $this->setAttribute('country', $address->getCountry()->getCode());
+            $this->setAttribute('country', $address->getCountry() instanceof \Geocoder\Model\Country ? $address->getCountry()->getCode() : null);
         }
 
         if ($coordinates = $address->getCoordinates()) {
@@ -243,7 +243,7 @@ class Place extends Model
         $attributes['neighborhood'] = $address->getNeighborhood();
         $attributes['city']         = $address->getLocality();
         $attributes['building']     = $address->getStreetNumber();
-        $attributes['country']      = $address->getCountry()->getCode();
+        $attributes['country']      = $address->getCountry() instanceof \Geocoder\Model\Country ? $address->getCountry()->getCode() : null;
         $attributes['location']     = new \Grimzy\LaravelMysqlSpatial\Types\Point($coordinates->getLatitude(), $coordinates->getLongitude());
 
         return $attributes;

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

package/server/src/Models/Vendor.php

@@ -72,7 +72,7 @@ class Vendor extends Model
      *
      * @var array
      */
-    protected $searchableColumns = ['name', 'email', 'business_id', 'company.name'];
+    protected $searchableColumns = ['name', 'email', 'business_id', 'connectCompany.name'];
 
     /**
      * Dynamic attributes that are appended to object.

package/server/src/Observers/DriverObserver.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Observers;
 
 use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\Models\User;
 use Grimzy\LaravelMysqlSpatial\Types\Point;
 
@@ -21,6 +22,17 @@ class DriverObserver
         }
     }
 
+    /**
+     * Handle the Driver "deleting" event.
+     *
+     * @return void
+     */
+    public function deleting(Driver $driver)
+    {
+        // unassign the vehicle from the driver
+        $driver->vehicle_uuid = null;
+    }
+
     /**
      * Handle the Driver "deleted" event.
      *
@@ -30,5 +42,8 @@ class DriverObserver
     {
         // if the driver is deleted, delete their user account assosciated as well
         User::where(['uuid' => $driver->user_uuid, 'type' => 'driver'])->delete();
+
+        // also unassign them from any order they are assigned to
+        Order::where(['driver_assigned_uui' => $driver->uuid])->update(['driver_assigned_uui' => null]);
     }
 }