@fleetbase/fleetops-engine 0.3.8 → 0.3.9

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

@@ -17,6 +17,7 @@ use Fleetbase\Models\Invite;
 use Fleetbase\Models\User;
 use Fleetbase\Models\VerificationCode;
 use Fleetbase\Notifications\UserInvited;
+use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
@@ -79,6 +80,12 @@ class DriverController extends FleetOpsController
                     // if exists in organization create driver profile for user
                     $isOrganizationMember = $existingUser->companies()->where('company_uuid', session('company'))->exists();
 
+                    // Check if driver profile also already exists
+                    $existingDriverProfile = Driver::where(['company_uuid' => session('company'), 'user_uuid' => $existingUser->uuid])->first();
+                    if ($existingDriverProfile) {
+                        return ['driver' => new $this->resource($existingDriverProfile)];
+                    }
+
                     // create driver profile for user
                     $input = collect($input)
                         ->except(['name', 'password', 'email', 'phone', 'meta', 'avatar_uuid', 'photo_uuid'])
@@ -90,6 +97,11 @@ class DriverController extends FleetOpsController
                     $input['user_uuid']    = $existingUser->uuid;
                     $input['slug']         = $existingUser->slug;
 
+                    // If no location provided set
+                    if (empty($input['location'])) {
+                        $input['location'] = new Point(0, 0);
+                    }
+
                     // create the profile
                     $driverProfile = Driver::create($input);
 
@@ -109,7 +121,7 @@ class DriverController extends FleetOpsController
                         $existingUser->notify(new UserInvited($invitation));
                     }
 
-                    return response()->json(['driver' => $driverProfile]);
+                    return ['driver' => new $this->resource($driverProfile)];
                 }
             }
 
@@ -138,15 +150,19 @@ class DriverController extends FleetOpsController
                         ->filter()
                         ->toArray();
 
-                    if (!isset($input['password'])) {
-                        $input['password'] = data_get($userInput, 'phone', Str::random(14));
+                    // Make sure password is set
+                    if (empty($userInput['password'])) {
+                        $userInput['password'] = Str::random(14);
                     }
 
                     $userInput['company_uuid'] = session('company');
-                    $userInput['type']         = 'driver';
 
+                    // Create user account
                     $user = User::create($userInput);
 
+                    // Set user type as driver
+                    $user->setUserType('driver');
+
                     // send invitation to user
                     $invitation = Invite::create([
                         'company_uuid'    => session('company'),
@@ -163,6 +179,11 @@ class DriverController extends FleetOpsController
 
                     $input['user_uuid'] = $user->uuid;
                     $input['slug']      = $user->slug;
+
+                    // If no location provided set
+                    if (empty($input['location'])) {
+                        $input['location'] = new Point(0, 0);
+                    }
                 },
                 function ($request, &$driver) {
                     $driver->load(['user']);

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

@@ -82,26 +82,19 @@ class LiveController extends Controller
     }
 
     /**
-     * Get online drivers with active jobs for the current company.
+     * Get drivers for the current company.
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function drivers()
     {
-        $drivers = Driver::where(['company_uuid' => session('company'), 'online' => 1])
-            ->whereHas(
-                'currentJob',
-                function ($q) {
-                    $q->whereNotIn('status', ['canceled', 'completed']);
-                }
-            )
-            ->get();
+        $drivers = Driver::where(['company_uuid' => session('company')])->get();
 
         return DriverResource::collection($drivers);
     }
 
     /**
-     * Get online vehicles for the current company.
+     * Get vehicles for the current company.
      *
      * @return \Illuminate\Http\JsonResponse
      */

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

@@ -30,7 +30,7 @@ class NavigatorController extends Controller
                 ]
             );
 
-            return redirect()->away('flbnavigator://configure?key=' . $apiCredential->key . '&host=' . url()->secure('/'));
+            return redirect()->away('flbnavigator://configure?key=' . $apiCredential->key . '&host=' . url()->secure('/') . '&socketcluster_host=' . env('SOCKETCLUSTER_HOST', 'socket') . '&socketcluster_port=' . env('SOCKETCLUSTER_PORT', 8000));
         }
 
         return response()->error('Organization for linking not found.');

package/addon/helpers/extract-coordinates.js

@@ -1,6 +0,0 @@
-import { helper } from '@ember/component/helper';
-import extractCoordinatesUtil from '../utils/extract-coordinates';
-
-export default helper(function extractCoordinates([coordinates = [], format = 'latlng']) {
-    return extractCoordinatesUtil(coordinates, format);
-});

package/addon/utils/extract-coordinates.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/ember-core/utils/extract-coordinates';

package/app/helpers/extract-coordinates.js

@@ -1 +0,0 @@
-export { default, extractCoordinates } from '@fleetbase/fleetops-engine/helpers/extract-coordinates';

package/app/utils/extract-coordinates.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/fleetops-engine/utils/extract-coordinates';