@fleetbase/fleetops-engine 0.4.11 → 0.4.13

package/server/migrations/2023_11_17_053001_add_category_uuid_to_entities_table.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddCategoryUuidToEntitiesTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
@@ -30,4 +30,4 @@ class AddCategoryUuidToEntitiesTable extends Migration
             $table->dropColumn(['category_uuid']);
         });
     }
-}
+};

package/server/migrations/2023_11_28_074244_add_supplier_uuid_column_to_entities_table.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddSupplierUuidColumnToEntitiesTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
@@ -30,4 +30,4 @@ class AddSupplierUuidColumnToEntitiesTable extends Migration
             $table->dropColumn(['supplier_uuid']);
         });
     }
-}
+};

package/server/migrations/{2023_12_14_100209_add_meta_column_on_driver_table.php → 2023_12_14_100209_add_meta_column_on_driver_table copy.php }

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddMetaColumnOnDriverTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
@@ -25,6 +25,8 @@ class AddMetaColumnOnDriverTable extends Migration
      */
     public function down()
     {
-        //
+        Schema::table('drivers', function (Blueprint $table) {
+            $table->dropColumn('meta');
+        });
     }
-}
+};

package/server/migrations/2024_02_18_100209_add_avatar_url_columns_table.php

@@ -0,0 +1,54 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // Increase size of vehicles avatar url column for signed urls
+        Schema::table('vehicles', function (Blueprint $table) {
+            $table->mediumText('avatar_url')->change();
+        });
+
+        // Add avatar url column to places
+        Schema::table('places', function (Blueprint $table) {
+            $table->mediumText('avatar_url')->nullable()->after('remarks');
+        });
+
+        // Add avatar url column to drivers
+        Schema::table('drivers', function (Blueprint $table) {
+            $table->mediumText('avatar_url')->nullable()->after('signup_token_used');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+         // Reverse: Increase size of vehicles avatar url column for signed urls
+         Schema::table('vehicles', function (Blueprint $table) {
+            $table->string('avatar_url', 300)->change();
+        });
+
+        // Reverse: Add avatar url column to places
+        Schema::table('places', function (Blueprint $table) {
+            $table->dropColumn('avatar_url');
+        });
+
+        // Reverse: Add avatar url column to drivers
+        Schema::table('drivers', function (Blueprint $table) {
+            $table->dropColumn('avatar_url');
+        });
+    }
+};

package/server/src/Expansions/UserExpansion.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Expansions;
 
 use Fleetbase\Build\Expansion;
+use Fleetbase\FleetOps\Models\Contact;
 use Fleetbase\FleetOps\Models\Driver;
 
 class UserExpansion implements Expansion

package/server/src/Http/Controllers/Api/v1/DriverController.php

@@ -58,7 +58,13 @@ class DriverController extends Controller
         $user = User::create($userDetails);
 
         // Assign company
-        $user->assignCompany($company);
+        if ($company) {
+            $user->assignCompany($company);
+        } else {
+            $user->deleteQuietly();
+
+            return response()->apiError('Unable to assign driver to company.');
+        }
 
         // Set user type
         $user->setUserType('driver');

package/server/src/Http/Controllers/Api/v1/PlaceController.php

@@ -48,8 +48,11 @@ class PlaceController extends Controller
             'meta',
         ]);
 
+        // Check is missing key address attributes
+        $isNotAddressObject = $request->isNotFilled(['name', 'location', 'latititude', 'longitude', 'city', 'province', 'postal_code']);
+
         // if address param is sent create from mixed
-        if ($request->isString('address')) {
+        if ($isNotAddressObject && $request->isString('address')) {
             $place = Place::createFromGeocodingLookup($request->input('address'));
 
             if ($place instanceof Place) {
@@ -58,7 +61,7 @@ class PlaceController extends Controller
         }
 
         // if street1 is the only param
-        if ($request->missing(['name', 'location', 'latititude', 'longitude', 'address']) && $request->isString('street1')) {
+        if ($isNotAddressObject && $request->isString('street1')) {
             $place = Place::createFromGeocodingLookup($request->input('street1'));
 
             if ($place instanceof Place) {
@@ -129,6 +132,11 @@ class PlaceController extends Controller
         // check if missing location
         $isMissingLocation = empty($input['location']);
 
+        // set a default location for creation
+        if ($isMissingLocation) {
+            $input['location'] = new Point(0, 0);
+        }
+
         // fill place with attributes
         $place->fill($input);
 
@@ -145,6 +153,7 @@ class PlaceController extends Controller
             }
         }
 
+        // Save place
         $place->save();
 
         return new PlaceResource($place);

package/server/src/Http/Controllers/Internal/v1/DriverController.php

@@ -14,7 +14,6 @@ use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\LaravelMysqlSpatial\Types\Point;
-use Fleetbase\Models\CompanyUser;
 use Fleetbase\Models\Invite;
 use Fleetbase\Models\User;
 use Fleetbase\Models\VerificationCode;
@@ -176,13 +175,9 @@ class DriverController extends FleetOpsController
                     // Assign user to company
                     if ($company) {
                         $user->assignCompany($company);
-
-                        // create company user
-                        CompanyUser::create([
-                            'user_uuid'    => $user->uuid,
-                            'company_uuid' => $company->uuid,
-                            'status'       => 'active',
-                        ]);
+                    } else {
+                        $user->deleteQuietly();
+                        throw new \Exception('Unable to assign driver to company.');
                     }
 
                     // Set user type as driver
@@ -305,6 +300,18 @@ class DriverController extends FleetOpsController
         return response()->json($statuses);
     }
 
+    /**
+     * Get all avatar options for an vehicle.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function avatars()
+    {
+        $options = Driver::getAvatarOptions();
+
+        return response()->json($options);
+    }
+
     /**
      * Export the drivers to excel or csv.
      *

package/server/src/Http/Controllers/Internal/v1/OrderController.php

@@ -142,6 +142,52 @@ class OrderController extends FleetOpsController
         }
     }
 
+    /**
+     *  Route which enables editing of an order route.
+     * 
+     * @param string $id - The order ID.
+     * @param Request $request
+     * @return Response
+     */
+    public function editOrderRoute(string $id, Request $request) {
+        $pickup = $request->input('pickup');
+        $dropoff = $request->input('dropoff');
+        $return = $request->input('return');
+        $waypoints = $request->array('waypoints', []);
+
+        // Get the order
+        $order = Order::where('uuid', $id)->with(['payload'])->first();
+        if (!$order) {
+            return response()->error('Unable to find order to update route for.');
+        }
+        
+        // Handle update of multiple waypoints
+        if ($waypoints) {
+            $order->payload->updateWaypoints($waypoints);
+            $order->payload->removePlace(['pickup', 'dropoff', 'return'], ['save' => true]);
+        } else {
+            // Update pickup
+            if ($pickup) {
+                $order->payload->setPickup($pickup, ['save' => true]);
+            }
+
+            // Update dropoff
+            if ($dropoff) {
+                $order->payload->setDropoff($dropoff, ['save' => true]);
+            }
+
+            // Update return
+            if ($return) {
+                $order->payload->setDropoff($return, ['save' => true]);
+            }
+
+            // Remove waypoints if any
+            $order->payload->removeWaypoints();
+        }
+
+        return ['order' => new $this->resource($order)]; 
+    }
+
     /**
      * Process import files (excel,csv) into Fleetbase order data.
      *

package/server/src/Http/Controllers/Internal/v1/PlaceController.php

@@ -160,4 +160,16 @@ class PlaceController extends FleetOpsController
             200
         );
     }
+
+    /**
+     * Get all avatar options for an vehicle.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function avatars()
+    {
+        $options = Place::getAvatarOptions();
+
+        return response()->json($options);
+    }
 }

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

@@ -29,10 +29,12 @@ class Driver extends FleetbaseResource
             'public_id'                     => $this->when(Http::isInternalRequest(), $this->public_id),
             'internal_id'                   => $this->internal_id,
             'name'                          => $this->name,
-            'email'                         => $this->email ?? null,
-            'phone'                         => $this->phone ?? null,
-            'drivers_license_number'        => $this->drivers_license_number ?? null,
-            'photo_url'                     => $this->photo_url ?? null,
+            'email'                         => $this->email,
+            'phone'                         => $this->phone,
+            'drivers_license_number'        => $this->drivers_license_number,
+            'photo_url'                     => $this->photo_url,
+            'avatar_url'                    => $this->avatar_url,
+            'avatar_value'                  => $this->when(Http::isInternalRequest(), $this->getOriginal('avatar_url')),
             'vehicle_name'                  => $this->when(Http::isInternalRequest(), $this->vehicle_name),
             'vehicle_avatar'                => $this->when(Http::isInternalRequest(), $this->vehicle_avatar),
             'vendor_name'                   => $this->when(Http::isInternalRequest(), $this->vendor_name),

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

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Resources\Comment;
+use Fleetbase\Http\Resources\File;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
 use Fleetbase\Support\Resolve;
@@ -45,7 +46,7 @@ class Order extends FleetbaseResource
             'tracking_number'      => new TrackingNumber($this->trackingNumber),
             'tracking_statuses'    => $this->whenLoaded('trackingStatuses', TrackingStatus::collection($this->trackingStatuses)),
             'comments'             => $this->when(Http::isInternalRequest(), Comment::collection($this->comments)),
-            'files'                => $this->when(Http::isInternalRequest(), $this->files),
+            'files'                => $this->when(Http::isInternalRequest(), $this->files, File::collection($this->files)),
             'purchase_rate'        => new PurchaseRate($this->purchaseRate),
             'notes'                => $this->notes,
             'type'                 => $this->type,

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

@@ -41,11 +41,15 @@ class Payload extends FleetbaseResource
 
     private function getWaypoints(): ?\Illuminate\Support\Collection
     {
-        return $this->waypoints->map(function ($waypoint) {
-            $waypoint->payload_uuid = $this->uuid;
+        if ($this->waypoints instanceof \Illuminate\Support\Collection) {
+            return $this->waypoints->map(function ($waypoint) {
+                $waypoint->payload_uuid = $this->uuid;
 
-            return $waypoint;
-        });
+                return $waypoint;
+            });
+        }
+        
+        return [];
     }
 
     /**

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

@@ -26,6 +26,8 @@ class Place extends FleetbaseResource
             'location'             => data_get($this, 'location', new Point(0, 0)),
             'address'              => $this->address,
             'address_html'         => $this->when(Http::isInternalRequest(), $this->address_html),
+            'avatar_url'           => $this->avatar_url,
+            'avatar_value'         => $this->when(Http::isInternalRequest(), $this->getOriginal('avatar_url')),
             'street1'              => $this->street1 ?? null,
             'street2'              => $this->street2 ?? null,
             'city'                 => $this->city ?? null,

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

@@ -29,6 +29,7 @@ class Vehicle extends FleetbaseResource
             'devices'                => $this->whenLoaded('devices', $this->devices),
             'photo_url'              => $this->photo_url,
             'avatar_url'             => $this->avatar_url,
+            'avatar_value'           => $this->when(Http::isInternalRequest(), $this->getOriginal('avatar_url')),
             'make'                   => $this->make,
             'model'                  => $this->model,
             'year'                   => $this->year,

package/server/src/Models/Driver.php

@@ -8,6 +8,7 @@ use Fleetbase\FleetOps\Scopes\DriverScope;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\FleetOps\Support\Utils as FleetOpsUtils;
 use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+use Fleetbase\Models\File;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasInternalId;
@@ -77,6 +78,7 @@ class Driver extends Model
         'current_job_uuid',
         'auth_token',
         'signup_token_used',
+        'avatar_url',
         'drivers_license_number',
         'location',
         'heading',
@@ -295,6 +297,80 @@ class Driver extends Model
         return $this->hasMany(\Fleetbase\Models\UserDevice::class, 'user_uuid', 'user_uuid');
     }
 
+    /**
+     * Get avatar url.
+     *
+     * @return string|null
+     */
+    public function getAvatarUrlAttribute($value)
+    {
+        // if vehicle assigned us the vehicle avatar
+        if ($this->vehicle) {
+            return $this->vehicle->avatar_url;
+        }
+
+        if (!$value) {
+            return static::getAvatar();
+        }
+
+        if (Str::isUuid($value)) {
+            return static::getAvatar($value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Get an avatar url by key.
+     *
+     * @param string $key
+     */
+    public static function getAvatar($key = 'moto-driver'): ?string
+    {
+        if (Str::isUuid($key)) {
+            $file = File::where('uuid', $key)->first();
+            if ($file) {
+                return $file->url;
+            }
+
+            return null;
+        }
+
+        return static::getAvatarOptions()->get($key);
+    }
+
+    /**
+     * Get all avatar options for a vehicle.
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    public static function getAvatarOptions()
+    {
+        $options = [
+            'moto-driver.png',
+        ];
+
+        // Get custom avatars
+        $customAvatars = collect(File::where('type', 'driver-avatar')->get()->mapWithKeys(
+            function ($file) {
+                $key = str_replace(['.svg', '.png'], '', 'Custom: ' . $file->original_filename);
+
+                return [$key => $file->uuid];
+            }
+        )->toArray());
+
+        // Create default avatars included from fleetbase
+        $avatars = collect($options)->mapWithKeys(
+            function ($option) {
+                $key = str_replace(['.svg', '.png'], '', $option);
+
+                return [$key => Utils::assetFromS3('static/driver-icons/' . $option)];
+            }
+        );
+
+        return $customAvatars->merge($avatars);
+    }
+
     /**
      * Specifies the user's FCM tokens.
      *

package/server/src/Models/Payload.php

@@ -578,10 +578,47 @@ class Payload extends Model
         }
 
         $this->load('order');
-
         return $this->order;
     }
 
+    public function removeWaypoints()
+    {
+        Waypoint::where('payload_uuid', $this->uuid)->delete();
+        $this->setRelation('waypoints', collect());
+        return $this;
+    }
+
+    public function removePlace($property, array $options = [])
+    {
+        // remove multiple places
+        if (is_array($property)) {
+            foreach ($property as $prop) {
+                if (is_string($prop)) {
+                    $this->removePlace($prop, $options);
+                }
+            }
+
+            return $this;
+        }
+
+        $attr     = $property . '_uuid';
+        $save     = data_get($options, 'save', false);
+        $callback = data_get($options, 'callback', false);
+
+        $this->setAttribute($attr, null);
+        $this->setRelation($property, null);
+
+        if ($save) {
+            $this->updateQuietly([$attr => null]);
+        }
+
+        if (is_callable($callback)) {
+            $callback($this);
+        }
+
+        return $this;
+    }
+
     public function setPlace($property, Place $place, array $options = [])
     {
         $attr     = $property . '_uuid';
@@ -599,8 +636,17 @@ class Payload extends Model
             }
         }
 
+        // Get the ID property
+        $id = $this->{$attr};
+
+        // set relationship to model instance to
+        if ($instance instanceof Model) {
+            $this->setRelation($property, $instance);
+        }
+
+        // If optioned to save
         if ($save) {
-            $this->save();
+            $this->updateQuietly([$attr => $id]);
         }
 
         if (is_callable($callback)) {
@@ -673,7 +719,7 @@ class Payload extends Model
         }
 
         $this->current_waypoint_uuid = $destination->uuid;
-        $this->save();
+        $this->saveQuietly();
         $this->updateWaypointActivity($activity, $location);
 
         return $this->load('currentWaypoint');

package/server/src/Models/Place.php

@@ -7,6 +7,7 @@ use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Support\Geocoding;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+use Fleetbase\Models\File;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasMetaAttributes;
@@ -69,6 +70,7 @@ class Place extends Model
         'company_uuid',
         'owner_uuid',
         'owner_type',
+        'avatar_url',
         'name',
         'type',
         'street1',
@@ -168,6 +170,75 @@ class Place extends Model
         return data_get($this, 'country_data.name.common');
     }
 
+    /**
+     * Get avatar url.
+     *
+     * @return string|null
+     */
+    public function getAvatarUrlAttribute($value)
+    {
+        if (!$value) {
+            return static::getAvatar();
+        }
+
+        if (Str::isUuid($value)) {
+            return static::getAvatar($value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Get an avatar url by key.
+     *
+     * @param string $key
+     */
+    public static function getAvatar($key = 'basic-building'): ?string
+    {
+        if (Str::isUuid($key)) {
+            $file = File::where('uuid', $key)->first();
+            if ($file) {
+                return $file->url;
+            }
+
+            return null;
+        }
+
+        return static::getAvatarOptions()->get($key);
+    }
+
+    /**
+     * Get all avatar options for a vehicle.
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    public static function getAvatarOptions()
+    {
+        $options = [
+            'basic-building.png',
+        ];
+
+        // Get custom avatars
+        $customAvatars = collect(File::where('type', 'place-avatar')->get()->mapWithKeys(
+            function ($file) {
+                $key = str_replace(['.svg', '.png'], '', 'Custom: ' . $file->original_filename);
+
+                return [$key => $file->uuid];
+            }
+        )->toArray());
+
+        // Create default avatars included from fleetbase
+        $avatars = collect($options)->mapWithKeys(
+            function ($option) {
+                $key = str_replace(['.svg', '.png'], '', $option);
+
+                return [$key => Utils::assetFromS3('static/place-icons/' . $option)];
+            }
+        );
+
+        return $customAvatars->merge($avatars);
+    }
+
     /**
      * Returns a Point instance from the location of the model.
      */