@fleetbase/fleetops-engine 0.6.57 → 0.6.59

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,12 +7,12 @@ 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'],

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'],

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

@@ -12,20 +12,16 @@ class CreateDriverRequest extends CreateDriverApiRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
-     * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return Auth::can('fleet-ops create driver');
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         $isCreating                   = $this->isMethod('POST');
         $isCreatingWithUser           = $this->filled('driver.user_uuid');
@@ -67,10 +63,8 @@ class CreateDriverRequest extends CreateDriverApiRequest
 
     /**
      * Get custom attributes for validator errors.
-     *
-     * @return array
      */
-    public function attributes()
+    public function attributes(): array
     {
         return [
             'name'                   => 'driver name',
@@ -85,10 +79,8 @@ class CreateDriverRequest extends CreateDriverApiRequest
 
     /**
      * Get custom messages for validator errors.
-     *
-     * @return array
      */
-    public function messages()
+    public function messages(): array
     {
         return [
             'name.required'  => 'Driver name is required.',

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

@@ -10,20 +10,16 @@ class CreateOrderConfigRequest extends FleetbaseRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
-     * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return Auth::can('fleet-ops create order-config');
     }
 
     /**
      * 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/Internal/CreateOrderRequest.php

@@ -11,28 +11,27 @@ class CreateOrderRequest extends FleetbaseRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
-     * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return Auth::can('fleet-ops create order');
     }
 
     /**
      * 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 = [
             'order_config_uuid' => ['required'],
             '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,uuid'],
             'service_quote'     => ['nullable', 'exists:service_quotes,uuid'],
@@ -45,7 +44,7 @@ class CreateOrderRequest extends FleetbaseRequest
 
         // Conditionally require 'pod_method' if 'pod_required' is truthy
         if (Utils::isTrue($this->input('order.pod_required'))) {
-            $validations['pod_method'] = ['required', 'in:' . config('fleetops.pod_methods')];
+            $validations['pod_method'] = ['required', 'in:' . $podMethods];
         }
 
         if ($this->has('payload')) {

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

@@ -9,38 +9,34 @@ class FleetActionRequest extends FleetbaseRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
-     * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
-        $action = $this->route()->getActionMethod();
+        $action = $this->actionMethod();
 
         if ($action === 'assignVehicle') {
-            return Auth::can('fleet-ops assign-vehicle-for fleet');
+            return $this->can('fleet-ops assign-vehicle-for fleet');
         }
 
         if ($action === 'assignDriver') {
-            return Auth::can('fleet-ops assign-driver-for fleet');
+            return $this->can('fleet-ops assign-driver-for fleet');
         }
 
         if ($action === 'removeVehicle') {
-            return Auth::can('fleet-ops remove-vehicle-for fleet');
+            return $this->can('fleet-ops remove-vehicle-for fleet');
         }
 
         if ($action === 'removeDriver') {
-            return Auth::can('fleet-ops remove-driver-for fleet');
+            return $this->can('fleet-ops remove-driver-for fleet');
         }
 
-        return Auth::can('fleet-ops update fleet');
+        return $this->can('fleet-ops update fleet');
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'fleet'   => 'string|exists:fleets,uuid',
@@ -48,4 +44,14 @@ class FleetActionRequest extends FleetbaseRequest
             'vehicle' => 'nullable|string|exists:vehicles,uuid',
         ];
     }
+
+    protected function actionMethod(): string
+    {
+        return $this->route()->getActionMethod();
+    }
+
+    protected function can(string $permission): bool
+    {
+        return Auth::can($permission);
+    }
 }

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

@@ -8,10 +8,13 @@ class UpdateDriverRequest extends CreateDriverRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
-     * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
+    {
+        return $this->canUpdateDriver();
+    }
+
+    protected function canUpdateDriver(): bool
     {
         return Auth::can('fleet-ops update driver');
     }