@fleetbase/fleetops-engine 0.3.9 → 0.4.0

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.3.9",
+    "version": "0.4.0",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "fleetbase/core-api": "^1.3.7",
+        "fleetbase/core-api": "^1.3.10",
         "barryvdh/laravel-dompdf": "^2.0",
         "brick/geo": "0.7.2",
         "cknow/laravel-money": "^7.1",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.3.9",
+    "version": "0.4.0",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.3.9",
+    "version": "0.4.0",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops",

package/server/src/Console/Commands/FixDriverCompanies.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Fleetbase\FleetOps\Console\Commands;
+
+use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\Models\Company;
+use Fleetbase\Models\CompanyUser;
+use Illuminate\Console\Command;
+
+class FixDriverCompanies extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'fleetops:fix-driver-companies';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This is a command which checks driver\'s users to make sure they are assigned to company, if not it assigns the user to the drivers company';
+
+    /**
+     * Execute the console command.
+     *
+     * This method is responsible for the main logic of the command.
+     * It fetches dispatchable orders, notifies about the current time and number of orders,
+     * and then dispatches each order if there are nearby drivers.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $drivers = Driver::whereHas('user', function ($query) {
+            $query->whereNull('company_uuid');
+            $query->withTrashed();
+        })->with(['user'])->get();
+
+        // Fix these drivers
+        foreach ($drivers as $driver) {
+            $user = $driver->user;
+            if ($user) {
+                $this->line('Found user ' . $user->name . ' (' . $user->email . ') which has no company assigned');
+                // Get company from driver profile
+                $company = Company::where('uuid', $driver->company_uuid)->first();
+                if ($company) {
+                    $user->assignCompany($company);
+
+                    // create company user
+                    CompanyUser::create([
+                        'user_uuid'    => $user->uuid,
+                        'company_uuid' => $company->uuid,
+                        'status'       => 'active',
+                    ]);
+
+                    // Inform
+                    $this->line('User ' . $user->email . ' was assigned to company: ' . $company->name);
+                }
+            }
+        }
+    }
+}

package/server/src/Exceptions/IntegratedVendorException.php

@@ -7,32 +7,30 @@ use Illuminate\Contracts\Support\Responsable;
 use Illuminate\Http\JsonResponse;
 
 /**
- * Class IntegratedVendorException
+ * Class IntegratedVendorException.
  *
  * Custom exception class for IntegratedVendor-related exceptions.
- *
- * @package Fleetbase\FleetOps\Exceptions
  */
 class IntegratedVendorException extends \Exception implements Responsable
 {
     /**
-     * @var IntegratedVendor|null The IntegratedVendor instance associated with the exception.
+     * @var IntegratedVendor|null the IntegratedVendor instance associated with the exception
      */
     public ?IntegratedVendor $integratedVendor;
 
     /**
-     * @var string The trigger method that caused the exception.
+     * @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.
+     * @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)
     {
@@ -45,6 +43,7 @@ class IntegratedVendorException extends \Exception implements Responsable
      * Get the response representing the exception.
      *
      * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Http\JsonResponse
      */
     public function toResponse($request)
@@ -53,8 +52,8 @@ class IntegratedVendorException extends \Exception implements Responsable
 
         return new JsonResponse(
             [
-                'errors' => [$errorMessage],
-                'integratedVendorId' => data_get($this->integratedVendor, 'uuid')
+                '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());
@@ -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,12 @@ 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;
@@ -155,11 +157,25 @@ class DriverController extends FleetOpsController
                         $userInput['password'] = Str::random(14);
                     }
 
-                    $userInput['company_uuid'] = session('company');
+                    // 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');
 

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()