@fleetbase/fleetops-engine 0.6.46 → 0.6.48

package/server/seeders/VroomOrchestrationSeeder.php

@@ -0,0 +1,402 @@
+<?php
+
+namespace Fleetbase\FleetOps\Seeders;
+
+use Fleetbase\FleetOps\Models\Entity;
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\Payload;
+use Fleetbase\FleetOps\Models\Place;
+use Fleetbase\FleetOps\Models\Vehicle;
+use Fleetbase\FleetOps\Models\Waypoint;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\Models\Company;
+use Fleetbase\Seeders\Concerns\ResolvesSeedCompany;
+use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+
+class VroomOrchestrationSeeder extends Seeder
+{
+    use ResolvesSeedCompany;
+
+    protected const SEED_NAME = 'vroom-orchestration';
+
+    public function run(): void
+    {
+        $company = $this->resolveCompany();
+        if (!$company) {
+            $this->command?->error('No company found. Create a Fleetbase company before running the VROOM orchestration seeder.');
+
+            return;
+        }
+
+        session(['company' => $company->uuid]);
+
+        DB::transaction(function () use ($company) {
+            $this->purgePreviousSeedData();
+
+            $places   = $this->seedPlaces($company);
+            $vehicles = $this->seedVehicles($company);
+            $orders   = $this->seedOrders($company, $places);
+
+            $this->command?->info('Seeded VROOM orchestration test data for company: ' . $company->public_id);
+            $this->command?->line('Order IDs: ' . implode(', ', array_map(fn (Order $order) => $order->public_id, $orders)));
+            $this->command?->line('Vehicle IDs: ' . implode(', ', array_map(fn (Vehicle $vehicle) => $vehicle->public_id, $vehicles)));
+        });
+    }
+
+    protected function resolveCompany(): ?Company
+    {
+        return $this->resolveSeedCompany(
+            'FLEETOPS_VROOM_SEED_COMPANY_UUID',
+            'FLEETOPS_VROOM_SEED_COMPANY_PUBLIC_ID'
+        );
+    }
+
+    protected function purgePreviousSeedData(): void
+    {
+        $payloadUuids = $this->seeded(Payload::query())->pluck('uuid');
+
+        $this->seeded(Order::query())->forceDelete();
+        Entity::whereIn('payload_uuid', $payloadUuids)->forceDelete();
+        Waypoint::whereIn('payload_uuid', $payloadUuids)->forceDelete();
+        $this->seeded(Payload::query())->forceDelete();
+        $this->seeded(Vehicle::query())->forceDelete();
+        $this->seeded(Place::query())->forceDelete();
+    }
+
+    protected function seeded($query)
+    {
+        return $query->where('meta->seed', static::SEED_NAME);
+    }
+
+    protected function meta(string $seedId, array $extra = []): array
+    {
+        return array_merge([
+            'seed'    => static::SEED_NAME,
+            'seed_id' => $seedId,
+        ], $extra);
+    }
+
+    protected function seedPlaces(Company $company): array
+    {
+        $places = [
+            'depot' => [
+                'seed_id'   => 'depot_tanjong_pagar',
+                'name'      => 'VROOM Test Depot - Tanjong Pagar',
+                'street1'   => '1 Raffles Quay',
+                'city'      => 'Singapore',
+                'country'   => 'SG',
+                'lat'       => 1.2816,
+                'lng'       => 103.8510,
+            ],
+            'orchard' => [
+                'seed_id'   => 'dropoff_orchard',
+                'name'      => 'VROOM Test Dropoff - Orchard',
+                'street1'   => '2 Orchard Turn',
+                'city'      => 'Singapore',
+                'country'   => 'SG',
+                'lat'       => 1.3048,
+                'lng'       => 103.8318,
+            ],
+            'changi' => [
+                'seed_id'   => 'dropoff_changi',
+                'name'      => 'VROOM Test Dropoff - Changi',
+                'street1'   => '80 Airport Boulevard',
+                'city'      => 'Singapore',
+                'country'   => 'SG',
+                'lat'       => 1.3644,
+                'lng'       => 103.9915,
+            ],
+            'woodlands' => [
+                'seed_id'   => 'dropoff_woodlands',
+                'name'      => 'VROOM Test Dropoff - Woodlands',
+                'street1'   => '1 Woodlands Square',
+                'city'      => 'Singapore',
+                'country'   => 'SG',
+                'lat'       => 1.4360,
+                'lng'       => 103.7860,
+            ],
+            'rochor' => [
+                'seed_id'   => 'waypoint_rochor',
+                'name'      => 'VROOM Test Waypoint - Rochor',
+                'street1'   => '1 Rochor Canal Road',
+                'city'      => 'Singapore',
+                'country'   => 'SG',
+                'lat'       => 1.3039,
+                'lng'       => 103.8520,
+            ],
+            'novena' => [
+                'seed_id'   => 'waypoint_novena',
+                'name'      => 'VROOM Test Waypoint - Novena',
+                'street1'   => '10 Sinaran Drive',
+                'city'      => 'Singapore',
+                'country'   => 'SG',
+                'lat'       => 1.3206,
+                'lng'       => 103.8439,
+            ],
+            'serangoon' => [
+                'seed_id'   => 'waypoint_serangoon',
+                'name'      => 'VROOM Test Waypoint - Serangoon',
+                'street1'   => '23 Serangoon Central',
+                'city'      => 'Singapore',
+                'country'   => 'SG',
+                'lat'       => 1.3508,
+                'lng'       => 103.8723,
+            ],
+            'paya_lebar' => [
+                'seed_id'   => 'waypoint_paya_lebar',
+                'name'      => 'VROOM Test Waypoint - Paya Lebar',
+                'street1'   => '10 Paya Lebar Road',
+                'city'      => 'Singapore',
+                'country'   => 'SG',
+                'lat'       => 1.3174,
+                'lng'       => 103.8927,
+            ],
+            'tampines' => [
+                'seed_id'   => 'waypoint_tampines',
+                'name'      => 'VROOM Test Waypoint - Tampines',
+                'street1'   => '4 Tampines Central 5',
+                'city'      => 'Singapore',
+                'country'   => 'SG',
+                'lat'       => 1.3525,
+                'lng'       => 103.9447,
+            ],
+        ];
+
+        return collect($places)->mapWithKeys(function (array $place, string $key) use ($company) {
+            $model = new Place();
+            $model->forceFill([
+                'uuid'         => (string) Str::uuid(),
+                'company_uuid' => $company->uuid,
+                'name'         => $place['name'],
+                'street1'      => $place['street1'],
+                'city'         => $place['city'],
+                'country'      => $place['country'],
+                'location'     => new Point($place['lat'], $place['lng']),
+                'meta'         => $this->meta($place['seed_id']),
+            ])->save();
+
+            return [$key => $model];
+        })->all();
+    }
+
+    protected function seedVehicles(Company $company): array
+    {
+        $vehicles = [
+            [
+                'seed_id'   => 'central_1',
+                'name'      => 'VROOM Test Van - Central',
+                'make'      => 'Nissan',
+                'model'     => 'NV200',
+                'lat'       => 1.2798,
+                'lng'       => 103.8500,
+                'capacity'  => [120, 4.5, 1, 20],
+            ],
+            [
+                'seed_id'   => 'east_1',
+                'name'      => 'VROOM Test Van - East',
+                'make'      => 'Toyota',
+                'model'     => 'HiAce',
+                'lat'       => 1.3349,
+                'lng'       => 103.9617,
+                'capacity'  => [250, 8, 2, 40],
+            ],
+            [
+                'seed_id'   => 'north_1',
+                'name'      => 'VROOM Test Van - North',
+                'make'      => 'Mercedes-Benz',
+                'model'     => 'Sprinter',
+                'lat'       => 1.4326,
+                'lng'       => 103.7856,
+                'capacity'  => [500, 16, 4, 80],
+            ],
+            [
+                'seed_id'   => 'west_1',
+                'name'      => 'VROOM Test Van - West',
+                'make'      => 'Ford',
+                'model'     => 'Transit',
+                'lat'       => 1.3345,
+                'lng'       => 103.7420,
+                'capacity'  => [90, 3, 0, 12],
+            ],
+            [
+                'seed_id'   => 'capacity_only_heavy_1',
+                'name'      => 'VROOM Test Capacity Truck - No Position',
+                'make'      => 'Isuzu',
+                'model'     => 'NPR',
+                'capacity'  => [900, 24, 8, 160],
+                'skills'    => ['tail_lift'],
+                'max_tasks' => 10,
+            ],
+            [
+                'seed_id'   => 'capacity_only_cold_1',
+                'name'      => 'VROOM Test Cold Chain Van - No Position',
+                'make'      => 'Hyundai',
+                'model'     => 'H350',
+                'capacity'  => [350, 10, 3, 60],
+                'skills'    => ['cold_chain'],
+                'max_tasks' => 8,
+            ],
+        ];
+
+        return collect($vehicles)->mapWithKeys(function (array $vehicle) use ($company) {
+            $model = new Vehicle();
+            $model->forceFill([
+                'uuid'                     => (string) Str::uuid(),
+                'company_uuid'             => $company->uuid,
+                'name'                     => $vehicle['name'],
+                'make'                     => $vehicle['make'],
+                'model'                    => $vehicle['model'],
+                'year'                     => '2024',
+                'type'                     => 'van',
+                'status'                   => 'active',
+                'online'                   => true,
+                'location'                 => isset($vehicle['lat'], $vehicle['lng']) ? new Point($vehicle['lat'], $vehicle['lng']) : null,
+                'skills'                   => $vehicle['skills'] ?? [],
+                'payload_capacity'         => $vehicle['capacity'][0],
+                'payload_capacity_volume'  => $vehicle['capacity'][1],
+                'payload_capacity_pallets' => $vehicle['capacity'][2],
+                'payload_capacity_parcels' => $vehicle['capacity'][3],
+                'max_tasks'                => $vehicle['max_tasks'] ?? 6,
+                'return_to_depot'          => false,
+                'meta'                     => $this->meta($vehicle['seed_id'], [
+                    'location_state' => isset($vehicle['lat'], $vehicle['lng']) ? 'set' : 'not_set',
+                    'capacity'       => [
+                        'weight_kg'     => $vehicle['capacity'][0],
+                        'volume_m3'     => $vehicle['capacity'][1],
+                        'pallets'       => $vehicle['capacity'][2],
+                        'parcels'       => $vehicle['capacity'][3],
+                    ],
+                ]),
+            ])->save();
+
+            return [$vehicle['seed_id'] => $model];
+        })->all();
+    }
+
+    protected function seedOrders(Company $company, array $places): array
+    {
+        $orders = [
+            'endpoint_only' => [
+                'payload_seed_id' => 'endpoint_only',
+                'name'       => 'VROOM Test Order - Pickup Dropoff',
+                'pickup'     => $places['depot'],
+                'dropoff'    => $places['orchard'],
+                'waypoints'  => [],
+                'entities'   => [
+                    ['name' => 'Small carton', 'type' => 'parcel', 'weight' => 12, 'weight_unit' => 'kg', 'length' => 60, 'width' => 40, 'height' => 35, 'dimensions_unit' => 'cm'],
+                    ['name' => 'Fragile tote', 'type' => 'parcel', 'weight' => 8, 'weight_unit' => 'kg', 'length' => 50, 'width' => 35, 'height' => 30, 'dimensions_unit' => 'cm'],
+                ],
+            ],
+            'waypoint_only' => [
+                'payload_seed_id' => 'waypoint_only',
+                'name'       => 'VROOM Test Order - Waypoints Only',
+                'pickup'     => null,
+                'dropoff'    => null,
+                'waypoints'  => [$places['rochor'], $places['novena'], $places['serangoon']],
+                'entities'   => [
+                    ['name' => 'Multi-stop parcel 1', 'type' => 'parcel', 'weight' => 25, 'weight_unit' => 'kg', 'length' => 80, 'width' => 50, 'height' => 40, 'dimensions_unit' => 'cm'],
+                    ['name' => 'Multi-stop parcel 2', 'type' => 'parcel', 'weight' => 18, 'weight_unit' => 'kg', 'length' => 70, 'width' => 45, 'height' => 35, 'dimensions_unit' => 'cm'],
+                    ['name' => 'Multi-stop parcel 3', 'type' => 'parcel', 'weight' => 15, 'weight_unit' => 'kg', 'length' => 65, 'width' => 40, 'height' => 35, 'dimensions_unit' => 'cm'],
+                ],
+            ],
+            'mixed' => [
+                'payload_seed_id' => 'mixed',
+                'name'       => 'VROOM Test Order - Mixed Stops',
+                'pickup'     => $places['depot'],
+                'dropoff'    => $places['changi'],
+                'waypoints'  => [$places['paya_lebar'], $places['tampines']],
+                'entities'   => [
+                    ['name' => 'Heavy equipment crate', 'type' => 'freight', 'weight' => 180, 'weight_unit' => 'kg', 'length' => 120, 'width' => 80, 'height' => 90, 'dimensions_unit' => 'cm'],
+                    ['name' => 'Accessory box', 'type' => 'parcel', 'weight' => 22, 'weight_unit' => 'kg', 'length' => 75, 'width' => 55, 'height' => 45, 'dimensions_unit' => 'cm'],
+                ],
+            ],
+            'single_waypoint' => [
+                'payload_seed_id' => 'single_waypoint',
+                'name'       => 'VROOM Test Order - Single Waypoint',
+                'pickup'     => null,
+                'dropoff'    => null,
+                'waypoints'  => [$places['woodlands']],
+                'entities'   => [
+                    ['name' => 'Oversized sample case', 'type' => 'parcel', 'weight' => 60, 'weight_unit' => 'kg', 'length' => 100, 'width' => 60, 'height' => 60, 'dimensions_unit' => 'cm'],
+                ],
+            ],
+        ];
+
+        return collect($orders)->mapWithKeys(function (array $definition, string $seedId) use ($company) {
+            $payload = $this->createPayload($company, $definition);
+            $order   = new Order();
+            $order->forceFill([
+                'uuid'                  => (string) Str::uuid(),
+                'internal_id'           => 'VROOM-SEED-' . Str::of($seedId)->upper(),
+                'company_uuid'          => $company->uuid,
+                'payload_uuid'          => $payload->uuid,
+                'status'                => 'created',
+                'type'                  => 'transport',
+                'notes'                 => $definition['name'],
+                'orchestrator_priority' => 50,
+                'required_skills'       => [],
+                'meta'                  => $this->meta($seedId),
+            ])->save();
+
+            $this->seedEntities($company, $payload, $definition['entities'] ?? []);
+
+            return [$seedId => $order];
+        })->all();
+    }
+
+    protected function createPayload(Company $company, array $definition): Payload
+    {
+        $payload = new Payload();
+        $payload->forceFill([
+            'uuid'         => (string) Str::uuid(),
+            'company_uuid' => $company->uuid,
+            'pickup_uuid'  => $definition['pickup']?->uuid,
+            'dropoff_uuid' => $definition['dropoff']?->uuid,
+            'type'         => 'transport',
+            'meta'         => $this->meta($definition['payload_seed_id']),
+        ])->save();
+
+        foreach ($definition['waypoints'] as $index => $place) {
+            $waypoint = new Waypoint();
+            $waypoint->forceFill([
+                'uuid'         => (string) Str::uuid(),
+                '_import_id'   => static::SEED_NAME . ':waypoint:' . $definition['payload_seed_id'] . ':' . ($index + 1),
+                'company_uuid' => $company->uuid,
+                'payload_uuid' => $payload->uuid,
+                'place_uuid'   => $place->uuid,
+                'type'         => 'dropoff',
+                'order'        => $index + 1,
+                'service_time' => 300,
+            ]);
+
+            Waypoint::withoutEvents(fn () => $waypoint->save());
+        }
+
+        return $payload;
+    }
+
+    protected function seedEntities(Company $company, Payload $payload, array $entities): void
+    {
+        foreach ($entities as $index => $definition) {
+            $entity = new Entity();
+            $entity->forceFill([
+                'uuid'            => (string) Str::uuid(),
+                'company_uuid'    => $company->uuid,
+                'payload_uuid'    => $payload->uuid,
+                'name'            => $definition['name'],
+                'type'            => $definition['type'],
+                'weight'          => $definition['weight'],
+                'weight_unit'     => $definition['weight_unit'],
+                'length'          => $definition['length'],
+                'width'           => $definition['width'],
+                'height'          => $definition['height'],
+                'dimensions_unit' => $definition['dimensions_unit'],
+                'meta'            => $this->meta($payload->getMeta('seed_id') . '_' . ($index + 1)),
+            ]);
+
+            Entity::withoutEvents(fn () => $entity->save());
+        }
+    }
+}

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

@@ -0,0 +1,64 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Api\v1;
+
+use Fleetbase\FleetOps\Http\Controllers\Internal\v1\OrchestrationController as InternalOrchestrationController;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+/**
+ * Public consumable API for FleetOps orchestration.
+ *
+ * This controller delegates orchestration behavior to the internal workbench
+ * controller and only changes the public API serialization boundary.
+ */
+class OrchestrationController extends InternalOrchestrationController
+{
+    public function run(Request $request): JsonResponse
+    {
+        return $this->publicResponse(parent::run($request));
+    }
+
+    public function commit(Request $request): JsonResponse
+    {
+        return $this->publicResponse(parent::commit($request));
+    }
+
+    protected function publicResponse(JsonResponse $response): JsonResponse
+    {
+        return response()->json(
+            $this->sanitizePublicPayload($response->getData(true)),
+            $response->getStatusCode()
+        );
+    }
+
+    /**
+     * Recursively remove internal identifiers from public orchestrator payloads.
+     */
+    protected function sanitizePublicPayload(mixed $payload): mixed
+    {
+        if (!is_array($payload)) {
+            return $payload;
+        }
+
+        $sanitized = [];
+
+        foreach ($payload as $key => $value) {
+            if (is_string($key) && $this->isInternalIdentifierKey($key)) {
+                continue;
+            }
+
+            $sanitized[$key] = $this->sanitizePublicPayload($value);
+        }
+
+        return $sanitized;
+    }
+
+    protected function isInternalIdentifierKey(string $key): bool
+    {
+        return $key === 'uuid'
+            || str_ends_with($key, '_uuid')
+            || $key === 'internal_id'
+            || $key === 'company_uuid';
+    }
+}

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

@@ -93,17 +93,17 @@ class OrderController extends Controller
 
         // create payload
         if ($request->has('payload') && $request->isArray('payload')) {
-            $payload      = new Payload();
-            $payloadInput = $request->input('payload');
-            $entities     = data_get($payloadInput, 'entities', []);
-            $waypoints    = data_get($payloadInput, 'waypoints', []);
-            $pickup       = data_get($payloadInput, 'pickup');
-            $dropoff      = data_get($payloadInput, 'dropoff');
-            $return       = data_get($payloadInput, 'return');
-            $hasPickupField = array_key_exists('pickup', $payloadInput);
-            $hasDropoffField = array_key_exists('dropoff', $payloadInput);
-            $hasReturnField = array_key_exists('return', $payloadInput);
-            $hasWaypointsField = array_key_exists('waypoints', $payloadInput);
+            $payload                = new Payload();
+            $payloadInput           = $request->input('payload');
+            $entities               = data_get($payloadInput, 'entities', []);
+            $waypoints              = data_get($payloadInput, 'waypoints', []);
+            $pickup                 = data_get($payloadInput, 'pickup');
+            $dropoff                = data_get($payloadInput, 'dropoff');
+            $return                 = data_get($payloadInput, 'return');
+            $hasPickupField         = array_key_exists('pickup', $payloadInput);
+            $hasDropoffField        = array_key_exists('dropoff', $payloadInput);
+            $hasReturnField         = array_key_exists('return', $payloadInput);
+            $hasWaypointsField      = array_key_exists('waypoints', $payloadInput);
             $hasRouteEndpointFields = $hasPickupField || $hasDropoffField || $hasReturnField;
 
             if ($pickup) {
@@ -445,17 +445,17 @@ class OrderController extends Controller
 
         // create a payload if missing payload[] but has pickup/dropoff/etc
         if ($request->missing('payload')) {
-            $payload      = data_get($order, 'payload', new Payload());
-            $payloadInput = $request->only(['pickup', 'dropoff', 'return', 'waypoints', 'entities']);
-            $entities     = data_get($payloadInput, 'entities', []);
-            $waypoints    = data_get($payloadInput, 'waypoints', []);
-            $pickup       = data_get($payloadInput, 'pickup');
-            $dropoff      = data_get($payloadInput, 'dropoff');
-            $return       = data_get($payloadInput, 'return');
-            $hasPickupField = $request->exists('pickup');
-            $hasDropoffField = $request->exists('dropoff');
-            $hasReturnField = $request->exists('return');
-            $hasWaypointsField = $request->exists('waypoints');
+            $payload                = data_get($order, 'payload', new Payload());
+            $payloadInput           = $request->only(['pickup', 'dropoff', 'return', 'waypoints', 'entities']);
+            $entities               = data_get($payloadInput, 'entities', []);
+            $waypoints              = data_get($payloadInput, 'waypoints', []);
+            $pickup                 = data_get($payloadInput, 'pickup');
+            $dropoff                = data_get($payloadInput, 'dropoff');
+            $return                 = data_get($payloadInput, 'return');
+            $hasPickupField         = $request->exists('pickup');
+            $hasDropoffField        = $request->exists('dropoff');
+            $hasReturnField         = $request->exists('return');
+            $hasWaypointsField      = $request->exists('waypoints');
             $hasRouteEndpointFields = $hasPickupField || $hasDropoffField || $hasReturnField;
 
             // if no pickup and dropoff extract from waypoints
@@ -1328,13 +1328,13 @@ class OrderController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function trackerData(string $id)
+    public function trackerData(Request $request, string $id)
     {
         set_time_limit(280);
 
         try {
             $order = Order::findRecordOrFail($id);
-            $data  = $order->tracker()->toArray();
+            $data  = $order->tracker()->toArray($request->only(['provider', 'fallbacks', 'traffic_enabled']));
 
             return response()->json($data);
         } catch (ModelNotFoundException $e) {
@@ -1351,11 +1351,11 @@ class OrderController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function etaData(string $id)
+    public function etaData(Request $request, string $id)
     {
         try {
             $order = Order::findRecordOrFail($id);
-            $data  = $order->tracker()->eta();
+            $data  = $order->tracker()->eta($request->only(['provider', 'fallbacks', 'traffic_enabled']));
 
             return response()->json($data);
         } catch (ModelNotFoundException $e) {

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

@@ -25,16 +25,16 @@ class PayloadController extends Controller
      */
     public function create(CreatePayloadRequest $request)
     {
-        $input     = $request->all();
-        $entities  = data_get($input, 'entities', []);
-        $waypoints = data_get($input, 'waypoints', []);
-        $pickup    = data_get($input, 'pickup');
-        $dropoff   = data_get($input, 'dropoff');
-        $return    = data_get($input, 'return');
-        $hasPickupField = array_key_exists('pickup', $input);
-        $hasDropoffField = array_key_exists('dropoff', $input);
-        $hasReturnField = array_key_exists('return', $input);
-        $hasWaypointsField = array_key_exists('waypoints', $input);
+        $input                  = $request->all();
+        $entities               = data_get($input, 'entities', []);
+        $waypoints              = data_get($input, 'waypoints', []);
+        $pickup                 = data_get($input, 'pickup');
+        $dropoff                = data_get($input, 'dropoff');
+        $return                 = data_get($input, 'return');
+        $hasPickupField         = array_key_exists('pickup', $input);
+        $hasDropoffField        = array_key_exists('dropoff', $input);
+        $hasReturnField         = array_key_exists('return', $input);
+        $hasWaypointsField      = array_key_exists('waypoints', $input);
         $hasRouteEndpointFields = $hasPickupField || $hasDropoffField || $hasReturnField;
 
         // make sure company is set

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

@@ -231,7 +231,7 @@ class ServiceQuoteController extends Controller
         $entities  = collect($entities)->mapInto(Entity::class);
 
         // should all be Place like
-        $waypoints = collect([$pickup, ...$waypoints, $dropoff])->filter();
+        $waypoints     = collect([$pickup, ...$waypoints, $dropoff])->filter();
         $endpointCount = (int) ($pickup instanceof Place) + (int) ($dropoff instanceof Place);
 
         // if facilitator is an integrated partner resolve service quotes from bridge

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

@@ -8,6 +8,7 @@ use Fleetbase\FleetOps\Imports\ContactImport;
 use Fleetbase\FleetOps\Models\Contact;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
+use Fleetbase\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
@@ -21,11 +22,35 @@ class ContactController extends FleetOpsController
      */
     public $resource = 'contact';
 
+    /**
+     * Handle pre-create transactions.
+     */
+    public function onBeforeCreate(Request $request, array &$input)
+    {
+        $this->resolveUserInput($request, $input);
+    }
+
+    /**
+     * Handle pre-update transactions.
+     */
+    public function onBeforeUpdate(Request $request, Contact $contact, array &$input)
+    {
+        if ($contact->type === 'customer' && isset($input['type']) && $input['type'] !== 'customer') {
+            throw new \Exception('Customer contact type cannot be changed.');
+        }
+
+        $this->resolveUserInput($request, $input);
+    }
+
     /**
      * Handle post save transactions.
      */
     public function afterSave(Request $request, Contact $contact)
     {
+        if ($contact->type === 'customer') {
+            $contact->normalizeCustomerUser();
+        }
+
         $customFieldValues = $request->array('contact.custom_field_values');
         if ($customFieldValues) {
             $contact->syncCustomFieldValues($customFieldValues);
@@ -105,4 +130,20 @@ class ContactController extends FleetOpsController
 
         return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
     }
+
+    private function resolveUserInput(Request $request, array &$input): void
+    {
+        $user = data_get($input, 'user_uuid') ?? data_get($input, 'user') ?? $request->input('contact.user_uuid') ?? $request->input('contact.user');
+
+        if (is_array($user)) {
+            $user = data_get($user, 'uuid') ?? data_get($user, 'id');
+        }
+
+        if (!$user) {
+            return;
+        }
+
+        $input['user_uuid'] = User::where('uuid', $user)->orWhere('public_id', $user)->value('uuid') ?? $user;
+        unset($input['user']);
+    }
 }