@fleetbase/fleetops-engine 0.6.47 → 0.6.49

package/server/src/Models/Contact.php

@@ -5,6 +5,7 @@ namespace Fleetbase\FleetOps\Models;
 use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Exceptions\UserAlreadyExistsException;
 use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Models\CompanyUser;
 use Fleetbase\Models\Invite;
 use Fleetbase\Models\Model;
 use Fleetbase\Models\User;
@@ -261,6 +262,14 @@ class Contact extends Model
         return $this->type === 'customer';
     }
 
+    /**
+     * Determines if this contact is a Fleet-Ops customer.
+     */
+    public function isCustomer(): bool
+    {
+        return $this->type === 'customer';
+    }
+
     /**
      * Creates a new contact from an import row.
      */
@@ -308,19 +317,33 @@ class Contact extends Model
     public static function createUserFromContact(Contact $contact, bool $sendInvite = false, bool $update = false): User
     {
         // Check if user already exist with email or phone number
-        $existingUser = User::where(function ($query) use ($contact) {
-            $query->where('company_uuid', $contact->company_uuid);
-            $query->where('email', $contact->email);
-            if ($contact->phone) {
-                $query->orWhere('phone', Utils::formatPhoneNumber($contact->phone));
-            }
-        })->whereNull('deleted_at')->first();
+        $existingUser = null;
+        if ($contact->email || $contact->phone) {
+            $existingUser = User::where('company_uuid', $contact->company_uuid)
+                ->where(function ($query) use ($contact) {
+                    if ($contact->email) {
+                        $query->where('email', $contact->email);
+                    }
+
+                    if ($contact->phone) {
+                        $method = $contact->email ? 'orWhere' : 'where';
+                        $query->{$method}('phone', Utils::formatPhoneNumber($contact->phone));
+                    }
+                })
+                ->whereNull('deleted_at')
+                ->first();
+        }
+
         if ($existingUser) {
             // Check if existing user belongs to another contact
             $existingUserContact = Contact::where(['user_uuid' => $existingUser->uuid, 'company_uuid' => $contact->company_uuid])->whereHas('user')->first();
             if ($existingUserContact) {
                 throw new UserAlreadyExistsException('User already exists, try to assigning the user to this contact.', $existingUser);
             } else {
+                if ($contact->isCustomer()) {
+                    $contact->normalizeCustomerUser($existingUser);
+                }
+
                 // Assign the user to this contact instead
                 $contact->setAttribute('user_uuid', $existingUser->uuid);
                 if ($update) {
@@ -351,10 +374,10 @@ class Contact extends Model
         $user->setType($contact->type);
 
         // Assing to company
-        $user->assignCompany($contact->company, $user->type === 'customer' ? 'Fleet-Ops Customer' : 'Fleet-Ops Contact');
+        $user->assignCompany($contact->company, $contact->isCustomer() ? 'Fleet-Ops Customer' : 'Fleet-Ops Contact');
 
         // Assign customer role
-        if ($user->type === 'customer') {
+        if ($contact->isCustomer()) {
             $user->assignSingleRole('Fleet-Ops Customer');
         }
 
@@ -386,6 +409,87 @@ class Contact extends Model
         return $user;
     }
 
+    /**
+     * Normalize the linked user for a customer contact.
+     */
+    public function normalizeCustomerUser(?User $user = null, bool $quiet = false): ?User
+    {
+        if (!$this->isCustomer()) {
+            return $user;
+        }
+
+        $user ??= $this->getUser();
+        if (!$user) {
+            return null;
+        }
+
+        if ($user->type !== 'customer') {
+            if ($quiet) {
+                $user->forceFill(['type' => 'customer'])->saveQuietly();
+            } else {
+                $user->setType('customer');
+            }
+        }
+
+        $this->loadMissing('company');
+        if ($this->company) {
+            $companyUser = CompanyUser::firstOrCreate(
+                [
+                    'company_uuid' => $this->company->uuid,
+                    'user_uuid'    => $user->uuid,
+                ],
+                [
+                    'company_uuid' => $this->company->uuid,
+                    'user_uuid'    => $user->uuid,
+                    'status'       => $user->status ?? 'active',
+                ]
+            );
+            $user->forceFill(['company_uuid' => $this->company->uuid])->saveQuietly();
+            $user->setRelation('companyUser', $companyUser);
+
+            if ($companyUser) {
+                $companyUser->assignSingleRole('Fleet-Ops Customer');
+            }
+        }
+
+        $this->setRelation('user', $user);
+
+        return $user;
+    }
+
+    /**
+     * Repair a historical customer contact and its linked user.
+     */
+    public function repairCustomerTypeInvariant(bool $quiet = false): ?User
+    {
+        if (!$this->isCustomer()) {
+            $this->forceFill(['type' => 'customer'])->saveQuietly();
+        }
+
+        $user = $this->getUser();
+        if (!$user && ($this->email || $this->phone)) {
+            if ($quiet) {
+                $this->loadMissing('company');
+                $user = User::create([
+                    'company_uuid' => $this->company_uuid,
+                    'name'         => $this->name,
+                    'email'        => $this->email,
+                    'phone'        => $this->phone ? Utils::formatPhoneNumber($this->phone) : null,
+                    'username'     => Str::slug($this->name . '_' . Str::random(4), '_'),
+                    'password'     => Str::random(),
+                    'timezone'     => $this->company->timezone ?? date_default_timezone_get(),
+                    'status'       => 'pending',
+                ]);
+                $user->forceFill(['type' => 'customer'])->saveQuietly();
+                $this->forceFill(['user_uuid' => $user->uuid])->saveQuietly();
+            } else {
+                $user = $this->createUser();
+            }
+        }
+
+        return $this->normalizeCustomerUser($user, $quiet);
+    }
+
     /**
      * Assigns a user to the company and optionally sends an invitation email.
      *
@@ -406,16 +510,21 @@ class Contact extends Model
     public function assignUser(User $user, bool $sendInvite = false): self
     {
         // Load company
-        $this->loadMissing('copmany');
+        $this->loadMissing('company');
+
+        if ($this->isCustomer() && $user->type !== 'customer') {
+            $user->setType('customer');
+        }
 
         // Assing to company
-        $user->assignCompany($this->company, $this->type === 'customer' ? 'Fleet-Ops Customer' : 'Fleet-Ops Contact');
+        $user->assignCompany($this->company, $this->isCustomer() ? 'Fleet-Ops Customer' : 'Fleet-Ops Contact');
 
         // Get the company user instance
         $companyUser = $user->getCompanyUser($this->company);
 
-        // Assign customer role
-        $companyUser->assignSingleRole('Fleet-Ops Customer');
+        if ($companyUser) {
+            $companyUser->assignSingleRole($this->isCustomer() ? 'Fleet-Ops Customer' : 'Fleet-Ops Contact');
+        }
 
         // Set user to contact
         $this->update(['user_uuid' => $user->uuid]);

package/server/src/Models/Driver.php

@@ -97,6 +97,7 @@ class Driver extends Model
         'signup_token_used',
         'avatar_url',
         'drivers_license_number',
+        'license_expiry',
         'location',
         'heading',
         'bearing',
@@ -141,6 +142,7 @@ class Driver extends Model
         'location'        => Point::class,
         'online'          => 'boolean',
         'meta'            => Json::class,
+        'license_expiry'  => 'date',
         // Orchestrator
         'skills'          => Json::class,
         'max_travel_time' => 'integer',

package/server/src/Models/Order.php

@@ -1739,7 +1739,7 @@ class Order extends Model
             }
         }
 
-        $company = $this->relationLoaded('company') ? $this->company : $this->company()->first();
+        $company     = $this->relationLoaded('company') ? $this->company : $this->company()->first();
         $orderConfig = OrderConfig::defaultOrCreate($company);
         if ($orderConfig instanceof OrderConfig) {
             $orderConfig->setOrderContext($this);

package/server/src/Models/OrderConfig.php

@@ -458,28 +458,31 @@ class OrderConfig extends Model
     /**
      * Resolves an OrderConfig from a given identifier or an array of identifiers within an optional company context.
      *
-     * @param string|array $orderConfigIdentifier the identifier(s) for the OrderConfig (namespace, public_id, or key)
+     * @param string|array $orderConfigIdentifier the identifier(s) for the OrderConfig (uuid, namespace, public_id, or key)
      * @param Company|null $company               the company context, if any, to narrow down the search
      *
      * @return OrderConfig|null the found OrderConfig or null if none found
      */
     public static function resolveFromIdentifier($orderConfigIdentifier, ?Company $company = null): ?OrderConfig
     {
-        $query = static::query();
+        $companyUuid  = $company instanceof Company ? $company->uuid : session('company');
+        $identifiers  = is_array($orderConfigIdentifier) ? $orderConfigIdentifier : [$orderConfigIdentifier];
+        $identifiers  = collect($identifiers)->filter(fn ($identifier) => filled($identifier))->values();
+
+        if ($identifiers->isEmpty()) {
+            return static::default($company);
+        }
+
+        foreach ($identifiers as $identifier) {
+            $query = static::query();
 
-        if ($company instanceof Company) {
-            $query->where('company_uuid', $company->uuid);
-        } else {
-            $companyUuid = session('company');
             if ($companyUuid) {
                 $query->where('company_uuid', $companyUuid);
             }
-        }
 
-        $identifiers = is_array($orderConfigIdentifier) ? $orderConfigIdentifier : [$orderConfigIdentifier];
-        foreach ($identifiers as $identifier) {
             $orderConfig = $query->where(function ($query) use ($identifier) {
-                $query->where('namespace', $identifier)
+                $query->where('uuid', $identifier)
+                      ->orWhere('namespace', $identifier)
                       ->orWhere('public_id', $identifier)
                       ->orWhere('key', $identifier);
             })->first();
@@ -489,7 +492,7 @@ class OrderConfig extends Model
             }
         }
 
-        return static::default($company);
+        return null;
     }
 
     /**

package/server/src/Models/Payload.php

@@ -555,15 +555,15 @@ class Payload extends Model
         }
 
         $this->loadMissing('waypointMarkers');
-        $keptWaypointIds = [];
+        $keptWaypointIds          = [];
         $availableWaypointMarkers = $this->waypointMarkers()->get();
 
         foreach ($waypoints as $index => $attributes) {
-            $raw = $attributes;
-            $type = data_get($raw, 'type', 'dropoff');
-            $customerUuidIn = data_get($raw, 'customer_uuid');
+            $raw             = $attributes;
+            $type            = data_get($raw, 'type', 'dropoff');
+            $customerUuidIn  = data_get($raw, 'customer_uuid');
             $customerPubIdIn = data_get($raw, 'customer_id');
-            $customerType = data_get($raw, 'customer_type', 'fleetops:contact');
+            $customerType    = data_get($raw, 'customer_type', 'fleetops:contact');
 
             if (Utils::isset($attributes, 'place') && is_array(Utils::get($attributes, 'place'))) {
                 $attributes = Utils::get($attributes, 'place');
@@ -599,12 +599,12 @@ class Payload extends Model
                 $placeUuid = $place->uuid;
             }
 
-            $customerUuid = null;
+            $customerUuid          = null;
             $customerTypeNamespace = null;
 
             if ($customerType) {
                 $customerTypeNamespace = Utils::getMutationType($customerType);
-                $customerModel = app($customerTypeNamespace);
+                $customerModel         = app($customerTypeNamespace);
 
                 if ($customerUuidIn && $customerModel->where('uuid', $customerUuidIn)->exists()) {
                     $customerUuid = $customerUuidIn;
@@ -642,7 +642,7 @@ class Payload extends Model
                 continue;
             }
 
-            $waypointRecord = Waypoint::create($values);
+            $waypointRecord    = Waypoint::create($values);
             $keptWaypointIds[] = $waypointRecord->uuid;
         }
 

package/server/src/Models/Place.php

@@ -21,7 +21,6 @@ use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\SendsWebhooks;
 use Fleetbase\Traits\TracksApiCredential;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 
 class Place extends Model
@@ -383,8 +382,6 @@ class Place extends Model
 
     /**
      * Create a new Place instance from a geocoding lookup.
-     *
-     * @return array
      */
     public static function getValuesFromGeocodingLookup(string $address): array
     {

package/server/src/Models/ServiceRate.php

@@ -740,7 +740,7 @@ class ServiceRate extends Model
 
         if ($this->isAlgorithm()) {
             $resolvedEndpointCount = $endpointCount ?? $this->inferEndpointCountFromStops($waypoints);
-            $rateFee = $this->normalizeCalculatedMoney(Algo::exec(
+            $rateFee               = $this->normalizeCalculatedMoney(Algo::exec(
                 $this->algorithm,
                 $this->buildAlgorithmVariables(
                     $entities,

package/server/src/Notifications/LateDeparture.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Fleetbase\FleetOps\Notifications;
+
+use Fleetbase\FleetOps\Models\Order;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class LateDeparture extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public static string $name = 'Late Departure';
+    public static string $description = 'Notify when an order has not departed after the configured grace period.';
+    public static string $package = 'fleet-ops';
+
+    public function __construct(public Order $order, public array $context = [])
+    {
+    }
+
+    public function via($notifiable): array
+    {
+        return ['mail', 'database'];
+    }
+
+    public function toMail($notifiable): MailMessage
+    {
+        $orderId = $this->order->tracking ?? $this->order->public_id;
+
+        return (new MailMessage())
+            ->subject("Late departure detected for {$orderId}")
+            ->line("Order {$orderId} has not departed within the configured grace period.")
+            ->line('Please review the order and dispatch status.');
+    }
+
+    public function toArray($notifiable): array
+    {
+        return [
+            'event'      => 'order.late_departure',
+            'order_id'   => $this->order->public_id,
+            'order_uuid' => $this->order->uuid,
+            'context'    => $this->context,
+            'message'    => sprintf('Order %s has not departed within the configured grace period.', $this->order->tracking ?? $this->order->public_id),
+        ];
+    }
+}

package/server/src/Notifications/ProlongedStoppage.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Fleetbase\FleetOps\Notifications;
+
+use Fleetbase\FleetOps\Models\Order;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class ProlongedStoppage extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public static string $name = 'Prolonged Stoppage';
+    public static string $description = 'Notify when a vehicle remains stopped during an active trip beyond the configured threshold.';
+    public static string $package = 'fleet-ops';
+
+    public function __construct(public Order $order, public array $context = [])
+    {
+    }
+
+    public function via($notifiable): array
+    {
+        return ['mail', 'database'];
+    }
+
+    public function toMail($notifiable): MailMessage
+    {
+        $orderId = $this->order->tracking ?? $this->order->public_id;
+
+        return (new MailMessage())
+            ->subject("Prolonged stoppage detected for {$orderId}")
+            ->line("The vehicle assigned to order {$orderId} has remained stopped beyond the configured threshold.")
+            ->line('Please review the active trip and vehicle location.');
+    }
+
+    public function toArray($notifiable): array
+    {
+        return [
+            'event'      => 'order.prolonged_stoppage',
+            'order_id'   => $this->order->public_id,
+            'order_uuid' => $this->order->uuid,
+            'context'    => $this->context,
+            'message'    => sprintf('The vehicle assigned to order %s has remained stopped beyond the configured threshold.', $this->order->tracking ?? $this->order->public_id),
+        ];
+    }
+}

package/server/src/Notifications/RouteDeviation.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Fleetbase\FleetOps\Notifications;
+
+use Fleetbase\FleetOps\Models\Order;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class RouteDeviation extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public static string $name = 'Route Deviation';
+    public static string $description = 'Notify when tracked vehicle location deviates from the active route beyond the configured threshold.';
+    public static string $package = 'fleet-ops';
+
+    public function __construct(public Order $order, public array $context = [])
+    {
+    }
+
+    public function via($notifiable): array
+    {
+        return ['mail', 'database'];
+    }
+
+    public function toMail($notifiable): MailMessage
+    {
+        $orderId = $this->order->tracking ?? $this->order->public_id;
+
+        return (new MailMessage())
+            ->subject("Route deviation detected for {$orderId}")
+            ->line("The vehicle assigned to order {$orderId} has deviated from the active route beyond the configured threshold.")
+            ->line('Please review the route and current vehicle position.');
+    }
+
+    public function toArray($notifiable): array
+    {
+        return [
+            'event'      => 'order.route_deviation',
+            'order_id'   => $this->order->public_id,
+            'order_uuid' => $this->order->uuid,
+            'context'    => $this->context,
+            'message'    => sprintf('The vehicle assigned to order %s has deviated from the active route beyond the configured threshold.', $this->order->tracking ?? $this->order->public_id),
+        ];
+    }
+}

package/server/src/Observers/ContactObserver.php

@@ -27,11 +27,19 @@ class ContactObserver
      */
     public function saving(Contact $contact)
     {
+        if ($contact->exists && $contact->getOriginal('type') === 'customer' && $contact->isDirty('type') && $contact->type !== 'customer') {
+            throw new \Exception('Customer contact type cannot be changed.');
+        }
+
         // Get the contacts assosciated user
         if ($contact->doesntHaveUser()) {
             $contact->createUser();
         }
 
+        if ($contact->isCustomer()) {
+            $contact->normalizeCustomerUser();
+        }
+
         // Validate email is available to user
         if (!empty($contact->email) && $contact->wasChanged('email') && $this->isEmailUnavailable($contact)) {
             throw new \Exception('Email attempting to update for ' . $contact->type . ' is not available.');