@fleetbase/fleetops-engine 0.6.58 → 0.6.59

package/server/src/Http/Requests/QueryServiceQuotesRequest.php

@@ -10,20 +10,16 @@ class QueryServiceQuotesRequest extends FleetbaseRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
-     * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('api_credential');
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'payload'      => ['nullable', 'required_without_all:waypoints,pickup,dropoff', Rule::exists('payloads', 'public_id')->whereNull('deleted_at')],

package/server/src/Http/Requests/ScheduleOrderRequest.php

@@ -8,20 +8,16 @@ class ScheduleOrderRequest extends FleetbaseRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
-     * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('api_credential');
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'date'     => 'required|date_format:Y-m-d',

package/server/src/Http/Requests/UpdateIssueRequest.php

@@ -6,10 +6,8 @@ class UpdateIssueRequest extends CreateIssueRequest
 {
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'report'       => ['required'],

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

@@ -46,7 +46,7 @@ class Customer extends FleetbaseResource
         ];
     }
 
-    private function getOrdersCount(Request $request): int
+    protected function getOrdersCount(Request $request): int
     {
         return Order::where('customer_uuid', $this->uuid)
             ->whereNull('deleted_at')
@@ -61,7 +61,7 @@ class Customer extends FleetbaseResource
      * Currency falls back through company.currency → ledger base_currency
      * → "USD" via {@see Utils::getCompanyTransactionCurrency}.
      */
-    private function buildCompanyPayload(): ?array
+    protected function buildCompanyPayload(): ?array
     {
         $company = Company::find($this->company_uuid);
         if (!$company) {

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

@@ -128,11 +128,10 @@ class Maintenance extends FleetbaseResource
             return null;
         }
 
+        // Find::httpResourceForModel() always resolves a class, falling back to
+        // FleetbaseResource, so there is no un-resolvable case to handle here
         $resourceClass = \Fleetbase\Support\Find::httpResourceForModel($model);
-        if ($resourceClass) {
-            return (new $resourceClass($model))->resolve();
-        }
 
-        return (new \Illuminate\Http\Resources\Json\JsonResource($model))->resolve();
+        return (new $resourceClass($model))->resolve();
     }
 }

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

@@ -127,11 +127,10 @@ class MaintenanceSchedule extends FleetbaseResource
             return null;
         }
 
+        // Find::httpResourceForModel() always resolves a class, falling back to
+        // FleetbaseResource, so there is no un-resolvable case to handle here
         $resourceClass = \Fleetbase\Support\Find::httpResourceForModel($model);
-        if ($resourceClass) {
-            return (new $resourceClass($model))->resolve();
-        }
 
-        return (new \Illuminate\Http\Resources\Json\JsonResource($model))->resolve();
+        return (new $resourceClass($model))->resolve();
     }
 }

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

@@ -161,15 +161,11 @@ class Order extends FleetbaseResource
             return null;
         }
 
-        // Use Find to get the appropriate resource class for this model
+        // Find::httpResourceForModel() always resolves a class, falling back to
+        // FleetbaseResource, so there is no un-resolvable case to handle here
         $resourceClass = \Fleetbase\Support\Find::httpResourceForModel($model);
 
-        if ($resourceClass) {
-            return (new $resourceClass($model))->resolve();
-        }
-
-        // Fallback to generic resource
-        return (new \Illuminate\Http\Resources\Json\JsonResource($model))->resolve();
+        return (new $resourceClass($model))->resolve();
     }
 
     /**

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

@@ -67,12 +67,10 @@ class PurchaseRate extends FleetbaseResource
             return $this->resource->serviceQuote ? new ServiceQuote($this->resource->serviceQuote) : null;
         }
 
-        if (method_exists($this, 'loadMissing')) {
-            $this->loadMissing('serviceQuote');
-
-            return $this->serviceQuote ? new ServiceQuote($this->serviceQuote) : null;
-        }
-
+        // A `loadMissing` fallback used to live here, guarded by
+        // method_exists($this, 'loadMissing'). No class in this resource's
+        // hierarchy declares that method — it only resolves through __call,
+        // which method_exists cannot see — so the branch never ran.
         return null;
     }
 }

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

@@ -74,12 +74,10 @@ class TrackingStatus extends FleetbaseResource
             return $this->resource->trackingNumber ? new TrackingNumber($this->resource->trackingNumber) : null;
         }
 
-        if (method_exists($this, 'loadMissing')) {
-            $this->loadMissing('trackingNumber');
-
-            return $this->trackingNumber ? new TrackingNumber($this->trackingNumber) : null;
-        }
-
+        // A `loadMissing` fallback used to live here, guarded by
+        // method_exists($this, 'loadMissing'). No class in this resource's
+        // hierarchy declares that method — it only resolves through __call,
+        // which method_exists cannot see — so the branch never ran.
         return null;
     }
 }

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

@@ -127,11 +127,10 @@ class WorkOrder extends FleetbaseResource
             return null;
         }
 
+        // Find::httpResourceForModel() always resolves a class, falling back to
+        // FleetbaseResource, so there is no un-resolvable case to handle here
         $resourceClass = \Fleetbase\Support\Find::httpResourceForModel($model);
-        if ($resourceClass) {
-            return (new $resourceClass($model))->resolve();
-        }
 
-        return (new \Illuminate\Http\Resources\Json\JsonResource($model))->resolve();
+        return (new $resourceClass($model))->resolve();
     }
 }

package/server/src/Imports/ContactImport.php

@@ -24,8 +24,17 @@ class ContactImport implements ToCollection, WithHeadingRow
                 $row = array_filter($row->toArray());
             }
 
-            Contact::createFromImport($row, true);
+            if (empty($row)) {
+                continue;
+            }
+
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Contact::createFromImport($row, true);
+    }
 }

package/server/src/Imports/DriverImport.php

@@ -24,8 +24,17 @@ class DriverImport implements ToCollection, WithHeadingRow
                 $row = array_filter($row->toArray());
             }
 
-            Driver::createFromImport($row, true);
+            if (empty($row)) {
+                continue;
+            }
+
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Driver::createFromImport($row, true);
+    }
 }

package/server/src/Imports/EquipmentImport.php

@@ -25,8 +25,13 @@ class EquipmentImport implements ToCollection, WithHeadingRow
                 continue;
             }
 
-            Equipment::createFromImport($row, true);
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Equipment::createFromImport($row, true);
+    }
 }

package/server/src/Imports/FleetImport.php

@@ -24,8 +24,17 @@ class FleetImport implements ToCollection, WithHeadingRow
                 $row = array_filter($row->toArray());
             }
 
-            Fleet::createFromImport($row, true);
+            if (empty($row)) {
+                continue;
+            }
+
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Fleet::createFromImport($row, true);
+    }
 }

package/server/src/Imports/FuelReportImport.php

@@ -24,8 +24,17 @@ class FuelReportImport implements ToCollection, WithHeadingRow
                 $row = array_filter($row->toArray());
             }
 
-            FuelReport::createFromImport($row, true);
+            if (empty($row)) {
+                continue;
+            }
+
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        FuelReport::createFromImport($row, true);
+    }
 }

package/server/src/Imports/IssueImport.php

@@ -24,8 +24,17 @@ class IssueImport implements ToCollection, WithHeadingRow
                 $row = array_filter($row->toArray());
             }
 
-            Issue::createFromImport($row, true);
+            if (empty($row)) {
+                continue;
+            }
+
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Issue::createFromImport($row, true);
+    }
 }

package/server/src/Imports/MaintenanceImport.php

@@ -25,8 +25,13 @@ class MaintenanceImport implements ToCollection, WithHeadingRow
                 continue;
             }
 
-            Maintenance::createFromImport($row, true);
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Maintenance::createFromImport($row, true);
+    }
 }

package/server/src/Imports/MaintenanceScheduleImport.php

@@ -25,8 +25,13 @@ class MaintenanceScheduleImport implements ToCollection, WithHeadingRow
                 continue;
             }
 
-            MaintenanceSchedule::createFromImport($row, true);
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        MaintenanceSchedule::createFromImport($row, true);
+    }
 }

package/server/src/Imports/PartImport.php

@@ -25,8 +25,13 @@ class PartImport implements ToCollection, WithHeadingRow
                 continue;
             }
 
-            Part::createFromImport($row, true);
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Part::createFromImport($row, true);
+    }
 }

package/server/src/Imports/PlaceImport.php

@@ -24,8 +24,17 @@ class PlaceImport implements ToCollection, WithHeadingRow
                 $row = array_filter($row->toArray());
             }
 
-            Place::createFromImport($row, true);
+            if (empty($row)) {
+                continue;
+            }
+
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Place::createFromImport($row, true);
+    }
 }

package/server/src/Imports/VehicleImport.php

@@ -24,8 +24,17 @@ class VehicleImport implements ToCollection, WithHeadingRow
                 $row = array_filter($row->toArray());
             }
 
-            Vehicle::createFromImport($row, true);
+            if (empty($row)) {
+                continue;
+            }
+
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Vehicle::createFromImport($row, true);
+    }
 }

package/server/src/Imports/VendorImport.php

@@ -24,8 +24,17 @@ class VendorImport implements ToCollection, WithHeadingRow
                 $row = array_filter($row->toArray());
             }
 
-            Vendor::createFromImport($row, true);
+            if (empty($row)) {
+                continue;
+            }
+
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Vendor::createFromImport($row, true);
+    }
 }

package/server/src/Imports/WorkOrderImport.php

@@ -25,8 +25,13 @@ class WorkOrderImport implements ToCollection, WithHeadingRow
                 continue;
             }
 
-            WorkOrder::createFromImport($row, true);
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        WorkOrder::createFromImport($row, true);
+    }
 }

package/server/src/Integrations/Lalamove/Lalamove.php

@@ -111,15 +111,11 @@ class Lalamove
 
     public static function instance(?string $apiKey = null, ?string $apiSecret = null, bool $sandbox = false, $market = null): Lalamove
     {
-        return new static($apiKey, $apiSecret, $market, $sandbox);
+        return new static($apiKey, $apiSecret, $sandbox, $market);
     }
 
     public static function __callStatic($name, $arguments)
     {
-        if ($name === 'instance') {
-            return static::instance(...$arguments);
-        }
-
         $sandbox = false;
 
         if (Str::contains($name, 'FromSandbox')) {
@@ -182,7 +178,7 @@ class Lalamove
         return $serviceQuote->load(['items']);
     }
 
-    public static function serviceQuoteFromQuotation($quotation = null, $requestId = null, $integratedVendor = null, ?Payload $payload = null): ServiceQuote
+    public static function serviceQuoteFromQuotation($quotation = null, $requestId = null, $integratedVendor = null, ?Payload $payload = null): ?ServiceQuote
     {
         if (!$quotation) {
             return null;
@@ -453,7 +449,7 @@ class Lalamove
 
     public static function getQuotationForMarket($market, ...$params)
     {
-        $instance = static::instance(null, null, $market);
+        $instance = static::instance(null, null, false, $market);
 
         return $instance->getQuotations(...$params);
     }

package/server/src/Integrations/Lalamove/LalamoveServiceType.php

@@ -123,16 +123,13 @@ class LalamoveServiceType
         return null;
     }
 
+    /**
+     * `__call` only ever fires for names this class does not define, and every
+     * method it does define — `all()` included — is public, so neither an
+     * `all` forward nor a `method_exists()` forward is reachable from here.
+     */
     public function __call(string $key, $arguments)
     {
-        if ($key === 'all') {
-            return collect(static::$serviceTypes)->mapInto(LalamoveServiceType::class);
-        }
-
-        if (method_exists($this, $key)) {
-            $this->{$key}(...$arguments);
-        }
-
         return null;
     }
 

package/server/src/Jobs/CheckGeofenceDwell.php

@@ -88,14 +88,7 @@ class CheckGeofenceDwell implements ShouldQueue
     public function handle(): void
     {
         // Check if the driver is still inside the geofence
-        $stateTable    = $this->subjectType === 'vehicle' ? 'vehicle_geofence_states' : 'driver_geofence_states';
-        $subjectColumn = $this->subjectType === 'vehicle' ? 'vehicle_uuid' : 'driver_uuid';
-
-        $state = DB::table($stateTable)
-            ->where($subjectColumn, $this->driverUuid)
-            ->where('geofence_uuid', $this->geofenceUuid)
-            ->where('is_inside', true)
-            ->first();
+        $state = $this->findDwellState();
 
         if (!$state) {
             // Driver has already exited; dwell event should not fire
@@ -103,12 +96,10 @@ class CheckGeofenceDwell implements ShouldQueue
         }
 
         // Load the driver
-        $subject = $this->subjectType === 'vehicle'
-            ? Vehicle::where('uuid', $this->driverUuid)->withoutGlobalScopes()->first()
-            : Driver::where('uuid', $this->driverUuid)->withoutGlobalScopes()->first();
+        $subject = $this->findSubject();
 
         if (!$subject) {
-            Log::warning('CheckGeofenceDwell: Subject not found', [
+            $this->logWarning('CheckGeofenceDwell: Subject not found', [
                 'subject_uuid' => $this->driverUuid,
                 'subject_type' => $this->subjectType,
             ]);
@@ -117,12 +108,10 @@ class CheckGeofenceDwell implements ShouldQueue
         }
 
         // Load the geofence model
-        $geofence = $this->geofenceType === 'service_area'
-            ? ServiceArea::where('uuid', $this->geofenceUuid)->first()
-            : Zone::where('uuid', $this->geofenceUuid)->first();
+        $geofence = $this->findGeofence();
 
         if (!$geofence) {
-            Log::warning('CheckGeofenceDwell: Geofence not found', [
+            $this->logWarning('CheckGeofenceDwell: Geofence not found', [
                 'geofence_uuid' => $this->geofenceUuid,
                 'geofence_type' => $this->geofenceType,
             ]);
@@ -134,6 +123,42 @@ class CheckGeofenceDwell implements ShouldQueue
         $enteredAt = \Carbon\Carbon::parse($state->entered_at);
 
         // Fire the dwell event
+        $this->fireDwellEvent($subject, $geofence, $enteredAt);
+    }
+
+    protected function findDwellState(): ?object
+    {
+        $stateTable    = $this->subjectType === 'vehicle' ? 'vehicle_geofence_states' : 'driver_geofence_states';
+        $subjectColumn = $this->subjectType === 'vehicle' ? 'vehicle_uuid' : 'driver_uuid';
+
+        return DB::table($stateTable)
+            ->where($subjectColumn, $this->driverUuid)
+            ->where('geofence_uuid', $this->geofenceUuid)
+            ->where('is_inside', true)
+            ->first();
+    }
+
+    protected function findSubject(): Driver|Vehicle|null
+    {
+        return $this->subjectType === 'vehicle'
+            ? Vehicle::where('uuid', $this->driverUuid)->withoutGlobalScopes()->first()
+            : Driver::where('uuid', $this->driverUuid)->withoutGlobalScopes()->first();
+    }
+
+    protected function findGeofence(): ServiceArea|Zone|null
+    {
+        return $this->geofenceType === 'service_area'
+            ? ServiceArea::where('uuid', $this->geofenceUuid)->first()
+            : Zone::where('uuid', $this->geofenceUuid)->first();
+    }
+
+    protected function fireDwellEvent(Driver|Vehicle $subject, ServiceArea|Zone $geofence, \DateTimeInterface $enteredAt): void
+    {
         event(new GeofenceDwelled($subject, $geofence, $this->geofenceType, $enteredAt));
     }
+
+    protected function logWarning(string $message, array $context): void
+    {
+        Log::warning($message, $context);
+    }
 }

package/server/src/Jobs/FinalizeApiOrderCreation.php

@@ -27,12 +27,12 @@ class FinalizeApiOrderCreation implements ShouldQueue
 
     public function handle(): void
     {
-        $order = Order::where('uuid', $this->orderUuid)->first();
+        $order = $this->findOrder();
         if (!$order) {
             return;
         }
 
-        $serviceQuote = $this->serviceQuoteUuid ? ServiceQuote::where('uuid', $this->serviceQuoteUuid)->first() : null;
+        $serviceQuote = $this->findServiceQuote();
 
         $order->notifyDriverAssigned();
         $order->setPreliminaryDistanceAndTime();
@@ -42,6 +42,21 @@ class FinalizeApiOrderCreation implements ShouldQueue
             $order->dispatchWithActivity();
         }
 
+        $this->fireOrderReady($order);
+    }
+
+    protected function findOrder(): ?Order
+    {
+        return Order::where('uuid', $this->orderUuid)->first();
+    }
+
+    protected function findServiceQuote(): ?ServiceQuote
+    {
+        return $this->serviceQuoteUuid ? ServiceQuote::where('uuid', $this->serviceQuoteUuid)->first() : null;
+    }
+
+    protected function fireOrderReady(Order $order): void
+    {
         event(new OrderReady($order));
     }
 }

package/server/src/Jobs/FinalizeInternalOrderCreation.php

@@ -23,13 +23,23 @@ class FinalizeInternalOrderCreation implements ShouldQueue
 
     public function handle(): void
     {
-        $order = Order::where('uuid', $this->orderUuid)->first();
+        $order = $this->findOrder();
         if (!$order) {
             return;
         }
 
         $order->notifyDriverAssigned();
 
+        $this->fireOrderReady($order);
+    }
+
+    protected function findOrder(): ?Order
+    {
+        return Order::where('uuid', $this->orderUuid)->first();
+    }
+
+    protected function fireOrderReady(Order $order): void
+    {
         event(new OrderReady($order));
     }
 }