@fleetbase/fleetops-engine 0.3.7 → 0.3.8

package/server/src/Http/Requests/QueryServiceQuotesRequest.php

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Http\Requests;
 
 use Fleetbase\Http\Requests\FleetbaseRequest;
 use Fleetbase\Rules\ExistsInAny;
+use Illuminate\Validation\Rule;
 
 class QueryServiceQuotesRequest extends FleetbaseRequest
 {
@@ -25,17 +26,17 @@ class QueryServiceQuotesRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'payload'      => 'nullable|exists:payloads,public_id',
-            'service_type' => 'nullable|exists:service_rates,service_type',
-            'pickup'       => 'nullable|required_without:payload,waypoints',
-            'dropoff'      => 'nullable|required_without:payload,waypoints',
-            'waypoints'    => 'nullable|array',
+            'payload'      => ['nullable', 'required_without_all:waypoints,pickup,dropoff', Rule::exists('payloads', 'public_id')->whereNull('deleted_at')],
+            'service_type' => ['nullable', Rule::exists('service_rates', 'service_type')->whereNull('deleted_at')],
+            'pickup'       => ['nullable', 'required_without_all:payload,waypoints'],
+            'dropoff'      => ['nullable', 'required_without_all:payload,waypoints'],
+            'waypoints'    => ['nullable', 'array', 'required_without_all:payload,pickup,dropoff'],
             'facilitator'  => ['nullable', new ExistsInAny(['vendors', 'integrated_vendors', 'contacts'], ['public_id', 'provider'])],
-            'scheduled_at' => 'nullable|date',
-            'cod'          => 'nullable',
-            'currency'     => 'nullable',
-            'distance'     => 'nullable',
-            'time'         => 'nullable',
+            'scheduled_at' => ['nullable', 'date'],
+            'cod'          => ['nullable'],
+            'currency'     => ['nullable', 'string', 'size:3'],
+            'distance'     => ['nullable'],
+            'time'         => ['nullable'],
         ];
     }
 }

package/server/src/Http/Requests/ScheduleOrderRequest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Requests;
+
+use Fleetbase\Http\Requests\FleetbaseRequest;
+
+class ScheduleOrderRequest extends FleetbaseRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return request()->session()->has('api_credential');
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'date'     => 'required|date_format:Y-m-d',
+            'time'     => 'nullable',
+            'timezone' => 'nullable|timezone',
+        ];
+    }
+}

package/server/src/Http/Requests/UpdateContactRequest.php

@@ -4,17 +4,4 @@ namespace Fleetbase\FleetOps\Http\Requests;
 
 class UpdateContactRequest extends CreateContactRequest
 {
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'name'  => 'required',
-            'email' => 'nullable|email',
-            'phone' => 'nullable',
-        ];
-    }
 }

package/server/src/Http/Requests/UpdateServiceAreaRequest.php

@@ -2,28 +2,6 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
-use Fleetbase\Http\Requests\FleetbaseRequest;
-
-class UpdateServiceAreaRequest extends FleetbaseRequest
+class UpdateServiceAreaRequest extends CreateServiceAreaRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return false;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-        ];
-    }
 }

package/server/src/Http/Requests/UpdateServiceQuoteRequest.php

@@ -2,28 +2,6 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
-use Fleetbase\Http\Requests\FleetbaseRequest;
-
-class UpdateServiceQuoteRequest extends FleetbaseRequest
+class UpdateServiceQuoteRequest extends CreateServiceQuoteRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return false;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-        ];
-    }
 }

package/server/src/Http/Requests/UpdateServiceRateRequest.php

@@ -2,28 +2,6 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
-use Fleetbase\Http\Requests\FleetbaseRequest;
-
-class UpdateServiceRateRequest extends FleetbaseRequest
+class UpdateServiceRateRequest extends CreateServiceRateRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return false;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-        ];
-    }
 }

package/server/src/Http/Requests/UpdateTrackingStatusRequest.php

@@ -2,31 +2,6 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
-use Fleetbase\Http\Requests\FleetbaseRequest;
-
-class UpdateTrackingStatusRequest extends FleetbaseRequest
+class UpdateTrackingStatusRequest extends CreateTrackingStatusRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return request()->session()->has('api_credential');
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'status'  => 'required|string',
-            'details' => 'required|string',
-            'code'    => 'nullable|string',
-        ];
-    }
 }

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

@@ -5,7 +5,6 @@ namespace Fleetbase\FleetOps\Http\Resources\v1;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
-use Illuminate\Support\Arr;
 
 class DeletedResource extends FleetbaseResource
 {
@@ -18,7 +17,7 @@ class DeletedResource extends FleetbaseResource
      */
     public function toArray($request)
     {
-        $deleted = [
+        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),
@@ -26,12 +25,6 @@ class DeletedResource extends FleetbaseResource
             'time'      => $this->deleted_at,
             'deleted'   => true,
         ];
-
-        if (Http::isInternalRequest()) {
-            $deleted = Arr::insertAfterKey($deleted, ['uuid' => $this->uuid, 'public_id' => $this->public_id], 'id');
-        }
-
-        return $deleted;
     }
 
     /**
@@ -56,6 +49,6 @@ class DeletedResource extends FleetbaseResource
      */
     public function getObjectType()
     {
-        return strtolower(Utils::getClassName($this->resource));
+        return Utils::getTypeFromClassName($this->resource);
     }
 }

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

@@ -19,36 +19,39 @@ class Entity extends FleetbaseResource
     public function toArray($request)
     {
         return [
-            'id'              => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid'            => $this->when(Http::isInternalRequest(), $this->uuid),
-            'photo_uuid'      => $this->when(Http::isInternalRequest(), $this->photo_uuid),
-            'public_id'       => $this->when(Http::isInternalRequest(), $this->public_id),
-            'customer_uuid'   => $this->when(Http::isInternalRequest(), $this->customer_uuid),
-            'customer_type'   => $this->when(Http::isInternalRequest(), $this->customer_type),
-            'supplier_uuid'   => $this->when(Http::isInternalRequest(), $this->supplier_uuid),
-            'internal_id'     => $this->internal_id,
-            'name'            => $this->name,
-            'type'            => $this->type ?? null,
-            'destination'     => $this->when(Http::isPublicRequest(), data_get($this, 'destination.public_id'), null),
-            'customer'        => $this->setCustomerType(Resolve::resourceForMorph($this->customer_type, $this->customer_uuid)),
-            'supplier'        => $this->whenLoaded('supplier', $this->supplier),
-            'tracking_number' => new TrackingNumber($this->trackingNumber),
-            'description'     => $this->description ?? null,
-            'photo_url'       => $this->photo_url ?? null,
-            'length'          => $this->length ?? null,
-            'width'           => $this->width ?? null,
-            'height'          => $this->height ?? null,
-            'dimensions_unit' => $this->dimensions_unit ?? null,
-            'weight'          => $this->weight ?? null,
-            'weight_unit'     => $this->weight_unit ?? null,
-            'declared_value'  => $this->declared_value ?? null,
-            'price'           => $this->price ?? null,
-            'sale_price'      => $this->sale_price ?? null,
-            'sku'             => $this->sku ?? null,
-            'currency'        => $this->currency ?? null,
-            'meta'            => $this->meta ?? [],
-            '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),
+            'photo_uuid'       => $this->when(Http::isInternalRequest(), $this->photo_uuid),
+            'public_id'        => $this->when(Http::isInternalRequest(), $this->public_id),
+            'customer_uuid'    => $this->when(Http::isInternalRequest(), $this->customer_uuid),
+            'customer_type'    => $this->when(Http::isInternalRequest(), $this->customer_type),
+            'supplier_uuid'    => $this->when(Http::isInternalRequest(), $this->supplier_uuid),
+            'destination_uuid' => $this->when(Http::isInternalRequest(), $this->destination_uuid),
+            'payload_uuid'     => $this->when(Http::isInternalRequest(), $this->payload_uuid),
+            'internal_id'      => $this->internal_id,
+            'name'             => $this->name,
+            'type'             => $this->type,
+            'payload'          => $this->when(Http::isPublicRequest(), data_get($this, 'payload.public_id'), null),
+            'destination'      => $this->when(Http::isPublicRequest(), data_get($this, 'destination.public_id'), null),
+            'customer'         => $this->setCustomerType(Resolve::resourceForMorph($this->customer_type, $this->customer_uuid)),
+            'supplier'         => $this->whenLoaded('supplier', $this->supplier),
+            'tracking_number'  => new TrackingNumber($this->trackingNumber),
+            'description'      => data_get($this, 'description'),
+            'photo_url'        => data_get($this, 'photo_url'),
+            'length'           => data_get($this, 'length'),
+            'width'            => data_get($this, 'width'),
+            'height'           => data_get($this, 'height'),
+            'dimensions_unit'  => data_get($this, 'dimensions_unit'),
+            'weight'           => data_get($this, 'weight'),
+            'weight_unit'      => data_get($this, 'weight_unit'),
+            'declared_value'   => data_get($this, 'declared_value'),
+            'price'            => data_get($this, 'price'),
+            'sale_price'       => data_get($this, 'sale_price'),
+            'sku'              => data_get($this, 'sku'),
+            'currency'         => data_get($this, 'currency'),
+            'meta'             => data_get($this, 'meta', []),
+            'updated_at'       => $this->updated_at,
+            'created_at'       => $this->created_at,
         ];
     }
 
@@ -82,23 +85,23 @@ class Entity extends FleetbaseResource
             'id'              => $this->public_id,
             'internal_id'     => $this->internal_id,
             'name'            => $this->name,
-            'type'            => $this->type ?? null,
+            'type'            => data_get($this, 'type'),
             'destination'     => $this->destination ? $this->destination->public_id : null,
             'customer'        => Resolve::resourceForMorph($this->customer_type, $this->customer_uuid),
             'tracking_number' => new TrackingNumber($this->trackingNumber),
-            'description'     => $this->description ?? null,
-            'photo_url'       => $this->photo_url ?? null,
-            'length'          => $this->length ?? null,
-            'width'           => $this->width ?? null,
-            'height'          => $this->height ?? null,
-            'dimensions_unit' => $this->dimensions_unit ?? null,
-            'weight'          => $this->weight ?? null,
-            'weight_unit'     => $this->weight_unit ?? null,
-            'declared_value'  => $this->declared_value ?? null,
-            'price'           => $this->price ?? null,
-            'sale_price'      => $this->sale_price ?? null,
-            'sku'             => $this->sku ?? null,
-            'currency'        => $this->currency ?? null,
+            'description'     => data_get($this, 'description'),
+            'photo_url'       => data_get($this, 'photo_url'),
+            'length'          => data_get($this, 'length'),
+            'width'           => data_get($this, 'width'),
+            'height'          => data_get($this, 'height'),
+            'dimensions_unit' => data_get($this, 'dimensions_unit'),
+            'weight'          => data_get($this, 'weight'),
+            'weight_unit'     => data_get($this, 'weight_unit'),
+            'declared_value'  => data_get($this, 'declared_value'),
+            'price'           => data_get($this, 'price'),
+            'sale_price'      => data_get($this, 'sale_price'),
+            'sku'             => data_get($this, 'sku'),
+            'currency'        => data_get($this, 'currency'),
             'meta'            => $this->meta ?? [],
             'updated_at'      => $this->updated_at,
             'created_at'      => $this->created_at,

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

@@ -50,7 +50,7 @@ class Order extends FleetbaseResource
             'pod_method'           => $this->pod_method,
             'pod_required'         => (bool) data_get($this, 'pod_required', false),
             'dispatched'           => (bool) data_get($this, 'dispatched', false),
-            'adhoc'                => $this->adhoc,
+            'adhoc'                => (bool) data_get($this, 'adhoc', false),
             'adhoc_distance'       => (int) $this->getAdhocDistance(),
             'distance'             => (int) $this->distance,
             'time'                 => (int) $this->time,

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

@@ -22,7 +22,7 @@ class ServiceArea extends FleetbaseResource
             'public_id'  => $this->when(Http::isInternalRequest(), $this->public_id),
             'name'       => $this->name,
             'type'       => $this->type,
-            'location'   => $this->location,
+            'center'     => $this->location,
             'border'     => $this->border,
             'zones'      => $this->whenLoaded('zones', Zone::collection($this->zones)),
             'status'     => $this->status,
@@ -42,7 +42,7 @@ class ServiceArea extends FleetbaseResource
             'id'         => $this->public_id,
             'name'       => $this->name,
             'type'       => $this->type,
-            'location'   => $this->location,
+            'center'     => $this->location,
             'border'     => $this->border,
             'status'     => $this->status,
             'updated_at' => $this->updated_at,

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

@@ -22,7 +22,6 @@ class Vehicle extends FleetbaseResource
             '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,
@@ -59,9 +58,8 @@ class Vehicle extends FleetbaseResource
     {
         return [
             'id'                         => $this->public_id,
-            'internal_id'                => $this->internal_id,
             'name'                       => $this->name,
-            'vin'                        => $this->vin ?? null,
+            'vin'                        => $this->vin,
             'driver'                     => $this->whenLoaded('driver', new Driver($this->driver)),
             'photo_url'                  => $this->photoUrl,
             'avatar_url'                 => $this->avatar_url,

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

@@ -2,10 +2,8 @@
 
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
-use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
-use Grimzy\LaravelMysqlSpatial\Types\Polygon;
 
 class Zone extends FleetbaseResource
 {
@@ -24,7 +22,7 @@ class Zone extends FleetbaseResource
             '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), []),
+            'center'       => $this->location,
             'border'       => $this->border,
             'color'        => $this->color,
             'stroke_color' => $this->stroke_color,
@@ -45,7 +43,7 @@ class Zone extends FleetbaseResource
             'id'           => $this->public_id,
             'name'         => $this->name,
             'description'  => $this->description,
-            'coordinates'  => data_get($this->border, 'coordinates', []),
+            'center'       => $this->location,
             'border'       => $this->border,
             'color'        => $this->color,
             'stroke_color' => $this->stroke_color,

package/server/src/Models/Entity.php

@@ -197,7 +197,7 @@ class Entity extends Model
      */
     public function payload()
     {
-        return $this->belongsTo(Payload::class);
+        return $this->belongsTo(Payload::class)->without(['entities']);
     }
 
     /**
@@ -273,7 +273,7 @@ class Entity extends Model
     /**
      * The length the entity belongs to.
      *
-     * @var PhpUnitsOfMeasure\PhysicalQuantity\Length
+     * @var \PhpUnitsOfMeasure\PhysicalQuantity\Length
      */
     public function getLengthUnitAttribute()
     {
@@ -283,7 +283,7 @@ class Entity extends Model
     /**
      * The width the entity belongs to.
      *
-     * @var PhpUnitsOfMeasure\PhysicalQuantity\Length
+     * @var \PhpUnitsOfMeasure\PhysicalQuantity\Length
      */
     public function getWidthUnitAttribute()
     {
@@ -350,6 +350,72 @@ class Entity extends Model
         return data_get($this, 'trackingNumber.last_status');
     }
 
+    public function setDestination($destinationKey, Payload $payload, bool $save = true): Entity
+    {
+        // if waypoint index provided
+        if (is_numeric($destinationKey)) {
+            $waypoint = $payload->waypoints->values()->get($destinationKey);
+
+            if ($waypoint) {
+                $this->destination_uuid = $waypoint->uuid;
+            }
+        }
+
+        // if explicitly set to pickup
+        if ($destinationKey === 'pickup' && $payload->pickup) {
+            $this->destination_uuid = $payload->pickup->uuid;
+        }
+
+        // if explicitly set to dropoff
+        if ($destinationKey === 'dropoff' && $payload->dropoff) {
+            $this->destination_uuid = $payload->dropoff->uuid;
+        }
+
+        // if waypoint public_id
+        if (Utils::isPublicId($destinationKey)) {
+            $waypoint = $payload->waypoints->firstWhere('public_id', $destinationKey);
+
+            // if no waypoint found from public_id check pickup/dropoff
+            if (!$waypoint) {
+                $waypoint = collect([$this->pickup, $this->dropoff])->firstWhere('public_id', $destinationKey);
+            }
+
+            if ($waypoint) {
+                $this->destination_uuid = $waypoint->uuid;
+            }
+        }
+
+        // if waypoint uuid
+        if (Str::isUuid($destinationKey)) {
+            $waypoint = $payload->waypoints->firstWhere('uuid', $destinationKey);
+
+            // if no waypoint found from uuid check pickup/dropoff
+            if (!$waypoint) {
+                $waypoint = collect([$payload->pickup, $payload->dropoff])->firstWhere('uuid', $destinationKey);
+            }
+
+            if ($waypoint) {
+                $this->destination_uuid = $waypoint->uuid;
+            }
+        }
+
+        // confirm destination_uuid is indeed a place record
+        if (isset($attributes['destination_uuid']) && Place::where('uuid', $attributes['destination_uuid'])->doesntExist()) {
+            // search waypoints for search_uuid if any
+            $destination = Place::where('meta->search_uuid', $attributes['destination_uuid'])->first();
+
+            if ($destination instanceof Place) {
+                $this->destination_uuid = $destination->uuid;
+            }
+        }
+
+        if ($save) {
+            $this->save();
+        }
+
+        return $this;
+    }
+
     public static function insertGetUuid($values = [], Payload $payload = null)
     {
         if (is_array($values) && isset($values['uuid'])) {
@@ -408,4 +474,34 @@ class Entity extends Model
         $this->customer_uuid = $model->uuid;
         $this->customer_type = Utils::getMutationType($model);
     }
+
+    public function getPayload(): ?Payload
+    {
+        $this->load('payload');
+
+        if ($this->payload instanceof Payload) {
+            return $this->payload;
+        }
+
+        if (Str::isUuid($this->payload_uuid)) {
+            return Payload::where('uuid', $this->payload_uuid)->first();
+        }
+
+        return null;
+    }
+
+    public function getTrashedPayload(): ?Payload
+    {
+        $payload = $this->payload()->withoutGlobalScopes()->first();
+
+        if ($payload instanceof Payload) {
+            return $payload;
+        }
+
+        if (Str::isUuid($this->payload_uuid)) {
+            return Payload::where('uuid', $this->payload_uuid)->withoutGlobalScopes()->first();
+        }
+
+        return null;
+    }
 }