@fleetbase/fleetops-engine 0.6.58 → 0.6.60

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

@@ -8,25 +8,32 @@ class CreateFuelReportRequest 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') || request()->session()->has('is_sanctum_token');
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
+        // requiredIf(POST), not required: UpdateFuelReportRequest extends this class, so a
+        // flat `required` made every partial update fail — PUT /v1/fuel-reports/{id} with
+        // just {"status": "approved"} answered "The driver field is required."
+        //
+        // `driver` is the clearest case: the update action's $request->only() list does not
+        // even include it, so validation demanded a field the endpoint then discarded.
+        // CreateFuelTransactionRequest solves the same create/update inheritance with
+        // Rule::requiredIf(isMethod('POST')); a plain conditional is used here because
+        // illuminate/validation is not autoloadable in the package's test harness.
+        $requiredOnCreate = $this->isMethod('POST') ? ['required'] : ['sometimes'];
+
         return [
-            'driver'          => ['required'],
-            'odometer'        => ['required'],
-            'volume'          => ['required'],
+            'driver'          => $requiredOnCreate,
+            'odometer'        => $requiredOnCreate,
+            'volume'          => $requiredOnCreate,
             'metric_unit'     => ['nullable'],
             'location'        => ['nullable'],
             'amount'          => ['nullable'],

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

@@ -2,21 +2,22 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
+use Fleetbase\FleetOps\Models\FuelProviderTransaction;
 use Fleetbase\Http\Requests\FleetbaseRequest;
 use Illuminate\Validation\Rule;
 
 class CreateFuelTransactionRequest extends FleetbaseRequest
 {
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
 
-    public function rules()
+    public function rules(): array
     {
         return [
             'provider'                => [Rule::requiredIf($this->isMethod('POST')), 'string'],
-            'provider_transaction_id' => [Rule::requiredIf($this->isMethod('POST')), 'string'],
+            'provider_transaction_id' => [Rule::requiredIf($this->isMethod('POST')), 'string', $this->uniqueProviderTransactionIdRule()],
             'connection'              => ['nullable', 'string'],
             'fuel_report'             => ['nullable', 'string'],
             'vehicle'                 => ['nullable', 'string'],
@@ -47,4 +48,66 @@ class CreateFuelTransactionRequest extends FleetbaseRequest
             'meta'                    => ['nullable', 'array'],
         ];
     }
+
+    public function messages(): array
+    {
+        return [
+            'provider_transaction_id.unique' => 'A fuel transaction with this provider transaction id already exists for this provider.',
+        ];
+    }
+
+    /**
+     * Mirrors the fuel_provider_txn_company_provider_unique index.
+     *
+     * Provider transaction ids are natural idempotency keys, so a re-sent batch
+     * used to raise an unhandled UniqueConstraintViolationException — an HTTP 500
+     * rather than a duplicate signal the client could act on.
+     *
+     * @return \Illuminate\Validation\Rules\Unique
+     */
+    protected function uniqueProviderTransactionIdRule()
+    {
+        $provider = $this->resolveProvider();
+
+        $rule = Rule::unique('fuel_provider_transactions', 'provider_transaction_id')
+            ->where(function ($query) use ($provider) {
+                $query->where('company_uuid', session('company'));
+                $query->where('provider', $provider);
+
+                return $query->whereNull('deleted_at');
+            });
+
+        // On PUT the record re-sends its own provider_transaction_id. The v1 route
+        // parameter is a public_id (fuel_provider_transaction_xxxxx), not a uuid.
+        $id = $this->route('id');
+        if (!$this->isMethod('POST') && filled($id)) {
+            $rule->ignore($id, 'public_id');
+        }
+
+        return $rule;
+    }
+
+    /**
+     * The uniqueness scope is per provider, but `provider` is only required on
+     * POST — a PUT may change the transaction id while leaving the provider out of
+     * the body. Fall back to the stored value so the scope is never null, which
+     * would otherwise compare against the wrong set of rows.
+     */
+    protected function resolveProvider(): ?string
+    {
+        if ($this->filled('provider')) {
+            return $this->input('provider');
+        }
+
+        $id = $this->route('id');
+        if (blank($id)) {
+            return null;
+        }
+
+        return FuelProviderTransaction::where('company_uuid', session('company'))
+            ->where(function ($query) use ($id) {
+                $query->where('public_id', $id)->orWhere('uuid', $id);
+            })
+            ->value('provider');
+    }
 }

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

@@ -8,20 +8,16 @@ class CreateIssueRequest 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') || request()->session()->has('is_sanctum_token');
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'driver'       => ['required'],

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

@@ -11,27 +11,26 @@ class CreateOrderRequest 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
     {
+        $podMethods = config('fleetops.pod_methods');
+        $podMethods = is_array($podMethods) ? implode(',', $podMethods) : (string) $podMethods;
+
         $validations = [
             'adhoc'             => ['nullable', 'boolean'],
             'dispatch'          => ['nullable', 'boolean'],
             'adhoc_distance'    => ['nullable', 'numeric'],
             'pod_required'      => ['nullable', 'boolean'],
-            'pod_method'        => ['nullable', 'in:' . config('fleetops.pod_methods')],
+            'pod_method'        => ['nullable', 'in:' . $podMethods],
             'scheduled_at'      => ['nullable', 'date'],
             'driver'            => ['nullable', 'exists:drivers,public_id'],
             'service_quote'     => ['nullable', 'exists:service_quotes,public_id'],
@@ -44,7 +43,7 @@ class CreateOrderRequest extends FleetbaseRequest
 
         // Conditionally require 'pod_method' if 'pod_required' is truthy
         if (Utils::isTrue($this->input('pod_required'))) {
-            $validations['pod_method'] = ['required', 'in:' . implode(',', config('fleetops.pod_methods'))];
+            $validations['pod_method'] = ['required', 'in:' . $podMethods];
         }
 
         if ($this->has('payload')) {

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

@@ -7,15 +7,15 @@ use Illuminate\Validation\Rule;
 
 class CreatePartRequest extends FleetbaseRequest
 {
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
 
-    public function rules()
+    public function rules(): array
     {
         return [
-            'sku'              => ['nullable', 'string'],
+            'sku'              => ['nullable', 'string', $this->uniqueSkuRule()],
             'name'             => [Rule::requiredIf($this->isMethod('POST')), 'string'],
             'manufacturer'     => ['nullable', 'string'],
             'model'            => ['nullable', 'string'],
@@ -37,4 +37,42 @@ class CreatePartRequest extends FleetbaseRequest
             'meta'             => ['nullable', 'array'],
         ];
     }
+
+    public function messages(): array
+    {
+        return [
+            'sku.unique' => 'A part with this SKU already exists.',
+        ];
+    }
+
+    /**
+     * Mirrors the parts_company_uuid_active_sku_unique index.
+     *
+     * Without this rule a duplicate SKU reached the driver and came back as an
+     * unhandled UniqueConstraintViolationException — an HTTP 500 with no field
+     * attribution, since public v1 controllers have no QueryException catch.
+     *
+     * `nullable` runs first, so this never fires on a null SKU; that matches the
+     * nullable column and MySQL's tolerance of repeated NULLs in a unique index.
+     *
+     * @return \Illuminate\Validation\Rules\Unique
+     */
+    protected function uniqueSkuRule()
+    {
+        $rule = Rule::unique('parts', 'sku')
+            ->where(function ($query) {
+                $query->where('company_uuid', session('company'));
+
+                return $query->whereNull('deleted_at');
+            });
+
+        // On PUT the record re-sends its own SKU, so it must not collide with
+        // itself. The v1 route parameter is a public_id (part_xxxxx), not a uuid.
+        $id = $this->route('id');
+        if (!$this->isMethod('POST') && filled($id)) {
+            $rule->ignore($id, 'public_id');
+        }
+
+        return $rule;
+    }
 }

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

@@ -9,22 +9,18 @@ class CreatePayloadRequest 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 [
+        $validations = [
             'entities'              => 'array',
             'waypoints'             => 'array',
             'return'                => 'nullable',
@@ -38,16 +34,18 @@ class CreatePayloadRequest extends FleetbaseRequest
             $validations['dropoff'] = 'required';
         }
 
-        if ($this->isString('pickup')) {
+        if (is_string($this->input('pickup'))) {
             $validations['pickup'] = 'required|exists:places,public_id';
         }
 
-        if ($this->isString('dropoff')) {
+        if (is_string($this->input('dropoff'))) {
             $validations['dropoff'] = 'required|exists:places,public_id';
         }
 
         if ($this->missing(['pickup', 'dropoff'])) {
             $validations['waypoints'] = 'required|array|min:2';
         }
+
+        return $validations;
     }
 }

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

@@ -11,20 +11,16 @@ class CreatePlaceRequest 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') || request()->session()->has('is_sanctum_token');
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'name'      => [

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

@@ -10,20 +10,16 @@ class CreatePurchaseRateRequest 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 [
             'service_quote' => ['required', Rule::exists('service_quotes', 'public_id')->whereNull('deleted_at')],

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

@@ -8,12 +8,12 @@ use Illuminate\Validation\Rule;
 
 class CreateSensorRequest extends FleetbaseRequest
 {
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
 
-    public function rules()
+    public function rules(): array
     {
         return [
             'name'                 => [Rule::requiredIf($this->isMethod('POST')), 'string'],

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

@@ -10,20 +10,16 @@ class CreateServiceAreaRequest 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 [
             'name'    => [Rule::requiredIf($this->isMethod('POST')), 'string'],

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

@@ -8,20 +8,16 @@ class CreateServiceQuoteRequest extends FleetbaseRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
-     * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return false;
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
         ];

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

@@ -11,20 +11,16 @@ class CreateServiceRateRequest 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 [
             'service_name'                  => [Rule::requiredIf($this->isMethod('POST')), 'string'],

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

@@ -9,20 +9,16 @@ class CreateTrackingNumberRequest 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 [
             'region' => 'required|string',

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

@@ -13,20 +13,16 @@ class CreateTrackingStatusRequest 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
     {
         $validations = [
             'tracking_number' => array_filter([

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

@@ -10,20 +10,16 @@ class CreateVehicleRequest 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') || request()->session()->has('is_sanctum_token');
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'status'    => [

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

@@ -9,20 +9,16 @@ class CreateVendorRequest 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 [
             'name'    => [Rule::requiredIf($this->isMethod('POST')), 'string'],

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

@@ -7,12 +7,12 @@ use Illuminate\Validation\Rule;
 
 class CreateWorkOrderRequest extends FleetbaseRequest
 {
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
 
-    public function rules()
+    public function rules(): array
     {
         return [
             'code'            => ['nullable', 'string'],

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

@@ -10,20 +10,16 @@ class CreateZoneRequest 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 [
             'name'         => [Rule::requiredIf($this->isMethod('POST')), 'string'],

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

@@ -8,20 +8,16 @@ class DecodeTrackingNumberQR 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 [
             'code' => 'required|string',

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

@@ -10,20 +10,16 @@ class DriverSimulationRequest 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 [
             'start' => [Rule::requiredIf(

package/server/src/Http/Requests/Internal/AssignOrderRequest.php

@@ -8,20 +8,16 @@ class AssignOrderRequest extends FleetbaseRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
-     * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
-        return session('company');
+        return (bool) session('company');
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'order'  => ['required', 'exists:orders,public_id'],