@fleetbase/fleetops-engine 0.6.56 → 0.6.58

package/scripts/coverage-runner.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+$args = array_slice($argv, 1);
+
+if ($args === []) {
+    fwrite(STDERR, "Usage: php scripts/coverage-runner.php <pest coverage arguments>\n");
+    exit(1);
+}
+
+$pestRunner = getcwd() . '/scripts/pest-runner.php';
+if (!is_file($pestRunner)) {
+    fwrite(STDERR, "Unable to find Pest runner at scripts/pest-runner.php.\n");
+    exit(1);
+}
+
+$hasCoverageExtension = extension_loaded('xdebug') || extension_loaded('pcov');
+
+if (!$hasCoverageExtension) {
+    fwrite(STDERR, "No PHP coverage driver is available.\n\n");
+    fwrite(STDERR, "Install or enable one of:\n");
+    fwrite(STDERR, "  - Xdebug with XDEBUG_MODE=coverage\n");
+    fwrite(STDERR, "  - PCOV\n");
+    fwrite(STDERR, "\n");
+    fwrite(STDERR, 'Current PHP binary: ' . PHP_BINARY . "\n");
+    exit(1);
+}
+
+putenv('XDEBUG_MODE=coverage');
+$_ENV['XDEBUG_MODE']    = 'coverage';
+$_SERVER['XDEBUG_MODE'] = 'coverage';
+
+$hasTestTarget = false;
+foreach ($args as $arg) {
+    if ($arg !== '' && $arg[0] !== '-') {
+        $hasTestTarget = true;
+        break;
+    }
+}
+
+if (!$hasTestTarget && is_dir(getcwd() . '/server/tests')) {
+    $args[] = 'server/tests';
+}
+
+$command        = array_merge([PHP_BINARY, $pestRunner], $args);
+$escapedCommand = implode(' ', array_map('escapeshellarg', $command));
+
+passthru($escapedCommand, $exitCode);
+
+exit($exitCode);

package/scripts/coverage-summary.php

@@ -0,0 +1,110 @@
+<?php
+
+declare(strict_types=1);
+
+$cloverPath = $argv[1] ?? 'coverage/clover.xml';
+
+if (!is_file($cloverPath)) {
+    fwrite(STDERR, "Coverage file not found: {$cloverPath}\n");
+    fwrite(STDERR, "Run `composer test:coverage:clover` first.\n");
+    exit(1);
+}
+
+$xml = simplexml_load_file($cloverPath);
+if (!$xml) {
+    fwrite(STDERR, "Unable to parse Clover coverage file: {$cloverPath}\n");
+    exit(1);
+}
+
+function coveragePercent(int $covered, int $total): float
+{
+    return $total === 0 ? 0.0 : round(($covered / $total) * 100, 2);
+}
+
+function intMetric(SimpleXMLElement $node, string $name): int
+{
+    return (int) ($node->metrics[$name] ?? 0);
+}
+
+$project = $xml->project;
+$metrics = $project->metrics;
+
+$statements        = (int) ($metrics['statements'] ?? 0);
+$coveredStatements = (int) ($metrics['coveredstatements'] ?? 0);
+$methods           = (int) ($metrics['methods'] ?? 0);
+$coveredMethods    = (int) ($metrics['coveredmethods'] ?? 0);
+$classes           = (int) ($metrics['classes'] ?? 0);
+$coveredClasses    = (int) ($metrics['coveredclasses'] ?? 0);
+
+$files       = [];
+$directories = [];
+
+foreach ($project->xpath('.//file') ?: [] as $file) {
+    $path              = (string) $file['name'];
+    $fileStatements    = intMetric($file, 'statements');
+    $coveredFileLines  = intMetric($file, 'coveredstatements');
+    $fileMethods       = intMetric($file, 'methods');
+    $coveredFileMethod = intMetric($file, 'coveredmethods');
+
+    if ($fileStatements === 0) {
+        continue;
+    }
+
+    $files[] = [
+        'path'            => $path,
+        'covered'         => $coveredFileLines,
+        'statements'      => $fileStatements,
+        'methods'         => $fileMethods,
+        'covered_methods' => $coveredFileMethod,
+        'percent'         => coveragePercent($coveredFileLines, $fileStatements),
+    ];
+
+    $relativePath = preg_replace('#^' . preg_quote(getcwd(), '#') . '/?#', '', $path);
+    $parts        = explode('/', $relativePath ?: $path);
+    $directory    = count($parts) > 2 ? $parts[0] . '/' . $parts[1] : dirname($relativePath ?: $path);
+
+    if (!isset($directories[$directory])) {
+        $directories[$directory] = [
+            'covered'    => 0,
+            'statements' => 0,
+        ];
+    }
+
+    $directories[$directory]['covered'] += $coveredFileLines;
+    $directories[$directory]['statements'] += $fileStatements;
+}
+
+usort($files, function (array $a, array $b): int {
+    return $a['percent'] <=> $b['percent']
+        ?: $b['statements'] <=> $a['statements'];
+});
+
+$directoryRows = [];
+foreach ($directories as $directory => $directoryMetrics) {
+    $directoryRows[] = [
+        'directory'  => $directory,
+        'covered'    => $directoryMetrics['covered'],
+        'statements' => $directoryMetrics['statements'],
+        'percent'    => coveragePercent($directoryMetrics['covered'], $directoryMetrics['statements']),
+    ];
+}
+
+usort($directoryRows, function (array $a, array $b): int {
+    return $a['percent'] <=> $b['percent']
+        ?: $b['statements'] <=> $a['statements'];
+});
+
+printf("Line coverage: %.2f%% (%d/%d statements)\n", coveragePercent($coveredStatements, $statements), $coveredStatements, $statements);
+printf("Method coverage: %.2f%% (%d/%d methods)\n", coveragePercent($coveredMethods, $methods), $coveredMethods, $methods);
+printf("Class coverage: %.2f%% (%d/%d classes)\n", coveragePercent($coveredClasses, $classes), $coveredClasses, $classes);
+
+echo "\nLowest covered directories:\n";
+foreach (array_slice($directoryRows, 0, 10) as $row) {
+    printf("  %6.2f%%  %5d/%-5d  %s\n", $row['percent'], $row['covered'], $row['statements'], $row['directory']);
+}
+
+echo "\nLowest covered files:\n";
+foreach (array_slice($files, 0, 20) as $file) {
+    $relativePath = preg_replace('#^' . preg_quote(getcwd(), '#') . '/?#', '', $file['path']);
+    printf("  %6.2f%%  %5d/%-5d  %s\n", $file['percent'], $file['covered'], $file['statements'], $relativePath ?: $file['path']);
+}

package/scripts/normalize-rgba-alpha.js

@@ -0,0 +1,90 @@
+#!/usr/bin/env node
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+const root = process.cwd();
+const checkOnly = process.argv.includes('--check');
+const cssRoot = path.join(root, 'addon');
+const rgbaPercentAlphaPattern = /rgba\(\s*([+-]?(?:\d*\.)?\d+)\s*,\s*([+-]?(?:\d*\.)?\d+)\s*,\s*([+-]?(?:\d*\.)?\d+)\s*,\s*([+-]?(?:\d*\.)?\d+)%\s*\)/g;
+
+function collectCssFiles(dir, files = []) {
+    if (!fs.existsSync(dir)) {
+        return files;
+    }
+
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+        const fullPath = path.join(dir, entry.name);
+
+        if (entry.isDirectory()) {
+            collectCssFiles(fullPath, files);
+            continue;
+        }
+
+        if (entry.isFile() && entry.name.endsWith('.css')) {
+            files.push(fullPath);
+        }
+    }
+
+    return files;
+}
+
+function formatAlpha(percent) {
+    const alpha = Number(percent) / 100;
+    return Number.isInteger(alpha) ? String(alpha) : String(Number(alpha.toFixed(4)));
+}
+
+function lineForIndex(source, index) {
+    return source.slice(0, index).split('\n').length;
+}
+
+const changes = [];
+
+for (const filePath of collectCssFiles(cssRoot)) {
+    const source = fs.readFileSync(filePath, 'utf8');
+    const matches = [];
+
+    const next = source.replace(rgbaPercentAlphaPattern, (match, red, green, blue, alphaPercent, offset) => {
+        const replacement = `rgba(${red}, ${green}, ${blue}, ${formatAlpha(alphaPercent)})`;
+        matches.push({
+            line: lineForIndex(source, offset),
+            before: match,
+            after: replacement,
+        });
+        return replacement;
+    });
+
+    if (matches.length === 0) {
+        continue;
+    }
+
+    changes.push({
+        filePath,
+        matches,
+    });
+
+    if (!checkOnly) {
+        fs.writeFileSync(filePath, next);
+    }
+}
+
+if (changes.length === 0) {
+    console.log('No comma-form rgba() percent-alpha values found.');
+    process.exit(0);
+}
+
+for (const change of changes) {
+    const relativePath = path.relative(root, change.filePath);
+
+    for (const match of change.matches) {
+        console.log(`${relativePath}:${match.line} ${match.before} -> ${match.after}`);
+    }
+}
+
+if (checkOnly) {
+    console.error('\nRun `npm run fix:css-alpha` to normalize these values before production builds.');
+    process.exit(1);
+}
+
+console.log(`\nNormalized ${changes.reduce((total, change) => total + change.matches.length, 0)} rgba() alpha value(s).`);

package/scripts/pest-bootstrap.php

@@ -0,0 +1,177 @@
+<?php
+
+declare(strict_types=1);
+
+$autoloadCandidates = [
+    getcwd() . '/server_vendor/autoload.php',
+    getcwd() . '/vendor/autoload.php',
+];
+
+foreach ($autoloadCandidates as $candidate) {
+    if (is_file($candidate)) {
+        require_once $candidate;
+        break;
+    }
+}
+
+if (!function_exists('config')) {
+    function config(?string $key = null, mixed $default = null): mixed
+    {
+        return $default;
+    }
+}
+
+if (class_exists('Illuminate\Container\Container') && class_exists('Illuminate\Support\Facades\Facade')) {
+    $app = Illuminate\Container\Container::getInstance();
+    Illuminate\Support\Facades\Facade::setFacadeApplication($app);
+
+    if (!$app->bound('http') && class_exists('Illuminate\Http\Client\Factory')) {
+        $app->singleton('http', fn () => new Illuminate\Http\Client\Factory());
+    }
+
+    if (!$app->bound('cache') && class_exists('Illuminate\Cache\Repository') && class_exists('Illuminate\Cache\ArrayStore')) {
+        $app->singleton('cache.store', fn () => new Illuminate\Cache\Repository(new Illuminate\Cache\ArrayStore()));
+        $app->singleton('cache', fn ($app) => $app->make('cache.store'));
+    }
+
+    if (!$app->bound('session.store') && class_exists('Illuminate\Session\Store') && class_exists('Illuminate\Session\ArraySessionHandler')) {
+        $app->singleton('session.store', fn () => new Illuminate\Session\Store('pest', new Illuminate\Session\ArraySessionHandler(120)));
+        $app->singleton('session', fn ($app) => $app->make('session.store'));
+    }
+
+    if (!$app->bound('log') && class_exists('Psr\Log\NullLogger')) {
+        if (!class_exists('Fleetbase\TestSupport\LoggerManager')) {
+            eval('namespace Fleetbase\TestSupport; class LoggerManager extends \Psr\Log\NullLogger { public function channel(?string $name = null): self { return $this; } }');
+        }
+
+        $app->singleton('log', fn () => new Fleetbase\TestSupport\LoggerManager());
+    }
+}
+
+if (!function_exists('app')) {
+    function app(?string $abstract = null, array $parameters = []): mixed
+    {
+        if (class_exists('Illuminate\Container\Container')) {
+            $container = Illuminate\Container\Container::getInstance();
+
+            return $abstract === null ? $container : $container->make($abstract, $parameters);
+        }
+
+        return $abstract === null ? null : new $abstract(...array_values($parameters));
+    }
+}
+
+if (!function_exists('request')) {
+    function request(?string $key = null, mixed $default = null): mixed
+    {
+        $request = class_exists('Illuminate\Http\Request') ? Illuminate\Http\Request::create('/') : new stdClass();
+
+        return $key === null ? $request : $default;
+    }
+}
+
+if (!function_exists('response')) {
+    function response(): object
+    {
+        return 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 error(mixed $error = null, int $status = 500): mixed
+            {
+                return $this->json(['error' => $error], $status);
+            }
+        };
+    }
+}
+
+if (!function_exists('session')) {
+    function session(array|string|null $key = null, mixed $default = null): mixed
+    {
+        static $values = [];
+
+        if (is_array($key)) {
+            $values = array_merge($values, $key);
+
+            return null;
+        }
+
+        return $key === null ? $values : ($values[$key] ?? $default);
+    }
+}
+
+if (!function_exists('now') && class_exists('Illuminate\Support\Carbon')) {
+    function now($tz = null): Illuminate\Support\Carbon
+    {
+        return Illuminate\Support\Carbon::now($tz);
+    }
+}
+
+if (!trait_exists('Illuminate\Foundation\Auth\Access\AuthorizesRequests')) {
+    eval('namespace Illuminate\Foundation\Auth\Access; trait AuthorizesRequests {}');
+}
+
+if (!trait_exists('Illuminate\Foundation\Bus\Dispatchable')) {
+    eval('namespace Illuminate\Foundation\Bus; trait Dispatchable {}');
+}
+
+if (!trait_exists('Illuminate\Foundation\Bus\DispatchesJobs')) {
+    eval('namespace Illuminate\Foundation\Bus; trait DispatchesJobs {}');
+}
+
+if (!trait_exists('Illuminate\Foundation\Validation\ValidatesRequests')) {
+    eval('namespace Illuminate\Foundation\Validation; trait ValidatesRequests {}');
+}
+
+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 (!interface_exists('Fleetbase\Ai\Contracts\AIContextCapabilityInterface')) {
+    eval('namespace Fleetbase\Ai\Contracts; interface AIContextCapabilityInterface {}');
+}
+
+if (!interface_exists('Fleetbase\Ai\Contracts\AIActionCapabilityInterface')) {
+    eval('namespace Fleetbase\Ai\Contracts; interface AIActionCapabilityInterface {}');
+}
+
+if (!class_exists('Fleetbase\Ai\Models\AiTask')) {
+    eval('namespace Fleetbase\Ai\Models; class AiTask { public function __construct(array $attributes = []) { foreach ($attributes as $key => $value) { $this->{$key} = $value; } } }');
+}
+
+if (!class_exists('Fleetbase\Ai\Support\Capabilities\AbstractAICapability')) {
+    eval('namespace Fleetbase\Ai\Support\Capabilities; abstract class AbstractAICapability {}');
+}
+
+if (!class_exists('Fleetbase\Ai\Support\AiQueryableResource')) {
+    eval('namespace Fleetbase\Ai\Support; class AiQueryableResource { public string $key; public array $fields; public array $aliases; public function __construct(string $key, string $label = "", string $module = "", string $modelClass = "", string $permission = "", array $aliases = [], array $fields = [], array $sampleFields = [], ?string $locationField = null, ?string $directivePermission = null, int $maxLimit = 100) { $this->key = $key; $this->fields = $fields; $this->aliases = $aliases; } public function hasField(string $field): bool { return array_key_exists($field, $this->fields); } }');
+}
+
+if (!class_exists('Fleetbase\Ai\Support\AiQueryRegistry')) {
+    eval('namespace Fleetbase\Ai\Support; class AiQueryRegistry { private array $resources = []; public function register(AiQueryableResource $resource): void { $this->resources[$resource->key] = $resource; foreach ($resource->aliases as $alias) { $this->resources[$alias] = $resource; } } public function find(string $key): ?AiQueryableResource { return $this->resources[$key] ?? null; } }');
+}
+
+if (!class_exists('Fleetbase\Ai\Support\AiRelativeDateResolver') && class_exists('Illuminate\Support\Carbon')) {
+    eval('namespace Fleetbase\Ai\Support; class AiRelativeDateResolver { public function __construct($parser = null) {} public function resolveDateTime(string $prompt, ?string $timezone = null): ?\Illuminate\Support\Carbon { if (preg_match("/(\d+)\s+days?\s+from\s+now/i", $prompt, $matches)) { return \Illuminate\Support\Carbon::now($timezone)->addDays((int) $matches[1]); } return null; } public function resolveWindow(string $prompt, ?string $timezone = null): ?array { $timezone = $timezone ?: date_default_timezone_get(); $now = \Illuminate\Support\Carbon::now($timezone); if (str_contains(strtolower($prompt), "last week")) { $start = $now->copy()->subWeek()->startOfWeek(); $end = $now->copy()->subWeek()->endOfWeek(); return ["label" => "last week", "timezone" => $timezone, "start" => $start, "end" => $end]; } if (str_contains(strtolower($prompt), "yesterday")) { $start = $now->copy()->subDay()->startOfDay(); $end = $now->copy()->subDay()->endOfDay(); return ["label" => "yesterday", "timezone" => $timezone, "start" => $start, "end" => $end]; } return null; } }');
+}
+
+set_error_handler(function (int $severity, string $message): bool {
+    if (str_contains($message, '/pestphp/pest/vendor/autoload.php')) {
+        return true;
+    }
+
+    return false;
+}, E_WARNING);

package/scripts/pest-file-runner.php

@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+
+$autoloadCandidates = [
+    getcwd() . '/server_vendor/autoload.php',
+    getcwd() . '/vendor/autoload.php',
+];
+
+$autoload = null;
+foreach ($autoloadCandidates as $candidate) {
+    if (is_file($candidate)) {
+        $autoload = $candidate;
+        break;
+    }
+}
+
+if ($autoload === null) {
+    fwrite(STDERR, "Unable to find Composer autoload. Run composer install first.\n");
+    exit(1);
+}
+
+require_once $autoload;
+
+$runner = getcwd() . '/scripts/pest-runner.php';
+if (!is_file($runner)) {
+    fwrite(STDERR, "Unable to find Pest runner at scripts/pest-runner.php.\n");
+    exit(1);
+}
+
+$testsPath = getcwd() . '/server/tests';
+$files     = glob($testsPath . '/*.php') ?: [];
+sort($files);
+
+if ($files === []) {
+    fwrite(STDERR, "Unable to find Pest test files in server/tests.\n");
+    exit(1);
+}
+
+$args    = array_slice($argv, 1);
+$timeout = (float) (getenv('PEST_FILE_TIMEOUT') ?: 120);
+
+foreach ($files as $file) {
+    $relativeFile = str_replace(getcwd() . '/', '', $file);
+
+    fwrite(STDOUT, "::group::{$relativeFile}\n");
+
+    $command = array_merge([PHP_BINARY, $runner], $args, [$file]);
+    $timeoutBinary = trim((string) shell_exec('command -v timeout'));
+    if ($timeoutBinary !== '') {
+        $command = array_merge([$timeoutBinary, "{$timeout}s"], $command);
+    }
+
+    fwrite(STDOUT, '$ ' . implode(' ', array_map('escapeshellarg', $command)) . "\n");
+
+    passthru(implode(' ', array_map('escapeshellarg', $command)), $exitCode);
+
+    if ($exitCode === 124) {
+        fwrite(STDERR, "\nTimed out after {$timeout} seconds while running {$relativeFile}.\n");
+        fwrite(STDOUT, "::endgroup::\n");
+        exit(1);
+    }
+
+    fwrite(STDOUT, "::endgroup::\n");
+
+    if ($exitCode !== 0) {
+        if (!in_array('--debug', $args, true)) {
+            fwrite(STDOUT, "::group::{$relativeFile} debug\n");
+            $debugCommand = array_merge([PHP_BINARY, $runner], $args, ['--debug', $file]);
+            if ($timeoutBinary !== '') {
+                $debugCommand = array_merge([$timeoutBinary, "{$timeout}s"], $debugCommand);
+            }
+
+            fwrite(STDOUT, '$ ' . implode(' ', array_map('escapeshellarg', $debugCommand)) . "\n");
+            passthru(implode(' ', array_map('escapeshellarg', $debugCommand)));
+            fwrite(STDOUT, "::endgroup::\n");
+        }
+
+        fwrite(STDERR, "\nPest failed for {$relativeFile} with exit code {$exitCode}.\n");
+        exit($exitCode);
+    }
+}

package/scripts/pest-runner.php

@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+$pestCandidates = [
+    getcwd() . '/server_vendor/bin/pest',
+    getcwd() . '/vendor/bin/pest',
+    getcwd() . '/server_vendor/pestphp/pest/bin/pest',
+    getcwd() . '/vendor/pestphp/pest/bin/pest',
+];
+
+$pest = null;
+foreach ($pestCandidates as $candidate) {
+    if (is_file($candidate)) {
+        $pest = $candidate;
+        break;
+    }
+}
+
+if ($pest === null) {
+    fwrite(STDERR, "Unable to find Pest. Run composer install first.\n");
+    exit(1);
+}
+
+$serverVendor = getcwd() . '/server_vendor';
+$vendor       = getcwd() . '/vendor';
+if (!file_exists($vendor) && is_dir($serverVendor) && function_exists('symlink')) {
+    @symlink($serverVendor, $vendor);
+}
+
+$bootstrap = getcwd() . '/scripts/pest-bootstrap.php';
+if (!is_file($bootstrap)) {
+    fwrite(STDERR, "Unable to find Pest bootstrap at scripts/pest-bootstrap.php.\n");
+    exit(1);
+}
+
+$args = array_slice($argv, 1);
+$hasConfiguration = false;
+foreach ($args as $arg) {
+    if (str_starts_with($arg, '--configuration')) {
+        $hasConfiguration = true;
+        break;
+    }
+}
+$configuration = getcwd() . '/phpunit.xml.dist';
+
+if (!$hasConfiguration && is_file($configuration)) {
+    array_unshift($args, '--configuration=' . $configuration);
+}
+
+$command = array_merge([
+    PHP_BINARY,
+    '-d',
+    'display_errors=1',
+    '-d',
+    'error_reporting=8191',
+    '-d',
+    'auto_prepend_file=' . $bootstrap,
+    $pest,
+], $args);
+
+passthru(implode(' ', array_map('escapeshellarg', $command)), $exitCode);
+
+exit($exitCode);

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

@@ -24,8 +24,14 @@ class Fleet extends FleetbaseResource
 
             $this->load($with);
 
-            if (in_array('subfleets', $with, true) && in_array('vehicles', $with, true)) {
-                $this->loadMissing('subFleets.vehicles');
+            if (in_array('subfleets', $with, true)) {
+                if (in_array('drivers', $with, true)) {
+                    $this->loadMissing('subFleets.drivers');
+                }
+
+                if (in_array('vehicles', $with, true)) {
+                    $this->loadMissing('subFleets.vehicles');
+                }
             }
         }
 

package/server/src/Models/Driver.php

@@ -278,6 +278,8 @@ class Driver extends Model
             'photo_uuid',
             'avatar_url',
             'public_id',
+            'name',
+            'internal_id',
             'location',
             'online',
             'updated_at',
@@ -288,6 +290,10 @@ class Driver extends Model
             'year',
             'make',
             'model',
+            'class',
+            'color',
+            'call_sign',
+            'status',
             'specs',
             'vin_data',
             'telematics',

package/server/src/Models/Order.php

@@ -849,7 +849,7 @@ class Order extends Model
             $attributes['type'] = $this->type;
         }
 
-        if (isset($attributes['pickup']) && is_array($attributes['pickup'])) {
+        if ($this->shouldResolvePayloadPlace($attributes, 'pickup')) {
             $pickup = Place::createFromMixed($attributes['pickup']);
 
             if ($pickup instanceof Place) {
@@ -857,7 +857,7 @@ class Order extends Model
             }
         }
 
-        if (isset($attributes['dropoff']) && is_array($attributes['dropoff'])) {
+        if ($this->shouldResolvePayloadPlace($attributes, 'dropoff')) {
             $dropoff = Place::createFromMixed($attributes['dropoff']);
 
             if ($dropoff instanceof Place) {
@@ -865,7 +865,7 @@ class Order extends Model
             }
         }
 
-        if (isset($attributes['return']) && is_array($attributes['return'])) {
+        if ($this->shouldResolvePayloadPlace($attributes, 'return')) {
             $return = Place::createFromMixed($attributes['return']);
 
             if ($return instanceof Place) {
@@ -897,19 +897,19 @@ class Order extends Model
             $attributes['type'] = $this->type;
         }
 
-        if (isset($attributes['pickup']) && is_array($attributes['pickup'])) {
+        if ($this->shouldResolvePayloadPlace($attributes, 'pickup')) {
             $pickupId = Place::insertFromMixed($attributes['pickup']);
 
             $attributes['pickup_uuid'] = $pickupId;
         }
 
-        if (isset($attributes['dropoff']) && is_array($attributes['dropoff'])) {
+        if ($this->shouldResolvePayloadPlace($attributes, 'dropoff')) {
             $dropoffId = Place::insertFromMixed($attributes['dropoff']);
 
             $attributes['dropoff_uuid'] = $dropoffId;
         }
 
-        if (isset($attributes['return']) && is_array($attributes['return'])) {
+        if ($this->shouldResolvePayloadPlace($attributes, 'return')) {
             $returnId = Place::insertFromMixed($attributes['return']);
 
             $attributes['return_uuid'] = $returnId;
@@ -947,6 +947,18 @@ class Order extends Model
         return $payload;
     }
 
+    protected function shouldResolvePayloadPlace(?array $attributes, string $role): bool
+    {
+        return !$this->hasExistingPayloadPlaceUuid($attributes, $role) && isset($attributes[$role]) && is_array($attributes[$role]);
+    }
+
+    protected function hasExistingPayloadPlaceUuid(?array $attributes, string $role): bool
+    {
+        $uuid = data_get($attributes, "{$role}_uuid");
+
+        return is_string($uuid) && Str::isUuid($uuid) && Place::where('uuid', $uuid)->exists();
+    }
+
     /**
      * Retrieves the payload associated with the order.
      * If the payload is not already loaded, it loads the payload relationship.