@fleetbase/fleetops-engine 0.6.58 → 0.6.59

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

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

@@ -50,7 +50,7 @@ class ProcessMaintenanceTriggers extends Command
 
         $sandbox = (bool) $this->option('sandbox');
         $dryRun  = (bool) $this->option('dry-run');
-        $conn    = $sandbox ? 'sandbox' : 'mysql';
+        $conn    = $this->connectionName($sandbox);
 
         $this->info('Processing maintenance schedule triggers' . ($dryRun ? ' [DRY RUN]' : '') . ' at ' . Carbon::now()->toDateTimeString());
 
@@ -59,56 +59,25 @@ class ProcessMaintenanceTriggers extends Command
         // ------------------------------------------------------------------
         // Load all active schedules that have at least one threshold set
         // ------------------------------------------------------------------
-        $schedules = MaintenanceSchedule::on($conn)
-            ->withoutGlobalScopes()
-            ->where('status', 'active')
-            ->where(function ($q) {
-                $q->whereNotNull('next_due_date')
-                  ->orWhereNotNull('next_due_odometer')
-                  ->orWhereNotNull('next_due_engine_hours');
-            })
-            ->whereNull('deleted_at')
-            ->with('subject')
-            ->get();
+        $schedules = $this->schedules($conn);
 
         foreach ($schedules as $schedule) {
-            $subject         = $schedule->subject;
-            $currentOdometer = null;
-            $currentEngHours = null;
-
-            // Resolve current readings from the subject asset if it is a vehicle
-            if ($subject instanceof Vehicle) {
-                $currentOdometer = $subject->odometer;
-                $currentEngHours = $subject->engine_hours;
-            }
+            $subject                             = $schedule->subject;
+            [$currentOdometer, $currentEngHours] = $this->currentReadingsFromSubject($subject);
 
             if (!$schedule->isDue($currentOdometer, $currentEngHours)) {
                 continue;
             }
 
             // Build a human-readable reason string for logging
-            $reasons = [];
-            if ($schedule->next_due_date && now()->gte($schedule->next_due_date)) {
-                $reasons[] = 'date due ' . $schedule->next_due_date->toDateString();
-            }
-            if ($schedule->next_due_odometer && $currentOdometer !== null && $currentOdometer >= $schedule->next_due_odometer) {
-                $reasons[] = "odometer {$currentOdometer} >= {$schedule->next_due_odometer}";
-            }
-            if ($schedule->next_due_engine_hours && $currentEngHours !== null && $currentEngHours >= $schedule->next_due_engine_hours) {
-                $reasons[] = "engine hours {$currentEngHours} >= {$schedule->next_due_engine_hours}";
-            }
+            $reasons = $this->triggerReasons($schedule, $currentOdometer, $currentEngHours);
 
             $this->line("Triggered: schedule {$schedule->public_id} ({$schedule->name}) — " . implode(', ', $reasons));
 
             if (!$dryRun) {
                 // Check if a pending work order already exists for this schedule
                 // to avoid duplicates on repeated runs before the WO is completed
-                $existingOpen = WorkOrder::on($conn)
-                    ->withoutGlobalScopes()
-                    ->where('schedule_uuid', $schedule->uuid)
-                    ->whereIn('status', ['open', 'in_progress'])
-                    ->whereNull('deleted_at')
-                    ->exists();
+                $existingOpen = $this->openWorkOrderExists($conn, $schedule);
 
                 if ($existingOpen) {
                     $this->line('  → Skipped: open work order already exists for this schedule.');
@@ -117,10 +86,10 @@ class ProcessMaintenanceTriggers extends Command
 
                 // Auto-generate a work order from the schedule defaults
                 // Generate a sequential WO code: WO-YYYYMMDD-XXXX
-                $woCount = WorkOrder::on($conn)->withoutGlobalScopes()->whereNull('deleted_at')->count() + 1;
-                $woCode  = 'WO-' . now()->format('Ymd') . '-' . str_pad($woCount, 4, '0', STR_PAD_LEFT);
+                $woCount = $this->workOrderCount($conn) + 1;
+                $woCode  = $this->workOrderCode($woCount, now());
 
-                $workOrder = WorkOrder::on($conn)->create([
+                $workOrder = $this->createWorkOrder($conn, [
                     'company_uuid'    => $schedule->company_uuid,
                     'schedule_uuid'   => $schedule->uuid,
                     'subject'         => $schedule->name,
@@ -140,12 +109,95 @@ class ProcessMaintenanceTriggers extends Command
 
                 $this->line("  → Created work order {$workOrder->public_id}");
 
-                event('maintenance.triggered', [$schedule, $workOrder]);
+                $this->dispatchTriggeredEvent($schedule, $workOrder);
             }
 
             $triggered++;
         }
 
-        $this->info("Processed {$triggered} schedule trigger(s)" . ($dryRun ? ' (dry run — no work orders created)' : '.'));
+        $this->info($this->processedSummary($triggered, $dryRun));
+    }
+
+    protected function connectionName(bool $sandbox): string
+    {
+        return $sandbox ? 'sandbox' : 'mysql';
+    }
+
+    protected function schedules(string $conn)
+    {
+        return MaintenanceSchedule::on($conn)
+            ->withoutGlobalScopes()
+            ->where('status', 'active')
+            ->where(function ($q) {
+                $q->whereNotNull('next_due_date')
+                  ->orWhereNotNull('next_due_odometer')
+                  ->orWhereNotNull('next_due_engine_hours');
+            })
+            ->whereNull('deleted_at')
+            ->with('subject')
+            ->get();
+    }
+
+    protected function openWorkOrderExists(string $conn, MaintenanceSchedule $schedule): bool
+    {
+        return WorkOrder::on($conn)
+            ->withoutGlobalScopes()
+            ->where('schedule_uuid', $schedule->uuid)
+            ->whereIn('status', ['open', 'in_progress'])
+            ->whereNull('deleted_at')
+            ->exists();
+    }
+
+    protected function workOrderCount(string $conn): int
+    {
+        return WorkOrder::on($conn)->withoutGlobalScopes()->whereNull('deleted_at')->count();
+    }
+
+    protected function createWorkOrder(string $conn, array $attributes): WorkOrder
+    {
+        return WorkOrder::on($conn)->create($attributes);
+    }
+
+    protected function dispatchTriggeredEvent(MaintenanceSchedule $schedule, WorkOrder $workOrder): void
+    {
+        event('maintenance.triggered', [$schedule, $workOrder]);
+    }
+
+    protected function currentReadingsFromSubject(mixed $subject): array
+    {
+        if ($subject instanceof Vehicle) {
+            return [$subject->odometer, $subject->engine_hours];
+        }
+
+        return [null, null];
+    }
+
+    protected function triggerReasons(object $schedule, mixed $currentOdometer = null, mixed $currentEngHours = null): array
+    {
+        $reasons = [];
+
+        if ($schedule->next_due_date && now()->gte($schedule->next_due_date)) {
+            $reasons[] = 'date due ' . $schedule->next_due_date->toDateString();
+        }
+
+        if ($schedule->next_due_odometer && $currentOdometer !== null && $currentOdometer >= $schedule->next_due_odometer) {
+            $reasons[] = "odometer {$currentOdometer} >= {$schedule->next_due_odometer}";
+        }
+
+        if ($schedule->next_due_engine_hours && $currentEngHours !== null && $currentEngHours >= $schedule->next_due_engine_hours) {
+            $reasons[] = "engine hours {$currentEngHours} >= {$schedule->next_due_engine_hours}";
+        }
+
+        return $reasons;
+    }
+
+    protected function workOrderCode(int $count, \DateTimeInterface $now): string
+    {
+        return 'WO-' . $now->format('Ymd') . '-' . str_pad($count, 4, '0', STR_PAD_LEFT);
+    }
+
+    protected function processedSummary(int $triggered, bool $dryRun): string
+    {
+        return "Processed {$triggered} schedule trigger(s)" . ($dryRun ? ' (dry run — no work orders created)' : '.');
     }
 }

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

@@ -32,19 +32,14 @@ class PurgeUnpurchasedServiceQuotes extends Command
     {
         $thresholdDate = now()->subHours(48);
 
-        Schema::disableForeignKeyConstraints();
-        DB::beginTransaction();
+        $this->disableForeignKeyConstraints();
+        $this->beginTransaction();
 
         try {
             // Get service quotes that are expired and have not been purchased
-            $deletedCount = ServiceQuote::where('created_at', '<', $thresholdDate)
-                ->whereNotIn('uuid', function ($query) {
-                    $query->select('service_quote_uuid')->from('purchase_rates')->whereNotNull('service_quote_uuid');
-                })
-                ->withTrashed()
-                ->forceDelete();
+            $deletedCount = $this->purgeServiceQuotes($thresholdDate);
 
-            DB::commit();
+            $this->commit();
 
             if ($deletedCount > 0) {
                 $this->info("Successfully deleted {$deletedCount} unpurchased service quotes.");
@@ -52,15 +47,50 @@ class PurgeUnpurchasedServiceQuotes extends Command
                 $this->info('No unpurchased service quotes found for deletion.');
             }
         } catch (\Exception $e) {
-            DB::rollBack();
-            Schema::enableForeignKeyConstraints();
+            $this->rollBack();
+            $this->enableForeignKeyConstraints();
             $this->error('Error deleting unpurchased service quotes: ' . $e->getMessage());
 
             return Command::FAILURE;
         }
 
-        Schema::enableForeignKeyConstraints();
+        $this->enableForeignKeyConstraints();
 
         return Command::SUCCESS;
     }
+
+    protected function disableForeignKeyConstraints(): void
+    {
+        Schema::disableForeignKeyConstraints();
+    }
+
+    protected function enableForeignKeyConstraints(): void
+    {
+        Schema::enableForeignKeyConstraints();
+    }
+
+    protected function beginTransaction(): void
+    {
+        DB::beginTransaction();
+    }
+
+    protected function commit(): void
+    {
+        DB::commit();
+    }
+
+    protected function rollBack(): void
+    {
+        DB::rollBack();
+    }
+
+    protected function purgeServiceQuotes($thresholdDate): int
+    {
+        return ServiceQuote::where('created_at', '<', $thresholdDate)
+            ->whereNotIn('uuid', function ($query) {
+                $query->select('service_quote_uuid')->from('purchase_rates')->whereNotNull('service_quote_uuid');
+            })
+            ->withTrashed()
+            ->forceDelete();
+    }
 }