@fleetbase/fleetops-engine 0.3.6 → 0.3.8

package/server/src/Http/Controllers/Api/v1/TrackingStatusController.php

@@ -105,8 +105,8 @@ class TrackingStatusController extends Controller
         }
 
         // if no code set create a code from the status
-        if (empty($input['code'])) {
-            $input['code'] = TrackingStatus::prepareCode($input['status']);
+        if (empty($trackingStatus->code)) {
+            $input['code'] = TrackingStatus::prepareCode(data_get($input, 'status', $trackingStatus->status));
         }
 
         // update the trackingStatus

package/server/src/Http/Controllers/Api/v1/VehicleController.php

@@ -24,13 +24,18 @@ class VehicleController extends Controller
     public function create(CreateVehicleRequest $request)
     {
         // get request input
-        $input = $request->only(['status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin', 'meta', 'location', 'altitude', 'heading', 'speed']);
+        $input = $request->only(['status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin', 'meta', 'online', 'location', 'altitude', 'heading', 'speed']);
         // make sure company is set
         $input['company_uuid'] = session('company');
 
         // create instance of vehicle model
         $vehicle = new Vehicle();
 
+        // set default online
+        if (!isset($input['online'])) {
+            $input['online'] = 0;
+        }
+
         // vendor assignment
         if ($request->has('vendor')) {
             $input['vendor_uuid'] = Utils::getUuid('vendors', [
@@ -39,6 +44,11 @@ class VehicleController extends Controller
             ]);
         }
 
+        // latitude / longitude
+        if ($request->has(['latitude', 'longitude'])) {
+            $input['location'] = Utils::getPointFromCoordinates($request->only(['latitude', 'longitude']));
+        }
+
         // apply user input to vehicle
         $vehicle = $vehicle->fill($input);
 
@@ -90,7 +100,7 @@ class VehicleController extends Controller
         }
 
         // get request input
-        $input = $request->only(['status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin', 'meta', 'location', 'altitude', 'heading', 'speed']);
+        $input = $request->only(['status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin', 'meta', 'location', 'online', 'altitude', 'heading', 'speed']);
 
         // vendor assignment
         if ($request->has('vendor')) {
@@ -100,6 +110,16 @@ class VehicleController extends Controller
             ]);
         }
 
+        // set default online
+        if (!isset($input['online'])) {
+            $input['online'] = 0;
+        }
+
+        // latitude / longitude
+        if ($request->has(['latitude', 'longitude'])) {
+            $input['location'] = Utils::getPointFromCoordinates($request->only(['latitude', 'longitude']));
+        }
+
         // update the vehicle w/ user input
         $vehicle->fill($input);
 

package/server/src/Http/Controllers/Api/v1/ZoneController.php

@@ -9,6 +9,7 @@ use Fleetbase\FleetOps\Http\Resources\v1\Zone as ZoneResource;
 use Fleetbase\FleetOps\Models\Zone;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
+use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 
 class ZoneController extends Controller
@@ -23,7 +24,10 @@ class ZoneController extends Controller
     public function create(CreateZoneRequest $request)
     {
         // get request input
-        $input = $request->only(['name', 'boundary', 'status', 'description', 'color', 'stroke_color']);
+        $input = $request->only(['name', 'border', 'status', 'description', 'color', 'stroke_color']);
+
+        // get radius for creating zone border - default to 500 meters
+        $radius = $request->input('radius', 500);
 
         // make sure company is set
         $input['company_uuid'] = session('company');
@@ -36,10 +40,37 @@ class ZoneController extends Controller
             ]);
         }
 
+        // if latitude and longitude is provided
+        if ($request->has(['latitude', 'longitude'])) {
+            // create a polygon given the radius
+            $latitude  = $request->input('latitude');
+            $longitude = $request->input('longitude');
+            $point     = new Point($latitude, $longitude);
+
+            if ($point instanceof Point) {
+                $input['border'] = Zone::createPolygonFromPoint($point, $radius);
+            }
+        }
+
+        // if a location is provided
+        if ($request->has('location')) {
+            $location = $request->input('location');
+            $point    = Utils::getPointFromMixed($location);
+
+            if ($point instanceof Point) {
+                $input['border'] = Zone::createPolygonFromPoint($point, $radius);
+            }
+        }
+
+        /**
+         * @todo if missing location, latitude, longitude and border
+         * then create a zone from the center of the service area provided
+         */
+
         // create the zone
         $zone = Zone::create($input);
 
-        // response the driver resource
+        // response the zone resource
         return new ZoneResource($zone);
     }
 
@@ -66,7 +97,10 @@ class ZoneController extends Controller
         }
 
         // get request input
-        $input = $request->only(['name', 'boundary', 'status', 'description', 'color', 'stroke_color']);
+        $input = $request->only(['name', 'border', 'status', 'description', 'color', 'stroke_color']);
+
+        // get radius for creating zone border - default to 500 meters
+        $radius = $request->input('radius', 500);
 
         // service area assignment
         if ($request->has('service_area')) {
@@ -76,6 +110,28 @@ class ZoneController extends Controller
             ]);
         }
 
+        // if latitude and longitude is provided
+        if ($request->has(['latitude', 'longitude'])) {
+            // create a polygon given the radius
+            $latitude  = $request->input('latitude');
+            $longitude = $request->input('longitude');
+            $point     = new Point($latitude, $longitude);
+
+            if ($point instanceof Point) {
+                $input['border'] = Zone::createPolygonFromPoint($point, $radius);
+            }
+        }
+
+        // if a location is provided
+        if ($request->has('location')) {
+            $location = $request->input('location');
+            $point    = Utils::getPointFromMixed($location);
+
+            if ($point instanceof Point) {
+                $input['border'] = Zone::createPolygonFromPoint($point, $radius);
+            }
+        }
+
         // update the zone
         $zone->update($input);
 

package/server/src/Http/Controllers/Internal/v1/DriverController.php

@@ -4,14 +4,18 @@ namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
 use Fleetbase\Exceptions\FleetbaseRequestValidationException;
 use Fleetbase\FleetOps\Exports\DriverExport;
+use Fleetbase\FleetOps\Http\Controllers\Api\v1\DriverController as ApiDriverController;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+use Fleetbase\FleetOps\Http\Requests\Internal\AssignOrderRequest;
 use Fleetbase\FleetOps\Http\Requests\Internal\CreateDriverRequest;
 use Fleetbase\FleetOps\Http\Requests\Internal\UpdateDriverRequest;
 use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Models\Invite;
 use Fleetbase\Models\User;
+use Fleetbase\Models\VerificationCode;
 use Fleetbase\Notifications\UserInvited;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
@@ -267,4 +271,148 @@ class DriverController extends FleetOpsController
 
         return Excel::download(new DriverExport(), $fileName);
     }
+
+    /**
+     * Assigns a driver to a specified order.
+     *
+     * @param Fleetbase\FleetOps\Http\Requests\Internal\AssignOrderRequest $request
+     *
+     * @return \Illuminate\Http\Response $response
+     */
+    public function assignOrder(AssignOrderRequest $request)
+    {
+        $driver = Driver::where('public_id', $request->driver)->first();
+        $order  = Order::where('public_id', $request->order)->first();
+
+        if ($order->hasDriverAssigned) {
+            return response()->error('A driver is already assigned to this order.');
+        }
+
+        if ($order->isDriver($driver)) {
+            return response()->error('The driver is already assigned to this order.');
+        }
+
+        $order->assignDriver($driver);
+
+        return response()->json([
+            'status'  => 'ok',
+            'message' => 'Driver assigned',
+        ]);
+    }
+
+    /**
+     * Update drivers geolocation data.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function track(string $id, Request $request)
+    {
+        return app(ApiDriverController::class)->track($id, $request);
+    }
+
+    /**
+     * Query for Storefront Customer orders.
+     *
+     * @return \Fleetbase\Http\Resources\Storefront\Customer
+     */
+    public function registerDevice(Request $request)
+    {
+        return app(ApiDriverController::class)->registerDevice($request);
+    }
+
+    /**
+     * Authenticates customer using login credentials and returns with auth token.
+     *
+     * @return \Fleetbase\Http\Resources\Storefront\Customer
+     */
+    public function login(Request $request)
+    {
+        return app(ApiDriverController::class)->login($request);
+    }
+
+    /**
+     * Attempts authentication with phone number via SMS verification.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function loginWithPhone()
+    {
+        $phone = static::phone();
+
+        // Check if user exists
+        $user = User::where('phone', $phone)->whereNull('deleted_at')->withoutGlobalScopes()->first();
+
+        if (!$user) {
+            return response()->error('No driver with this phone # found.');
+        }
+
+        // Generate verification token
+        VerificationCode::generateSmsVerificationFor($user, 'driver_login', function ($verification) {
+            return 'Your ' . config('app.name') . ' verification code is ' . $verification->code;
+        });
+
+        return response()->json(['status' => 'OK']);
+    }
+
+    /**
+     * Verifys SMS code and sends auth token with driver resource.
+     *
+     * @return \Fleetbase\Http\Resources\FleetOps\Driver
+     */
+    public function verifyCode(Request $request)
+    {
+        $identity = Utils::isEmail($request->identity) ? $request->identity : static::phone($request->identity);
+        $code     = $request->input('code');
+        $for      = $request->input('for', 'driver_login');
+        $attrs    = $request->input(['name', 'phone', 'email']);
+
+        if ($for === 'create_driver') {
+            return app(ApiDriverController::class)->create($request);
+        }
+
+        // Check if user exists
+        $user = User::where('phone', $identity)->orWhere('email', $identity)->first();
+        if (!$user) {
+            return response()->error('Unable to verify code.');
+        }
+
+        // Find and verify code
+        $verificationCode = VerificationCode::where(['subject_uuid' => $user->uuid, 'code' => $code, 'for' => $for])->exists();
+        if (!$verificationCode && $code !== config('fleetops.navigator.bypass_verification_code')) {
+            return response()->error('Invalid verification code!');
+        }
+
+        // Get driver record
+        $driver = Driver::where('user_uuid', $user->uuid)->whereNull('deleted_at')->withoutGlobalScopes()->first();
+        if (!$driver) {
+            return response()->error('No driver/agent record found for login.');
+        }
+
+        // Generate auth token
+        try {
+            $token = $user->createToken($driver->uuid);
+        } catch (\Exception $e) {
+            return response()->error($e->getMessage());
+        }
+
+        $driver->token = $token->plainTextToken;
+
+        return new $this->resource($driver);
+    }
+
+    /**
+     * Patches phone number with international code.
+     */
+    public static function phone(string $phone = null): string
+    {
+        if ($phone === null) {
+            $phone = request()->input('phone');
+        }
+
+        if (!Str::startsWith($phone, '+')) {
+            $phone = '+' . $phone;
+        }
+
+        return $phone;
+    }
 }

package/server/src/Http/Controllers/Internal/v1/NavigatorController.php

@@ -3,8 +3,12 @@
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
 use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Http\Resources\Organization;
 use Fleetbase\Models\ApiCredential;
+use Fleetbase\Models\Company;
 use Fleetbase\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
 
 class NavigatorController extends Controller
 {
@@ -38,4 +42,38 @@ class NavigatorController extends Controller
             'linkUrl' => url('int/v1/fleet-ops/navigator/link-app'),
         ]);
     }
+
+    public function getCurrentOrganization(Request $request)
+    {
+        $token       = $request->bearerToken();
+        $isSecretKey = Str::startsWith($token, '$');
+
+        // Depending on API key format set the connection to find credential on
+        $connection = Str::startsWith($token, 'flb_test_') ? 'sandbox' : 'mysql';
+
+        // Find the API Credential record
+        $findApKey = ApiCredential::on($connection)
+            ->where(function ($query) use ($isSecretKey, $token) {
+                if ($isSecretKey) {
+                    $query->where('secret', $token);
+                } else {
+                    $query->where('key', $token);
+                }
+            })
+            ->with(['company.owner'])
+            ->withoutGlobalScopes();
+
+        // Get the api credential model record
+        $apiCredential = $findApKey->first();
+
+        // Handle no api credential found
+        if (!$apiCredential) {
+            return response()->error('No API key found to fetch company details with.');
+        }
+
+        // Get the organization owning the API key
+        $organization = Company::where('uuid', $apiCredential->company_uuid)->first();
+
+        return new Organization($organization);
+    }
 }

package/server/src/Http/Controllers/Internal/v1/OrderController.php

@@ -62,6 +62,16 @@ class OrderController extends FleetOpsController
 
                         $input['integrated_vendor_order'] = $integratedVendorOrder;
                     }
+
+                    // if no type is set its default to default
+                    if (!isset($input['type'])) {
+                        $input['type'] = 'default';
+                    }
+
+                    // if no status is set its default to `created`
+                    if (!isset($input['status'])) {
+                        $input['status'] = 'created';
+                    }
                 },
                 function (&$request, Order &$order, &$requestInput) {
                     $input                   = $request->input('order');
@@ -101,7 +111,7 @@ class OrderController extends FleetOpsController
                     $order->purchaseServiceQuote($serviceQuote);
 
                     // dispatch if flagged true
-                    $order->firstDispatch();
+                    $order->firstDispatchWithActivity();
 
                     // load tracking number
                     $order->load(['trackingNumber']);

package/server/src/Http/Filter/TrackingStatusFilter.php

@@ -11,6 +11,16 @@ class TrackingStatusFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function trackingNumber(string $trackingNumber)
+    {
+        $this->builder->whereHas('trackingNumber', function ($query) use ($trackingNumber) {
+            $query->where(function ($query) use ($trackingNumber) {
+                $query->where('public_id', $trackingNumber);
+                $query->orWhere('uuid', $trackingNumber);
+            });
+        });
+    }
+
     public function order(string $order)
     {
         $this->builder->whereHas(

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

@@ -2,7 +2,6 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
-use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Requests\FleetbaseRequest;
 
 class CancelOrderRequest extends FleetbaseRequest
@@ -14,7 +13,7 @@ class CancelOrderRequest extends FleetbaseRequest
      */
     public function authorize()
     {
-        return Utils::notEmpty(session('user'));
+        return request()->session()->has('api_credential');
     }
 
     /**

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

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Http\Requests;
 
 use Fleetbase\Http\Requests\FleetbaseRequest;
+use Illuminate\Validation\Rules\RequiredIf;
 
 class CreateContactRequest extends FleetbaseRequest
 {
@@ -24,10 +25,10 @@ class CreateContactRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'name'  => 'required',
-            'type'  => 'required',
-            'email' => 'nullable|email',
-            'phone' => 'nullable',
+            'name'  => ['required'],
+            'type'  => [new RequiredIf($this->isMethod('POST'))],
+            'email' => ['nullable', 'email'],
+            'phone' => ['nullable'],
         ];
     }
 }

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

@@ -28,17 +28,19 @@ class CreateDriverRequest extends FleetbaseRequest
         $isCreating = $this->isMethod('POST');
 
         return [
-            'name'     => [Rule::requiredIf($isCreating)],
-            'email'    => [Rule::requiredIf($isCreating), Rule::when($this->filled('email'), ['email']), Rule::when($isCreating, [Rule::unique('users')->whereNull('deleted_at')])],
-            'phone'    => [Rule::requiredIf($isCreating), Rule::when($isCreating, [Rule::unique('users')->whereNull('deleted_at')])],
-            'password' => 'nullable|string',
-            'country'  => 'nullable|size:2',
-            'city'     => 'nullable|string',
-            'vehicle'  => 'nullable|string|starts_with:vehicle_|exists:drivers,public_id',
-            'status'   => 'nullable|string|in:active,inactive',
-            'vendor'   => 'nullable|exists:vendors,public_id',
-            'job'      => 'nullable|exists:orders,public_id',
-            'location' => ['nullable', new ResolvablePoint()],
+            'name'      => [Rule::requiredIf($isCreating)],
+            'email'     => [Rule::requiredIf($isCreating), Rule::when($this->filled('email'), ['email']), Rule::when($isCreating, [Rule::unique('users')->whereNull('deleted_at')])],
+            'phone'     => [Rule::requiredIf($isCreating), Rule::when($isCreating, [Rule::unique('users')->whereNull('deleted_at')])],
+            'password'  => 'nullable|string',
+            'country'   => 'nullable|size:2',
+            'city'      => 'nullable|string',
+            'vehicle'   => 'nullable|string|starts_with:vehicle_|exists:drivers,public_id',
+            'status'    => 'nullable|string|in:active,inactive',
+            'vendor'    => 'nullable|exists:vendors,public_id',
+            'job'       => 'nullable|exists:orders,public_id',
+            'location'  => ['nullable', new ResolvablePoint()],
+            'latitude'  => ['nullable', 'required_with:longitude'],
+            'longitude' => ['nullable', 'required_with:latitude'],
         ];
     }
 

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

@@ -27,16 +27,19 @@ class CreateEntityRequest extends FleetbaseRequest
         return [
             'name'            => [Rule::requiredIf($this->isMethod('POST'))],
             'type'            => [Rule::requiredIf($this->isMethod('POST'))],
-            'email'           => 'nullable|email',
+            'destination'     => ['nullable', Rule::exists('places', 'public_id')->whereNull('deleted_at')],
+            'waypoint'        => ['nullable', Rule::exists('places', 'public_id')->whereNull('deleted_at')],
+            'payload'         => ['nullable', Rule::exists('payloads', 'public_id')->whereNull('deleted_at'), 'required_with:destination,waypoint'],
+            'email'           => ['nullable', 'email'],
             'weight'          => 'nullable',
             'weight_unit'     => [Rule::requiredIf($this->has('weight')), 'in:g,oz,lb,kg'],
             'length'          => 'nullable',
             'width'           => 'nullable',
             'height'          => 'nullable',
             'dimensions_unit' => [Rule::requiredIf($this->has(['length', 'width', 'height'])), 'in:cm,in,ft,mm,m,yd'],
-            'declared_value'  => 'nullable',
-            'price'           => 'nullable',
-            'sales_price'     => 'nullable',
+            'declared_value'  => ['nullable', 'numeric'],
+            'price'           => ['nullable', 'numeric'],
+            'sales_price'     => ['nullable', 'numeric'],
             'currency'        => [Rule::requiredIf($this->has(['declared_value', 'price', 'sales_price'])), 'size:3'],
         ];
     }

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

@@ -26,11 +26,11 @@ class CreateOrderRequest extends FleetbaseRequest
     {
         $validations = [
             'adhoc'          => 'in:true,false,1,0',
-            'dispatch'       => 'boolean',
+            'dispatch'       => ['nullable', 'boolean'],
             'adhoc_distance' => 'numeric',
             'pod_required'   => 'in:true,false,1,0',
             'pod_method'     => 'in:' . config('api.pod_methods'),
-            'scheduled_at'   => 'date',
+            'scheduled_at'   => ['nullable', 'date'],
             'driver'         => 'nullable|exists:drivers,public_id',
             'service_quote'  => 'nullable|exists:service_quotes,public_id',
             'purchase_rate'  => 'nullable|exists:purchase_rates,public_id',

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')],
         ];
     }