@fleetbase/fleetops-engine 0.6.58 → 0.6.60

package/server/migrations/2026_08_08_000001_make_sku_and_provider_transaction_unique_indexes_soft_delete_aware.php

@@ -0,0 +1,152 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Both `parts` and `fuel_provider_transactions` soft-delete, but their unique
+ * indexes were not soft-delete aware.  A deleted row kept occupying the key, so
+ * re-creating a Part with a previously used SKU (or re-ingesting a fuel provider
+ * transaction that had been deleted) raised a UniqueConstraintViolationException.
+ * On the public v1 API that surfaced as an HTTP 500, and because there is no
+ * restore/force-delete route the key was unusable from then on.
+ *
+ * The fix follows the pattern already used for alrashed contract numbers in
+ * 2026_05_25_000001_make_contract_number_unique_for_active_contracts: a STORED
+ * generated column that is NULL for soft-deleted rows.  MySQL permits any number
+ * of NULLs in a unique index, so tombstones stop colliding while live rows stay
+ * constrained.
+ *
+ * `fuel_provider_transactions` additionally gains `company_uuid` in the key.  The
+ * old index was global, so one company's provider transaction id blocked — or,
+ * via FuelProviderService::ingestTransaction()'s updateOrCreate, silently
+ * overwrote — another company's.  Provider transaction ids are only unique within
+ * the account they were issued for, so the key belongs per tenant.
+ *
+ * Both new indexes are strictly more permissive than the ones they replace, so no
+ * existing row can violate them and no backfill is required.
+ */
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // ---- parts: (company_uuid, sku) -> (company_uuid, active_sku) ----
+        if (!Schema::hasColumn('parts', 'active_sku')) {
+            Schema::table('parts', function (Blueprint $table) {
+                $table->string('active_sku')->nullable()->storedAs('IF(`deleted_at` IS NULL, `sku`, NULL)');
+            });
+        }
+
+        // The replacement index MUST be created before the old one is dropped:
+        // parts_company_uuid_sku_unique is currently the only index covering
+        // company_uuid, and parts_company_uuid_foreign depends on it. Adding an
+        // index that also leads with company_uuid lets it take over as the
+        // covering index, otherwise the drop below fails with errno 150.
+        if (!$this->indexExists('parts', 'parts_company_uuid_active_sku_unique')) {
+            Schema::table('parts', function (Blueprint $table) {
+                $table->unique(['company_uuid', 'active_sku'], 'parts_company_uuid_active_sku_unique');
+            });
+        }
+
+        if ($this->indexExists('parts', 'parts_company_uuid_sku_unique')) {
+            Schema::table('parts', function (Blueprint $table) {
+                $table->dropUnique('parts_company_uuid_sku_unique');
+            });
+        }
+
+        // ---- fuel_provider_transactions: (provider, provider_transaction_id)
+        //      -> (company_uuid, provider, active_provider_transaction_id) ----
+        if (!Schema::hasColumn('fuel_provider_transactions', 'active_provider_transaction_id')) {
+            Schema::table('fuel_provider_transactions', function (Blueprint $table) {
+                $table->string('active_provider_transaction_id', 191)->nullable()->storedAs('IF(`deleted_at` IS NULL, `provider_transaction_id`, NULL)');
+            });
+        }
+
+        if (!$this->indexExists('fuel_provider_transactions', 'fuel_provider_txn_company_provider_unique')) {
+            Schema::table('fuel_provider_transactions', function (Blueprint $table) {
+                $table->unique(['company_uuid', 'provider', 'active_provider_transaction_id'], 'fuel_provider_txn_company_provider_unique');
+            });
+        }
+
+        if ($this->indexExists('fuel_provider_transactions', 'fuel_provider_txn_provider_unique')) {
+            Schema::table('fuel_provider_transactions', function (Blueprint $table) {
+                $table->dropUnique('fuel_provider_txn_provider_unique');
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * Restoring the old global index can fail if rows now exist that only the new
+     * key permits (two tenants sharing a provider transaction id, or a live row
+     * whose SKU matches a soft-deleted one). That is inherent to reversing a
+     * relaxed constraint, so the old indexes are restored on a best-effort basis
+     * and the generated columns are dropped either way.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        if (!$this->indexExists('parts', 'parts_company_uuid_sku_unique')) {
+            try {
+                Schema::table('parts', function (Blueprint $table) {
+                    $table->unique(['company_uuid', 'sku'], 'parts_company_uuid_sku_unique');
+                });
+            } catch (Throwable $e) {
+                // Duplicate SKUs the new index allowed now block the old one.
+            }
+        }
+
+        if ($this->indexExists('parts', 'parts_company_uuid_active_sku_unique')) {
+            Schema::table('parts', function (Blueprint $table) {
+                $table->dropUnique('parts_company_uuid_active_sku_unique');
+            });
+        }
+
+        if (Schema::hasColumn('parts', 'active_sku')) {
+            Schema::table('parts', function (Blueprint $table) {
+                $table->dropColumn('active_sku');
+            });
+        }
+
+        if (!$this->indexExists('fuel_provider_transactions', 'fuel_provider_txn_provider_unique')) {
+            try {
+                Schema::table('fuel_provider_transactions', function (Blueprint $table) {
+                    $table->unique(['provider', 'provider_transaction_id'], 'fuel_provider_txn_provider_unique');
+                });
+            } catch (Throwable $e) {
+                // Cross-tenant duplicates the new index allows now block the old one.
+            }
+        }
+
+        if ($this->indexExists('fuel_provider_transactions', 'fuel_provider_txn_company_provider_unique')) {
+            Schema::table('fuel_provider_transactions', function (Blueprint $table) {
+                $table->dropUnique('fuel_provider_txn_company_provider_unique');
+            });
+        }
+
+        if (Schema::hasColumn('fuel_provider_transactions', 'active_provider_transaction_id')) {
+            Schema::table('fuel_provider_transactions', function (Blueprint $table) {
+                $table->dropColumn('active_provider_transaction_id');
+            });
+        }
+    }
+
+    private function indexExists(string $table, string $index): bool
+    {
+        $database = DB::connection()->getDatabaseName();
+
+        return DB::table('information_schema.statistics')
+            ->where('table_schema', $database)
+            ->where('table_name', $table)
+            ->where('index_name', $index)
+            ->exists();
+    }
+};

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']);
+    }
 }

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

@@ -97,7 +97,7 @@ class DispatchAdhocOrders extends Command
         $cutoffDate = Carbon::now()->subDays($days);
         $now        = Carbon::now();
 
-        return Order::on($sandbox ? 'sandbox' : 'mysql')
+        return $this->newOrderQuery($sandbox ? 'sandbox' : 'mysql')
             ->withoutGlobalScopes()
             ->where(['adhoc' => 1, 'dispatched' => 1, 'started' => 0])
             ->whereBetween('dispatched_at', [
@@ -125,7 +125,7 @@ class DispatchAdhocOrders extends Command
      */
     public function getNearbyDriversForOrder(Order $order, Point $pickup, int $distance, bool $testing = false): Collection
     {
-        $driverQuery = Driver::query()
+        $driverQuery = $this->newDriverQuery()
             ->where(['online' => 1])
             ->where(function ($q) use ($order) {
                 $q->where('company_uuid', $order->company_uuid)
@@ -146,4 +146,14 @@ class DispatchAdhocOrders extends Command
 
         return $driverQuery->get();
     }
+
+    protected function newOrderQuery(string $connection)
+    {
+        return Order::on($connection);
+    }
+
+    protected function newDriverQuery()
+    {
+        return Driver::query();
+    }
 }

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

@@ -31,27 +31,24 @@ class FixCustomerCompanies extends Command
      */
     public function handle()
     {
-        $customers = Contact::where('type', 'customer')->whereNotNull('company_uuid')->get();
+        $customers = $this->customers();
 
         // Fix these customers
         foreach ($customers as $customer) {
             /** @var User $user */
-            $customer->loadMissing('user');
-            $user = $customer->user;
+            $user = $this->customerUser($customer);
             if (!$user) {
                 try {
-                    $customer->createUser();
+                    $this->createUserForCustomer($customer);
                     $this->info('User created for customer (' . $customer->name . ' - ' . $customer->email . ')');
-                    $customer->loadMissing('user');
-                    $user = $customer->user;
+                    $user = $this->customerUser($customer);
                 } catch (\Exception $e) {
                     $this->error($e->getMessage());
                     $this->error('Existing user: ' . $customer->email);
                     // Assign existing user to the contact/customer
-                    $existingUser = User::where('email', $customer->email)->first();
+                    $existingUser = $this->userByEmail($customer->email);
                     if ($existingUser) {
-                        $customer->updateQuietly(['user_uuid' => $existingUser->uuid]);
-                        $customer->setRelation('user', $existingUser);
+                        $this->assignExistingUserToCustomer($customer, $existingUser);
                         $this->info('Update customer user to existing user of the same email address.');
                         $user = $existingUser;
                     }
@@ -66,10 +63,10 @@ class FixCustomerCompanies extends Command
                 $user->syncProperty('phone', $customer);
 
                 // Check if customers user has a customer user record with the company
-                $doesntHaveCompanyUser = CompanyUser::where(['user_uuid' => $user->uuid, 'company_uuid' => $customer->company_uuid])->doesntExist();
+                $doesntHaveCompanyUser = $this->missingCompanyUser($user->uuid, $customer->company_uuid);
                 if ($doesntHaveCompanyUser) {
                     $this->line('Found user ' . $user->name . ' (' . $user->email . ') which doesnt have correct company assignment.');
-                    $company = Company::where('uuid', $customer->company_uuid)->first();
+                    $company = $this->companyByUuid($customer->company_uuid);
                     if ($company) {
                         $user->assignCompany($company);
                         $this->line('User ' . $user->email . ' was assigned to company: ' . $company->name);
@@ -80,4 +77,42 @@ class FixCustomerCompanies extends Command
 
         return Command::SUCCESS;
     }
+
+    protected function customers()
+    {
+        return Contact::where('type', 'customer')->whereNotNull('company_uuid')->get();
+    }
+
+    protected function customerUser(Contact $customer)
+    {
+        $customer->loadMissing('user');
+
+        return $customer->user;
+    }
+
+    protected function createUserForCustomer(Contact $customer)
+    {
+        return $customer->createUser();
+    }
+
+    protected function assignExistingUserToCustomer(Contact $customer, $existingUser): void
+    {
+        $customer->updateQuietly(['user_uuid' => $existingUser->uuid]);
+        $customer->setRelation('user', $existingUser);
+    }
+
+    protected function userByEmail(string $email)
+    {
+        return User::where('email', $email)->first();
+    }
+
+    protected function missingCompanyUser(string $userUuid, string $companyUuid): bool
+    {
+        return CompanyUser::where(['user_uuid' => $userUuid, 'company_uuid' => $companyUuid])->doesntExist();
+    }
+
+    protected function companyByUuid(string $companyUuid): ?Company
+    {
+        return Company::where('uuid', $companyUuid)->first();
+    }
 }

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

@@ -30,7 +30,7 @@ class FixDriverCompanies extends Command
      */
     public function handle()
     {
-        $drivers = Driver::whereHas('user')->whereNotNull('company_uuid')->with(['user'])->get();
+        $drivers = $this->drivers();
 
         // Fix these drivers
         foreach ($drivers as $driver) {
@@ -44,10 +44,10 @@ class FixDriverCompanies extends Command
                 $user->syncProperty('phone', $driver);
 
                 // Check if customers user has a customer user record with the company
-                $doesntHaveCompanyUser = CompanyUser::where(['user_uuid' => $user->uuid, 'company_uuid' => $driver->company_uuid])->doesntExist();
+                $doesntHaveCompanyUser = $this->missingCompanyUser($user->uuid, $driver->company_uuid);
                 if ($doesntHaveCompanyUser) {
                     $this->line('Found driver ' . $user->name . ' (' . $user->email . ') which doesnt have correct company assignment.');
-                    $company = Company::where('uuid', $driver->company_uuid)->first();
+                    $company = $this->companyByUuid($driver->company_uuid);
                     if ($company) {
                         $user->assignCompany($company);
                         $this->line('Driver ' . $user->email . ' was assigned to company: ' . $company->name);
@@ -58,4 +58,19 @@ class FixDriverCompanies extends Command
 
         return Command::SUCCESS;
     }
+
+    protected function drivers()
+    {
+        return Driver::whereHas('user')->whereNotNull('company_uuid')->with(['user'])->get();
+    }
+
+    protected function missingCompanyUser(string $userUuid, string $companyUuid): bool
+    {
+        return CompanyUser::where(['user_uuid' => $userUuid, 'company_uuid' => $companyUuid])->doesntExist();
+    }
+
+    protected function companyByUuid(string $companyUuid): ?Company
+    {
+        return Company::where('uuid', $companyUuid)->first();
+    }
 }

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

@@ -37,13 +37,13 @@ class FixLegacyOrderConfigs extends Command
     {
         $shouldCreateConfigs = $this->option('create-configs');
         if ($shouldCreateConfigs) {
-            $companies      = Company::all();
+            $companies      = $this->companies();
             $totalCompanies = $companies->count();
             $this->info('Initializing transport config for ' . $totalCompanies . ' companies.');
-            $progressBar = $this->output->createProgressBar($totalCompanies);
+            $progressBar = $this->createProgressBar($totalCompanies);
             $progressBar->start();
             foreach ($companies as $company) {
-                FleetOps::createTransportConfig($company);
+                $this->createTransportConfig($company);
                 $progressBar->advance();
             }
             $progressBar->finish();
@@ -51,14 +51,14 @@ class FixLegacyOrderConfigs extends Command
             $this->info('All transport configs created.');
         }
 
-        $orders      = Order::whereNull('order_config_uuid')->get();
+        $orders      = $this->ordersWithoutConfig();
         $totalOrders = $orders->count();
         $this->info($totalOrders . ' orders found for updating.');
-        $progressBar = $this->output->createProgressBar($totalOrders);
+        $progressBar = $this->createProgressBar($totalOrders);
         $progressBar->start();
         foreach ($orders as $order) {
             try {
-                $orderConfig = OrderConfig::where(['company_uuid' => $order->company_uuid, 'namespace' => 'system:order-config:transport'])->first();
+                $orderConfig = $this->transportConfigForCompany($order->company_uuid);
                 if ($orderConfig) {
                     $order->update(['order_config_uuid' => $orderConfig->uuid]);
                 }
@@ -75,4 +75,29 @@ class FixLegacyOrderConfigs extends Command
         $this->line('');
         $this->info('All orders have been processed.');
     }
+
+    protected function companies()
+    {
+        return Company::all();
+    }
+
+    protected function createTransportConfig(Company $company): void
+    {
+        FleetOps::createTransportConfig($company);
+    }
+
+    protected function ordersWithoutConfig()
+    {
+        return Order::whereNull('order_config_uuid')->get();
+    }
+
+    protected function transportConfigForCompany(string $companyUuid): ?OrderConfig
+    {
+        return OrderConfig::where(['company_uuid' => $companyUuid, 'namespace' => 'system:order-config:transport'])->first();
+    }
+
+    protected function createProgressBar(int $total)
+    {
+        return $this->output->createProgressBar($total);
+    }
 }