@fleetbase/fleetops-engine 0.6.58 → 0.6.59

package/scripts/pest-bootstrap.php

@@ -15,8 +15,31 @@ foreach ($autoloadCandidates as $candidate) {
 }
 
 if (!function_exists('config')) {
-    function config(?string $key = null, mixed $default = null): mixed
+    function config(string|array|null $key = null, mixed $default = null): mixed
     {
+        if (class_exists('Illuminate\Container\Container')) {
+            $app = Illuminate\Container\Container::getInstance();
+
+            if ($app->bound('config')) {
+                $config = $app->make('config');
+
+                if ($key === null) {
+                    return $config;
+                }
+
+                // Laravel's helper doubles as a setter when handed an array
+                if (is_array($key)) {
+                    foreach ($key as $configKey => $configValue) {
+                        $config->set($configKey, $configValue);
+                    }
+
+                    return null;
+                }
+
+                return $config->get($key, $default);
+            }
+        }
+
         return $default;
     }
 }
@@ -25,6 +48,106 @@ if (class_exists('Illuminate\Container\Container') && class_exists('Illuminate\S
     $app = Illuminate\Container\Container::getInstance();
     Illuminate\Support\Facades\Facade::setFacadeApplication($app);
 
+    if (!$app->bound('config') && class_exists('Illuminate\Config\Repository')) {
+        $app->singleton('config', fn () => new Illuminate\Config\Repository([
+            'fleetops'   => [],
+            'services'   => [],
+            'telematics' => [],
+        ]));
+    }
+
+    if (!$app->bound(Illuminate\Contracts\Routing\ResponseFactory::class)) {
+        $responseFactory = new class {
+            public function json(mixed $data = [], int $status = 200): mixed
+            {
+                if (class_exists('Illuminate\Http\JsonResponse')) {
+                    return new Illuminate\Http\JsonResponse($data, $status);
+                }
+
+                return new class($data, $status) {
+                    public function __construct(public mixed $data, public int $status)
+                    {
+                    }
+
+                    public function getStatusCode(): int
+                    {
+                        return $this->status;
+                    }
+                };
+            }
+
+            public function make(mixed $content = '', int $status = 200, array $headers = []): mixed
+            {
+                if (class_exists('Illuminate\\Http\\Response')) {
+                    return new Illuminate\Http\Response($content, $status, $headers);
+                }
+
+                return new class($content, $status) {
+                    public function __construct(public mixed $content, public int $status)
+                    {
+                    }
+
+                    public function getContent(): mixed
+                    {
+                        return $this->content;
+                    }
+
+                    public function getStatusCode(): int
+                    {
+                        return $this->status;
+                    }
+                };
+            }
+
+            public function error(mixed $error = null, int $status = 500): mixed
+            {
+                return $this->json(['error' => $error], $status);
+            }
+
+            public function apiError(mixed $error = null, int $statusCode = 400, ?array $data = []): mixed
+            {
+                if ($error instanceof Illuminate\Support\MessageBag) {
+                    $error = $error->all();
+                }
+
+                return $this->json(['error' => $error] + ($data ?? []), $statusCode);
+            }
+        };
+
+        $app->instance(Illuminate\Contracts\Routing\ResponseFactory::class, $responseFactory);
+        $app->instance('Illuminate\Contracts\Routing\ResponseFactory', $responseFactory);
+        $app->instance('response', $responseFactory);
+    }
+
+    if (!$app->bound('db')) {
+        // Unbound 'db' resolutions recurse the container until memory is
+        // exhausted when model boot paths reach the DB facade — proxy to the
+        // Eloquent connection resolver instead. Fixture instance bindings
+        // override this fallback.
+        $app->singleton('db', function () {
+            return new class {
+                public function connection($name = null)
+                {
+                    return Illuminate\Database\Eloquent\Model::getConnectionResolver()
+                        ? Illuminate\Database\Eloquent\Model::resolveConnection($name)
+                        : null;
+                }
+
+                public function raw($value)
+                {
+                    return new Illuminate\Database\Query\Expression($value);
+                }
+
+                public function __call($method, $arguments)
+                {
+                    $connection = $this->connection();
+
+                    return $connection ? $connection->{$method}(...$arguments) : null;
+                }
+            };
+        });
+    }
+
     if (!$app->bound('http') && class_exists('Illuminate\Http\Client\Factory')) {
         $app->singleton('http', fn () => new Illuminate\Http\Client\Factory());
     }
@@ -64,6 +187,16 @@ if (!function_exists('app')) {
 if (!function_exists('request')) {
     function request(?string $key = null, mixed $default = null): mixed
     {
+        if (class_exists('Illuminate\Container\Container')) {
+            $container = Illuminate\Container\Container::getInstance();
+
+            if ($container->bound('request')) {
+                $request = $container->make('request');
+
+                return $key === null ? $request : $request->input($key, $default);
+            }
+        }
+
         $request = class_exists('Illuminate\Http\Request') ? Illuminate\Http\Request::create('/') : new stdClass();
 
         return $key === null ? $request : $default;
@@ -81,7 +214,32 @@ if (!function_exists('response')) {
                 }
 
                 return new class($data, $status) {
-                    public function __construct(public mixed $data, public int $status) {}
+                    public function __construct(public mixed $data, public int $status)
+                    {
+                    }
+
+                    public function getStatusCode(): int
+                    {
+                        return $this->status;
+                    }
+                };
+            }
+
+            public function make(mixed $content = '', int $status = 200, array $headers = []): mixed
+            {
+                if (class_exists('Illuminate\\Http\\Response')) {
+                    return new Illuminate\Http\Response($content, $status, $headers);
+                }
+
+                return new class($content, $status) {
+                    public function __construct(public mixed $content, public int $status)
+                    {
+                    }
+
+                    public function getContent(): mixed
+                    {
+                        return $this->content;
+                    }
 
                     public function getStatusCode(): int
                     {
@@ -94,6 +252,15 @@ if (!function_exists('response')) {
             {
                 return $this->json(['error' => $error], $status);
             }
+
+            public function apiError(mixed $error = null, int $statusCode = 400, ?array $data = []): mixed
+            {
+                if ($error instanceof Illuminate\Support\MessageBag) {
+                    $error = $error->all();
+                }
+
+                return $this->json(['error' => $error] + ($data ?? []), $statusCode);
+            }
         };
     }
 }
@@ -120,12 +287,63 @@ if (!function_exists('now') && class_exists('Illuminate\Support\Carbon')) {
     }
 }
 
+if (!class_exists('Illuminate\Validation\ValidationException')) {
+    // Laravel's real constructor takes the failing validator and an optional
+    // response, not a message. Both shapes are accepted so
+    // `new ValidationException($validator, $response)` works alongside the
+    // `withMessages()` string form.
+    eval('namespace Illuminate\Validation; class ValidationException extends \Exception { public array $messages = []; public $validator; public $response; public function __construct($validator = null, $response = null) { parent::__construct(is_string($validator) ? $validator : "The given data was invalid."); $this->response = $response; if (!is_string($validator) && is_object($validator)) { $this->validator = $validator; if (method_exists($validator, "errors")) { $errors = $validator->errors(); $this->messages = is_object($errors) && method_exists($errors, "messages") ? $errors->messages() : (array) $errors; } } } public static function withMessages(array $messages): self { $exception = new self("The given data was invalid."); $exception->messages = $messages; return $exception; } public function errors(): array { return $this->messages; } public function getResponse() { return $this->response; } }');
+}
+
+if (class_exists('Illuminate\Http\Request') && method_exists('Illuminate\Http\Request', 'macro')) {
+    if (!method_exists('Illuminate\Http\Request', 'array')) {
+        Illuminate\Http\Request::macro('array', function (string $key, array $default = []): array {
+            $value = $this->input($key, $default);
+
+            return is_array($value) ? $value : $default;
+        });
+    }
+
+    if (!method_exists('Illuminate\Http\Request', 'validate')) {
+        Illuminate\Http\Request::macro('validate', function (array $rules, ...$parameters): array {
+            if (app()->bound('validator')) {
+                $validator = app('validator')->make($this->all(), $rules);
+                if (is_object($validator) && method_exists($validator, 'fails') && $validator->fails()) {
+                    $messages = method_exists($validator, 'errors') ? $validator->errors()->toArray() : ['error' => ['Validation failed.']];
+                    throw Illuminate\Validation\ValidationException::withMessages($messages);
+                }
+            }
+
+            return $this->all();
+        });
+    }
+}
+
 if (!trait_exists('Illuminate\Foundation\Auth\Access\AuthorizesRequests')) {
     eval('namespace Illuminate\Foundation\Auth\Access; trait AuthorizesRequests {}');
 }
 
+if (!class_exists('Fleetbase\TestSupport\PendingDispatch')) {
+    eval('namespace Fleetbase\TestSupport; class PendingDispatch { public function __call($name, $arguments) { return $this; } public function __toString(): string { return \'\'; } }');
+}
+
+if (!class_exists('Fleetbase\TestSupport\DispatchRecorder')) {
+    eval('namespace Fleetbase\TestSupport; class DispatchRecorder { public static array $dispatched = []; public static function record(string $job, array $arguments): void { self::$dispatched[] = [\'job\' => $job, \'arguments\' => $arguments]; } }');
+}
+
 if (!trait_exists('Illuminate\Foundation\Bus\Dispatchable')) {
-    eval('namespace Illuminate\Foundation\Bus; trait Dispatchable {}');
+    eval('namespace Illuminate\Foundation\Bus; trait Dispatchable {
+        public static function dispatch(...$arguments) { \Fleetbase\TestSupport\DispatchRecorder::record(static::class, $arguments); return new \Fleetbase\TestSupport\PendingDispatch(); }
+        public static function dispatchIf($boolean, ...$arguments) { if ($boolean) { \Fleetbase\TestSupport\DispatchRecorder::record(static::class, $arguments); } return new \Fleetbase\TestSupport\PendingDispatch(); }
+        public static function dispatchUnless($boolean, ...$arguments) { if (!$boolean) { \Fleetbase\TestSupport\DispatchRecorder::record(static::class, $arguments); } return new \Fleetbase\TestSupport\PendingDispatch(); }
+        public static function dispatchSync(...$arguments) { \Fleetbase\TestSupport\DispatchRecorder::record(static::class, $arguments); return null; }
+        public static function dispatchAfterResponse(...$arguments) { \Fleetbase\TestSupport\DispatchRecorder::record(static::class, $arguments); return null; }
+        public static function dispatchNow(...$arguments) { \Fleetbase\TestSupport\DispatchRecorder::record(static::class, $arguments); return null; }
+    }');
+}
+
+if (!trait_exists('Illuminate\Foundation\Events\Dispatchable')) {
+    eval('namespace Illuminate\Foundation\Events; trait Dispatchable {}');
 }
 
 if (!trait_exists('Illuminate\Foundation\Bus\DispatchesJobs')) {
@@ -136,10 +354,26 @@ if (!trait_exists('Illuminate\Foundation\Validation\ValidatesRequests')) {
     eval('namespace Illuminate\Foundation\Validation; trait ValidatesRequests {}');
 }
 
+if (!trait_exists('Fleetbase\Traits\HasApiModelCache')) {
+    eval('namespace Fleetbase\Traits; trait HasApiModelCache {}');
+}
+
+if (!trait_exists('Fleetbase\Traits\HasCustomFields')) {
+    eval('namespace Fleetbase\Traits; trait HasCustomFields {}');
+}
+
 if (!class_exists('Illuminate\Foundation\Http\FormRequest') && class_exists('Illuminate\Http\Request')) {
     eval('namespace Illuminate\Foundation\Http; class FormRequest extends \Illuminate\Http\Request { public function authorize(): bool { return true; } public function rules(): array { return []; } public function responseWithErrors(\Illuminate\Contracts\Validation\Validator $validator) { return $validator; } }');
 }
 
+if (!class_exists('Illuminate\Foundation\Auth\User') && class_exists('Illuminate\Database\Eloquent\Model')) {
+    eval('namespace Illuminate\Foundation\Auth; class User extends \Illuminate\Database\Eloquent\Model {}');
+}
+
+if (!class_exists('Fleetbase\Models\ScheduleItem') && class_exists('Fleetbase\Models\Model')) {
+    eval('namespace Fleetbase\Models; class ScheduleItem extends Model {}');
+}
+
 if (!interface_exists('Fleetbase\Ai\Contracts\AIContextCapabilityInterface')) {
     eval('namespace Fleetbase\Ai\Contracts; interface AIContextCapabilityInterface {}');
 }

package/scripts/pest-file-runner.php

@@ -29,7 +29,19 @@ if (!is_file($runner)) {
 }
 
 $testsPath = getcwd() . '/server/tests';
-$files     = glob($testsPath . '/*.php') ?: [];
+$files     = [];
+
+$iterator = new RecursiveIteratorIterator(
+    new RecursiveDirectoryIterator($testsPath, FilesystemIterator::SKIP_DOTS)
+);
+
+foreach ($iterator as $fileInfo) {
+    if ($fileInfo->isFile() && $fileInfo->getExtension() === 'php') {
+        $files[] = $fileInfo->getPathname();
+    }
+}
+
+$files = array_values(array_unique($files));
 sort($files);
 
 if ($files === []) {

package/scripts/pest-runner.php

@@ -24,8 +24,24 @@ if ($pest === null) {
 
 $serverVendor = getcwd() . '/server_vendor';
 $vendor       = getcwd() . '/vendor';
+
+// Pest hardcodes its autoloader at ../../../vendor/autoload.php (pestphp/pest#920),
+// so it needs a `vendor` entry even though this package installs to server_vendor.
+// Create the symlink only for the duration of this run and remove it afterwards, so it
+// never persists to collide with other tooling — notably the console's Ember build,
+// whose addon `vendor/` convention breaks when a dev-linked package exposes this PHP
+// server_vendor symlink there.
+$createdVendorSymlink = false;
 if (!file_exists($vendor) && is_dir($serverVendor) && function_exists('symlink')) {
-    @symlink($serverVendor, $vendor);
+    $createdVendorSymlink = @symlink($serverVendor, $vendor);
+}
+
+if ($createdVendorSymlink) {
+    register_shutdown_function(static function () use ($vendor): void {
+        if (is_link($vendor)) {
+            @unlink($vendor);
+        }
+    });
 }
 
 $bootstrap = getcwd() . '/scripts/pest-bootstrap.php';
@@ -34,7 +50,7 @@ if (!is_file($bootstrap)) {
     exit(1);
 }
 
-$args = array_slice($argv, 1);
+$args             = array_slice($argv, 1);
 $hasConfiguration = false;
 foreach ($args as $arg) {
     if (str_starts_with($arg, '--configuration')) {
@@ -48,6 +64,43 @@ if (!$hasConfiguration && is_file($configuration)) {
     array_unshift($args, '--configuration=' . $configuration);
 }
 
+/**
+ * Resolve the memory limit to run Pest under.
+ *
+ * Inheriting the ambient php.ini value makes the suite pass or fail on the
+ * developer's local configuration: fleetbase/countries loads a sizeable JSON5
+ * dataset, which alone pushes some test files past a stock 128M. Apply a floor
+ * so a run is reproducible everywhere, while never lowering an unlimited or
+ * already-larger setting. Mirrors FLEETOPS_COVERAGE_MEMORY_LIMIT in the
+ * coverage runners.
+ */
+function fleetopsResolveMemoryLimit(string $ambient, string $floor): string
+{
+    $toBytes = static function (string $value): float {
+        $value = trim($value);
+        if ($value === '' || $value === '-1') {
+            return INF;
+        }
+
+        $unit   = strtolower(substr($value, -1));
+        $number = (float) $value;
+
+        return match ($unit) {
+            'g'     => $number * 1024 * 1024 * 1024,
+            'm'     => $number * 1024 * 1024,
+            'k'     => $number * 1024,
+            default => $number,
+        };
+    };
+
+    return $toBytes($ambient) >= $toBytes($floor) ? $ambient : $floor;
+}
+
+$memoryLimit = fleetopsResolveMemoryLimit(
+    (string) ini_get('memory_limit'),
+    getenv('FLEETOPS_TEST_MEMORY_LIMIT') ?: '512M'
+);
+
 $command = array_merge([
     PHP_BINARY,
     '-d',
@@ -55,6 +108,8 @@ $command = array_merge([
     '-d',
     'error_reporting=8191',
     '-d',
+    'memory_limit=' . $memoryLimit,
+    '-d',
     'auto_prepend_file=' . $bootstrap,
     $pest,
 ], $args);

package/server/resources/views/labels/entity-label.php

@@ -8,7 +8,7 @@ use Fleetbase\Support\Utils;
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title><?= $company->name ?? ($waypoint->internal_id ?? $waypoint->public_id) ?> Waypoint Label</title>
+    <title><?= $company->name ?? ($entity->internal_id ?? $entity->public_id) ?> Item Label</title>
 </head>
 
 <style>
@@ -45,7 +45,7 @@ use Fleetbase\Support\Utils;
     <div style="width: 420px; border: 2px #414141 solid; margin: auto;">
         <div class="group" style="border-bottom: 1px #414141 solid; overflow: hidden;">
             <div style="float: left; width: 130px; height: 120px; border-right: 1px #414141 solid; text-align: center; padding: 10px; box-sizing: border-box;">
-                <img src="data:image/png;base64,<?= Utils::notEmpty($trackingNumber) ? $trackingNumber->qr_code : $order->trackingNumber->qr_code ?>" style="width: 100%; height: 100%; object-fit: cover;">
+                <img src="data:image/png;base64,<?= Utils::notEmpty($trackingNumber) ? $trackingNumber->qr_code : $entity->qr_code ?>" style="width: 100%; height: 100%; object-fit: cover;">
             </div>
             <div style="margin-top: 10px;">
                 <span style="padding-left: 10px; font-size: 18px; font-weight: bold;"><?= strtoupper($company->name) ?></span>
@@ -114,8 +114,8 @@ use Fleetbase\Support\Utils;
         <?php } ?>
         <div class="group">
             <div style="text-align: center; padding: 15px 0px; border-top: 1px #414141 solid;">
-                <img src="data:image/png;base64,<?= isset($trackingNumber) ? $trackingNumber->barcode : $order->trackingNumber->barcode ?>" style="height: 90px; margin-top: 10px;">
-                <div><?= strtoupper(isset($trackingNumber) ? $trackingNumber->tracking_number : $order->trackingNumber->tracking_number) ?></div>
+                <img src="data:image/png;base64,<?= isset($trackingNumber) ? $trackingNumber->barcode : $entity->barcode ?>" style="height: 90px; margin-top: 10px;">
+                <div><?= strtoupper(isset($trackingNumber) ? $trackingNumber->tracking_number : $entity->public_id) ?></div>
             </div>
         </div>
     </div>

package/server/src/Casts/MultiPolygon.php

@@ -31,16 +31,21 @@ class MultiPolygon implements CastsAttributes
      */
     public function set($model, $key, $value, $attributes)
     {
-        if ($value instanceof GeometryInterface) {
+        // Checked before the broader GeometryInterface guard below, which a
+        // SpatialMultiPolygon also satisfies — otherwise this arm never fires.
+        // It must wrap in a SpatialExpression exactly as that guard does:
+        // returning the bare geometry here would change what is bound on writes
+        // that skip SpatialTrait::performInsert().
+        if ($value instanceof SpatialMultiPolygon) {
             $model->geometries[$key] = $value;
 
             return new SpatialExpression($value);
         }
 
-        if ($value instanceof SpatialMultiPolygon) {
+        if ($value instanceof GeometryInterface) {
             $model->geometries[$key] = $value;
 
-            return $value;
+            return new SpatialExpression($value);
         }
 
         if (Utils::isGeoJson($value)) {

package/server/src/Casts/OrderConfigEntities.php

@@ -23,9 +23,9 @@ class OrderConfigEntities implements CastsAttributes
         if (is_array($entities)) {
             $entities = array_map(function ($entity) {
                 if (isset($entity['photo_uuid'])) {
-                    $file = File::where('uuid', $entity['photo_uuid'])->first();
-                    if ($file) {
-                        $entity['photo_url'] = $file->url;
+                    $photoUrl = $this->photoUrlFor($entity['photo_uuid']);
+                    if ($photoUrl) {
+                        $entity['photo_url'] = $photoUrl;
                     }
                 }
 
@@ -50,4 +50,11 @@ class OrderConfigEntities implements CastsAttributes
     {
         return json_encode($value);
     }
+
+    protected function photoUrlFor(string $photoUuid): ?string
+    {
+        $file = File::where('uuid', $photoUuid)->first();
+
+        return $file?->url;
+    }
 }

package/server/src/Casts/Point.php

@@ -39,6 +39,16 @@ class Point implements CastsAttributes
      */
     public function set($model, $key, $value, $attributes)
     {
+        // Checked before the generic Expression guard below, which SpatialExpression
+        // also satisfies — otherwise this arm never fires and the geometry is never
+        // recorded on the model. Both arms return the value untouched, so ordering
+        // only affects the bookkeeping.
+        if ($value instanceof SpatialExpression) {
+            $model->geometries[$key] = $value;
+
+            return $value;
+        }
+
         if ($value instanceof Expression) {
             return $value;
         }
@@ -63,12 +73,6 @@ class Point implements CastsAttributes
             return $point;
         }
 
-        if ($value instanceof SpatialExpression) {
-            $model->geometries[$key] = $value;
-
-            return $value;
-        }
-
         return static::createEmptySpatialExpression();
     }
 

package/server/src/Casts/Polygon.php

@@ -31,13 +31,16 @@ class Polygon implements CastsAttributes
      */
     public function set($model, $key, $value, $attributes)
     {
-        if ($value instanceof GeometryInterface) {
+        // Checked before the broader GeometryInterface guard below, which a
+        // SpatialPolygon also satisfies — otherwise this arm never fires. Both
+        // arms behave identically, so ordering does not change what is stored.
+        if ($value instanceof SpatialPolygon) {
             $model->geometries[$key] = $value;
 
             return $value;
         }
 
-        if ($value instanceof SpatialPolygon) {
+        if ($value instanceof GeometryInterface) {
             $model->geometries[$key] = $value;
 
             return $value;

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

@@ -28,17 +28,17 @@ class AssignCustomerRoles extends Command
      */
     public function handle()
     {
-        $customers = Contact::where('type', 'customer')->get();
+        $customers = $this->customers();
 
         foreach ($customers as $customer) {
-            $customer->loadMissing('user');
-            if (!$customer->user) {
-                $customer->createUser();
-                $customer->loadMissing('user');
+            $user = $this->customerUser($customer);
+            if (!$user) {
+                $this->createUserForCustomer($customer);
+                $user = $this->customerUser($customer);
             }
 
             try {
-                $customer->user->assignSingleRole('Fleet-Ops Customer');
+                $this->assignCustomerRole($user);
                 $this->info($customer->name . ' - Customer: ' . $customer->email . ' has been assigned the Customer role.');
             } catch (\Throwable $e) {
                 $this->error($e->getMessage());
@@ -47,4 +47,26 @@ class AssignCustomerRoles extends Command
 
         return Command::SUCCESS;
     }
+
+    protected function customers()
+    {
+        return Contact::where('type', 'customer')->get();
+    }
+
+    protected function customerUser(Contact $customer)
+    {
+        $customer->loadMissing('user');
+
+        return $customer->user;
+    }
+
+    protected function createUserForCustomer(Contact $customer)
+    {
+        return $customer->createUser();
+    }
+
+    protected function assignCustomerRole($user): void
+    {
+        $user->assignSingleRole('Fleet-Ops Customer');
+    }
 }

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

@@ -29,18 +29,18 @@ class AssignDriverRoles extends Command
      */
     public function handle()
     {
-        $companies = Company::with('users', 'users.driver')->get();
+        $companies = $this->companies();
 
         foreach ($companies as $company) {
             /** @var Company $company */
             $company->loadMissing('users');
             foreach ($company->users as $user) {
-                if ($user instanceof User) {
-                    $user->setCompanyUserRelation($company);
-                    $driver = $user->driver()->where('company_uuid', $company->uuid)->first();
-                    if ($driver && $user->isNotAdmin()) {
+                if ($this->isUser($user)) {
+                    $this->setCompanyUserRelation($user, $company);
+                    $driver = $this->driverForCompany($user, $company->uuid);
+                    if ($driver && $this->isNotAdmin($user)) {
                         try {
-                            $user->assignSingleRole('Driver');
+                            $this->assignDriverRole($user);
                             $this->info($company->name . ' - Driver: ' . $user->email . ' has been made Driver.');
                         } catch (\Throwable $e) {
                             $this->error($e->getMessage());
@@ -52,4 +52,34 @@ class AssignDriverRoles extends Command
 
         return Command::SUCCESS;
     }
+
+    protected function companies()
+    {
+        return Company::with('users', 'users.driver')->get();
+    }
+
+    protected function isUser($user): bool
+    {
+        return $user instanceof User;
+    }
+
+    protected function setCompanyUserRelation($user, Company $company): void
+    {
+        $user->setCompanyUserRelation($company);
+    }
+
+    protected function driverForCompany($user, string $companyUuid)
+    {
+        return $user->driver()->where('company_uuid', $companyUuid)->first();
+    }
+
+    protected function isNotAdmin($user): bool
+    {
+        return $user->isNotAdmin();
+    }
+
+    protected function assignDriverRole($user): void
+    {
+        $user->assignSingleRole('Driver');
+    }
 }

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

@@ -13,7 +13,7 @@ class AuditCustomerUserConflicts extends Command
 
     public function handle(): int
     {
-        $query = Contact::where('type', 'customer')->whereNotNull('user_uuid')->with(['anyUser.companyUsers.roles', 'company']);
+        $query = $this->customerContactsQuery();
 
         if ($company = $this->option('company')) {
             $query->where('company_uuid', $company);
@@ -72,4 +72,9 @@ class AuditCustomerUserConflicts extends Command
 
         return self::SUCCESS;
     }
+
+    protected function customerContactsQuery()
+    {
+        return Contact::where('type', 'customer')->whereNotNull('user_uuid')->with(['anyUser.companyUsers.roles', 'company']);
+    }
 }