@fleetbase/fleetops-engine 0.3.1 → 0.3.2

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

@@ -0,0 +1,77 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+use Grimzy\LaravelMysqlSpatial\Types\Point;
+
+class Issue extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array
+     */
+    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),
+            'issue_id'                   => $this->when(Http::isInternalRequest(), $this->issue_id),
+            'driver_uuid'                => $this->when(Http::isInternalRequest(), $this->driver_uuid),
+            'vehicle_uuid'               => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
+            'assigned_to_uuid'           => $this->when(Http::isInternalRequest(), $this->assigned_to_uuid),
+            'reported_by_uuid'           => $this->when(Http::isInternalRequest(), $this->reported_by_uuid),
+            'assignee'                   => $this->whenLoaded('assignee', $this->assignee),
+            'reporter'                   => $this->whenLoaded('reporter', $this->reporter),
+            'vehicle'                    => $this->whenLoaded('vehicle', new Vehicle($this->vehicle)),
+            'driver'                     => $this->whenLoaded('driver', new Driver($this->driver)),
+            'driver_name'                => $this->driver_name,
+            'vehicle_name'               => $this->vehicle_name,
+            'assignee_name'              => $this->assignee_name,
+            'reporter_name'              => $this->reporter_name,
+            'issue_id'                   => $this->issue_id,
+            'report'                     => $this->report,
+            'priority'                   => $this->priority,
+            'meta'                       => data_get($this, 'meta', []),
+            'type'                       => $this->type,
+            'category'                   => $this->category,
+            'status'                     => $this->status,
+            'location'                   => data_get($this, 'location', new Point(0, 0)),
+            'resolved_at'                => $this->resolved_at,
+            'updated_at'                 => $this->updated_at,
+            'created_at'                 => $this->created_at,
+        ];
+    }
+
+    /**
+     * Transform the resource into an webhook payload.
+     *
+     * @return array
+     */
+    public function toWebhookPayload()
+    {
+        return [
+            'id'                 => $this->public_id,
+            'reporter'           => data_get($this, 'reportedBy.public_id'),
+            'assignee'           => data_get($this, 'assignedTo.public_id'),
+            'driver'             => data_get($this, 'driver.public_id'),
+            'vehicle'            => data_get($this, 'vehicle.public_id'),
+            'issue_id'           => $this->issue_id,
+            'report'             => $this->report,
+            'priority'           => $this->priority,
+            'meta'               => data_get($this, 'meta', []),
+            'type'               => $this->type,
+            'category'           => $this->category,
+            'status'             => $this->status,
+            'location'           => data_get($this, 'location', new Point(0, 0)),
+            'resolved_at'        => $this->resolved_at,
+            'updated_at'         => $this->updated_at,
+            'created_at'         => $this->created_at,
+        ];
+    }
+}

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

@@ -0,0 +1,60 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+class ParentFleet extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array
+     */
+    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),
+            '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)),
+            'drivers'               => $this->whenLoaded('drivers', Driver::collection($this->drivers()->without(['driverAssigned'])->with(Http::isInternalRequest() ? ['jobs'] : [])->get())),
+            'vehicles'              => $this->whenLoaded('vehicles', Vehicle::collection($this->vehicles)),
+            'subfleets'             => [],
+            'type'                  => 'fleet',
+            'updated_at'            => $this->updated_at,
+            'created_at'            => $this->created_at,
+        ];
+    }
+
+    /**
+     * Transform the resource into an webhook payload.
+     *
+     * @return array
+     */
+    public function toWebhookPayload()
+    {
+        return [
+            'id'           => $this->public_id,
+            'name'         => $this->name,
+            'task'         => $this->task ?? null,
+            'status'       => $this->status ?? null,
+            'service_area' => $this->when($this->serviceArea, data_get($this, 'serviceArea.public_id')),
+            'zone'         => $this->when($this->zone, data_get($this, 'zone.public_id')),
+            'updated_at'   => $this->updated_at,
+            'created_at'   => $this->created_at,
+        ];
+    }
+}

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

@@ -0,0 +1,60 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+class SubFleet extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array
+     */
+    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),
+            '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)),
+            'drivers'               => $this->whenLoaded('drivers', Driver::collection($this->drivers()->without(['driverAssigned'])->with(Http::isInternalRequest() ? ['jobs'] : [])->get())),
+            'vehicles'              => $this->whenLoaded('vehicles', Vehicle::collection($this->vehicles)),
+            'subfleets'             => [],
+            'type'                  => 'fleet',
+            'updated_at'            => $this->updated_at,
+            'created_at'            => $this->created_at,
+        ];
+    }
+
+    /**
+     * Transform the resource into an webhook payload.
+     *
+     * @return array
+     */
+    public function toWebhookPayload()
+    {
+        return [
+            'id'           => $this->public_id,
+            'name'         => $this->name,
+            'task'         => $this->task ?? null,
+            'status'       => $this->status ?? null,
+            'service_area' => $this->when($this->serviceArea, data_get($this, 'serviceArea.public_id')),
+            'zone'         => $this->when($this->zone, data_get($this, 'zone.public_id')),
+            'updated_at'   => $this->updated_at,
+            'created_at'   => $this->created_at,
+        ];
+    }
+}

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

@@ -23,13 +23,14 @@ class Vehicle extends FleetbaseResource
                 '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),
+                'photo_uuid'             => $this->when(Http::isInternalRequest(), $this->photo_uuid),
                 'internal_id'            => $this->internal_id,
                 'name'                   => $this->display_name,
                 'display_name'           => $this->when(Http::isInternalRequest(), $this->display_name),
                 'vin'                    => $this->vin ?? null,
                 'driver'                 => $this->whenLoaded('driver', new Driver($this->driver)),
                 'devices'                => $this->whenLoaded('devices', $this->devices),
-                'photo'                  => $this->photoUrl,
+                'photo_url'              => $this->photoUrl,
                 'avatar_url'             => $this->avatar_url,
                 'make'                   => $this->make,
                 'model'                  => $this->model,
@@ -65,7 +66,8 @@ class Vehicle extends FleetbaseResource
             'name'                       => $this->name,
             'vin'                        => $this->vin ?? null,
             'driver'                     => $this->whenLoaded('driver', new Driver($this->driver)),
-            'photo'                      => $this->photoUrl,
+            'photo_url'                  => $this->photoUrl,
+            'avatar_url'                 => $this->avatar_url,
             'make'                       => $this->make,
             'model'                      => $this->model,
             'year'                       => $this->year,

package/server/src/Integrations/Lalamove/Lalamove.php

@@ -44,17 +44,17 @@ class Lalamove
     /**
      * API Key.
      */
-    private string $apiKey;
+    private ?string $apiKey;
 
     /**
      * API Secret.
      */
-    private string $apiSecret;
+    private ?string $apiSecret;
 
     /**
      * Applicable request ID.
      */
-    private string $requestId;
+    private ?string $requestId;
 
     /**
      * Applicable options.
@@ -272,7 +272,7 @@ class Lalamove
         return $this;
     }
 
-    private static function sign($timestamp, string $apiSecret, string $requestMethod, string $requestPath, string $requestBody)
+    private static function sign($timestamp, ?string $apiSecret, ?string $requestMethod, ?string $requestPath, ?string $requestBody)
     {
         $requestMethod = strtoupper($requestMethod);
         $rawSignature  =  "$timestamp\r\n$requestMethod\r\n$requestPath\r\n\r\n$requestBody";
@@ -281,7 +281,7 @@ class Lalamove
         return $signature;
     }
 
-    private function createSignature($timestamp, string $requestMethod, string $requestPath, string $requestBody)
+    private function createSignature($timestamp, ?string $requestMethod, ?string $requestPath, ?string $requestBody)
     {
         $requestPath = '/' . $this->namespace . '/' . $requestPath;
         $apiSecret   = $this->apiSecret;
@@ -289,7 +289,7 @@ class Lalamove
         return static::sign($timestamp, $apiSecret, $requestMethod, $requestPath, $requestBody);
     }
 
-    private function getAuthorizationKey(string $method, string $path, string $body)
+    private function getAuthorizationKey(?string $method, ?string $path, ?string $body)
     {
         $key       = $this->apiKey;
         $timestamp = floor(microtime(true) * 1000);

package/server/src/Models/Contact.php

@@ -84,6 +84,13 @@ class Contact extends Model
      */
     protected $hidden = ['photo'];
 
+    /**
+     * Filterable attributes/parameters.
+     *
+     * @var array
+     */
+    protected $filterParams = ['place_uuid', 'customer_type', 'facilitator_type', 'place'];
+
     /**
      * Properties which activity needs to be logged.
      *

package/server/src/Models/Driver.php

@@ -144,7 +144,7 @@ class Driver extends Model
      *
      * @var array
      */
-    protected $filterParams = ['vendor', 'facilitator', 'customer', 'fleet'];
+    protected $filterParams = ['vendor', 'facilitator', 'customer', 'fleet', 'photo_uuid', 'avatar_uuid'];
 
     /**
      * Properties which activity needs to be logged.

package/server/src/Models/Fleet.php

@@ -75,6 +75,9 @@ class Fleet extends Model
      */
     protected static $logName = 'fleet';
 
+    /**
+     * The flug options for this model.
+     */
     public function getSlugOptions(): SlugOptions
     {
         return SlugOptions::create()
@@ -108,7 +111,7 @@ class Fleet extends Model
      *
      * @var array
      */
-    protected $appends = ['photo_url', 'drivers_count', 'drivers_online_count'];
+    protected $appends = ['photo_url', 'drivers_count', 'drivers_online_count', 'vehicles_count', 'vehicles_online_count'];
 
     /**
      * The attributes excluded from the model's JSON form.
@@ -154,7 +157,15 @@ class Fleet extends Model
      */
     public function parentFleet()
     {
-        return $this->belongsTo(Fleet::class)->select(['uuid', 'public_id', 'name']);
+        return $this->belongsTo(Fleet::class)->without(['subFleets']);
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function subFleets()
+    {
+        return $this->hasMany(Fleet::class, 'parent_fleet_uuid', 'uuid')->without(['parentFleet']);
     }
 
     /**
@@ -180,7 +191,7 @@ class Fleet extends Model
      */
     public function getPhotoUrlAttribute()
     {
-        return data_get($this, 'photo.s3url', 'https://s3.ap-northeast-2.amazonaws.com/fleetbase/public/default-fleet.png');
+        return data_get($this, 'photo.url', 'https://s3.ap-northeast-2.amazonaws.com/fleetbase/public/default-fleet.png');
     }
 
     /**
@@ -194,7 +205,7 @@ class Fleet extends Model
     }
 
     /**
-     * Get the number of drivers in fleet.
+     * Get the number of online drivers in fleet.
      *
      * @return int
      */
@@ -202,4 +213,24 @@ class Fleet extends Model
     {
         return $this->drivers()->where('online', 1)->count();
     }
+
+    /**
+     * Get the number of vehicles in fleet.
+     *
+     * @return int
+     */
+    public function getVehiclesCountAttribute()
+    {
+        return $this->vehicles()->count();
+    }
+
+    /**
+     * Get the number of online vehicles in fleet.
+     *
+     * @return int
+     */
+    public function getVehiclesOnlineCountAttribute()
+    {
+        return $this->vehicles()->where('online', 1)->count();
+    }
 }

package/server/src/Models/FuelReport.php

@@ -2,12 +2,14 @@
 
 namespace Fleetbase\FleetOps\Models;
 
+use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
+use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\TracksApiCredential;
 use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 
@@ -18,6 +20,7 @@ class FuelReport extends Model
     use HasPublicId;
     use HasApiModelBehavior;
     use SpatialTrait;
+    use Searchable;
 
     /**
      * The database table used by the model.
@@ -38,14 +41,27 @@ class FuelReport extends Model
      *
      * @var array
      */
-    protected $searchableColumns = [];
+    protected $searchableColumns = ['report', 'vehicle.name', 'driver.name'];
 
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
-    protected $fillable = ['company_uuid', 'driver_uuid', 'vehicle_uuid', 'odometer', 'latitude', 'longitude', 'location', 'amount', 'currency', 'volume', 'metric_unit'];
+    protected $fillable = [
+        'company_uuid',
+        'driver_uuid',
+        'vehicle_uuid',
+        'reported_by_uuid',
+        'report',
+        'odometer',
+        'location',
+        'amount',
+        'currency',
+        'volume',
+        'metric_unit',
+        'meta',
+    ];
 
     /**
      * The attributes that are spatial columns.
@@ -61,6 +77,7 @@ class FuelReport extends Model
      */
     protected $casts = [
         'location' => Point::class,
+        'meta'     => Json::class,
     ];
 
     /**
@@ -68,7 +85,7 @@ class FuelReport extends Model
      *
      * @var array
      */
-    protected $appends = ['vehicle_name', 'driver_name'];
+    protected $appends = ['vehicle_name', 'driver_name', 'reporter_name'];
 
     /**
      * The attributes excluded from the model's JSON form.
@@ -77,6 +94,13 @@ class FuelReport extends Model
      */
     protected $hidden = ['driver', 'vehicle'];
 
+    /**
+     * Filterable attributes/parameters.
+     *
+     * @var array
+     */
+    protected $filterParams = ['type', 'reporter'];
+
     /**
      * Set the parcel fee as only numbers.
      *
@@ -103,6 +127,22 @@ class FuelReport extends Model
         return $this->belongsTo(Vehicle::class)->without(['driver']);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function reportedBy()
+    {
+        return $this->belongsTo(\Fleetbase\Models\User::class);
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function reporter()
+    {
+        return $this->belongsTo(\Fleetbase\Models\User::class, 'reported_by_uuid');
+    }
+
     /**
      * Get the driver's name assigned to vehicle.
      *
@@ -122,4 +162,14 @@ class FuelReport extends Model
     {
         return data_get($this, 'vehicle.display_name');
     }
+
+    /**
+     * Get the vehicless name.
+     *
+     * @var Model
+     */
+    public function getReporterNameAttribute()
+    {
+        return data_get($this, 'reportedBy.name');
+    }
 }

package/server/src/Models/Issue.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Models;
 
+use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
@@ -9,6 +10,7 @@ use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\TracksApiCredential;
 use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+use Illuminate\Support\Str;
 
 class Issue extends Model
 {
@@ -46,18 +48,19 @@ class Issue extends Model
      */
     protected $fillable = [
         '_key',
+        'public_id',
         'company_uuid',
         'reported_by_uuid',
-        'vehicle_uuid',
         'assigned_to_uuid',
+        'vehicle_uuid',
+        'driver_uuid',
         'issue_id',
-        'odometer',
         'location',
-        'latitude',
-        'longitude',
+        'category',
         'type',
         'report',
         'priority',
+        'meta',
         'resolved_at',
         'status',
     ];
@@ -67,16 +70,32 @@ class Issue extends Model
      *
      * @var array
      */
-    protected $spatialFields = [
-        'location' => Point::class,
+    protected $spatialFields = ['location'];
+
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'location'        => Point::class,
+        'meta'            => Json::class,
+        'resolved_at'     => 'date',
     ];
 
+    /**
+     * Filterable attributes/parameters.
+     *
+     * @var array
+     */
+    protected $filterParams = ['assignee', 'reporter'];
+
     /**
      * Dynamic attributes that are appended to object.
      *
      * @var array
      */
-    protected $appends = [];
+    protected $appends = ['driver_name', 'vehicle_name', 'assignee_name', 'reporter_name'];
 
     /**
      * The attributes excluded from the model's JSON form.
@@ -93,6 +112,14 @@ class Issue extends Model
         return $this->belongsTo(\Fleetbase\Models\User::class);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function reporter()
+    {
+        return $this->belongsTo(\Fleetbase\Models\User::class, 'reported_by_uuid');
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
@@ -101,6 +128,14 @@ class Issue extends Model
         return $this->belongsTo(\Fleetbase\Models\User::class);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function assignee()
+    {
+        return $this->belongsTo(\Fleetbase\Models\User::class, 'assigned_to_uuid');
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
@@ -108,4 +143,68 @@ class Issue extends Model
     {
         return $this->belongsTo(Vehicle::class);
     }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function driver()
+    {
+        return $this->belongsTo(Driver::class);
+    }
+
+    /**
+     * Set a default status if none is provided, and always dasherize status input.
+     *
+     * @param string $value
+     *
+     * @return void
+     */
+    public function setStatusAttribute($value)
+    {
+        if (empty($value)) {
+            $this->attributes['status'] = 'pending';
+        } else {
+            $this->attributes['status'] = Str::slug($value);
+        }
+    }
+
+    /**
+     * Get the driver's name assigned to vehicle.
+     *
+     * @return string
+     */
+    public function getDriverNameAttribute()
+    {
+        return data_get($this, 'driver.name');
+    }
+
+    /**
+     * Get the vehicless name.
+     *
+     * @return string
+     */
+    public function getVehicleNameAttribute()
+    {
+        return data_get($this, 'vehicle.display_name');
+    }
+
+    /**
+     * Get the reporter name.
+     *
+     * @return string
+     */
+    public function getReporterNameAttribute()
+    {
+        return data_get($this, 'reporter.name');
+    }
+
+    /**
+     * Get the assignee name.
+     *
+     * @return string
+     */
+    public function getAssigneeNameAttribute()
+    {
+        return data_get($this, 'assignee.name');
+    }
 }

package/server/src/Models/Vehicle.php

@@ -54,7 +54,7 @@ class Vehicle extends Model
      *
      * @var array
      */
-    protected $filterParams = ['vendor'];
+    protected $filterParams = ['vendor', 'driver', 'driver_uuid'];
 
     /**
      * Relationships to auto load with driver.