@fleetbase/fleetops-engine 0.6.49 → 0.6.50

package/server/seeders/Testing/VroomOrchestrationSeeder.php

@@ -257,7 +257,7 @@ class VroomOrchestrationSeeder extends Seeder
                 'model'                    => $vehicle['model'],
                 'year'                     => '2024',
                 'type'                     => 'van',
-                'status'                   => 'active',
+                'status'                   => 'available',
                 'online'                   => true,
                 'location'                 => isset($vehicle['lat'], $vehicle['lng']) ? new Point($vehicle['lat'], $vehicle['lng']) : null,
                 'skills'                   => $vehicle['skills'] ?? [],
@@ -287,22 +287,22 @@ class VroomOrchestrationSeeder extends Seeder
         $orders = [
             'endpoint_only' => [
                 'payload_seed_id' => 'endpoint_only',
-                'name'       => 'VROOM Test Order - Pickup Dropoff',
-                'pickup'     => $places['depot'],
-                'dropoff'    => $places['orchard'],
-                'waypoints'  => [],
-                'entities'   => [
+                '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'            => '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'],
@@ -310,22 +310,22 @@ class VroomOrchestrationSeeder extends Seeder
             ],
             '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'            => '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'            => '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'],
                 ],
             ],

package/server/src/Console/Commands/AuditCustomerUserConflicts.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace Fleetbase\FleetOps\Console\Commands;
+
+use Fleetbase\FleetOps\Models\Contact;
+use Illuminate\Console\Command;
+
+class AuditCustomerUserConflicts extends Command
+{
+    protected $signature = 'fleetops:audit-customer-user-conflicts {--company= : Limit audit to a company UUID} {--json : Output JSON instead of a table}';
+
+    protected $description = 'Reports customer contacts linked to users that may have been incorrectly promoted from staff/admin accounts.';
+
+    public function handle(): int
+    {
+        $query = Contact::where('type', 'customer')->whereNotNull('user_uuid')->with(['anyUser.companyUsers.roles', 'company']);
+
+        if ($company = $this->option('company')) {
+            $query->where('company_uuid', $company);
+        }
+
+        $rows = $query->get()->map(function (Contact $contact) {
+            $user        = $contact->anyUser;
+            $companyUser = $user?->companyUsers?->firstWhere('company_uuid', $contact->company_uuid);
+            $roles       = $companyUser?->roles?->pluck('name')->filter()->values()->all() ?? [];
+            $unexpected  = array_values(array_filter($roles, fn ($role) => $role !== 'Fleet-Ops Customer'));
+            $reasons     = [];
+
+            if (!$user) {
+                $reasons[] = 'missing linked user';
+            } elseif ($user->type !== 'customer') {
+                $reasons[] = 'linked user type is ' . $user->type;
+            }
+
+            if (!empty($unexpected)) {
+                $reasons[] = 'linked user has non-customer roles: ' . implode(', ', $unexpected);
+            }
+
+            if (empty($reasons)) {
+                return null;
+            }
+
+            return [
+                'contact_id'    => $contact->public_id,
+                'contact_uuid'  => $contact->uuid,
+                'contact_name'  => $contact->name,
+                'contact_email' => $contact->email,
+                'user_uuid'     => $user?->uuid,
+                'user_email'    => $user?->email,
+                'user_type'     => $user?->type,
+                'roles'         => implode(', ', $roles),
+                'company_uuid'  => $contact->company_uuid,
+                'company_name'  => $contact->company?->name,
+                'updated_at'    => optional($contact->updated_at)->toDateTimeString(),
+                'reason'        => implode('; ', $reasons),
+            ];
+        })->filter()->values();
+
+        if ($this->option('json')) {
+            $this->line($rows->toJson(JSON_PRETTY_PRINT));
+
+            return self::SUCCESS;
+        }
+
+        if ($rows->isEmpty()) {
+            $this->info('No suspicious customer user conflicts found.');
+
+            return self::SUCCESS;
+        }
+
+        $this->table(array_keys($rows->first()), $rows->all());
+
+        return self::SUCCESS;
+    }
+}

package/server/src/Exceptions/CustomerUserConflictException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Fleetbase\FleetOps\Exceptions;
+
+use Fleetbase\Models\User;
+
+class CustomerUserConflictException extends UserAlreadyExistsException
+{
+    public function __construct(string $message = '', ?User $user = null, int $code = 0, ?\Throwable $previous = null)
+    {
+        parent::__construct($message, $user, $code, $previous);
+    }
+}

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

@@ -39,6 +39,10 @@ class ContactController extends Controller
         }
 
         try {
+            $contactCandidate               = new Contact($input);
+            $contactCandidate->company_uuid = session('company');
+            $contactCandidate->assertCustomerIdentityIsAvailable();
+
             // create the contact
             $contact = Contact::updateOrCreate(
                 [
@@ -106,8 +110,19 @@ class ContactController extends Controller
             }
         }
 
-        // update the contact
-        $contact->update($input);
+        try {
+            // update the contact
+            $contactCandidate = $contact->replicate();
+            $contactCandidate->forceFill($contact->getAttributes());
+            $contactCandidate->exists = $contact->exists;
+            $contactCandidate->forceFill($input);
+            $contactCandidate->assertCustomerIdentityIsAvailable();
+
+            $contact->update($input);
+        } catch (\Exception $e) {
+            return response()->apiError($e->getMessage());
+        }
+
         $contact->flushAttributesCache();
 
         // response the contact resource