@fleetbase/fleetops-engine 0.6.54 → 0.6.56

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

@@ -24,7 +24,7 @@ class DeviceEventController extends FleetOpsController
      */
     public static function onQueryRecord($query, $request): void
     {
-        $query->with(['device']);
+        $query->with(['device.telematic']);
 
         if ($request->filled('telematic')) {
             $query->whereHas('device', function ($deviceQuery) use ($request) {

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

@@ -2,9 +2,12 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
+use Fleetbase\FleetOps\Exports\EquipmentExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Imports\EquipmentImport;
+use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
+use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 
 class EquipmentController extends FleetOpsController
@@ -16,6 +19,20 @@ class EquipmentController extends FleetOpsController
      */
     public $resource = 'equipment';
 
+    /**
+     * Export equipment to excel or csv.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function export(ExportRequest $request)
+    {
+        $format     = $request->input('format', 'xlsx');
+        $selections = $request->array('selections');
+        $fileName   = trim(Str::slug('equipment-' . date('Y-m-d-H:i')) . '.' . $format);
+
+        return Excel::download(new EquipmentExport($selections), $fileName);
+    }
+
     /**
      * Process import files (excel, csv) into Equipment records.
      *

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

@@ -148,7 +148,7 @@ class LiveController extends Controller
 
         return LiveCacheService::remember('drivers', $cacheParams, function () use ($bounds, $limit) {
             $query = Driver::where(['company_uuid' => session('company')])
-                ->with(['user', 'vehicle'])
+                ->with(['user', 'vehicle.devices'])
                 ->applyDirectivesForPermissions('fleet-ops list driver');
 
             $this->applyLiveLocationGuards($query);

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

@@ -2,12 +2,15 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
+use Fleetbase\FleetOps\Exports\MaintenanceExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Imports\MaintenanceImport;
 use Fleetbase\FleetOps\Models\Maintenance;
+use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 
 class MaintenanceController extends FleetOpsController
@@ -19,6 +22,20 @@ class MaintenanceController extends FleetOpsController
      */
     public $resource = 'maintenance';
 
+    /**
+     * Export maintenances to excel or csv.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function export(ExportRequest $request)
+    {
+        $format     = $request->input('format', 'xlsx');
+        $selections = $request->array('selections');
+        $fileName   = trim(Str::slug('maintenances-' . date('Y-m-d-H:i')) . '.' . $format);
+
+        return Excel::download(new MaintenanceExport($selections), $fileName);
+    }
+
     /**
      * Eager-load polymorphic relationships after create so they appear in the API response.
      * Called automatically by HasApiControllerBehavior::createRecord() via getControllerCallback.

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

@@ -2,15 +2,18 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
+use Fleetbase\FleetOps\Exports\MaintenanceScheduleExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Imports\MaintenanceScheduleImport;
 use Fleetbase\FleetOps\Models\MaintenanceSchedule;
 use Fleetbase\FleetOps\Models\WorkOrder;
+use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 use Spatie\IcalendarGenerator\Components\Calendar;
 use Spatie\IcalendarGenerator\Components\Event;
@@ -26,6 +29,20 @@ class MaintenanceScheduleController extends FleetOpsController
      */
     public $resource = 'maintenance-schedule';
 
+    /**
+     * Export maintenance schedules to excel or csv.
+     *
+     * @return Response
+     */
+    public function export(ExportRequest $request)
+    {
+        $format     = $request->input('format', 'xlsx');
+        $selections = $request->array('selections');
+        $fileName   = trim(Str::slug('maintenance-schedules-' . date('Y-m-d-H:i')) . '.' . $format);
+
+        return Excel::download(new MaintenanceScheduleExport($selections), $fileName);
+    }
+
     /**
      * Process import files (excel, csv) into MaintenanceSchedule records.
      *

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

@@ -2,9 +2,12 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
+use Fleetbase\FleetOps\Exports\PartExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Imports\PartImport;
+use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
+use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 
 class PartController extends FleetOpsController
@@ -16,6 +19,20 @@ class PartController extends FleetOpsController
      */
     public $resource = 'part';
 
+    /**
+     * Export parts to excel or csv.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function export(ExportRequest $request)
+    {
+        $format     = $request->input('format', 'xlsx');
+        $selections = $request->array('selections');
+        $fileName   = trim(Str::slug('parts-' . date('Y-m-d-H:i')) . '.' . $format);
+
+        return Excel::download(new PartExport($selections), $fileName);
+    }
+
     /**
      * Process import files (excel, csv) into Part records.
      *

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

@@ -2,7 +2,11 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
+use Fleetbase\FleetOps\Exports\SensorExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+use Fleetbase\Http\Requests\ExportRequest;
+use Illuminate\Support\Str;
+use Maatwebsite\Excel\Facades\Excel;
 
 class SensorController extends FleetOpsController
 {
@@ -13,6 +17,20 @@ class SensorController extends FleetOpsController
      */
     public $resource = 'sensor';
 
+    /**
+     * Export sensors to excel or csv.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function export(ExportRequest $request)
+    {
+        $format     = $request->input('format', 'xlsx');
+        $selections = $request->array('selections');
+        $fileName   = trim(Str::slug('sensors-' . date('Y-m-d-H:i')) . '.' . $format);
+
+        return Excel::download(new SensorExport($selections), $fileName);
+    }
+
     /**
      * Query callback when querying record.
      *

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

@@ -8,6 +8,7 @@ use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Models\ServiceRate;
 use Fleetbase\Http\Requests\ExportRequest;
 use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 
@@ -27,24 +28,30 @@ class ServiceRateController extends FleetOpsController
      */
     public function getServicesForRoute(Request $request)
     {
-        $coordinates = explode(';', $request->input('coordinates')); // ex. 1.3621663,103.8845049;1.353151,103.86458
+        $coordinates = $request->input('coordinates');
 
-        // convert coordinates to points
-        $waypoints = collect($coordinates)->map(
-            function ($coord) {
-                $coord                  = explode(',', $coord);
-                [$latitude, $longitude] = $coord;
+        if (!is_string($coordinates) || trim($coordinates) === '') {
+            return response()->error('Route coordinates are required to query service rates.', 422);
+        }
 
-                return Point::fromText("POINT($longitude $latitude)", 4326);
-            }
-        );
+        $waypoints = $this->parseRouteCoordinates($coordinates);
+
+        if ($waypoints === null) {
+            return response()->error('Invalid route coordinates provided.', 422);
+        }
+
+        if ($waypoints->count() < 2) {
+            return response()->error('At least two route coordinates are required to query service rates.', 422);
+        }
 
-        $applicableServiceRates = ServiceRate::getServicableForWaypoints(
+        $serviceType = $this->normalizeOptionalQueryValue($request->input('service_type'));
+
+        $applicableServiceRates = $this->getServicableForWaypoints(
             $waypoints,
-            function ($query) use ($request) {
+            function ($query) use ($request, $serviceType) {
                 $query->where('company_uuid', $request->session()->get('company'));
-                if ($request->filled('service_type')) {
-                    $query->where('service_type', $request->input('service_type'));
+                if ($serviceType) {
+                    $query->where('service_type', $serviceType);
                 }
             }
         );
@@ -52,6 +59,68 @@ class ServiceRateController extends FleetOpsController
         return response()->json($applicableServiceRates);
     }
 
+    /**
+     * Parse semicolon-delimited latitude,longitude coordinate pairs.
+     */
+    protected function parseRouteCoordinates(string $coordinates): ?Collection
+    {
+        $coordinates = collect(explode(';', $coordinates))
+            ->map(fn ($coordinate) => trim($coordinate));
+
+        if ($coordinates->contains('')) {
+            return null;
+        }
+
+        $waypoints = $coordinates
+            ->map(function ($coordinate) {
+                $parts = array_map('trim', explode(',', $coordinate));
+
+                if (count($parts) !== 2) {
+                    return null;
+                }
+
+                [$latitude, $longitude] = $parts;
+
+                if (!is_numeric($latitude) || !is_numeric($longitude)) {
+                    return null;
+                }
+
+                return Point::fromText("POINT($longitude $latitude)", 4326);
+            });
+
+        if ($waypoints->contains(null)) {
+            return null;
+        }
+
+        return $waypoints->values();
+    }
+
+    /**
+     * Treat placeholder query-string values from the UI as absent.
+     */
+    protected function normalizeOptionalQueryValue($value): ?string
+    {
+        if (!is_string($value)) {
+            return null;
+        }
+
+        $value = trim($value);
+
+        if ($value === '' || in_array(strtolower($value), ['null', 'undefined'], true)) {
+            return null;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Resolve applicable service rates for route waypoints.
+     */
+    protected function getServicableForWaypoints(Collection $waypoints, \Closure $queryCallback): array
+    {
+        return ServiceRate::getServicableForWaypoints($waypoints, $queryCallback);
+    }
+
     /**
      * Export the service rate to excel or csv.
      *

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

@@ -327,12 +327,16 @@ class SettingController extends Controller
     public function getMapSettings()
     {
         $defaults = [
-            'mapProvider' => 'leaflet',
+            'mapProvider'                 => 'leaflet',
+            'googleMapsMapType'           => 'roadmap',
+            'showGoogleMapsTrafficLayer'  => false,
+            'showGoogleMapsTransitLayer'  => false,
         ];
 
         $systemMapSettings          = Setting::lookup('fleet-ops.map-settings', []);
         $mapSettings                = Setting::lookupFromCompany('fleet-ops.map-settings', $defaults);
         $mapSettings['mapProvider'] = data_get($mapSettings, 'mapProvider') ?: data_get($systemMapSettings, 'mapProvider', 'leaflet');
+        $mapSettings                = $this->normalizeCompanyMapSettings($mapSettings);
 
         // Source the Google Maps API key from the system-level services config
         // that is managed by the core-api admin settings panel. This ensures a
@@ -362,10 +366,7 @@ class SettingController extends Controller
         unset($settings['googleMapsApiKey']);
 
         // Validate provider value
-        $allowedProviders = ['leaflet', 'google'];
-        if (isset($settings['mapProvider']) && !in_array($settings['mapProvider'], $allowedProviders)) {
-            $settings['mapProvider'] = 'leaflet';
-        }
+        $settings = $this->normalizeCompanyMapSettings($settings);
 
         Setting::configureCompany('fleet-ops.map-settings', $settings);
 
@@ -400,6 +401,29 @@ class SettingController extends Controller
         return response()->json($this->getAdminMapSettings()->getData(true));
     }
 
+    protected function normalizeCompanyMapSettings(array $settings): array
+    {
+        $allowedProviders = ['leaflet', 'google'];
+        $mapProvider      = data_get($settings, 'mapProvider', 'leaflet');
+        if (!in_array($mapProvider, $allowedProviders)) {
+            $mapProvider = 'leaflet';
+        }
+
+        $allowedGoogleMapTypes = ['roadmap', 'satellite', 'hybrid', 'terrain'];
+        $googleMapsMapType     = data_get($settings, 'googleMapsMapType', 'roadmap');
+        if (!in_array($googleMapsMapType, $allowedGoogleMapTypes)) {
+            $googleMapsMapType = 'roadmap';
+        }
+
+        return [
+            ...$settings,
+            'mapProvider'                => $mapProvider,
+            'googleMapsMapType'          => $googleMapsMapType,
+            'showGoogleMapsTrafficLayer' => filter_var(data_get($settings, 'showGoogleMapsTrafficLayer', false), FILTER_VALIDATE_BOOLEAN),
+            'showGoogleMapsTransitLayer' => filter_var(data_get($settings, 'showGoogleMapsTransitLayer', false), FILTER_VALIDATE_BOOLEAN),
+        ];
+    }
+
     /**
      * Retrieve driver scheduling settings for the current company.
      *

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

@@ -2,13 +2,17 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
+use Fleetbase\FleetOps\Exports\TelematicExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Models\Telematic;
 use Fleetbase\FleetOps\Support\Telematics\TelematicProviderRegistry;
 use Fleetbase\FleetOps\Support\Telematics\TelematicService;
+use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Models\Activity;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Str;
+use Maatwebsite\Excel\Facades\Excel;
 
 class TelematicController extends FleetOpsController
 {
@@ -29,6 +33,20 @@ class TelematicController extends FleetOpsController
         $this->registry          = $registry;
     }
 
+    /**
+     * Export telematics to excel or csv.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function export(ExportRequest $request)
+    {
+        $format     = $request->input('format', 'xlsx');
+        $selections = $request->array('selections');
+        $fileName   = trim(Str::slug('telematics-' . date('Y-m-d-H:i')) . '.' . $format);
+
+        return Excel::download(new TelematicExport($selections), $fileName);
+    }
+
     /**
      * Query callback when querying record.
      *

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

@@ -2,13 +2,16 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
+use Fleetbase\FleetOps\Exports\WorkOrderExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
 use Fleetbase\FleetOps\Imports\WorkOrderImport;
 use Fleetbase\FleetOps\Mail\WorkOrderDispatched;
 use Fleetbase\FleetOps\Models\WorkOrder;
+use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 
 class WorkOrderController extends FleetOpsController
@@ -20,6 +23,20 @@ class WorkOrderController extends FleetOpsController
      */
     public $resource = 'work-order';
 
+    /**
+     * Export work orders to excel or csv.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function export(ExportRequest $request)
+    {
+        $format     = $request->input('format', 'xlsx');
+        $selections = $request->array('selections');
+        $fileName   = trim(Str::slug('work-orders-' . date('Y-m-d-H:i')) . '.' . $format);
+
+        return Excel::download(new WorkOrderExport($selections), $fileName);
+    }
+
     /**
      * Process import files (excel, csv) into WorkOrder records.
      *

package/server/src/Http/Filter/DeviceEventFilter.php

@@ -26,6 +26,27 @@ class DeviceEventFilter extends Filter
         $this->builder->search($searchQuery);
     }
 
+    public function eventType(?string $eventType)
+    {
+        if ($eventType) {
+            $this->builder->where('event_type', 'like', '%' . $eventType . '%');
+        }
+    }
+
+    public function provider(?string $provider)
+    {
+        if ($provider) {
+            $this->builder->where('provider', 'like', '%' . $provider . '%');
+        }
+    }
+
+    public function code(?string $code)
+    {
+        if ($code) {
+            $this->builder->where('code', 'like', '%' . $code . '%');
+        }
+    }
+
     public function telematic(?string $telematic)
     {
         $this->builder->whereHas('device', function ($query) use ($telematic) {

package/server/src/Http/Filter/DeviceFilter.php

@@ -2,8 +2,11 @@
 
 namespace Fleetbase\FleetOps\Http\Filter;
 
+use Fleetbase\FleetOps\Models\Telematic;
+use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Filter\Filter;
+use Fleetbase\Support\Http;
 
 class DeviceFilter extends Filter
 {
@@ -38,9 +41,25 @@ class DeviceFilter extends Filter
         }
     }
 
+    public function type(string|array|null $type)
+    {
+        $type = Utils::arrayFrom($type);
+
+        if ($type) {
+            $this->builder->whereIn('type', $type);
+        }
+    }
+
+    public function serialNumber(?string $serialNumber)
+    {
+        if ($serialNumber) {
+            $this->builder->where('serial_number', 'like', '%' . $serialNumber . '%');
+        }
+    }
+
     public function telematic(?string $telematic)
     {
-        $this->builder->where('telematic_uuid', $telematic);
+        $this->wherePublicRelation('telematic_uuid', Telematic::class, $telematic);
     }
 
     public function telematicUuid(?string $telematic)
@@ -70,9 +89,7 @@ class DeviceFilter extends Filter
 
     public function vehicle(?string $vehicle)
     {
-        if ($vehicle) {
-            $this->builder->where('attachable_uuid', $vehicle);
-        }
+        $this->wherePublicRelation('attachable_uuid', Vehicle::class, $vehicle);
     }
 
     public function connectionStatus(string|array $connectionStatus)
@@ -128,4 +145,33 @@ class DeviceFilter extends Filter
             $this->builder->whereDate($column, $dates);
         }
     }
+
+    protected function wherePublicRelation(string $column, string $modelClass, ?string $identifier): void
+    {
+        if (!$identifier) {
+            return;
+        }
+
+        $this->builder->whereIn($column, $this->resolvePublicRelationUuids($modelClass, $identifier, Http::isInternalRequest($this->request)));
+    }
+
+    protected function resolvePublicRelationUuids(string $modelClass, string $identifier, bool $allowUuid = false)
+    {
+        $instance = new $modelClass();
+
+        return $modelClass::query()
+            ->where('company_uuid', $this->session->get('company'))
+            ->where(function ($query) use ($identifier, $instance, $allowUuid) {
+                $query->where('public_id', $identifier);
+
+                if (in_array('internal_id', $instance->getFillable())) {
+                    $query->orWhere('internal_id', $identifier);
+                }
+
+                if ($allowUuid) {
+                    $query->orWhere('uuid', $identifier);
+                }
+            })
+            ->pluck('uuid');
+    }
 }

package/server/src/Http/Filter/EquipmentFilter.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\Http\Filter\Filter;
+
+class EquipmentFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function queryForPublic()
+    {
+        $this->queryForInternal();
+    }
+
+    public function query(?string $searchQuery)
+    {
+        $this->builder->search($searchQuery);
+    }
+}

package/server/src/Http/Filter/FuelProviderTransactionFilter.php

@@ -2,8 +2,14 @@
 
 namespace Fleetbase\FleetOps\Http\Filter;
 
+use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\FleetOps\Models\FuelProviderConnection;
+use Fleetbase\FleetOps\Models\FuelReport;
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Filter\Filter;
+use Fleetbase\Support\Http;
 use Illuminate\Support\Str;
 
 class FuelProviderTransactionFilter extends Filter
@@ -13,6 +19,11 @@ class FuelProviderTransactionFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function queryForPublic()
+    {
+        $this->queryForInternal();
+    }
+
     public function query(?string $searchQuery)
     {
         $this->builder->search($searchQuery);
@@ -38,12 +49,27 @@ class FuelProviderTransactionFilter extends Filter
 
     public function vehicle(?string $vehicle)
     {
-        $this->builder->where('vehicle_uuid', $vehicle);
+        $this->wherePublicRelation('vehicle_uuid', Vehicle::class, $vehicle);
     }
 
     public function connection(?string $connection)
     {
-        $this->builder->where('fuel_provider_connection_uuid', $connection);
+        $this->wherePublicRelation('fuel_provider_connection_uuid', FuelProviderConnection::class, $connection);
+    }
+
+    public function driver(?string $driver)
+    {
+        $this->wherePublicRelation('driver_uuid', Driver::class, $driver);
+    }
+
+    public function order(?string $order)
+    {
+        $this->wherePublicRelation('order_uuid', Order::class, $order);
+    }
+
+    public function fuelReport(?string $fuelReport)
+    {
+        $this->wherePublicRelation('fuel_report_uuid', FuelReport::class, $fuelReport);
     }
 
     public function transactionAt($transactionAt)
@@ -56,4 +82,33 @@ class FuelProviderTransactionFilter extends Filter
             $this->builder->whereDate('transaction_at', $transactionAt);
         }
     }
+
+    protected function wherePublicRelation(string $column, string $modelClass, ?string $identifier): void
+    {
+        if (!$identifier) {
+            return;
+        }
+
+        $this->builder->whereIn($column, $this->resolvePublicRelationUuids($modelClass, $identifier, Http::isInternalRequest($this->request)));
+    }
+
+    protected function resolvePublicRelationUuids(string $modelClass, string $identifier, bool $allowUuid = false)
+    {
+        $instance = new $modelClass();
+
+        return $modelClass::query()
+            ->where('company_uuid', $this->session->get('company'))
+            ->where(function ($query) use ($identifier, $instance, $allowUuid) {
+                $query->where('public_id', $identifier);
+
+                if (in_array('internal_id', $instance->getFillable())) {
+                    $query->orWhere('internal_id', $identifier);
+                }
+
+                if ($allowUuid) {
+                    $query->orWhere('uuid', $identifier);
+                }
+            })
+            ->pluck('uuid');
+    }
 }