@fleetbase/fleetops-engine 0.3.4 → 0.3.6

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

@@ -0,0 +1,41 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
+
+use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Models\ApiCredential;
+use Fleetbase\Models\User;
+
+class NavigatorController extends Controller
+{
+    public function linkApp()
+    {
+        $adminUser = User::where('type', 'admin')->first();
+
+        if ($adminUser->company) {
+            $apiCredential = ApiCredential::firstOrCreate(
+                [
+                    'user_uuid'    => $adminUser->uuid,
+                    'company_uuid' => $adminUser->company_uuid,
+                    'name'         => 'NavigationAppLinker',
+                ],
+                [
+                    'user_uuid'    => $adminUser->uuid,
+                    'company_uuid' => $adminUser->company->uuid,
+                    'name'         => 'NavigationAppLinker',
+                ]
+            );
+
+            return redirect()->away('flbnavigator://configure?key=' . $apiCredential->key . '&host=' . url()->secure('/'));
+        }
+
+        return response()->error('Organization for linking not found.');
+    }
+
+    public function getLinkAppUrl()
+    {
+        return response()->json([
+            'linkUrl' => url('int/v1/fleet-ops/navigator/link-app'),
+        ]);
+    }
+}

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

@@ -129,6 +129,7 @@ class OrderController extends FleetOpsController
     public function importFromFiles(Request $request)
     {
         $info    = Utils::lookupIp();
+        $disk    = $request->input('disk', config('filesystems.default'));
         $files   = $request->input('files');
         $files   = File::whereIn('uuid', $files)->get();
         $country = $request->input('country', Utils::or($info, ['country_name', 'region'], 'Singapore'));
@@ -143,7 +144,7 @@ class OrderController extends FleetOpsController
             }
 
             try {
-                $data = Excel::toArray(new OrdersImport(), $file->path, 's3');
+                $data = Excel::toArray(new OrdersImport(), $file->path, $disk);
             } catch (\Exception $e) {
                 return response()->error('Invalid file, unable to proccess.');
             }
@@ -177,7 +178,7 @@ class OrderController extends FleetOpsController
                     $entity = new Entity(['name' => $itemName]);
                     $entity->setAttribute('destination_uuid', $place->uuid);
                     $entity->setAttribute('_import_id', $importId);
-                    $entity->setMetas($place->getMeta());
+                    $entity->setMeta($place->getMeta());
                     $entities[] = $entity;
                 }
             }

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

@@ -76,7 +76,7 @@ class PlaceController extends FleetOpsController
             }
         }
 
-        return response()->json($results);
+        return response()->json($results)->withHeaders(['Cache-Control' => 'no-cache']);
     }
 
     /**
@@ -113,7 +113,7 @@ class PlaceController extends FleetOpsController
             }
         }
 
-        return response()->json($results);
+        return response()->json($results)->withHeaders(['Cache-Control' => 'no-cache']);
     }
 
     /**

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

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
+use Fleetbase\FleetOps\Rules\ResolvablePoint;
 use Fleetbase\Http\Requests\FleetbaseRequest;
 use Illuminate\Validation\Rule;
 
@@ -37,6 +38,7 @@ class CreateDriverRequest extends FleetbaseRequest
             'status'   => 'nullable|string|in:active,inactive',
             'vendor'   => 'nullable|exists:vendors,public_id',
             'job'      => 'nullable|exists:orders,public_id',
+            'location' => ['nullable', new ResolvablePoint()],
         ];
     }
 

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

@@ -46,8 +46,16 @@ class CreateOrderRequest extends FleetbaseRequest
 
             if ($this->isArray('payload')) {
                 $validations['payload']         = 'required';
-                $validations['payload.pickup']  = 'required';
-                $validations['payload.dropoff'] = 'required';
+
+                if ($this->missing('payload.waypoints')) {
+                    $validations['payload.pickup']  = 'required';
+                    $validations['payload.dropoff'] = 'required';
+                }
+
+                if ($this->missing(['payload.pickup', 'payload.dropoff'])) {
+                    $validations['payload.waypoints'] = 'required|array|min:2';
+                }
+
                 $validations['payload.return']  = 'nullable';
             }
 
@@ -57,8 +65,14 @@ class CreateOrderRequest extends FleetbaseRequest
         }
 
         if ($this->missing('payload') && $this->isMethod('POST')) {
-            $validations['pickup']  = 'required';
-            $validations['dropoff'] = 'required';
+            if ($this->missing('waypoints')) {
+                $validations['pickup']  = 'required';
+                $validations['dropoff'] = 'required';
+            }
+
+            if ($this->missing(['pickup', 'dropoff'])) {
+                $validations['waypoints'] = 'required|array|min:2';
+            }
         }
 
         return $validations;

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

@@ -25,13 +25,29 @@ class CreatePayloadRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'pickup'             => 'required',
-            'dropoff'            => 'required',
-            'return'             => 'nullable',
-            'waypoints'          => 'nullable|array',
-            'type'               => 'required',
-            'cod_currency'       => [Rule::requiredIf($this->has(['cod_amount'])), 'size:3'],
-            'cod_payment_method' => [Rule::requiredIf($this->has(['cod_amount'])), 'in:card,check,cash,bank_transfer'],
+            'entities'              => 'array',
+            'waypoints'             => 'array',
+            'return'                => 'nullable',
+            'type'                  => 'required',
+            'cod_currency'          => [Rule::requiredIf($this->has(['cod_amount'])), 'size:3'],
+            'cod_payment_method'    => [Rule::requiredIf($this->has(['cod_amount'])), 'in:card,check,cash,bank_transfer'],
         ];
+
+        if ($this->missing('waypoints')) {
+            $validations['pickup']  = 'required';
+            $validations['dropoff'] = 'required';
+        }
+
+        if ($this->isString('pickup')) {
+            $validations['pickup'] = 'required|exists:places,public_id';
+        }
+
+        if ($this->isString('dropoff')) {
+            $validations['dropoff'] = 'required|exists:places,public_id';
+        }
+
+        if ($this->missing(['pickup', 'dropoff'])) {
+            $validations['waypoints'] = 'required|array|min:2';
+        }
     }
 }

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

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
+use Fleetbase\FleetOps\Rules\ResolvablePoint;
 use Fleetbase\Http\Requests\FleetbaseRequest;
 use Fleetbase\Rules\ExistsInAny;
 use Illuminate\Validation\Rule;
@@ -28,11 +29,14 @@ class CreatePlaceRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'name'     => [Rule::requiredIf($this->isMethod('POST'))],
-            'street1'  => [Rule::requiredIf($this->isMethod('POST'))],
-            'customer' => ['nullable', new ExistsInAny(['vendors', 'contacts'], 'public_id')],
-            'contact'  => ['nullable', new ExistsInAny(['vendors', 'contacts'], 'public_id')],
-            'vendor'   => 'nullable|exists:vendors,public_id',
+            'name'      => [Rule::requiredIf($this->isMethod('POST'))],
+            'street1'   => [Rule::requiredIf($this->isMethod('POST'))],
+            'customer'  => ['nullable', new ExistsInAny(['vendors', 'contacts'], 'public_id')],
+            'contact'   => ['nullable', new ExistsInAny(['vendors', 'contacts'], 'public_id')],
+            'vendor'    => 'nullable|exists:vendors,public_id',
+            'location'  => ['nullable', new ResolvablePoint()],
+            'latitude'  => 'nullable',
+            'longitude' => 'nullable',
         ];
     }
 }

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

@@ -2,7 +2,11 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\TrackingNumber;
+use Fleetbase\FleetOps\Rules\ResolvablePoint;
 use Fleetbase\Http\Requests\FleetbaseRequest;
+use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
 
 class CreateTrackingStatusRequest extends FleetbaseRequest
@@ -24,19 +28,72 @@ class CreateTrackingStatusRequest extends FleetbaseRequest
      */
     public function rules()
     {
-        return [
-            'tracking_number' => [
+        $validations = [
+            'tracking_number' => array_filter([
                 'required',
-                Rule::exists('tracking_numbers')->where(function ($query) {
-                    $query->where('public_id', $this->input('tracking_number'));
-                    $query->whereDoesntHave('status', function ($q) {
-                        $q->where('code', $this->input('code'));
-                    });
-                }),
-            ],
-            'status'  => 'required|string',
-            'details' => 'required|string',
-            'code'    => 'required|string',
+                $this->isMethod('POST') ? Rule::exists('tracking_numbers', 'public_id') : null,
+                $this->isMethod('POST') ? static::uniqueStatus($this) : null,
+            ]),
+            'location' => [new ResolvablePoint()],
+            'code'     => 'nullable|string|min:3',
+            'status'   => ['required', 'string', 'min:3'],
+            'details'  => 'nullable|string',
         ];
+
+        if ($this->isMethod('POST') && $this->missing('tracking_number') && $this->has('order')) {
+            $validations['tracking_number'] = 'nullable';
+            $validations['order']           = [
+                'required',
+                Rule::exists('orders', 'public_id'),
+                static::uniqueStatus($this),
+            ];
+        }
+
+        if ($this->missing(['latitude', 'longitude'])) {
+            $validations['location'] = ['required', new ResolvablePoint()];
+        } elseif ($this->missing('location')) {
+            $validations['latitude']  = 'required';
+            $validations['longitude'] = 'required';
+        }
+
+        return $validations;
+    }
+
+    /**
+     * Custom rule to ensure status is unique for an order or tracking number.
+     *
+     * @return \Closure
+     */
+    private static function uniqueStatus($request)
+    {
+        return function ($attribute, $value, $fail) use ($request) {
+            $trackingNumber = $request->input('tracking_number');
+            $orderId        = $request->input('order');
+            $status         = $request->input('status');
+            $exists         = false;
+
+            // if duplicate status enabled skip
+            if ($request->boolean('duplicate')) {
+                return;
+            }
+
+            if ($trackingNumber) {
+                $exists = TrackingNumber::where('public_id', $trackingNumber)->whereHas('statuses', function ($query) use ($status) {
+                    $query->where('status', $status);
+                    $query->orWhere('status', Str::title($status));
+                })->exists();
+            } elseif ($orderId) {
+                $exists = Order::where('public_id', $orderId)->whereHas('trackingNumber', function ($query) use ($status) {
+                    $query->whereHas('statuses', function ($query) use ($status) {
+                        $query->where('status', $status);
+                        $query->orWhere('status', Str::title($status));
+                    });
+                })->exists();
+            }
+
+            if ($exists) {
+                $fail('The status "' . Str::title($status) . '" has already been applied to the order.');
+            }
+        };
     }
 }

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

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
+use Fleetbase\FleetOps\Rules\ResolvablePoint;
 use Fleetbase\Http\Requests\FleetbaseRequest;
 
 class CreateVehicleRequest extends FleetbaseRequest
@@ -24,9 +25,10 @@ class CreateVehicleRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'status' => 'nullable|in:operational,maintenance,decommissioned',
-            'vendor' => 'nullable|exists:vendors,public_id',
-            'driver' => 'nullable|exists:drivers,public_id',
+            'status'   => 'nullable|in:operational,maintenance,decommissioned',
+            'vendor'   => 'nullable|exists:vendors,public_id',
+            'driver'   => 'nullable|exists:drivers,public_id',
+            'location' => ['nullable', new ResolvablePoint()],
         ];
     }
 }

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

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
+use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
 use Fleetbase\Support\Resolve;
@@ -24,11 +25,13 @@ class Entity extends FleetbaseResource
             '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,

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

@@ -17,23 +17,25 @@ class Fleet extends FleetbaseResource
     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),
-            '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)),
-            'parent_fleet'         => $this->whenLoaded('parentFleet', new ParentFleet($this->parentFleet)),
-            'subfleets'            => $this->whenLoaded('subFleets', SubFleet::collection($this->subFleets)),
-            'drivers'              => $this->whenLoaded('drivers', Driver::collection($this->drivers()->without(['driverAssigned'])->with(Http::isInternalRequest() ? ['jobs'] : [])->get())),
-            'vehicles'             => $this->whenLoaded('vehicles', Vehicle::collection($this->vehicles)),
-            '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),
+            '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)),
+            'parent_fleet'          => $this->whenLoaded('parentFleet', new ParentFleet($this->parentFleet)),
+            'subfleets'             => $this->whenLoaded('subFleets', SubFleet::collection($this->subFleets)),
+            'drivers'               => $this->whenLoaded('drivers', Driver::collection($this->drivers()->without(['driverAssigned'])->with(Http::isInternalRequest() ? ['jobs'] : [])->get())),
+            'vehicles'              => $this->whenLoaded('vehicles', Vehicle::collection($this->vehicles)),
+            'updated_at'            => $this->updated_at,
+            'created_at'            => $this->created_at,
         ];
     }
 

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

@@ -48,12 +48,13 @@ class Order extends FleetbaseResource
             'type'                 => $this->type,
             'status'               => $this->status,
             'pod_method'           => $this->pod_method,
-            'pod_required'         => $this->pod_required ?? false,
+            'pod_required'         => (bool) data_get($this, 'pod_required', false),
+            'dispatched'           => (bool) data_get($this, 'dispatched', false),
             'adhoc'                => $this->adhoc,
             'adhoc_distance'       => (int) $this->getAdhocDistance(),
             'distance'             => (int) $this->distance,
             'time'                 => (int) $this->time,
-            'meta'                 => $this->meta ?? [],
+            'meta'                 => data_get($this, 'meta', []),
             'dispatched_at'        => $this->dispatched_at,
             'started_at'           => $this->started_at,
             'scheduled_at'         => $this->scheduled_at,

package/server/src/Models/Driver.php

@@ -18,10 +18,12 @@ use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
 use Spatie\Activitylog\Traits\CausesActivity;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Spatie\Sluggable\HasSlug;
 use Spatie\Sluggable\SlugOptions;
+use WebSocket\Message\Ping;
 
 class Driver extends Model
 {
@@ -86,6 +88,7 @@ class Driver extends Model
         'online',
         'slug',
         'status',
+        'meta,',
     ];
 
     /**
@@ -108,8 +111,9 @@ class Driver extends Model
      * @var array
      */
     protected $casts = [
-        'location' => Point::class,
-        'online'   => 'boolean',
+        'location'   => Point::class,
+        'online'     => 'boolean',
+        'meta'       => Json::class,
     ];
 
     /**
@@ -546,4 +550,19 @@ class Driver extends Model
 
         return $position;
     }
+
+    /**
+     * Get the user relationship from the driver.
+     */
+    public function getUser(): ?\Fleetbase\Models\User
+    {
+        // get user
+        $user = $this->load(['user'])->user;
+
+        if (empty($user) && Str::isUuid($this->user_uuid)) {
+            $user = \Fleetbase\Models\User::where('uuid', $this->user_uuid)->first();
+        }
+
+        return $user;
+    }
 }

package/server/src/Models/Entity.php

@@ -68,6 +68,7 @@ class Entity extends Model
         'customer_type',
         'tracking_number_uuid',
         'destination_uuid',
+        'supplier_uuid',
         'photo_uuid',
         '_import_id',
         'internal_id',
@@ -160,9 +161,7 @@ class Entity extends Model
     }
 
     /**
-     * Photo of entity belongs to.
-     *
-     * @var Model
+     * @var \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function photo()
     {
@@ -170,9 +169,7 @@ class Entity extends Model
     }
 
     /**
-     * Files assosciated with entity.
-     *
-     * @var Model
+     * @var \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function files()
     {
@@ -180,7 +177,7 @@ class Entity extends Model
     }
 
     /**
-     * The proofs for this order.
+     * @var \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function proofs()
     {
@@ -188,9 +185,7 @@ class Entity extends Model
     }
 
     /**
-     * The entity destination.
-     *
-     * @var Model
+     * @var \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function destination()
     {
@@ -198,9 +193,7 @@ class Entity extends Model
     }
 
     /**
-     * Payload entity belongs to.
-     *
-     * @var Model
+     * @var \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function payload()
     {
@@ -208,9 +201,15 @@ class Entity extends Model
     }
 
     /**
-     * Driver assigned to order.
-     *
-     * @var Model
+     * @var \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function supplier()
+    {
+        return $this->belongsTo(Vendor::class, 'supplier_uuid', 'uuid');
+    }
+
+    /**
+     * @var \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function driver()
     {
@@ -218,9 +217,7 @@ class Entity extends Model
     }
 
     /**
-     * The company who manages this order.
-     *
-     * @var Model
+     * @var \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function company()
     {
@@ -228,7 +225,7 @@ class Entity extends Model
     }
 
     /**
-     * The tracking number assosicated to the entity.
+     * @var \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function trackingNumber()
     {
@@ -236,9 +233,7 @@ class Entity extends Model
     }
 
     /**
-     * The customer of this order.
-     *
-     * @var Model
+     * @var \Illuminate\Database\Eloquent\Relations\MorphTo
      */
     public function customer()
     {

package/server/src/Models/Order.php

@@ -975,7 +975,7 @@ class Order extends Model
             $this->load('driverAssigned');
 
             if ($this->driverAssigned instanceof Driver) {
-                $this->payload->setPickup($this->driverAssigned->location, true);
+                $this->payload->setPickup($this->driverAssigned->location, ['save' => true]);
             }
         }
 
@@ -985,7 +985,7 @@ class Order extends Model
             $this->load('driverAssigned');
 
             if ($this->driverAssigned instanceof Driver) {
-                $this->payload->setPickup($this->driverAssigned->location, true);
+                $this->payload->setPickup($this->driverAssigned->location, ['save' => true]);
             }
         }
     }