@fleetbase/fleetops-engine 0.6.51 → 0.6.53
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -2
- package/addon/components/cell/telematic-provider.hbs +16 -0
- package/addon/components/cell/telematic-provider.js +36 -0
- package/addon/components/cell/telematic-status.hbs +1 -0
- package/addon/components/cell/telematic-status.js +39 -0
- package/addon/components/device/manager.hbs +5 -6
- package/addon/components/device/manager.js +12 -15
- package/addon/components/driver/details.hbs +1 -1
- package/addon/components/fleet/vehicle-listing.js +1 -0
- package/addon/components/fuel-integration/form.hbs +200 -0
- package/addon/components/fuel-integration/form.js +242 -0
- package/addon/components/fuel-integration/hub.hbs +154 -0
- package/addon/components/fuel-integration/hub.js +165 -0
- package/addon/components/fuel-integration/matching-priority.hbs +76 -0
- package/addon/components/fuel-integration/matching-priority.js +145 -0
- package/addon/components/fuel-report/details.hbs +13 -1
- package/addon/components/issue/details.hbs +3 -57
- package/addon/components/issue/details.js +0 -96
- package/addon/components/layout/fleet-ops-sidebar/operations-monitor.hbs +201 -0
- package/addon/components/layout/fleet-ops-sidebar/operations-monitor.js +589 -0
- package/addon/components/layout/fleet-ops-sidebar.hbs +19 -233
- package/addon/components/layout/fleet-ops-sidebar.js +287 -376
- package/addon/components/maintenance-schedule/form.js +1 -0
- package/addon/components/map/drawer/device-event-listing.hbs +12 -2
- package/addon/components/map/drawer/driver-listing.hbs +14 -1
- package/addon/components/map/drawer/place-listing.hbs +14 -1
- package/addon/components/map/drawer/position-listing.hbs +12 -2
- package/addon/components/map/drawer/vehicle-listing.hbs +14 -1
- package/addon/components/modals/assigned-orders.hbs +40 -0
- package/addon/components/modals/attach-device.hbs +4 -3
- package/addon/components/modals/attach-telematic-device.hbs +25 -0
- package/addon/components/modals/attach-telematic-device.js +3 -0
- package/addon/components/modals/driver-assign-order.hbs +7 -58
- package/addon/components/modals/driver-assign-vehicle.hbs +10 -2
- package/addon/components/modals/fleet-assign-driver.hbs +18 -0
- package/addon/components/modals/fleet-assign-driver.js +3 -0
- package/addon/components/modals/fleet-assign-vehicle.hbs +18 -0
- package/addon/components/modals/fleet-assign-vehicle.js +3 -0
- package/addon/components/modals/telematic-connection-diagnostics.hbs +75 -0
- package/addon/components/modals/telematic-connection-diagnostics.js +287 -0
- package/addon/components/modals/vehicle-details.hbs +6 -1
- package/addon/components/modals/vehicle-form.hbs +8 -1
- package/addon/components/order/card.hbs +106 -0
- package/addon/components/order/card.js +257 -0
- package/addon/components/order/form/payload.js +3 -1
- package/addon/components/order/form/service-rate.hbs +2 -0
- package/addon/components/service-rate/form.hbs +3 -2
- package/addon/components/telematic/details.hbs +98 -87
- package/addon/components/telematic/details.js +230 -1
- package/addon/components/telematic/form.hbs +303 -72
- package/addon/components/telematic/form.js +519 -3
- package/addon/components/telematic/hub.hbs +149 -0
- package/addon/components/telematic/hub.js +142 -0
- package/addon/components/telematic/settings.hbs +152 -0
- package/addon/components/telematic/settings.js +45 -0
- package/addon/components/telematic/tab-empty-state.hbs +29 -0
- package/addon/components/telematic/tab-empty-state.js +33 -0
- package/addon/components/vehicle/details.hbs +6 -1
- package/addon/components/vehicle/form.hbs +2 -1
- package/addon/components/widget/fuel-providers.hbs +43 -0
- package/addon/components/widget/fuel-providers.js +27 -0
- package/addon/controllers/connectivity/devices/index/details.js +27 -1
- package/addon/controllers/connectivity/devices/index.js +18 -1
- package/addon/controllers/connectivity/fuel-providers/details/sync.js +18 -0
- package/addon/controllers/connectivity/fuel-providers/details/transactions.js +24 -0
- package/addon/controllers/connectivity/fuel-providers/details.js +69 -0
- package/addon/controllers/connectivity/fuel-providers/edit.js +24 -0
- package/addon/controllers/connectivity/fuel-providers/index.js +177 -0
- package/addon/controllers/connectivity/fuel-providers/new.js +37 -0
- package/addon/controllers/connectivity/telematics/details/attachments.js +247 -0
- package/addon/controllers/connectivity/telematics/details/devices.js +368 -0
- package/addon/controllers/connectivity/telematics/details/events.js +244 -0
- package/addon/controllers/connectivity/telematics/details/index.js +3 -0
- package/addon/controllers/connectivity/telematics/details/logs.js +43 -0
- package/addon/controllers/connectivity/telematics/details/sensors.js +270 -0
- package/addon/controllers/connectivity/telematics/details.js +149 -0
- package/addon/controllers/connectivity/telematics/{index/edit.js → edit.js} +15 -4
- package/addon/controllers/connectivity/telematics/index.js +25 -5
- package/addon/controllers/connectivity/telematics/{index/new.js → new.js} +8 -2
- package/addon/controllers/maintenance/index.js +100 -0
- package/addon/controllers/management/drivers/index/details.js +78 -1
- package/addon/controllers/management/drivers/index.js +39 -0
- package/addon/controllers/management/fleets/index/details.js +23 -1
- package/addon/controllers/management/fleets/index.js +6 -1
- package/addon/controllers/management/fuel-reports/index.js +37 -1
- package/addon/controllers/management/fuel-transactions/index/details.js +70 -0
- package/addon/controllers/management/fuel-transactions/index.js +240 -0
- package/addon/controllers/management/index.js +88 -0
- package/addon/controllers/management/vehicles/index/details.js +32 -0
- package/addon/controllers/management/vehicles/index.js +26 -0
- package/addon/controllers/operations/orders/index.js +4 -0
- package/addon/controllers/settings/index.js +142 -0
- package/addon/controllers/settings/payments/index.js +5 -0
- package/addon/extension.js +31 -0
- package/addon/routes/analytics/index.js +3 -0
- package/addon/routes/connectivity/devices/index.js +3 -0
- package/addon/routes/connectivity/fuel-providers/details/index.js +7 -0
- package/addon/routes/connectivity/fuel-providers/details/matching.js +7 -0
- package/addon/routes/connectivity/fuel-providers/details/settings.js +7 -0
- package/addon/routes/connectivity/fuel-providers/details/sync.js +18 -0
- package/addon/routes/connectivity/fuel-providers/details/transactions.js +14 -0
- package/addon/routes/connectivity/fuel-providers/details.js +18 -0
- package/addon/routes/connectivity/fuel-providers/edit.js +18 -0
- package/addon/routes/connectivity/fuel-providers/index.js +20 -0
- package/addon/routes/connectivity/fuel-providers/new.js +3 -0
- package/addon/routes/connectivity/fuel-providers.js +3 -0
- package/addon/routes/connectivity/telematics/details/attachments.js +28 -0
- package/addon/routes/connectivity/telematics/details/devices.js +30 -0
- package/addon/routes/connectivity/telematics/details/events.js +33 -0
- package/addon/routes/connectivity/telematics/details/index.js +3 -0
- package/addon/routes/connectivity/telematics/details/logs.js +17 -0
- package/addon/routes/connectivity/telematics/details/sensors.js +29 -0
- package/addon/routes/connectivity/telematics/{index/details.js → details.js} +1 -1
- package/addon/routes/connectivity/telematics/{index/edit.js → edit.js} +1 -1
- package/addon/routes/connectivity/telematics/new.js +3 -0
- package/addon/routes/maintenance/index.js +3 -0
- package/addon/routes/maintenance/work-orders/index.js +2 -0
- package/addon/routes/management/drivers/index/details/activity.js +3 -0
- package/addon/routes/management/fuel-reports/index.js +2 -0
- package/addon/routes/management/fuel-transactions/index/details.js +18 -0
- package/addon/routes/management/fuel-transactions/index.js +21 -0
- package/addon/routes/management/fuel-transactions.js +3 -0
- package/addon/routes/settings/index.js +3 -0
- package/addon/routes.js +28 -9
- package/addon/services/device-actions.js +64 -1
- package/addon/services/device-event-actions.js +12 -1
- package/addon/services/driver-actions.js +147 -11
- package/addon/services/fleet-actions.js +66 -1
- package/addon/services/fuel-integration-actions.js +31 -0
- package/addon/services/issue-actions.js +1 -1
- package/addon/services/telematic-actions.js +9 -3
- package/addon/services/vehicle-actions.js +125 -0
- package/addon/styles/fleetops-engine.css +2237 -162
- package/addon/templates/analytics/index.hbs +14 -0
- package/addon/templates/analytics/reports/index.hbs +19 -1
- package/addon/templates/connectivity/devices/index.hbs +19 -1
- package/addon/templates/connectivity/events/index.hbs +16 -1
- package/addon/templates/connectivity/fuel-providers/details/index.hbs +38 -0
- package/addon/templates/connectivity/fuel-providers/details/matching.hbs +13 -0
- package/addon/templates/connectivity/fuel-providers/details/settings.hbs +11 -0
- package/addon/templates/connectivity/fuel-providers/details/sync.hbs +48 -0
- package/addon/templates/connectivity/fuel-providers/details/transactions.hbs +21 -0
- package/addon/templates/connectivity/fuel-providers/details.hbs +51 -0
- package/addon/templates/connectivity/fuel-providers/edit.hbs +24 -0
- package/addon/templates/connectivity/fuel-providers/index.hbs +12 -0
- package/addon/templates/connectivity/fuel-providers/new.hbs +22 -0
- package/addon/templates/connectivity/fuel-providers.hbs +1 -0
- package/addon/templates/connectivity/sensors/index.hbs +19 -1
- package/addon/templates/connectivity/telematics/details/attachments.hbs +163 -0
- package/addon/templates/connectivity/telematics/details/devices.hbs +88 -0
- package/addon/templates/connectivity/telematics/details/events.hbs +101 -0
- package/addon/templates/connectivity/telematics/{index/details → details}/index.hbs +0 -1
- package/addon/templates/connectivity/telematics/details/logs.hbs +69 -0
- package/addon/templates/connectivity/telematics/details/sensors.hbs +88 -0
- package/addon/templates/connectivity/telematics/details.hbs +53 -0
- package/addon/templates/connectivity/telematics/edit.hbs +27 -0
- package/addon/templates/connectivity/telematics/index.hbs +6 -8
- package/addon/templates/connectivity/telematics/new.hbs +24 -0
- package/addon/templates/maintenance/equipment/index.hbs +19 -1
- package/addon/templates/maintenance/index.hbs +113 -0
- package/addon/templates/maintenance/maintenances/index.hbs +15 -1
- package/addon/templates/maintenance/parts/index.hbs +19 -1
- package/addon/templates/maintenance/schedules/index.hbs +19 -1
- package/addon/templates/maintenance/work-orders/index.hbs +19 -1
- package/addon/templates/management/contacts/customers.hbs +15 -1
- package/addon/templates/management/contacts/index.hbs +19 -1
- package/addon/templates/management/drivers/index/details/activity.hbs +1 -0
- package/addon/templates/management/drivers/index.hbs +19 -1
- package/addon/templates/management/fleets/index.hbs +19 -1
- package/addon/templates/management/fuel-reports/index.hbs +19 -1
- package/addon/templates/management/fuel-transactions/index/details.hbs +73 -0
- package/addon/templates/management/fuel-transactions/index.hbs +58 -0
- package/addon/templates/management/fuel-transactions.hbs +1 -0
- package/addon/templates/management/index.hbs +109 -73
- package/addon/templates/management/issues/index.hbs +19 -1
- package/addon/templates/management/places/index.hbs +19 -1
- package/addon/templates/management/vehicles/index.hbs +19 -1
- package/addon/templates/management/vendors/index.hbs +19 -1
- package/addon/templates/management/vendors/integrated.hbs +13 -1
- package/addon/templates/operations/orders/index.hbs +19 -1
- package/addon/templates/operations/service-rates/index.hbs +19 -1
- package/addon/templates/settings/index.hbs +83 -0
- package/addon/templates/settings/payments/index.hbs +15 -1
- package/addon/templates/settings/routing.hbs +2 -2
- package/addon/utils/fleet-ops-options.js +3 -0
- package/app/components/cell/telematic-provider.js +1 -0
- package/app/components/cell/telematic-status.js +1 -0
- package/app/components/fuel-integration/form.js +1 -0
- package/app/components/fuel-integration/hub.js +1 -0
- package/app/components/fuel-integration/matching-priority.js +1 -0
- package/app/components/modals/assigned-orders.js +1 -0
- package/app/components/modals/attach-telematic-device.js +1 -0
- package/app/components/modals/fleet-assign-driver.js +1 -0
- package/app/components/modals/fleet-assign-vehicle.js +1 -0
- package/app/components/modals/telematic-connection-diagnostics.js +1 -0
- package/app/components/order/card.js +1 -0
- package/app/components/telematic/hub.js +1 -0
- package/app/components/telematic/settings.js +1 -0
- package/app/components/telematic/tab-empty-state.js +1 -0
- package/app/components/widget/fuel-providers.js +1 -0
- package/app/controllers/connectivity/fuel-providers/details/sync.js +1 -0
- package/app/controllers/connectivity/{telematics/index/details/devices.js → fuel-providers/details/transactions.js} +1 -1
- package/app/controllers/connectivity/{telematics/index → fuel-providers}/details.js +1 -1
- package/app/controllers/connectivity/{telematics/index → fuel-providers}/edit.js +1 -1
- package/app/controllers/connectivity/{telematics/index/details → fuel-providers}/index.js +1 -1
- package/app/controllers/connectivity/{telematics/index → fuel-providers}/new.js +1 -1
- package/app/controllers/connectivity/telematics/details/attachments.js +1 -0
- package/app/controllers/connectivity/telematics/details/devices.js +1 -0
- package/app/controllers/connectivity/telematics/details/events.js +1 -0
- package/app/controllers/connectivity/telematics/details/index.js +1 -0
- package/app/controllers/connectivity/telematics/details/logs.js +1 -0
- package/app/controllers/connectivity/telematics/details/sensors.js +1 -0
- package/app/controllers/connectivity/telematics/details.js +1 -0
- package/app/controllers/connectivity/telematics/edit.js +1 -0
- package/app/controllers/connectivity/telematics/new.js +1 -0
- package/app/controllers/maintenance/index.js +1 -0
- package/app/controllers/management/fuel-transactions/index/details.js +1 -0
- package/app/controllers/management/fuel-transactions/index.js +1 -0
- package/app/controllers/management/index.js +1 -0
- package/app/controllers/settings/index.js +1 -0
- package/app/routes/analytics/index.js +1 -0
- package/app/routes/connectivity/{telematics/index → fuel-providers}/details/index.js +1 -1
- package/app/routes/connectivity/{telematics/index/details/events.js → fuel-providers/details/matching.js} +1 -1
- package/app/routes/connectivity/fuel-providers/details/settings.js +1 -0
- package/app/routes/connectivity/fuel-providers/details/sync.js +1 -0
- package/app/routes/connectivity/{telematics/index/details/devices.js → fuel-providers/details/transactions.js} +1 -1
- package/app/routes/connectivity/{telematics/index → fuel-providers}/details.js +1 -1
- package/app/routes/connectivity/{telematics/index → fuel-providers}/edit.js +1 -1
- package/app/routes/connectivity/fuel-providers/index.js +1 -0
- package/app/routes/connectivity/{telematics/index → fuel-providers}/new.js +1 -1
- package/app/routes/connectivity/fuel-providers.js +1 -0
- package/app/routes/connectivity/telematics/details/attachments.js +1 -0
- package/app/routes/connectivity/telematics/details/devices.js +1 -0
- package/app/routes/connectivity/telematics/details/events.js +1 -0
- package/app/routes/connectivity/telematics/details/index.js +1 -0
- package/app/routes/connectivity/telematics/details/logs.js +1 -0
- package/app/routes/connectivity/telematics/details/sensors.js +1 -0
- package/app/routes/connectivity/telematics/details.js +1 -0
- package/app/routes/connectivity/telematics/edit.js +1 -0
- package/app/routes/connectivity/telematics/new.js +1 -0
- package/app/routes/maintenance/index.js +1 -0
- package/app/routes/management/drivers/index/details/activity.js +1 -0
- package/app/routes/management/fuel-transactions/index/details.js +1 -0
- package/app/routes/management/fuel-transactions/index.js +1 -0
- package/app/routes/management/fuel-transactions.js +1 -0
- package/app/routes/settings/index.js +1 -0
- package/app/services/fuel-integration-actions.js +1 -0
- package/app/templates/analytics/index.js +1 -0
- package/app/templates/connectivity/{telematics/index → fuel-providers}/details/index.js +1 -1
- package/app/templates/connectivity/{telematics/index/details/events.js → fuel-providers/details/matching.js} +1 -1
- package/app/templates/connectivity/fuel-providers/details/settings.js +1 -0
- package/app/templates/connectivity/fuel-providers/details/sync.js +1 -0
- package/app/templates/connectivity/{telematics/index/details/devices.js → fuel-providers/details/transactions.js} +1 -1
- package/app/templates/connectivity/{telematics/index → fuel-providers}/details.js +1 -1
- package/app/templates/connectivity/{telematics/index → fuel-providers}/edit.js +1 -1
- package/app/templates/connectivity/fuel-providers/index.js +1 -0
- package/app/templates/connectivity/{telematics/index → fuel-providers}/new.js +1 -1
- package/app/templates/connectivity/fuel-providers.js +1 -0
- package/app/templates/connectivity/telematics/details/attachments.js +1 -0
- package/app/templates/connectivity/telematics/details/devices.js +1 -0
- package/app/templates/connectivity/telematics/details/events.js +1 -0
- package/app/templates/connectivity/telematics/details/index.js +1 -0
- package/app/templates/connectivity/telematics/details/logs.js +1 -0
- package/app/templates/connectivity/telematics/details/sensors.js +1 -0
- package/app/templates/connectivity/telematics/details.js +1 -0
- package/app/templates/connectivity/telematics/edit.js +1 -0
- package/app/templates/connectivity/telematics/new.js +1 -0
- package/app/templates/maintenance/index.js +1 -0
- package/app/templates/management/drivers/index/details/activity.js +1 -0
- package/app/templates/management/fuel-transactions/index/details.js +1 -0
- package/app/templates/management/fuel-transactions/index.js +1 -0
- package/app/templates/management/fuel-transactions.js +1 -0
- package/app/templates/management/index.js +1 -0
- package/app/templates/settings/index.js +1 -0
- package/assets/images/telematics/providers/afaqy.webp +0 -0
- package/assets/images/telematics/providers/default.webp +0 -0
- package/assets/images/telematics/providers/flespi.webp +0 -0
- package/assets/images/telematics/providers/geotab.webp +0 -0
- package/assets/images/telematics/providers/safee.webp +0 -0
- package/assets/images/telematics/providers/samsara.webp +0 -0
- package/composer.json +1 -1
- package/extension.json +1 -1
- package/package.json +4 -4
- package/server/config/fuel-providers.php +42 -0
- package/server/config/telematics.php +139 -130
- package/server/migrations/2026_06_06_000001_harden_device_events_telematics_contract.php +59 -0
- package/server/migrations/2026_06_08_000001_create_fuel_provider_connections_table.php +37 -0
- package/server/migrations/2026_06_08_000002_create_fuel_provider_transactions_table.php +53 -0
- package/server/migrations/2026_06_08_000003_create_fuel_provider_sync_runs_table.php +40 -0
- package/server/migrations/2026_06_10_000001_add_fuel_card_number_to_vehicles_table.php +25 -0
- package/server/migrations/2026_06_10_000002_add_vehicle_identity_columns_to_fuel_provider_transactions_table.php +39 -0
- package/server/migrations/2026_06_15_000001_normalize_device_attachable_vehicle_morph_types.php +30 -0
- package/server/src/Console/Commands/FixInvalidPolymorphicRelationTypeNamespaces.php +1 -0
- package/server/src/Contracts/FuelProvider.php +30 -0
- package/server/src/Contracts/TelematicProviderDescriptor.php +3 -1
- package/server/src/Events/FuelProviderTransactionImported.php +17 -0
- package/server/src/Events/FuelProviderTransactionMatched.php +17 -0
- package/server/src/Events/FuelProviderTransactionUnmatched.php +17 -0
- package/server/src/Events/FuelReportCreatedFromProvider.php +18 -0
- package/server/src/Http/Controllers/Internal/v1/AnalyticsController.php +6 -0
- package/server/src/Http/Controllers/Internal/v1/DeviceController.php +140 -2
- package/server/src/Http/Controllers/Internal/v1/DeviceEventController.php +44 -0
- package/server/src/Http/Controllers/Internal/v1/DriverController.php +158 -7
- package/server/src/Http/Controllers/Internal/v1/FuelProviderConnectionController.php +124 -0
- package/server/src/Http/Controllers/Internal/v1/FuelProviderSyncRunController.php +10 -0
- package/server/src/Http/Controllers/Internal/v1/FuelProviderTransactionController.php +76 -0
- package/server/src/Http/Controllers/Internal/v1/HubController.php +300 -0
- package/server/src/Http/Controllers/Internal/v1/SearchController.php +506 -0
- package/server/src/Http/Controllers/Internal/v1/SensorController.php +1 -1
- package/server/src/Http/Controllers/Internal/v1/TelematicController.php +179 -16
- package/server/src/Http/Controllers/Internal/v1/VehicleController.php +249 -0
- package/server/src/Http/Controllers/TelematicWebhookController.php +103 -19
- package/server/src/Http/Filter/DeviceFilter.php +74 -0
- package/server/src/Http/Filter/DriverFilter.php +6 -0
- package/server/src/Http/Filter/FuelProviderConnectionFilter.php +33 -0
- package/server/src/Http/Filter/FuelProviderSyncRunFilter.php +28 -0
- package/server/src/Http/Filter/FuelProviderTransactionFilter.php +59 -0
- package/server/src/Http/Filter/FuelReportFilter.php +10 -0
- package/server/src/Http/Filter/VehicleFilter.php +6 -0
- package/server/src/Http/Resources/v1/Driver.php +15 -0
- package/server/src/Http/Resources/v1/FuelProviderConnection.php +30 -0
- package/server/src/Http/Resources/v1/FuelProviderSyncRun.php +36 -0
- package/server/src/Http/Resources/v1/FuelProviderTransaction.php +54 -0
- package/server/src/Http/Resources/v1/FuelReport.php +28 -22
- package/server/src/Http/Resources/v1/Index/Driver.php +26 -20
- package/server/src/Http/Resources/v1/Index/Vehicle.php +29 -22
- package/server/src/Http/Resources/v1/Vehicle.php +17 -0
- package/server/src/Http/Resources/v1/VehicleWithoutDriver.php +2 -0
- package/server/src/Jobs/SyncFuelProviderTransactionsJob.php +57 -0
- package/server/src/Jobs/SyncTelematicDevicesJob.php +105 -17
- package/server/src/Jobs/TestTelematicConnectionJob.php +9 -22
- package/server/src/Models/Asset.php +2 -1
- package/server/src/Models/Contact.php +2 -1
- package/server/src/Models/Device.php +27 -4
- package/server/src/Models/DeviceEvent.php +40 -3
- package/server/src/Models/Driver.php +3 -2
- package/server/src/Models/Equipment.php +2 -1
- package/server/src/Models/Fleet.php +2 -1
- package/server/src/Models/FuelProviderConnection.php +60 -0
- package/server/src/Models/FuelProviderSyncRun.php +58 -0
- package/server/src/Models/FuelProviderTransaction.php +119 -0
- package/server/src/Models/FuelReport.php +16 -1
- package/server/src/Models/Part.php +2 -1
- package/server/src/Models/Sensor.php +21 -4
- package/server/src/Models/ServiceRate.php +39 -2
- package/server/src/Models/Vehicle.php +14 -2
- package/server/src/Models/Vendor.php +2 -1
- package/server/src/Providers/FleetOpsServiceProvider.php +20 -0
- package/server/src/Support/Analytics/FuelProviderSummary.php +42 -0
- package/server/src/Support/FuelProviders/FuelProviderDescriptor.php +55 -0
- package/server/src/Support/FuelProviders/FuelProviderRegistry.php +75 -0
- package/server/src/Support/FuelProviders/FuelProviderService.php +447 -0
- package/server/src/Support/FuelProviders/Providers/AbstractFuelProvider.php +98 -0
- package/server/src/Support/FuelProviders/Providers/PetroAppFuelProvider.php +167 -0
- package/server/src/Support/Telematics/Providers/AbstractProvider.php +27 -6
- package/server/src/Support/Telematics/Providers/AfaqyProvider.php +105 -38
- package/server/src/Support/Telematics/Providers/FlespiProvider.php +1 -0
- package/server/src/Support/Telematics/Providers/GeotabProvider.php +1 -0
- package/server/src/Support/Telematics/Providers/SafeeProvider.php +32 -22
- package/server/src/Support/Telematics/Providers/SamsaraProvider.php +3 -1
- package/server/src/Support/Telematics/TelematicService.php +340 -21
- package/server/src/routes.php +50 -4
- package/server/tests/FuelProviderRegistryTest.php +416 -0
- package/server/tests/HubRoutesTest.php +62 -0
- package/server/tests/ServiceRateAlgorithmWeightVariablesTest.php +44 -0
- package/server/tests/TelematicsHardeningTest.php +359 -0
- package/server/tests/VehicleDriverAssignmentTest.php +51 -0
- package/translations/ar-ae.yml +23 -1
- package/translations/bg-bg.yaml +72 -0
- package/translations/en-us.yaml +83 -0
- package/translations/es-pa.yaml +72 -0
- package/translations/fr-fr.yaml +72 -0
- package/translations/mn-mn.yaml +72 -0
- package/translations/pt-br.yaml +72 -0
- package/translations/ru-ru.yaml +72 -0
- package/translations/vi-vn.yaml +98 -1
- package/addon/controllers/connectivity/telematics/index/details/devices.js +0 -3
- package/addon/controllers/connectivity/telematics/index/details/events.js +0 -3
- package/addon/controllers/connectivity/telematics/index/details/index.js +0 -3
- package/addon/controllers/connectivity/telematics/index/details/sensors.js +0 -3
- package/addon/controllers/connectivity/telematics/index/details.js +0 -24
- package/addon/routes/connectivity/telematics/index/details/devices.js +0 -3
- package/addon/routes/connectivity/telematics/index/details/events.js +0 -3
- package/addon/routes/connectivity/telematics/index/details/index.js +0 -3
- package/addon/routes/connectivity/telematics/index/details/sensors.js +0 -3
- package/addon/routes/connectivity/telematics/index/new.js +0 -3
- package/addon/templates/connectivity/telematics/index/details/devices.hbs +0 -1
- package/addon/templates/connectivity/telematics/index/details/events.hbs +0 -1
- package/addon/templates/connectivity/telematics/index/details/sensors.hbs +0 -1
- package/addon/templates/connectivity/telematics/index/details.hbs +0 -14
- package/addon/templates/connectivity/telematics/index/edit.hbs +0 -12
- package/addon/templates/connectivity/telematics/index/new.hbs +0 -12
- package/app/controllers/connectivity/telematics/index/details/events.js +0 -1
- package/app/controllers/connectivity/telematics/index/details/sensors.js +0 -1
- package/app/routes/connectivity/telematics/index/details/sensors.js +0 -1
- package/app/templates/connectivity/telematics/index/details/sensors.js +0 -1
|
@@ -13,13 +13,13 @@ use Illuminate\Support\Facades\Http;
|
|
|
13
13
|
*/
|
|
14
14
|
class SafeeProvider extends AbstractProvider
|
|
15
15
|
{
|
|
16
|
-
protected string $baseUrl = '';
|
|
16
|
+
protected string $baseUrl = 'https://api.safee.com';
|
|
17
17
|
protected int $requestsPerMinute = 3000;
|
|
18
18
|
protected ?string $accessToken = null;
|
|
19
19
|
|
|
20
20
|
protected function prepareAuthentication(): void
|
|
21
21
|
{
|
|
22
|
-
$this->baseUrl = rtrim($this->credentials['api_base_url'] ?? $this->credentials['server_uri'] ??
|
|
22
|
+
$this->baseUrl = rtrim($this->credentials['api_base_url'] ?? $this->credentials['server_uri'] ?? $this->baseUrl, '/');
|
|
23
23
|
$this->accessToken = $this->credentials['access_token'] ?? $this->authenticate();
|
|
24
24
|
$scheme = $this->credentials['authorization_scheme'] ?? 'Bearer';
|
|
25
25
|
|
|
@@ -90,17 +90,21 @@ class SafeeProvider extends AbstractProvider
|
|
|
90
90
|
|
|
91
91
|
public function normalizeDevice(array $payload): array
|
|
92
92
|
{
|
|
93
|
-
$position
|
|
93
|
+
$position = $this->extractPosition($payload);
|
|
94
|
+
$rawStatus = $payload['status'] ?? $payload['vehicleStatus'] ?? null;
|
|
95
|
+
$status = $this->normalizeVehicleStatus($rawStatus);
|
|
94
96
|
|
|
95
97
|
return [
|
|
96
|
-
'
|
|
97
|
-
'
|
|
98
|
-
'
|
|
99
|
-
'
|
|
100
|
-
'imei'
|
|
101
|
-
'vin'
|
|
102
|
-
'status'
|
|
103
|
-
'
|
|
98
|
+
'device_id' => $payload['id'] ?? data_get($payload, 'vehicle.id') ?? null,
|
|
99
|
+
'name' => $payload['name'] ?? $payload['plateNumber'] ?? data_get($payload, 'vehicle.name') ?? 'Unknown Vehicle',
|
|
100
|
+
'provider' => 'safee',
|
|
101
|
+
'model' => $payload['model'] ?? data_get($payload, 'device.model') ?? null,
|
|
102
|
+
'imei' => data_get($payload, 'device.imei') ?? data_get($payload, 'device.serial') ?? null,
|
|
103
|
+
'vin' => $payload['vin'] ?? null,
|
|
104
|
+
'status' => $status,
|
|
105
|
+
'online' => $rawStatus ? $status === 'active' : null,
|
|
106
|
+
'last_seen_at' => $this->parseTimestamp($payload['date'] ?? $payload['deviceTime'] ?? $payload['time'] ?? null),
|
|
107
|
+
'location' => [
|
|
104
108
|
'lat' => $position['lat'] ?? null,
|
|
105
109
|
'lng' => $position['lng'] ?? null,
|
|
106
110
|
],
|
|
@@ -126,7 +130,9 @@ class SafeeProvider extends AbstractProvider
|
|
|
126
130
|
|
|
127
131
|
return [
|
|
128
132
|
'external_id' => $payload['id'] ?? data_get($payload, 'vehicle.id') ?? null,
|
|
133
|
+
'device_id' => $payload['id'] ?? data_get($payload, 'vehicle.id') ?? null,
|
|
129
134
|
'event_type' => data_get($payload, 'event.code') ?? data_get($payload, 'event.name') ?? 'telemetry_update',
|
|
135
|
+
'message' => data_get($payload, 'event.name') ?? data_get($payload, 'event.message') ?? null,
|
|
130
136
|
'occurred_at' => $this->parseTimestamp($payload['date'] ?? $payload['deviceTime'] ?? $payload['time'] ?? null),
|
|
131
137
|
'location' => [
|
|
132
138
|
'lat' => $position['lat'] ?? null,
|
|
@@ -156,12 +162,16 @@ class SafeeProvider extends AbstractProvider
|
|
|
156
162
|
{
|
|
157
163
|
return [
|
|
158
164
|
[
|
|
159
|
-
'name'
|
|
160
|
-
'label'
|
|
161
|
-
'type'
|
|
162
|
-
'placeholder'
|
|
163
|
-
'required'
|
|
164
|
-
'
|
|
165
|
+
'name' => 'server_uri',
|
|
166
|
+
'label' => 'Server URI',
|
|
167
|
+
'type' => 'text',
|
|
168
|
+
'placeholder' => 'https://api.safee.com',
|
|
169
|
+
'required' => false,
|
|
170
|
+
'advanced' => true,
|
|
171
|
+
'is_endpoint' => true,
|
|
172
|
+
'default_value' => 'https://api.safee.com',
|
|
173
|
+
'help_text' => 'Optional override. Leave blank to use the default Safee API host.',
|
|
174
|
+
'validation' => 'nullable|url',
|
|
165
175
|
],
|
|
166
176
|
[
|
|
167
177
|
'name' => 'realm_id',
|
|
@@ -203,13 +213,13 @@ class SafeeProvider extends AbstractProvider
|
|
|
203
213
|
|
|
204
214
|
protected function authenticate(): string
|
|
205
215
|
{
|
|
206
|
-
foreach (['
|
|
216
|
+
foreach (['realm_id', 'client_id', 'client_secret', 'username', 'password'] as $field) {
|
|
207
217
|
if (empty($this->credentials[$field])) {
|
|
208
218
|
throw new \InvalidArgumentException("Safee credential '{$field}' is required.");
|
|
209
219
|
}
|
|
210
220
|
}
|
|
211
221
|
|
|
212
|
-
$tokenUrl =
|
|
222
|
+
$tokenUrl = $this->baseUrl . '/auth/realms/' . $this->credentials['realm_id'] . '/protocol/openid-connect/token';
|
|
213
223
|
|
|
214
224
|
$response = Http::asForm()
|
|
215
225
|
->acceptJson()
|
|
@@ -223,7 +233,7 @@ class SafeeProvider extends AbstractProvider
|
|
|
223
233
|
]);
|
|
224
234
|
|
|
225
235
|
if ($response->failed()) {
|
|
226
|
-
throw new \RuntimeException('Safee authentication failed
|
|
236
|
+
throw new \RuntimeException('Safee authentication failed with status ' . $response->status());
|
|
227
237
|
}
|
|
228
238
|
|
|
229
239
|
$token = $response->json('access_token');
|
|
@@ -242,7 +252,7 @@ class SafeeProvider extends AbstractProvider
|
|
|
242
252
|
->get($this->baseUrl . $endpoint);
|
|
243
253
|
|
|
244
254
|
if ($response->failed()) {
|
|
245
|
-
throw new \RuntimeException('Safee API request failed
|
|
255
|
+
throw new \RuntimeException('Safee API request failed with status ' . $response->status());
|
|
246
256
|
}
|
|
247
257
|
|
|
248
258
|
return $response->json() ?? [];
|
|
@@ -255,7 +265,7 @@ class SafeeProvider extends AbstractProvider
|
|
|
255
265
|
->post($this->baseUrl . $endpoint, $payload);
|
|
256
266
|
|
|
257
267
|
if ($response->failed()) {
|
|
258
|
-
throw new \RuntimeException('Safee API request failed
|
|
268
|
+
throw new \RuntimeException('Safee API request failed with status ' . $response->status());
|
|
259
269
|
}
|
|
260
270
|
|
|
261
271
|
return $response->json() ?? [];
|
|
@@ -94,6 +94,7 @@ class SamsaraProvider extends AbstractProvider
|
|
|
94
94
|
{
|
|
95
95
|
return [
|
|
96
96
|
'external_id' => $payload['id'] ?? null,
|
|
97
|
+
'device_id' => $payload['vehicle']['id'] ?? $payload['vehicleId'] ?? null,
|
|
97
98
|
'event_type' => $payload['eventType'] ?? 'vehicle_update',
|
|
98
99
|
'occurred_at' => $payload['time'] ?? now(),
|
|
99
100
|
'location' => [
|
|
@@ -135,7 +136,8 @@ class SamsaraProvider extends AbstractProvider
|
|
|
135
136
|
if (isset($payload['data'])) {
|
|
136
137
|
foreach ($payload['data'] as $item) {
|
|
137
138
|
if (isset($item['vehicle'])) {
|
|
138
|
-
$devices[]
|
|
139
|
+
$devices[] = $this->normalizeDevice($item['vehicle']);
|
|
140
|
+
$item['vehicleId'] = $item['vehicle']['id'] ?? null;
|
|
139
141
|
}
|
|
140
142
|
|
|
141
143
|
$events[] = $this->normalizeEvent($item);
|
|
@@ -2,12 +2,15 @@
|
|
|
2
2
|
|
|
3
3
|
namespace Fleetbase\FleetOps\Support\Telematics;
|
|
4
4
|
|
|
5
|
-
use Fleetbase\FleetOps\Jobs\
|
|
6
|
-
use Fleetbase\FleetOps\Jobs\
|
|
5
|
+
use Fleetbase\FleetOps\Jobs\SyncTelematicDevicesJob;
|
|
6
|
+
use Fleetbase\FleetOps\Jobs\TestTelematicConnectionJob;
|
|
7
7
|
use Fleetbase\FleetOps\Models\Device;
|
|
8
|
+
use Fleetbase\FleetOps\Models\DeviceEvent;
|
|
9
|
+
use Fleetbase\FleetOps\Models\Sensor;
|
|
8
10
|
use Fleetbase\FleetOps\Models\Telematic;
|
|
9
11
|
use Illuminate\Support\Facades\Crypt;
|
|
10
12
|
use Illuminate\Support\Facades\Validator;
|
|
13
|
+
use Illuminate\Support\Str;
|
|
11
14
|
use Illuminate\Validation\ValidationException;
|
|
12
15
|
|
|
13
16
|
/**
|
|
@@ -58,7 +61,7 @@ class TelematicService
|
|
|
58
61
|
$telematic->company_uuid = session('company');
|
|
59
62
|
$telematic->name = $data['name'];
|
|
60
63
|
$telematic->provider = $providerKey;
|
|
61
|
-
$telematic->credentials =
|
|
64
|
+
$telematic->credentials = $this->encryptCredentials($data['credentials']);
|
|
62
65
|
$telematic->status = 'active';
|
|
63
66
|
$telematic->meta = $data['meta'] ?? [];
|
|
64
67
|
$telematic->save();
|
|
@@ -78,7 +81,7 @@ class TelematicService
|
|
|
78
81
|
if (isset($data['credentials'])) {
|
|
79
82
|
$descriptor = $this->registry->findByKey($telematic->provider);
|
|
80
83
|
$this->validateCredentials($data['credentials'], $descriptor->requiredFields);
|
|
81
|
-
$telematic->credentials =
|
|
84
|
+
$telematic->credentials = $this->encryptCredentials($data['credentials']);
|
|
82
85
|
}
|
|
83
86
|
|
|
84
87
|
if (isset($data['status'])) {
|
|
@@ -110,18 +113,21 @@ class TelematicService
|
|
|
110
113
|
public function testConnection(Telematic $telematic, bool $async = false)
|
|
111
114
|
{
|
|
112
115
|
if ($async) {
|
|
113
|
-
$
|
|
114
|
-
dispatch($
|
|
116
|
+
$jobId = (string) Str::uuid();
|
|
117
|
+
dispatch(new TestTelematicConnectionJob($telematic, $jobId));
|
|
115
118
|
|
|
116
|
-
return ['job_id' => $
|
|
119
|
+
return ['job_id' => $jobId, 'message' => 'Connection test queued'];
|
|
117
120
|
}
|
|
118
121
|
|
|
119
122
|
$provider = $this->registry->resolve($telematic->provider);
|
|
120
123
|
$provider->connect($telematic);
|
|
121
124
|
|
|
122
|
-
$credentials =
|
|
125
|
+
$credentials = $this->getCredentials($telematic);
|
|
123
126
|
|
|
124
|
-
|
|
127
|
+
$result = $provider->testConnection($credentials);
|
|
128
|
+
$this->recordConnectionTest($telematic, $result);
|
|
129
|
+
|
|
130
|
+
return $result;
|
|
125
131
|
}
|
|
126
132
|
|
|
127
133
|
/**
|
|
@@ -131,10 +137,19 @@ class TelematicService
|
|
|
131
137
|
*/
|
|
132
138
|
public function discoverDevices(Telematic $telematic, array $options = []): string
|
|
133
139
|
{
|
|
134
|
-
$
|
|
135
|
-
dispatch($
|
|
140
|
+
$jobId = (string) Str::uuid();
|
|
141
|
+
dispatch(new SyncTelematicDevicesJob($telematic, $options, $jobId));
|
|
142
|
+
|
|
143
|
+
$telematic->status = 'synchronizing';
|
|
144
|
+
$telematic->meta = array_merge($telematic->meta ?? [], [
|
|
145
|
+
'last_sync_job_id' => $jobId,
|
|
146
|
+
'last_sync_started_at' => now()->toDateTimeString(),
|
|
147
|
+
'last_sync_result' => 'queued',
|
|
148
|
+
'last_sync_error' => null,
|
|
149
|
+
]);
|
|
150
|
+
$telematic->save();
|
|
136
151
|
|
|
137
|
-
return $
|
|
152
|
+
return $jobId;
|
|
138
153
|
}
|
|
139
154
|
|
|
140
155
|
/**
|
|
@@ -142,22 +157,143 @@ class TelematicService
|
|
|
142
157
|
*/
|
|
143
158
|
public function linkDevice(Telematic $telematic, array $deviceData): Device
|
|
144
159
|
{
|
|
160
|
+
$externalId = $this->resolveExternalId($deviceData);
|
|
161
|
+
|
|
162
|
+
if (!$externalId) {
|
|
163
|
+
throw ValidationException::withMessages(['device_id' => ['Provider device identity is required to link a telematics device.']]);
|
|
164
|
+
}
|
|
165
|
+
|
|
145
166
|
$device = Device::firstOrNew([
|
|
146
167
|
'telematic_uuid' => $telematic->uuid,
|
|
147
|
-
'
|
|
168
|
+
'device_id' => $externalId,
|
|
148
169
|
]);
|
|
149
170
|
|
|
150
|
-
$device->
|
|
151
|
-
$device->
|
|
152
|
-
$device->
|
|
153
|
-
$device->
|
|
154
|
-
$device->
|
|
171
|
+
$device->company_uuid = $telematic->company_uuid;
|
|
172
|
+
$device->name = $deviceData['name'] ?? $deviceData['device_name'] ?? $device->name ?? 'Unknown Device';
|
|
173
|
+
$device->model = $deviceData['model'] ?? $deviceData['device_model'] ?? $device->model;
|
|
174
|
+
$device->provider = $deviceData['provider'] ?? $deviceData['device_provider'] ?? $telematic->provider;
|
|
175
|
+
$device->type = $deviceData['type'] ?? null;
|
|
176
|
+
$device->internal_id = $deviceData['internal_id'] ?? $externalId;
|
|
177
|
+
$device->imei = $deviceData['imei'] ?? null;
|
|
178
|
+
$device->imsi = $deviceData['imsi'] ?? null;
|
|
179
|
+
$device->serial_number = $deviceData['serial_number'] ?? null;
|
|
180
|
+
$device->firmware_version = $deviceData['firmware_version'] ?? null;
|
|
181
|
+
$device->status = $deviceData['status'] ?? $device->status ?? 'active';
|
|
182
|
+
|
|
183
|
+
if (array_key_exists('online', $deviceData) && $deviceData['online'] !== null) {
|
|
184
|
+
$device->online = (bool) $deviceData['online'];
|
|
185
|
+
} elseif (!$device->exists) {
|
|
186
|
+
$device->online = $device->status === 'active';
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
if (!empty($deviceData['last_online_at']) || !empty($deviceData['last_seen_at'])) {
|
|
190
|
+
$device->last_online_at = $deviceData['last_online_at'] ?? $deviceData['last_seen_at'];
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
$device->meta = array_merge($device->meta ?? [], [
|
|
194
|
+
'external_id' => $externalId,
|
|
195
|
+
], $deviceData['meta'] ?? []);
|
|
196
|
+
|
|
197
|
+
$location = $this->normalizeLocation($deviceData['location'] ?? null);
|
|
198
|
+
if ($location) {
|
|
199
|
+
$device->last_position = $location;
|
|
200
|
+
} elseif (!$device->exists || !$device->last_position) {
|
|
201
|
+
$device->last_position = $this->defaultLocation();
|
|
202
|
+
}
|
|
155
203
|
|
|
156
204
|
$device->save();
|
|
157
205
|
|
|
158
206
|
return $device;
|
|
159
207
|
}
|
|
160
208
|
|
|
209
|
+
public function storeDeviceEvent(Telematic $telematic, array $eventData, ?Device $device = null): DeviceEvent
|
|
210
|
+
{
|
|
211
|
+
if (!$device) {
|
|
212
|
+
$device = $this->resolveDeviceForPayload($telematic, $eventData);
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
$eventKey = $this->makeEventKey($telematic, $eventData, $device);
|
|
216
|
+
$event = $eventKey ? DeviceEvent::firstOrNew(['_key' => $eventKey]) : new DeviceEvent();
|
|
217
|
+
$event->company_uuid = $telematic->company_uuid;
|
|
218
|
+
$event->device_uuid = $device?->uuid;
|
|
219
|
+
$event->event_type = $eventData['event_type'] ?? $eventData['type'] ?? 'telemetry_update';
|
|
220
|
+
$event->severity = $eventData['severity'] ?? 'info';
|
|
221
|
+
$event->message = $eventData['message'] ?? $eventData['reason'] ?? null;
|
|
222
|
+
$event->provider = $telematic->provider;
|
|
223
|
+
$event->ident = $eventData['ident'] ?? $eventData['event_id'] ?? $eventData['external_event_id'] ?? $eventData['external_id'] ?? null;
|
|
224
|
+
$event->code = $eventData['code'] ?? null;
|
|
225
|
+
$event->state = $eventData['state'] ?? null;
|
|
226
|
+
$event->reason = $eventData['reason'] ?? null;
|
|
227
|
+
$event->occurred_at = $eventData['occurred_at'] ?? $eventData['recorded_at'] ?? $eventData['timestamp'] ?? null;
|
|
228
|
+
$event->data = $eventData['data'] ?? array_filter([
|
|
229
|
+
'speed' => $eventData['speed'] ?? null,
|
|
230
|
+
'heading' => $eventData['heading'] ?? null,
|
|
231
|
+
'odometer' => $eventData['odometer'] ?? null,
|
|
232
|
+
'ignition' => $eventData['ignition'] ?? null,
|
|
233
|
+
'fuel_level' => $eventData['fuel_level'] ?? null,
|
|
234
|
+
], fn ($value) => $value !== null);
|
|
235
|
+
$event->payload = $eventData['payload'] ?? $eventData['meta'] ?? $eventData;
|
|
236
|
+
$event->_key = $eventKey;
|
|
237
|
+
$event->meta = array_merge($eventData['meta'] ?? [], [
|
|
238
|
+
'telematic_uuid' => $telematic->uuid,
|
|
239
|
+
'telematic_id' => $telematic->public_id,
|
|
240
|
+
'provider_event_id' => $event->ident,
|
|
241
|
+
'occurred_at' => $eventData['occurred_at'] ?? null,
|
|
242
|
+
'speed' => $eventData['speed'] ?? null,
|
|
243
|
+
'heading' => $eventData['heading'] ?? null,
|
|
244
|
+
'odometer' => $eventData['odometer'] ?? null,
|
|
245
|
+
'ignition' => $eventData['ignition'] ?? null,
|
|
246
|
+
'fuel_level' => $eventData['fuel_level'] ?? null,
|
|
247
|
+
]);
|
|
248
|
+
|
|
249
|
+
$location = $this->normalizeLocation($eventData['location'] ?? null);
|
|
250
|
+
if ($location) {
|
|
251
|
+
$event->location = $location;
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
$event->save();
|
|
255
|
+
|
|
256
|
+
return $event;
|
|
257
|
+
}
|
|
258
|
+
|
|
259
|
+
public function storeSensor(Telematic $telematic, array $sensorData, ?Device $device = null): Sensor
|
|
260
|
+
{
|
|
261
|
+
if (!$device) {
|
|
262
|
+
$device = $this->resolveDeviceForPayload($telematic, $sensorData);
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
$sensorIdentity = $sensorData['internal_id'] ?? $sensorData['sensor_id'] ?? $sensorData['external_id'] ?? null;
|
|
266
|
+
if (!$sensorIdentity && !$device) {
|
|
267
|
+
throw ValidationException::withMessages(['sensor_id' => ['Provider sensor identity or device identity is required to link a telematics sensor.']]);
|
|
268
|
+
}
|
|
269
|
+
|
|
270
|
+
$sensor = Sensor::firstOrNew([
|
|
271
|
+
'telematic_uuid' => $telematic->uuid,
|
|
272
|
+
'device_uuid' => $device?->uuid,
|
|
273
|
+
'type' => $sensorData['type'] ?? $sensorData['sensor_type'] ?? 'generic',
|
|
274
|
+
'internal_id' => $sensorIdentity ?? $this->makeSensorIdentity($sensorData, $device),
|
|
275
|
+
]);
|
|
276
|
+
|
|
277
|
+
$sensor->company_uuid = $telematic->company_uuid;
|
|
278
|
+
$sensor->name = $sensorData['name'] ?? $sensorData['sensor_type'] ?? $sensor->type ?? 'Sensor';
|
|
279
|
+
$sensor->unit = $sensorData['unit'] ?? null;
|
|
280
|
+
$sensor->last_value = isset($sensorData['value']) ? (string) $sensorData['value'] : $sensor->last_value;
|
|
281
|
+
$sensor->last_reading_at = $sensorData['recorded_at'] ?? $sensorData['last_reading_at'] ?? $sensor->last_reading_at ?? now();
|
|
282
|
+
$sensor->status = $sensorData['status'] ?? 'active';
|
|
283
|
+
$sensor->meta = array_merge($sensor->meta ?? [], $sensorData['meta'] ?? []);
|
|
284
|
+
|
|
285
|
+
$location = $this->normalizeLocation($sensorData['location'] ?? null);
|
|
286
|
+
if ($location) {
|
|
287
|
+
$sensor->last_position = $location;
|
|
288
|
+
} elseif (!$sensor->exists || !$sensor->last_position) {
|
|
289
|
+
$sensor->last_position = $this->defaultLocation();
|
|
290
|
+
}
|
|
291
|
+
|
|
292
|
+
$sensor->save();
|
|
293
|
+
|
|
294
|
+
return $sensor;
|
|
295
|
+
}
|
|
296
|
+
|
|
161
297
|
/**
|
|
162
298
|
* Get devices for a telematic.
|
|
163
299
|
*
|
|
@@ -173,14 +309,28 @@ class TelematicService
|
|
|
173
309
|
|
|
174
310
|
if (isset($filters['search'])) {
|
|
175
311
|
$query->where(function ($q) use ($filters) {
|
|
176
|
-
$q->where('
|
|
177
|
-
|
|
312
|
+
$q->where('name', 'like', "%{$filters['search']}%")
|
|
313
|
+
->orWhere('device_id', 'like', "%{$filters['search']}%")
|
|
314
|
+
->orWhere('internal_id', 'like', "%{$filters['search']}%")
|
|
315
|
+
->orWhere('imei', 'like', "%{$filters['search']}%");
|
|
178
316
|
});
|
|
179
317
|
}
|
|
180
318
|
|
|
181
319
|
return $query->get();
|
|
182
320
|
}
|
|
183
321
|
|
|
322
|
+
public function recordConnectionTest(Telematic $telematic, array $result): void
|
|
323
|
+
{
|
|
324
|
+
$telematic->status = ($result['success'] ?? false) ? 'connected' : 'error';
|
|
325
|
+
$telematic->meta = array_merge($telematic->meta ?? [], [
|
|
326
|
+
'last_connection_test' => now()->toDateTimeString(),
|
|
327
|
+
'last_test_result' => ($result['success'] ?? false) ? 'success' : 'failed',
|
|
328
|
+
'last_error' => ($result['success'] ?? false) ? null : ($result['message'] ?? 'Connection test failed'),
|
|
329
|
+
'last_test_metadata' => $result['metadata'] ?? [],
|
|
330
|
+
]);
|
|
331
|
+
$telematic->save();
|
|
332
|
+
}
|
|
333
|
+
|
|
184
334
|
/**
|
|
185
335
|
* Validate credentials against provider schema.
|
|
186
336
|
*
|
|
@@ -218,6 +368,175 @@ class TelematicService
|
|
|
218
368
|
*/
|
|
219
369
|
public function getCredentials(Telematic $telematic): array
|
|
220
370
|
{
|
|
221
|
-
|
|
371
|
+
if (is_array($telematic->credentials)) {
|
|
372
|
+
return $telematic->credentials;
|
|
373
|
+
}
|
|
374
|
+
|
|
375
|
+
$credentials = $telematic->credentials;
|
|
376
|
+
if (!$credentials) {
|
|
377
|
+
return [];
|
|
378
|
+
}
|
|
379
|
+
|
|
380
|
+
try {
|
|
381
|
+
return json_decode(Crypt::decryptString($credentials), true) ?? [];
|
|
382
|
+
} catch (\Throwable) {
|
|
383
|
+
return json_decode($credentials, true) ?? [];
|
|
384
|
+
}
|
|
385
|
+
}
|
|
386
|
+
|
|
387
|
+
protected function encryptCredentials(array $credentials): string
|
|
388
|
+
{
|
|
389
|
+
return Crypt::encryptString(json_encode($credentials));
|
|
390
|
+
}
|
|
391
|
+
|
|
392
|
+
protected function resolveDeviceForPayload(Telematic $telematic, array $payload): ?Device
|
|
393
|
+
{
|
|
394
|
+
$externalId = $this->resolveExternalId($payload);
|
|
395
|
+
|
|
396
|
+
if (!$externalId) {
|
|
397
|
+
return null;
|
|
398
|
+
}
|
|
399
|
+
|
|
400
|
+
return Device::where('telematic_uuid', $telematic->uuid)
|
|
401
|
+
->where(function ($query) use ($externalId) {
|
|
402
|
+
$query->where('device_id', $externalId)
|
|
403
|
+
->orWhere('internal_id', $externalId)
|
|
404
|
+
->orWhere('imei', $externalId);
|
|
405
|
+
})
|
|
406
|
+
->first();
|
|
407
|
+
}
|
|
408
|
+
|
|
409
|
+
public function resolveWebhookTelematic(string $providerKey, array $payload = [], array $headers = [], ?string $integrationId = null): ?Telematic
|
|
410
|
+
{
|
|
411
|
+
$query = Telematic::where('provider', $providerKey);
|
|
412
|
+
|
|
413
|
+
if ($integrationId) {
|
|
414
|
+
return (clone $query)
|
|
415
|
+
->where(function ($query) use ($integrationId) {
|
|
416
|
+
$query->where('public_id', $integrationId)->orWhere('uuid', $integrationId);
|
|
417
|
+
})
|
|
418
|
+
->first();
|
|
419
|
+
}
|
|
420
|
+
|
|
421
|
+
$providerAccountId = $this->resolveProviderAccountId($payload, $headers);
|
|
422
|
+
if ($providerAccountId) {
|
|
423
|
+
$matches = (clone $query)
|
|
424
|
+
->where(function ($query) use ($providerAccountId) {
|
|
425
|
+
$query->where('meta->provider_account_id', $providerAccountId)
|
|
426
|
+
->orWhere('meta->account_id', $providerAccountId)
|
|
427
|
+
->orWhere('meta->organization_id', $providerAccountId)
|
|
428
|
+
->orWhere('meta->customer_id', $providerAccountId);
|
|
429
|
+
})
|
|
430
|
+
->limit(2)
|
|
431
|
+
->get();
|
|
432
|
+
|
|
433
|
+
if ($matches->count() === 1) {
|
|
434
|
+
return $matches->first();
|
|
435
|
+
}
|
|
436
|
+
}
|
|
437
|
+
|
|
438
|
+
$deviceId = $this->resolveExternalId($payload);
|
|
439
|
+
if ($deviceId) {
|
|
440
|
+
$matches = (clone $query)
|
|
441
|
+
->whereHas('device', function ($query) use ($deviceId) {
|
|
442
|
+
$query->where('device_id', $deviceId)
|
|
443
|
+
->orWhere('internal_id', $deviceId)
|
|
444
|
+
->orWhere('imei', $deviceId);
|
|
445
|
+
})
|
|
446
|
+
->limit(2)
|
|
447
|
+
->get();
|
|
448
|
+
|
|
449
|
+
if ($matches->count() === 1) {
|
|
450
|
+
return $matches->first();
|
|
451
|
+
}
|
|
452
|
+
}
|
|
453
|
+
|
|
454
|
+
return null;
|
|
455
|
+
}
|
|
456
|
+
|
|
457
|
+
protected function normalizeLocation(?array $location): mixed
|
|
458
|
+
{
|
|
459
|
+
if (!$location) {
|
|
460
|
+
return null;
|
|
461
|
+
}
|
|
462
|
+
|
|
463
|
+
$lat = $location['lat'] ?? $location['latitude'] ?? null;
|
|
464
|
+
$lng = $location['lng'] ?? $location['longitude'] ?? null;
|
|
465
|
+
|
|
466
|
+
if ($lat === null || $lng === null) {
|
|
467
|
+
return null;
|
|
468
|
+
}
|
|
469
|
+
|
|
470
|
+
return ['latitude' => (float) $lat, 'longitude' => (float) $lng];
|
|
471
|
+
}
|
|
472
|
+
|
|
473
|
+
protected function defaultLocation(): array
|
|
474
|
+
{
|
|
475
|
+
return ['latitude' => 0, 'longitude' => 0];
|
|
476
|
+
}
|
|
477
|
+
|
|
478
|
+
protected function resolveExternalId(array $payload): ?string
|
|
479
|
+
{
|
|
480
|
+
$value = $payload['device_id']
|
|
481
|
+
?? $payload['external_id']
|
|
482
|
+
?? $payload['ident']
|
|
483
|
+
?? $payload['unit_id']
|
|
484
|
+
?? $payload['vehicle_id']
|
|
485
|
+
?? $payload['imei']
|
|
486
|
+
?? null;
|
|
487
|
+
|
|
488
|
+
return $value === null || $value === '' ? null : (string) $value;
|
|
489
|
+
}
|
|
490
|
+
|
|
491
|
+
protected function resolveProviderAccountId(array $payload, array $headers = []): ?string
|
|
492
|
+
{
|
|
493
|
+
$headerValue = data_get($headers, 'x-provider-account.0')
|
|
494
|
+
?? data_get($headers, 'x-organization-id.0')
|
|
495
|
+
?? data_get($headers, 'x-customer-id.0');
|
|
496
|
+
|
|
497
|
+
$value = $payload['provider_account_id']
|
|
498
|
+
?? $payload['account_id']
|
|
499
|
+
?? $payload['organization_id']
|
|
500
|
+
?? $payload['org_id']
|
|
501
|
+
?? $payload['customer_id']
|
|
502
|
+
?? data_get($payload, 'account.id')
|
|
503
|
+
?? data_get($payload, 'organization.id')
|
|
504
|
+
?? $headerValue;
|
|
505
|
+
|
|
506
|
+
return $value === null || $value === '' ? null : (string) $value;
|
|
507
|
+
}
|
|
508
|
+
|
|
509
|
+
protected function makeEventKey(Telematic $telematic, array $eventData, ?Device $device = null): ?string
|
|
510
|
+
{
|
|
511
|
+
$deviceId = $device?->device_id ?? $this->resolveExternalId($eventData);
|
|
512
|
+
if (!$deviceId) {
|
|
513
|
+
return null;
|
|
514
|
+
}
|
|
515
|
+
|
|
516
|
+
$providerEventId = $eventData['event_id'] ?? $eventData['external_event_id'] ?? $eventData['ident'] ?? $eventData['external_id'] ?? null;
|
|
517
|
+
$occurredAt = $eventData['occurred_at'] ?? $eventData['recorded_at'] ?? $eventData['timestamp'] ?? null;
|
|
518
|
+
$eventType = $eventData['event_type'] ?? $eventData['type'] ?? 'telemetry_update';
|
|
519
|
+
|
|
520
|
+
if (!$providerEventId && !$occurredAt) {
|
|
521
|
+
return null;
|
|
522
|
+
}
|
|
523
|
+
|
|
524
|
+
return sha1(implode('|', [
|
|
525
|
+
$telematic->provider,
|
|
526
|
+
$telematic->public_id ?? $telematic->uuid,
|
|
527
|
+
$deviceId,
|
|
528
|
+
$providerEventId,
|
|
529
|
+
$eventType,
|
|
530
|
+
$occurredAt,
|
|
531
|
+
]));
|
|
532
|
+
}
|
|
533
|
+
|
|
534
|
+
protected function makeSensorIdentity(array $sensorData, ?Device $device = null): string
|
|
535
|
+
{
|
|
536
|
+
return sha1(implode('|', [
|
|
537
|
+
$device?->uuid ?? 'no-device',
|
|
538
|
+
$sensorData['type'] ?? $sensorData['sensor_type'] ?? 'generic',
|
|
539
|
+
$sensorData['name'] ?? $sensorData['unit'] ?? 'sensor',
|
|
540
|
+
]));
|
|
222
541
|
}
|
|
223
542
|
}
|