@fleetbase/fleetops-engine 0.3.7 → 0.3.9

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;
+    }
 }

package/server/src/Models/Order.php

@@ -604,12 +604,12 @@ class Order extends Model
 
     public function getIsAssignedNotDispatchedAttribute(): bool
     {
-        return !empty($this->driver_assigned_uuid) && !$this->dispatched_at;
+        return !empty($this->driver_assigned_uuid) && $this->dispatched_at === null;
     }
 
     public function getIsNotDispatchedAttribute(): bool
     {
-        return !$this->dispatched_at;
+        return $this->dispatched_at === null;
     }
 
     public function getIsIntegratedVendorOrderAttribute()
@@ -894,7 +894,7 @@ class Order extends Model
         return !$this->dispatched && Carbon::fromString($this->scheduled_at)->between($min, $max);
     }
 
-    public function dispatch($save = false)
+    public function dispatch($save = true)
     {
         $this->dispatched    = true;
         $this->dispatched_at = now();
@@ -907,11 +907,42 @@ class Order extends Model
         return event(new OrderDispatched($this));
     }
 
-    public function firstDispatch()
+    public function insertDispatchActivity(): Order
+    {
+        // get dispatch activity if any and apply to order
+        $dispatchActivity = Flow::getDispatchActivity($this);
+
+        if ($dispatchActivity) {
+            $this->updateActivity($dispatchActivity);
+        }
+
+        return $this;
+    }
+
+    public function dispatchWithActivity(): Order
+    {
+        $this->dispatch();
+        $this->insertDispatchActivity();
+
+        return $this;
+    }
+
+    public function firstDispatch(): Order
     {
         if ($this->dispatched) {
             $this->dispatch();
         }
+
+        return $this;
+    }
+
+    public function firstDispatchWithActivity(): Order
+    {
+        if ($this->dispatched) {
+            $this->dispatchWithActivity();
+        }
+
+        return $this;
     }
 
     public function cancel()
@@ -936,6 +967,22 @@ class Order extends Model
         }
     }
 
+    public function updateActivity(array $activity = null, $proof = null): Order
+    {
+        $status   = data_get($activity, 'status');
+        $details  = data_get($activity, 'details', '');
+        $code     = data_get($activity, 'code', 'dispatched');
+        $location = $this->getLastLocation();
+
+        // insert dispatch activity
+        $this->insertActivity($status, $details, $location, $code, $proof);
+
+        // update status using code
+        $this->setStatus($code, true);
+
+        return $this;
+    }
+
     public function notifyCompleted()
     {
         return event(new OrderCompleted($this));
@@ -950,7 +997,13 @@ class Order extends Model
     public function setCustomerTypeAttribute($type)
     {
         if (is_string($type)) {
-            if ($type === 'customer' || $type === 'vendor' || !Str::startsWith($type, 'fleet-ops')) {
+            $isNotNamespace           = !Str::contains($type, '\\');
+            $doesNotStartWithFleetOps = !Str::startsWith($type, 'fleet-ops');
+            $isValidType              = $type === 'customer' || $type === 'vendor';
+
+            // preprend fleet-ops IF not a namespace and does not start with fleet-ops
+            // this is for handling ember style registry spacing
+            if ($isNotNamespace && $doesNotStartWithFleetOps && $isValidType) {
                 $type = 'fleet-ops:' . $type;
             }
 
@@ -961,7 +1014,13 @@ class Order extends Model
     public function setFacilitatorTypeAttribute($type)
     {
         if (is_string($type)) {
-            if ($type === 'customer' || $type === 'vendor' || !Str::startsWith($type, 'fleet-ops')) {
+            $isNotNamespace           = !Str::contains($type, '\\');
+            $doesNotStartWithFleetOps = !Str::startsWith($type, 'fleet-ops');
+            $isValidType              = $type === 'customer' || $type === 'vendor';
+
+            // preprend fleet-ops IF not a namespace and does not start with fleet-ops
+            // this is for handling ember style registry spacing
+            if ($isNotNamespace && $doesNotStartWithFleetOps && $isValidType) {
                 $type = 'fleet-ops:' . $type;
             }
 
@@ -1087,7 +1146,16 @@ class Order extends Model
     public function getCurrentOriginPosition()
     {
         if ($this->hasDriverAssigned) {
-            return $this->driverAssigned->location;
+            $this->load(['driverAssigned']);
+            $driverAssigned = $this->driverAssigned;
+
+            if (!$driverAssigned) {
+                $driverAssigned = Driver::where('uuid', $this->driver_assigned_uuid)->first();
+            }
+
+            if ($driverAssigned instanceof Driver) {
+                return $driverAssigned->location;
+            }
         }
 
         $origin = null;