fleetmap-reports 2.0.99 → 2.0.100

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.99",
+  "version": "2.0.100",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/speeding-report.js

@@ -111,13 +111,13 @@ async function createSpeedingReportByDriver (from, to, userData, traccarInstance
   const sliced = automaticReports.sliceArray(devices, 5)
   let deviceCount = 0
   for (const slice of sliced) {
-    const { routes, events } = await getEvents(traccarInstance, from, to, slice, userData, deviceCount, devices.length, slice.length)
+    const eventsByDevice = await getEvents(traccarInstance, from, to, slice, userData, deviceCount, devices.length, slice.length)
     if (processServerSide()) {
       console.log('LOADING_MESSAGE:' + slice[0].name)
       console.log(`PROGRESS_PERC:${deviceCount / devices.length * 100}`)
     }
-    if (events && events.length > 0) {
-      _drivers.push(...(await processDrivers(from, to, events, routes, userData)))
+    if (eventsByDevice && eventsByDevice.length > 0) {
+      _drivers.push(...(await processDrivers(from, to, eventsByDevice, userData)))
     }
     deviceCount = deviceCount + slice.length
   }
@@ -193,13 +193,11 @@ function getGeofenceSpeedLimitEvents (geofencesFeatures, routes, devices) {
   return events
 }
 
-async function processDrivers (from, to, events, routes, userData) {
+async function processDrivers (from, to, eventsByDevice, userData) {
   const driversResult = []
 
-  findEventsPosition(from, to, userData.devices, events, routes, userData)
-
   for (const d of userData.drivers) {
-    const driverEvents = await getDriverData(d, { events }, userData).events
+    const driverEvents = (await getDriverData(d, { events: eventsByDevice.map(d => d.alerts).flat() }, userData)).events
     if (driverEvents.length > 0) {
       driverEvents.sort((a, b) => a.positionId - b.positionId)
       driversResult.push({

package/src/tests/speeding.test.js

@@ -64,6 +64,20 @@ describe('speeding tests', function () {
     assert.equal(totalEventTime, 1402000) // Total Duration
   }, 999990000)
 
+  // eslint-disable-next-line no-undef
+  it('Speeding by driver', async () => {
+    const report = await getReports(process.env.email, process.env.password)
+    const userData = await report.getUserData()
+    userData.byDriver = true
+    userData.useVehicleSpeedLimit = false
+    userData.customSpeed = 60
+    const data = await report.speedingReport(
+      new Date(Date.UTC(2024, 4, 2, 0, 0, 0, 0)),
+      new Date(Date.UTC(2024, 4, 2, 23, 59, 59, 0)),
+      userData)
+    assert.equal(data.drivers[0].alerts.length, 2) // Total Alerts
+  }, 999990000)
+
   // eslint-disable-next-line no-undef
   it('detects brazil', () => {
     const p = {