@fleetbase/fleetops-engine 0.3.7 → 0.3.9

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

@@ -28,7 +28,7 @@ class CreatePayloadRequest extends FleetbaseRequest
             'entities'              => 'array',
             'waypoints'             => 'array',
             'return'                => 'nullable',
-            'type'                  => 'required',
+            'type'                  => [Rule::requiredIf($this->isMethod('POST'))],
             'cod_currency'          => [Rule::requiredIf($this->has(['cod_amount'])), 'size:3'],
             'cod_payment_method'    => [Rule::requiredIf($this->has(['cod_amount'])), 'in:card,check,cash,bank_transfer'],
         ];

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

@@ -29,14 +29,56 @@ class CreatePlaceRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'name'      => [Rule::requiredIf($this->isMethod('POST'))],
-            'street1'   => [Rule::requiredIf($this->isMethod('POST'))],
+            'name'      => [
+                Rule::requiredIf(function () {
+                    $isCreating     = $this->isMethod('POST');
+                    $hasCoordiantes = $this->filled('latitude') && $this->filled('longitude');
+                    $hasLocation    = $this->filled('location');
+                    $hasStreet      = $this->filled('street1');
+
+                    // if creating then it's required
+                    if ($isCreating) {
+                        // if either has coordinated or location then it's not required
+                        if ($hasCoordiantes || $hasLocation) {
+                            return false;
+                        }
+
+                        // if street1 provided then it's not required
+                        if ($hasStreet) {
+                            return false;
+                        }
+
+                        return true;
+                    }
+
+                    return false;
+                }),
+            ],
+            'street1'   => [
+                Rule::requiredIf(function () {
+                    $isCreating     = $this->isMethod('POST');
+                    $hasCoordiantes = $this->filled('latitude') && $this->filled('longitude');
+                    $hasLocation    = $this->filled('location');
+
+                    // if creating then it's required
+                    if ($isCreating) {
+                        // if either has coordinated or location then it's not required
+                        if ($hasCoordiantes || $hasLocation) {
+                            return false;
+                        }
+
+                        return true;
+                    }
+
+                    return false;
+                }),
+            ],
             'customer'  => ['nullable', new ExistsInAny(['vendors', 'contacts'], 'public_id')],
             'contact'   => ['nullable', new ExistsInAny(['vendors', 'contacts'], 'public_id')],
             'vendor'    => 'nullable|exists:vendors,public_id',
             'location'  => ['nullable', new ResolvablePoint()],
-            'latitude'  => 'nullable',
-            'longitude' => 'nullable',
+            'latitude'  => ['nullable', 'required_with:longitude'],
+            'longitude' => ['nullable', 'required_with:latitude'],
         ];
     }
 }

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

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Http\Requests;
 
 use Fleetbase\Http\Requests\FleetbaseRequest;
 use Fleetbase\Rules\ExistsInAny;
+use Illuminate\Validation\Rule;
 
 class CreatePurchaseRateRequest extends FleetbaseRequest
 {
@@ -25,8 +26,8 @@ class CreatePurchaseRateRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'service_quote' => 'required|exists:service_quotes,public_id',
-            'order'         => 'nullable|exists:orders,public_id',
+            'service_quote' => ['required', Rule::exists('service_quotes', 'public_id')->whereNull('deleted_at')],
+            'order'         => ['nullable', Rule::exists('orders', 'public_id')->whereNull('deleted_at')],
             'customer'      => ['nullable', new ExistsInAny(['vendors', 'contacts'], 'public_id')],
         ];
     }

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

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
+use Fleetbase\FleetOps\Rules\ResolvablePoint;
 use Fleetbase\Http\Requests\FleetbaseRequest;
 use Illuminate\Validation\Rule;
 
@@ -14,9 +15,7 @@ class CreateServiceAreaRequest extends FleetbaseRequest
      */
     public function authorize()
     {
-        return request()
-            ->session()
-            ->has('api_credential');
+        return request()->session()->has('api_credential');
     }
 
     /**
@@ -28,8 +27,29 @@ class CreateServiceAreaRequest extends FleetbaseRequest
     {
         return [
             'name'    => [Rule::requiredIf($this->isMethod('POST')), 'string'],
-            'country' => 'required',
+            'country' => [Rule::requiredIf($this->isMethod('POST')), 'string'],
             'status'  => 'in:active,inactive',
+            'border'  => ['nullable', Rule::requiredIf(function () {
+                $isCreating     = $this->isMethod('POST');
+                $hasCoordiantes = $this->filled('latitude') && $this->filled('longitude');
+                $hasLocation    = $this->filled('location');
+
+                // if creating then it's required
+                if ($isCreating) {
+                    // if either has coordinated or location then it's not required
+                    if ($hasCoordiantes || $hasLocation) {
+                        return false;
+                    }
+
+                    return true;
+                }
+
+                return false;
+            })],
+            'parent'    => ['nullable', 'exists:service_areas,public_id'],
+            'location'  => ['nullable', new ResolvablePoint()],
+            'latitude'  => ['nullable', 'required_with:longitude'],
+            'longitude' => ['nullable', 'required_with:latitude'],
         ];
     }
 }

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

@@ -29,28 +29,29 @@ class CreateServiceRateRequest extends FleetbaseRequest
         return [
             'service_name'                  => [Rule::requiredIf($this->isMethod('POST')), 'string'],
             'service_type'                  => [Rule::requiredIf($this->isMethod('POST')), 'string'],
-            'service_area'                  => 'exists:service_areas,public_id',
-            'zone'                          => 'exists:zones,public_id',
-            'rate_calculation_method'       => 'required|string|in:per_km,fixed_meter,algo',
-            'currency'                      => 'required|size:3',
-            'base_fee'                      => 'integer',
-            'per_km_flat_rate_fee'          => [Rule::requiredIf($this->input(['rate_calculation_method']) === 'rate_calculation_method'), 'integer'],
-            'meter_fees'                    => [Rule::requiredIf($this->input(['rate_calculation_method']) === 'fixed_meter'), 'array'],
-            'meter_fees.*.distance'         => 'integer',
-            'meter_fees.*.fee'              => 'integer',
-            'algorithm'                     => [Rule::requiredIf($this->input(['rate_calculation_method']) === 'algo'), new ComputableAlgo(), 'string'],
-            'has_cod_fee'                   => 'boolean',
+            'service_area'                  => [Rule::exists('service_areas', 'public_id')->whereNull('deleted_at')],
+            'zone'                          => [Rule::exists('zones', 'public_id')->whereNull('deleted_at')],
+            'rate_calculation_method'       => [Rule::requiredIf($this->isMethod('POST')), 'string', 'in:fixed_meter,per_meter,per_drop,algo'],
+            'currency'                      => ['required', 'size:3'],
+            'base_fee'                      => ['numeric'],
+            'per_meter_unit'                => ['required_if:rate_calculation_method,per_meter', 'string', 'in:km,m'],
+            'per_meter_flat_rate_fee'       => ['required_if:rate_calculation_method,per_meter', 'numeric'],
+            'meter_fees'                    => ['required_if:rate_calculation_method,fixed_meter', 'array'],
+            'meter_fees.*.distance'         => ['numeric'],
+            'meter_fees.*.fee'              => ['numeric'],
+            'algorithm'                     => ['required_if:rate_calculation_method,algo', new ComputableAlgo(), 'string'],
+            'has_cod_fee'                   => ['boolean'],
             'cod_calculation_method'        => [Rule::requiredIf(Utils::isTrue($this->input(['has_cod_fee']))), 'in:percentage,flat'],
-            'cod_flat_fee'                  => [Rule::requiredIf($this->input(['cod_calculation_method']) === 'flat'), 'integer'],
-            'cod_percent'                   => [Rule::requiredIf($this->input(['cod_calculation_method']) === 'percentage'), 'integer'],
-            'has_peak_hours_fee'            => 'boolean',
-            'peak_hours_calculation_method' => [Rule::requiredIf(Utils::isTrue($this->input(['has_peak_hours']))), 'in:percentage,flat'],
-            'peak_hours_flat_fee'           => [Rule::requiredIf($this->input(['peak_hours_calculation_method']) === 'flat'), 'integer'],
-            'peak_hours_percent'            => [Rule::requiredIf($this->input(['peak_hours_calculation_method']) === 'percentage'), 'integer'],
-            'peak_hours_start'              => [Rule::requiredIf(Utils::isTrue($this->input(['has_peak_hours']))), 'date_format:H:i'],
-            'peak_hours_end'                => [Rule::requiredIf(Utils::isTrue($this->input(['has_peak_hours']))), 'date_format:H:i'],
-            'duration_terms'                => 'string',
-            'estimated_days'                => 'numeric',
+            'cod_flat_fee'                  => [Rule::requiredIf($this->input('cod_calculation_method') === 'flat'), 'numeric'],
+            'cod_percent'                   => [Rule::requiredIf($this->input('cod_calculation_method') === 'percentage'), 'integer'],
+            'has_peak_hours_fee'            => ['boolean'],
+            'peak_hours_calculation_method' => [Rule::requiredIf(Utils::isTrue($this->input('has_peak_hours'))), 'in:percentage,flat'],
+            'peak_hours_flat_fee'           => [Rule::requiredIf($this->input('peak_hours_calculation_method') === 'flat'), 'numeric'],
+            'peak_hours_percent'            => [Rule::requiredIf($this->input('peak_hours_calculation_method') === 'percentage'), 'integer'],
+            'peak_hours_start'              => [Rule::requiredIf(Utils::isTrue($this->input('has_peak_hours'))), 'date_format:H:i'],
+            'peak_hours_end'                => [Rule::requiredIf(Utils::isTrue($this->input('has_peak_hours'))), 'date_format:H:i'],
+            'duration_terms'                => ['string'],
+            'estimated_days'                => ['integer'],
         ];
     }
 }

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

@@ -30,14 +30,15 @@ class CreateTrackingStatusRequest extends FleetbaseRequest
     {
         $validations = [
             'tracking_number' => array_filter([
-                'required',
+                Rule::requiredIf($this->isMethod('POST')),
                 $this->isMethod('POST') ? Rule::exists('tracking_numbers', 'public_id') : null,
                 $this->isMethod('POST') ? static::uniqueStatus($this) : null,
             ]),
-            'location' => [new ResolvablePoint()],
-            'code'     => 'nullable|string|min:3',
-            'status'   => ['required', 'string', 'min:3'],
-            'details'  => 'nullable|string',
+            'location' => [Rule::requiredIf($this->isMethod('POST')), new ResolvablePoint()],
+            'country'  => ['nullable', 'string', 'size:2'],
+            'code'     => [Rule::requiredIf($this->isMethod('POST')), 'string', 'min:3'],
+            'status'   => [Rule::requiredIf($this->isMethod('POST')), 'string', 'min:3'],
+            'details'  => [Rule::requiredIf($this->isMethod('POST')), 'string', 'min:3'],
         ];
 
         if ($this->isMethod('POST') && $this->missing('tracking_number') && $this->has('order')) {
@@ -50,10 +51,10 @@ class CreateTrackingStatusRequest extends FleetbaseRequest
         }
 
         if ($this->missing(['latitude', 'longitude'])) {
-            $validations['location'] = ['required', new ResolvablePoint()];
+            $validations['location'] = [Rule::requiredIf($this->isMethod('POST')), new ResolvablePoint()];
         } elseif ($this->missing('location')) {
-            $validations['latitude']  = 'required';
-            $validations['longitude'] = 'required';
+            $validations['latitude']  = [Rule::requiredIf($this->isMethod('POST'))];
+            $validations['longitude'] = [Rule::requiredIf($this->isMethod('POST'))];
         }
 
         return $validations;

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

@@ -25,10 +25,12 @@ class CreateVehicleRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'status'   => 'nullable|in:operational,maintenance,decommissioned',
-            'vendor'   => 'nullable|exists:vendors,public_id',
-            'driver'   => 'nullable|exists:drivers,public_id',
-            'location' => ['nullable', new ResolvablePoint()],
+            'status'    => 'nullable|in:operational,maintenance,decommissioned',
+            'vendor'    => 'nullable|exists:vendors,public_id',
+            'driver'    => 'nullable|exists:drivers,public_id',
+            'location'  => ['nullable', new ResolvablePoint()],
+            'latitude'  => ['nullable', 'required_with:longitude'],
+            'longitude' => ['nullable', 'required_with:latitude'],
         ];
     }
 }

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

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
+use Fleetbase\FleetOps\Rules\ResolvablePoint;
 use Fleetbase\Http\Requests\FleetbaseRequest;
 use Illuminate\Validation\Rule;
 
@@ -25,11 +26,29 @@ class CreateZoneRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'name' => [Rule::requiredIf($this->isMethod('POST')), 'string'],
-            // @todo properly validate boundary param
-            'boundary'     => 'required|array',
-            'service_area' => 'required|exists:service_areas,public_id',
-            'status'       => 'nullable|in:active,inactive',
+            'name'         => [Rule::requiredIf($this->isMethod('POST')), 'string'],
+            'service_area' => [Rule::requiredIf($this->isMethod('POST')), 'exists:service_areas,public_id'],
+            'border'       => ['nullable', Rule::requiredIf(function () {
+                $isCreating     = $this->isMethod('POST');
+                $hasCoordiantes = $this->filled('latitude') && $this->filled('longitude');
+                $hasLocation    = $this->filled('location');
+
+                // if creating then it's required
+                if ($isCreating) {
+                    // if either has coordinated or location then it's not required
+                    if ($hasCoordiantes || $hasLocation) {
+                        return false;
+                    }
+
+                    return true;
+                }
+
+                return false;
+            })],
+            'location'     => ['nullable', new ResolvablePoint()],
+            'latitude'     => ['nullable', 'required_with:longitude'],
+            'longitude'    => ['nullable', 'required_with:latitude'],
+            'status'       => ['nullable', 'in:active,inactive'],
         ];
     }
 }

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

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Http\Requests;
 
 use Fleetbase\Http\Requests\FleetbaseRequest;
 use Fleetbase\Rules\ExistsInAny;
+use Illuminate\Validation\Rule;
 
 class QueryServiceQuotesRequest extends FleetbaseRequest
 {
@@ -25,17 +26,17 @@ class QueryServiceQuotesRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'payload'      => 'nullable|exists:payloads,public_id',
-            'service_type' => 'nullable|exists:service_rates,service_type',
-            'pickup'       => 'nullable|required_without:payload,waypoints',
-            'dropoff'      => 'nullable|required_without:payload,waypoints',
-            'waypoints'    => 'nullable|array',
+            'payload'      => ['nullable', 'required_without_all:waypoints,pickup,dropoff', Rule::exists('payloads', 'public_id')->whereNull('deleted_at')],
+            'service_type' => ['nullable', Rule::exists('service_rates', 'service_type')->whereNull('deleted_at')],
+            'pickup'       => ['nullable', 'required_without_all:payload,waypoints'],
+            'dropoff'      => ['nullable', 'required_without_all:payload,waypoints'],
+            'waypoints'    => ['nullable', 'array', 'required_without_all:payload,pickup,dropoff'],
             'facilitator'  => ['nullable', new ExistsInAny(['vendors', 'integrated_vendors', 'contacts'], ['public_id', 'provider'])],
-            'scheduled_at' => 'nullable|date',
-            'cod'          => 'nullable',
-            'currency'     => 'nullable',
-            'distance'     => 'nullable',
-            'time'         => 'nullable',
+            'scheduled_at' => ['nullable', 'date'],
+            'cod'          => ['nullable'],
+            'currency'     => ['nullable', 'string', 'size:3'],
+            'distance'     => ['nullable'],
+            'time'         => ['nullable'],
         ];
     }
 }

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

@@ -0,0 +1,32 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Requests;
+
+use Fleetbase\Http\Requests\FleetbaseRequest;
+
+class ScheduleOrderRequest extends FleetbaseRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return request()->session()->has('api_credential');
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'date'     => 'required|date_format:Y-m-d',
+            'time'     => 'nullable',
+            'timezone' => 'nullable|timezone',
+        ];
+    }
+}

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

@@ -4,17 +4,4 @@ namespace Fleetbase\FleetOps\Http\Requests;
 
 class UpdateContactRequest extends CreateContactRequest
 {
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'name'  => 'required',
-            'email' => 'nullable|email',
-            'phone' => 'nullable',
-        ];
-    }
 }

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

@@ -2,28 +2,6 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
-use Fleetbase\Http\Requests\FleetbaseRequest;
-
-class UpdateServiceAreaRequest extends FleetbaseRequest
+class UpdateServiceAreaRequest extends CreateServiceAreaRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return false;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-        ];
-    }
 }

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

@@ -2,28 +2,6 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
-use Fleetbase\Http\Requests\FleetbaseRequest;
-
-class UpdateServiceQuoteRequest extends FleetbaseRequest
+class UpdateServiceQuoteRequest extends CreateServiceQuoteRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return false;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-        ];
-    }
 }

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

@@ -2,28 +2,6 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
-use Fleetbase\Http\Requests\FleetbaseRequest;
-
-class UpdateServiceRateRequest extends FleetbaseRequest
+class UpdateServiceRateRequest extends CreateServiceRateRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return false;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-        ];
-    }
 }

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

@@ -2,31 +2,6 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
-use Fleetbase\Http\Requests\FleetbaseRequest;
-
-class UpdateTrackingStatusRequest extends FleetbaseRequest
+class UpdateTrackingStatusRequest extends CreateTrackingStatusRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return request()->session()->has('api_credential');
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'status'  => 'required|string',
-            'details' => 'required|string',
-            'code'    => 'nullable|string',
-        ];
-    }
 }

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

@@ -5,7 +5,6 @@ namespace Fleetbase\FleetOps\Http\Resources\v1;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
-use Illuminate\Support\Arr;
 
 class DeletedResource extends FleetbaseResource
 {
@@ -18,7 +17,7 @@ class DeletedResource extends FleetbaseResource
      */
     public function toArray($request)
     {
-        $deleted = [
+        return [
             'id'        => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'uuid'      => $this->when(Http::isInternalRequest(), $this->uuid),
             'public_id' => $this->when(Http::isInternalRequest(), $this->public_id),
@@ -26,12 +25,6 @@ class DeletedResource extends FleetbaseResource
             'time'      => $this->deleted_at,
             'deleted'   => true,
         ];
-
-        if (Http::isInternalRequest()) {
-            $deleted = Arr::insertAfterKey($deleted, ['uuid' => $this->uuid, 'public_id' => $this->public_id], 'id');
-        }
-
-        return $deleted;
     }
 
     /**
@@ -56,6 +49,6 @@ class DeletedResource extends FleetbaseResource
      */
     public function getObjectType()
     {
-        return strtolower(Utils::getClassName($this->resource));
+        return Utils::getTypeFromClassName($this->resource);
     }
 }