@fleetbase/fleetops-engine 0.3.7 → 0.3.9

package/server/src/Models/Payload.php

@@ -12,6 +12,7 @@ use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\TracksApiCredential;
 use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 
 class Payload extends Model
@@ -183,16 +184,6 @@ class Payload extends Model
         return $this->hasManyThrough(Place::class, Waypoint::class, 'payload_uuid', 'uuid', 'uuid', 'place_uuid')->whereNull('waypoints.deleted_at')->withoutGlobalScopes();
     }
 
-    /**
-     * Waypoints between start and end.
-     *
-     * @return \Illuminate\Database\Eloquent\Concerns\HasManyThrough
-     */
-    public function waypointsCompleted()
-    {
-        return $this->hasManyThrough(Place::class, WaypointCompleted::class, 'payload_uuid', 'uuid', 'uuid', 'place_uuid')->withoutGlobalScopes();
-    }
-
     /**
      * Always convert fee and rate to integer before insert.
      */
@@ -216,20 +207,16 @@ class Payload extends Model
                 }
             }
 
-            // 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 a destination or waypoint is explicitly set
+            if (empty($attributes['destination_uuid'])) {
+                $destinationKey = Utils::or($attributes, ['waypoint', 'destination']);
+                $destination    = $this->findDestinationFromKey($destinationKey);
                 if ($destination instanceof Place) {
                     $attributes['destination_uuid'] = $destination->uuid;
-                } else {
-                    unset($attributes['destination_uuid']);
                 }
             }
 
             $entity = new Entity($attributes);
-
             $this->entities()->save($entity);
         }
 
@@ -253,15 +240,12 @@ class Payload extends Model
                 }
             }
 
-            // 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 a destination or waypoint is explicitly set
+            if (empty($attributes['destination_uuid'])) {
+                $destinationKey = Utils::or($attributes, ['waypoint', 'destination']);
+                $destination    = $this->findDestinationFromKey($destinationKey);
                 if ($destination instanceof Place) {
                     $attributes['destination_uuid'] = $destination->uuid;
-                } else {
-                    unset($attributes['destination_uuid']);
                 }
             }
 
@@ -277,8 +261,8 @@ class Payload extends Model
     {
         $this->current_waypoint_uuid = $destination->uuid;
 
-        if ($this->save) {
-            $this->save();
+        if ($save) {
+            DB::table($this->getTable())->where('uuid', $this->uuid)->update(['current_waypoint_uuid' => $destination->uuid]);
         }
 
         return $this;
@@ -429,7 +413,7 @@ class Payload extends Model
         }
 
         if ($this->waypoints()->count()) {
-            return $this->waypoints->first();
+            return $this->waypoints->last();
         }
 
         return null;
@@ -449,7 +433,7 @@ class Payload extends Model
         }
 
         if ($this->waypoints()->count()) {
-            return $this->waypoints->last();
+            return $this->waypoints->first();
         }
 
         return null;
@@ -529,6 +513,19 @@ class Payload extends Model
             }
         }
 
+        // ensure all stops/waypoints are instances of Place
+        $stops = $stops->map(function ($place) {
+            if (is_array($place)) {
+                return new Place($place);
+            }
+
+            if ($place instanceof Place) {
+                return $place;
+            }
+
+            return null;
+        });
+
         return $stops->filter();
     }
 
@@ -557,10 +554,6 @@ class Payload extends Model
 
     public function setPlace($property, Place $place, array $options = [])
     {
-        if (!$place) {
-            return;
-        }
-
         $attr     = $property . '_uuid';
         $instance = Place::createFromMixed($place);
         $save     = data_get($options, 'save', false);
@@ -596,16 +589,28 @@ class Payload extends Model
             return;
         }
 
+        if (!$place instanceof Place) {
+            $place = Place::createFromMixed($place);
+        }
+
         return $this->setPlace('pickup', $place, $options);
     }
 
     public function setDropoff($place, array $options = [])
     {
+        if (!$place instanceof Place) {
+            $place = Place::createFromMixed($place);
+        }
+
         return $this->setPlace('dropoff', $place, $options);
     }
 
     public function setReturn($place, array $options = [])
     {
+        if (!$place instanceof Place) {
+            $place = Place::createFromMixed($place);
+        }
+
         return $this->setPlace('return', $place, $options);
     }
 
@@ -714,4 +719,70 @@ class Payload extends Model
 
         return null;
     }
+
+    public function findDestinationFromKey(string $destinationKey = null): ?Place
+    {
+        if ($destinationKey === null) {
+            return null;
+        }
+
+        // if waypoint index provided
+        if (is_numeric($destinationKey)) {
+            $waypoint = $this->waypoints->values()->get($destinationKey);
+
+            if ($waypoint) {
+                return $waypoint;
+            }
+        }
+
+        // if explicitly set to pickup
+        if ($destinationKey === 'pickup' && $this->pickup) {
+            return $this->pickup;
+        }
+
+        // if explicitly set to dropoff
+        if ($destinationKey === 'dropoff' && $this->dropoff) {
+            return $this->dropoff;
+        }
+
+        // if waypoint public_id
+        if (Utils::isPublicId($destinationKey)) {
+            $waypoint = $this->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) {
+                return $waypoint;
+            }
+        }
+
+        // if waypoint uuid
+        if (Str::isUuid($destinationKey)) {
+            $waypoint = $this->waypoints->firstWhere('uuid', $destinationKey);
+
+            // if no waypoint found from uuid check pickup/dropoff
+            if (!$waypoint) {
+                $waypoint = collect([$this->pickup, $this->dropoff])->firstWhere('uuid', $destinationKey);
+            }
+
+            if ($waypoint) {
+                return $waypoint;
+            }
+        }
+
+        // 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) {
+                return $destination;
+            }
+        }
+
+        return null;
+    }
 }

package/server/src/Models/Place.php

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Casts\Point;
+use Fleetbase\FleetOps\Support\Geocoding;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
@@ -251,8 +252,10 @@ class Place extends Model
 
     /**
      * Create a new Place instance from a Google Address instance and optionally save it to the database.
+     *
+     * @return \Fleetbase\Models\Place|null
      */
-    public static function createFromGoogleAddress(\Geocoder\Provider\GoogleMaps\Model\GoogleAddress $address, bool $saveInstance = false): Place
+    public static function createFromGoogleAddress(\Geocoder\Provider\GoogleMaps\Model\GoogleAddress $address, bool $saveInstance = false): ?Place
     {
         $instance = (new static())->fillWithGoogleAddress($address);
 
@@ -279,8 +282,10 @@ class Place extends Model
      * Create a new Place instance from a geocoding lookup.
      *
      * @param bool $saveInstance
+     *
+     * @return \Fleetbase\Models\Place|null
      */
-    public static function createFromGeocodingLookup(string $address, $saveInstance = false): Place
+    public static function createFromGeocodingLookup(string $address, $saveInstance = false): ?Place
     {
         $results = \Geocoder\Laravel\Facades\Geocoder::geocode($address)->get();
 
@@ -291,20 +296,49 @@ class Place extends Model
         return static::createFromGoogleAddress($results->first(), $saveInstance);
     }
 
+    /**
+     * Create a new Place instance from a geocoding lookup.
+     *
+     * @param bool $saveInstance
+     *
+     * @return \Fleetbase\Models\Place|null
+     */
+    public static function createFromReverseGeocodingLookup(\Grimzy\LaravelMysqlSpatial\Types\Point $point, $saveInstance = false): ?Place
+    {
+        $results = Geocoding::reverseFromCoordinates($point->getLat(), $point->getLng());
+        $place   = $results->first();
+
+        if (!$place) {
+            $place = (new static())->newInstance(['location' => $point]);
+        }
+
+        if ($saveInstance) {
+            $place->save();
+        }
+
+        return $place;
+    }
+
     /**
      * Creates a new Place instance from given coordinates.
      *
-     * @param array $attributes
-     * @param bool  $saveInstance
+     * @param \Grimzy\LaravelMysqlSpatial\Types\Point|array $coordinates
+     * @param bool                                          $saveInstance
      *
-     * @return Place|false
+     * @return \Fleetbase\Models\Place|null
      */
-    public static function createFromCoordinates($coordinates, $attributes = [], $saveInstance = false)
+    public static function createFromCoordinates($coordinates, array $attributes = [], $saveInstance = false): ?Place
     {
         $instance = new Place();
+        $point    = Utils::getPointFromMixed($coordinates);
 
-        $latitude  = Utils::getLatitudeFromCoordinates($coordinates);
-        $longitude = Utils::getLongitudeFromCoordinates($coordinates);
+        if ($coordinates instanceof \Grimzy\LaravelMysqlSpatial\Types\Point) {
+            $latitude               = $coordinates->getLat();
+            $longitude              = $coordinates->getLng();
+        } elseif ($point instanceof \Grimzy\LaravelMysqlSpatial\Types\Point) {
+            $latitude               = $point->getLat();
+            $longitude              = $point->getLng();
+        }
 
         $instance->setAttribute('location', new \Grimzy\LaravelMysqlSpatial\Types\Point($latitude, $longitude));
         $instance->fill($attributes);
@@ -312,7 +346,7 @@ class Place extends Model
         $results = \Geocoder\Laravel\Facades\Geocoder::reverse($latitude, $longitude)->get();
 
         if ($results->isEmpty()) {
-            return false;
+            return null;
         }
 
         $instance->fillWithGoogleAddress($results->first());
@@ -327,15 +361,15 @@ class Place extends Model
     /**
      * Inserts a new place into the database using latitude and longitude coordinates.
      *
+     * @param \Grimzy\LaravelMysqlSpatial\Types\Point|array        $coordinates
      * @param \Grimzy\LaravelMysqlSpatial\Types\Point|string|array $coordinates the coordinates to use for the new place
      *
      * @return mixed returns the UUID of the new place on success or false on failure
      */
-    public static function insertFromCoordinates($coordinates)
+    public static function insertFromCoordinates($coordinates, array $attributes = [])
     {
-        $attributes = [];
-
-        $point = Utils::getPointFromMixed($coordinates);
+        $attributes = array_merge([], $attributes);
+        $point      = Utils::getPointFromMixed($coordinates);
 
         if ($coordinates instanceof \Grimzy\LaravelMysqlSpatial\Types\Point) {
             $attributes['location'] = $coordinates;
@@ -365,10 +399,15 @@ class Place extends Model
      * @param array $attributes
      * @param bool  $saveInstance
      *
-     * @return \App\Models\Place|false
+     * @return \Fleetbase\Models\Place|null
      */
-    public static function createFromMixed($place, $attributes = [], $saveInstance = true)
+    public static function createFromMixed($place, $attributes = [], $saveInstance = true): ?Place
     {
+        // If place is already an instance
+        if ($place instanceof Place) {
+            return $place;
+        }
+
         // If $place is a string
         if (is_string($place)) {
             // Check if $place is a valid public_id, return matching Place object if found
@@ -399,7 +438,7 @@ class Place extends Model
         }
         // If $place is an array of coordinates
         elseif (Utils::isCoordinatesStrict($place)) {
-            return static::insertFromCoordinates($place, true);
+            return static::createFromCoordinates($place, $attributes, $saveInstance);
         }
         // If $place is an array
         elseif (is_array($place)) {
@@ -421,7 +460,7 @@ class Place extends Model
             return static::createFromGoogleAddress($place, $saveInstance);
         }
 
-        return false;
+        return null;
     }
 
     /**