@fleetbase/fleetops-engine 0.3.8 → 0.4.0

package/server/src/Exceptions/IntegratedVendorException.php

@@ -3,16 +3,59 @@
 namespace Fleetbase\FleetOps\Exceptions;
 
 use Fleetbase\FleetOps\Models\IntegratedVendor;
+use Illuminate\Contracts\Support\Responsable;
+use Illuminate\Http\JsonResponse;
 
-class IntegratedVendorException extends \Exception
+/**
+ * Class IntegratedVendorException.
+ *
+ * Custom exception class for IntegratedVendor-related exceptions.
+ */
+class IntegratedVendorException extends \Exception implements Responsable
 {
+    /**
+     * @var IntegratedVendor|null the IntegratedVendor instance associated with the exception
+     */
     public ?IntegratedVendor $integratedVendor;
+
+    /**
+     * @var string the trigger method that caused the exception
+     */
     public string $triggerMethod;
 
+    /**
+     * IntegratedVendorException constructor.
+     *
+     * @param string                $message          the exception message
+     * @param IntegratedVendor|null $integratedVendor the IntegratedVendor instance associated with the exception
+     * @param string|null           $triggerMethod    the trigger method that caused the exception
+     * @param int                   $code             the exception code
+     * @param \Throwable|null       $previous         the previous throwable used for the exception chaining
+     */
     public function __construct(string $message = '', IntegratedVendor $integratedVendor = null, string $triggerMethod = null, int $code = 400, \Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
         $this->integratedVendor = $integratedVendor;
         $this->triggerMethod    = $triggerMethod;
     }
+
+    /**
+     * Get the response representing the exception.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function toResponse($request)
+    {
+        $errorMessage = $this->getMessage();
+
+        return new JsonResponse(
+            [
+                'errors'             => [$errorMessage],
+                'integratedVendorId' => data_get($this->integratedVendor, 'uuid'),
+            ],
+            400
+        );
+    }
 }

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

@@ -360,32 +360,31 @@ class DriverController extends Controller
     {
         $identity = $request->input('identity');
         $password = $request->input('password');
-        $attrs    = $request->input(['name', 'phone', 'email']);
+        // $attrs    = $request->input(['name', 'phone', 'email']);
 
-        $user = User::where('email', $identity)->orWhere('phone', static::phone($identity))->first();
+        // Get driver attempting to authenticate via phone
+        $user = User::where(
+            function ($query) use ($identity) {
+                $query->where('phone', static::phone($identity));
+                $query->owWhere('email', $identity);
+            }
+        )->whereHas('driver')->first();
 
+        // Check password to authenticate driver
         if (!Hash::check($password, $user->password)) {
             return response()->apiError('Authentication failed using password provided.', 401);
         }
 
-        // Get the company session for the user
-        $company = Flow::getCompanySessionForUser($user);
+        // Get the user's company for this driver profile
+        $company = $this->_getDriverCompanyFromUser($user);
 
         // Get driver record
-        $driver = Driver::firstOrCreate(
-            [
-                'user_uuid'    => $user->uuid,
-                'company_uuid' => $company->uuid,
-            ],
+        $driver = Driver::where(
             [
                 'user_uuid'    => $user->uuid,
                 'company_uuid' => $company->uuid,
-                'name'         => data_get($attrs, 'name', $user->name),
-                'phone'        => data_get($attrs, 'phone', $user->phone),
-                'email'        => data_get($attrs, 'email', $user->email),
-                'location'     => new Point(0, 0),
             ]
-        );
+        )->first();
 
         // generate auth token
         try {
@@ -409,19 +408,18 @@ class DriverController extends Controller
         $phone = static::phone();
 
         // check if user exists
-        $user = User::where('phone', $phone)->whereNull('deleted_at')->withoutGlobalScopes()->first();
-
+        $user = User::where('phone', $phone)->whereHas('driver')->whereNull('deleted_at')->withoutGlobalScopes()->first();
         if (!$user) {
             return response()->apiError('No driver with this phone # found.');
         }
 
-        // get the current company session
-        $company = Flow::getCompanySessionForUser($user);
+        // Get the user's company for this driver profile
+        $company = $this->_getDriverCompanyFromUser($user);
 
         // generate verification token
         try {
             VerificationCode::generateSmsVerificationFor($user, 'driver_login', function ($verification) use ($company) {
-                return "Your {$company->name} verification code is {$verification->code}";
+                return 'Your ' . data_get($company, 'name', config('app.name')) . ' verification code is ' . $verification->code;
             });
         } catch (\Throwable $e) {
             return response()->apiError($e->getMessage());
@@ -447,9 +445,9 @@ class DriverController extends Controller
         }
 
         // check if user exists
-        $user = User::where('type', 'driver')->where(function ($query) use ($identity) {
+        $user = User::whereHas('driver')->where(function ($query) use ($identity) {
             $query->where('phone', $identity);
-            $query->orWhere('phone', $identity);
+            $query->orWhere('email', $identity);
         })->first();
 
         if (!$user) {
@@ -458,29 +456,20 @@ class DriverController extends Controller
 
         // 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()->apiError('Invalid verification code!');
         }
 
-        // get the current company session
-        $company = Flow::getCompanySessionForUser($user);
+        // Get the user's company for this driver profile
+        $company = $this->_getDriverCompanyFromUser($user);
 
         // get driver record
-        $driver = Driver::firstOrCreate(
-            [
-                'user_uuid'    => $user->uuid,
-                'company_uuid' => $company->uuid,
-            ],
+        $driver = Driver::where(
             [
                 'user_uuid'    => $user->uuid,
                 'company_uuid' => $company->uuid,
-                'name'         => data_get($attrs, 'name', $user->name),
-                'phone'        => data_get($attrs, 'phone', $user->phone),
-                'email'        => data_get($attrs, 'email', $user->email),
-                'location'     => new Point(0, 0),
             ]
-        );
+        )->first();
 
         // generate auth token
         try {
@@ -707,4 +696,24 @@ class DriverController extends Controller
 
         return response()->json($route);
     }
+
+    private function _getDriverCompanyFromUser(User $user): ?Company
+    {
+        // company defaults to null
+        $company = null;
+
+        // Load the driver profile to get the company
+        $driverProfile = Driver::where('user_uuid', $user->uuid)->first();
+        if ($driverProfile) {
+            // get company from driver profile
+            $company = Company::where('uuid', $driverProfile->company_uuid)->first();
+        }
+
+        // If unable to find company from driver profile, fallback to session flow
+        if (!$company) {
+            $company = Flow::getCompanySessionForUser($user);
+        }
+
+        return $company;
+    }
 }

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

@@ -13,10 +13,13 @@ use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Requests\ExportRequest;
+use Fleetbase\Models\CompanyUser;
 use Fleetbase\Models\Invite;
 use Fleetbase\Models\User;
 use Fleetbase\Models\VerificationCode;
 use Fleetbase\Notifications\UserInvited;
+use Fleetbase\Support\Auth;
+use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
@@ -79,6 +82,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 +99,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 +123,7 @@ class DriverController extends FleetOpsController
                         $existingUser->notify(new UserInvited($invitation));
                     }
 
-                    return response()->json(['driver' => $driverProfile]);
+                    return ['driver' => new $this->resource($driverProfile)];
                 }
             }
 
@@ -138,15 +152,33 @@ 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';
+                    // Get current session company
+                    $company                   = Auth::getCompany();
+                    $userInput['company_uuid'] = $company ? $company->uuid : session('company');
 
+                    // Create user account
                     $user = User::create($userInput);
 
+                    // Assign user to company
+                    if ($company) {
+                        $user->assignCompany($company);
+
+                        // create company user
+                        CompanyUser::create([
+                            'user_uuid'    => $user->uuid,
+                            'company_uuid' => $company->uuid,
+                            'status'       => 'active',
+                        ]);
+                    }
+
+                    // Set user type as driver
+                    $user->setUserType('driver');
+
                     // send invitation to user
                     $invitation = Invite::create([
                         'company_uuid'    => session('company'),
@@ -163,6 +195,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/server/src/Http/Resources/v1/Driver.php

@@ -42,7 +42,7 @@ class Driver extends FleetbaseResource
             'jobs'                          => $this->whenLoaded('jobs', CurrentJob::collection($this->jobs()->without(['driverAssigned'])->get())),
             'vendor'                        => $this->whenLoaded('vendor', new Vendor($this->vendor)),
             'fleets'                        => $this->whenLoaded('fleets', Fleet::collection($this->fleets()->without('drivers')->get())),
-            'location'                      => data_get($this, 'location', new Point(0, 0)),
+            'location'                      => $this->wasRecentlyCreated ? new Point(0, 0) : data_get($this, 'location', new Point(0, 0)),
             'heading'                       => (int) data_get($this, 'heading', 0),
             'altitude'                      => (int) data_get($this, 'altitude', 0),
             'speed'                         => (int) data_get($this, 'speed', 0),

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -44,6 +44,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         \Fleetbase\FleetOps\Console\Commands\DispatchAdhocOrders::class,
         \Fleetbase\FleetOps\Console\Commands\DispatchOrders::class,
         \Fleetbase\FleetOps\Console\Commands\TrackOrderDistanceAndTime::class,
+        \Fleetbase\FleetOps\Console\Commands\FixDriverCompanies::class,
     ];
 
     /**

package/server/src/Support/Flow.php

@@ -6,6 +6,7 @@ use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\Waypoint;
 use Fleetbase\Models\Company;
+use Fleetbase\Models\CompanyUser;
 use Fleetbase\Models\Extension;
 use Fleetbase\Models\ExtensionInstall;
 use Fleetbase\Models\User;
@@ -550,9 +551,25 @@ class Flow
         return Company::currentSession();
     }
 
-    public static function getCompanySessionForUser(User $user)
+    public static function getCompanySessionForUser(User $user): ?Company
     {
-        return Company::where('uuid', $user->company_uuid)->first();
+        if (Str::isUuid($user->company_uuid)) {
+            $company = Company::where('uuid', $user->company_uuid)->first();
+            if ($company) {
+                return $company;
+            }
+        }
+
+        // fallback to get user's first company
+        $userCompany = CompanyUser::where('user_uuid', $user->uuid)->first();
+        if ($userCompany) {
+            $company = Company::where('uuid', $userCompany->company_uuid)->first();
+            if ($company) {
+                return $company;
+            }
+        }
+
+        return null;
     }
 
     public static function getDefaultOrderFlow()

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';