@fleetbase/fleetops-engine 0.6.57 → 0.6.59

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

@@ -36,7 +36,7 @@ class SimulateOrderRouteNavigation extends Command
         ini_set('max_execution_time', 0);
 
         $orderId = $this->argument('order');
-        $order   = Order::where('public_id', $orderId)->orWhere('uuid', $orderId)->first();
+        $order   = $this->findOrder($orderId);
         $driver  = null;
         if (!$order) {
             return $this->error('Order not found to simulate driving for.');
@@ -45,7 +45,7 @@ class SimulateOrderRouteNavigation extends Command
         // If driver provided
         $driverId = $this->argument('driver');
         if ($driverId) {
-            $driver = Driver::where('public_id', $driverId)->orWhere('uuid', $driverId)->first();
+            $driver = $this->findDriver($driverId);
             if (!$driver) {
                 $this->error('The driver specified was not found, defaulting to driver assigned to order.');
             }
@@ -75,7 +75,7 @@ class SimulateOrderRouteNavigation extends Command
         $this->info('Found route starting point: ' . (string) $start . ' and route ending point: ' . (string) $end);
 
         // Send points to OSRM
-        $route = OSRM::getRoute($start, $end);
+        $route = $this->getRoute($start, $end);
         $this->info('Requesting route from OSRM.');
 
         // Create simulation events
@@ -85,7 +85,7 @@ class SimulateOrderRouteNavigation extends Command
             $this->info('Received route geometry from OSRM.');
 
             // Decode the waypoints if needed
-            $waypoints = OSRM::decodePolyline($routeGeometry);
+            $waypoints = $this->decodePolyline($routeGeometry);
             $this->info('Decoded OSRM route geometry.');
 
             // Loop through waypoints to calculate the heading for each point
@@ -107,8 +107,8 @@ class SimulateOrderRouteNavigation extends Command
                 }
 
                 $this->info('Simulating driver reaching waypoint #' . ($index + 1) . ' at ' . (string) $waypoint);
-                event(new DriverSimulatedLocationChanged($driver, $waypoint, $additionalData));
-                sleep(3);
+                $this->dispatchLocationChanged($driver, $waypoint, $additionalData);
+                $this->pauseBetweenWaypoints();
             }
         }
 
@@ -128,4 +128,34 @@ class SimulateOrderRouteNavigation extends Command
             'order' => 'Which order ID should be used to simulate driving the route for?',
         ];
     }
+
+    protected function findOrder(string $orderId): ?Order
+    {
+        return Order::where('public_id', $orderId)->orWhere('uuid', $orderId)->first();
+    }
+
+    protected function findDriver(string $driverId): ?Driver
+    {
+        return Driver::where('public_id', $driverId)->orWhere('uuid', $driverId)->first();
+    }
+
+    protected function getRoute(mixed $start, mixed $end): array
+    {
+        return OSRM::getRoute($start, $end);
+    }
+
+    protected function decodePolyline(string $routeGeometry): array
+    {
+        return OSRM::decodePolyline($routeGeometry);
+    }
+
+    protected function dispatchLocationChanged(Driver $driver, mixed $waypoint, array $additionalData): void
+    {
+        event(new DriverSimulatedLocationChanged($driver, $waypoint, $additionalData));
+    }
+
+    protected function pauseBetweenWaypoints(): void
+    {
+        sleep(3);
+    }
 }

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

@@ -69,7 +69,7 @@ class TrackOrderDistanceAndTime extends Command
             }
 
             $this->alert('Found ' . number_format($total) . ' orders to update. Current Time: ' . Carbon::now()->toDateTimeString());
-            $bar = $this->output->createProgressBar($total);
+            $bar = $this->createProgressBar($total);
             $bar->start();
 
             $updated = 0;
@@ -136,4 +136,9 @@ class TrackOrderDistanceAndTime extends Command
             ->where('created_at', '>=', $cutoff)
             ->whereHas('payload');
     }
+
+    protected function createProgressBar(int $total)
+    {
+        return $this->output->createProgressBar($total);
+    }
 }

package/server/src/Events/DriverLocationChanged.php

@@ -6,7 +6,7 @@ use Fleetbase\FleetOps\Models\Driver;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

package/server/src/Events/DriverSimulatedLocationChanged.php

@@ -7,7 +7,7 @@ use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

package/server/src/Events/EntityActivityChanged.php

@@ -8,7 +8,7 @@ use Fleetbase\FleetOps\Models\Order;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

package/server/src/Events/EntityCompleted.php

@@ -8,7 +8,7 @@ use Fleetbase\FleetOps\Models\Order;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

package/server/src/Events/EntityDriverAssigned.php

@@ -5,7 +5,7 @@ namespace Fleetbase\FleetOps\Events;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 class EntityDriverAssigned implements ShouldBroadcast

package/server/src/Events/FuelProviderTransactionImported.php

@@ -3,7 +3,7 @@
 namespace Fleetbase\FleetOps\Events;
 
 use Fleetbase\FleetOps\Models\FuelProviderTransaction;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 class FuelProviderTransactionImported

package/server/src/Events/FuelProviderTransactionMatched.php

@@ -3,7 +3,7 @@
 namespace Fleetbase\FleetOps\Events;
 
 use Fleetbase\FleetOps\Models\FuelProviderTransaction;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 class FuelProviderTransactionMatched

package/server/src/Events/FuelProviderTransactionUnmatched.php

@@ -3,7 +3,7 @@
 namespace Fleetbase\FleetOps\Events;
 
 use Fleetbase\FleetOps\Models\FuelProviderTransaction;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 class FuelProviderTransactionUnmatched

package/server/src/Events/FuelReportCreatedFromProvider.php

@@ -4,7 +4,7 @@ namespace Fleetbase\FleetOps\Events;
 
 use Fleetbase\FleetOps\Models\FuelProviderTransaction;
 use Fleetbase\FleetOps\Models\FuelReport;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 class FuelReportCreatedFromProvider

package/server/src/Events/GeofenceDwelled.php

@@ -7,7 +7,7 @@ use Fleetbase\FleetOps\Models\Vehicle;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 /**

package/server/src/Events/GeofenceEntered.php

@@ -8,7 +8,7 @@ use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 /**

package/server/src/Events/GeofenceExited.php

@@ -8,7 +8,7 @@ use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 /**

package/server/src/Events/VehicleLocationChanged.php

@@ -6,7 +6,7 @@ use Fleetbase\FleetOps\Models\Vehicle;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

package/server/src/Events/WaypointActivityChanged.php

@@ -8,7 +8,7 @@ use Fleetbase\FleetOps\Models\Waypoint;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

package/server/src/Events/WaypointCompleted.php

@@ -8,7 +8,7 @@ use Fleetbase\FleetOps\Models\Waypoint;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

package/server/src/Exceptions/IntegratedVendorException.php

@@ -19,9 +19,9 @@ class IntegratedVendorException extends \Exception implements Responsable
     public ?IntegratedVendor $integratedVendor;
 
     /**
-     * @var string the trigger method that caused the exception
+     * @var string|null the trigger method that caused the exception
      */
-    public string $triggerMethod;
+    public ?string $triggerMethod;
 
     /**
      * IntegratedVendorException constructor.

package/server/src/Exceptions/TelematicRateLimitExceededException.php

@@ -7,6 +7,6 @@ namespace Fleetbase\FleetOps\Exceptions;
  *
  * Exception thrown when provider rate limit is exceeded.
  */
-class TelematicRateLimitExceededException extends ProviderException
+class TelematicRateLimitExceededException extends TelematicProviderException
 {
 }

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

@@ -24,9 +24,7 @@ class ContactController extends Controller
     public function create(CreateContactRequest $request)
     {
         // get request input
-        $input          = $request->only(['name', 'type', 'title', 'email', 'phone', 'meta', 'type']);
-        $input['phone'] = is_string($input['phone']) ? Utils::formatPhoneNumber($input['phone']) : $input['phone'];
-        $input['type']  = empty($input['type']) ? 'contact' : $input['type'];
+        $input = $this->contactCreateInputFromRequest($request);
 
         // Handle photo upload using FileResolverService
         if ($request->has('photo')) {
@@ -39,12 +37,12 @@ class ContactController extends Controller
         }
 
         try {
-            $contactCandidate               = new Contact($input);
+            $contactCandidate               = $this->newContact($input);
             $contactCandidate->company_uuid = session('company');
             $contactCandidate->assertCustomerIdentityIsAvailable();
 
             // create the contact
-            $contact = Contact::updateOrCreate(
+            $contact = $this->updateOrCreateContact(
                 [
                     'company_uuid' => session('company'),
                     'name'         => $input['name'],
@@ -53,11 +51,11 @@ class ContactController extends Controller
                 $input
             );
         } catch (\Exception $e) {
-            return response()->apiError($e->getMessage());
+            return $this->apiError($e->getMessage());
         }
 
         // response the driver resource
-        return new ContactResource($contact);
+        return $this->contactResource($contact);
     }
 
     /**
@@ -72,9 +70,9 @@ class ContactController extends Controller
     {
         // find for the contact
         try {
-            $contact = Contact::findRecordOrFail($id);
+            $contact = $this->findContact($id);
         } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
-            return response()->json(
+            return $this->jsonResponse(
                 [
                     'error' => 'Contact resource not found.',
                 ],
@@ -83,11 +81,11 @@ class ContactController extends Controller
         }
 
         // get request input
-        $input = $request->only(['name', 'type', 'title', 'email', 'phone', 'meta']);
+        $input = $this->contactUpdateInputFromRequest($request);
 
         // If setting a default location for the contact
         if ($request->has('place')) {
-            $input['place_uuid'] = Utils::getUuid('places', [
+            $input['place_uuid'] = $this->getPlaceUuid('places', [
                 'public_id'    => $request->input('place'),
                 'company_uuid' => session('company'),
             ]);
@@ -120,13 +118,13 @@ class ContactController extends Controller
 
             $contact->update($input);
         } catch (\Exception $e) {
-            return response()->apiError($e->getMessage());
+            return $this->apiError($e->getMessage());
         }
 
         $contact->flushAttributesCache();
 
         // response the contact resource
-        return new ContactResource($contact);
+        return $this->contactResource($contact);
     }
 
     /**
@@ -136,9 +134,9 @@ class ContactController extends Controller
      */
     public function query(Request $request)
     {
-        $results = Contact::queryWithRequest($request);
+        $results = $this->queryContacts($request);
 
-        return ContactResource::collection($results);
+        return $this->contactResourceCollection($results);
     }
 
     /**
@@ -150,13 +148,13 @@ class ContactController extends Controller
     {
         // find for the contact
         try {
-            $contact = Contact::findRecordOrFail($id);
+            $contact = $this->findContact($id);
         } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
-            return response()->apiError('Contact resource not found.', 404);
+            return $this->apiError('Contact resource not found.', 404);
         }
 
         // response the contact resource
-        return new ContactResource($contact);
+        return $this->contactResource($contact);
     }
 
     /**
@@ -167,9 +165,9 @@ class ContactController extends Controller
     public function delete($id)
     {
         try {
-            $contact = Contact::findRecordOrFail($id);
+            $contact = $this->findContact($id);
         } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
-            return response()->json(
+            return $this->jsonResponse(
                 [
                     'error' => 'Contact resource not found.',
                 ],
@@ -182,15 +180,84 @@ class ContactController extends Controller
             $contact->delete();
 
             // Delete related user if any
-            $user = User::where(['uuid' => $contact->user_uuid, 'type' => $contact->type])->first();
+            $user = $this->findRelatedUser($contact);
             if ($user) {
                 $user->delete();
             }
         } catch (\Exception $e) {
-            return response()->apiError($e->getMessage());
+            return $this->apiError($e->getMessage());
         }
 
         // response the contact resource
+        return $this->deletedContactResource($contact);
+    }
+
+    protected function contactCreateInputFromRequest(Request $request): array
+    {
+        $input          = $request->only(['name', 'type', 'title', 'email', 'phone', 'meta', 'type']);
+        $input['phone'] = isset($input['phone']) && is_string($input['phone']) ? Utils::formatPhoneNumber($input['phone']) : ($input['phone'] ?? null);
+        $input['type']  = empty($input['type']) ? 'contact' : $input['type'];
+
+        return $input;
+    }
+
+    protected function contactUpdateInputFromRequest(Request $request): array
+    {
+        return $request->only(['name', 'type', 'title', 'email', 'phone', 'meta']);
+    }
+
+    protected function newContact(array $input): Contact
+    {
+        return new Contact($input);
+    }
+
+    protected function updateOrCreateContact(array $where, array $input): Contact
+    {
+        return Contact::updateOrCreate($where, $input);
+    }
+
+    protected function findContact(string $id): Contact
+    {
+        return Contact::findRecordOrFail($id);
+    }
+
+    protected function queryContacts(Request $request)
+    {
+        return Contact::queryWithRequest($request);
+    }
+
+    protected function getPlaceUuid(string $table, array $where): ?string
+    {
+        return Utils::getUuid($table, $where);
+    }
+
+    protected function findRelatedUser(Contact $contact): ?User
+    {
+        return User::where(['uuid' => $contact->user_uuid, 'type' => $contact->type])->first();
+    }
+
+    protected function contactResource(Contact $contact)
+    {
+        return new ContactResource($contact);
+    }
+
+    protected function contactResourceCollection($results)
+    {
+        return ContactResource::collection($results);
+    }
+
+    protected function deletedContactResource(Contact $contact)
+    {
         return new DeletedResource($contact);
     }
+
+    protected function jsonResponse(array $payload, int $status)
+    {
+        return response()->json($payload, $status);
+    }
+
+    protected function apiError(string $message, int $status = 400)
+    {
+        return response()->apiError($message, $status);
+    }
 }