fleetmap-reports 1.0.705 → 1.0.707

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.705",
+  "version": "1.0.707",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -35,8 +35,8 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
     "jest": "^27.5.0",
-    "mocha": "^9.0.3",
-    "webpack": "^5.24.3",
+    "mocha": "^10.2.0",
+    "webpack": "^5.51.0",
     "webpack-cli": "^4.5.0"
   }
 }

package/src/idle-report.js

@@ -206,7 +206,7 @@ function findPOIData (event, userData) {
 }
 
 function findGeofenceData (event, userData) {
-  const geofence = userData.geofences.filter(g => g && !g.area.startsWith('CIRCLE')).find(g =>
+  const geofence = userData.geofences.filter(g => !g.area.startsWith('CIRCLE')).find(g =>
     checkGeofenceIn(convertPositionToFeature(event.position), convertToFeature(g)))
   if (geofence) {
     const group = userData.groups.find(g => g.geofenceIds && g.geofenceIds.includes(geofence.id))

package/src/tests/idle.test.js

@@ -1,5 +1,4 @@
 const { getReports } = require('./index')
-const assert = require('assert')
 // eslint-disable-next-line no-undef
 describe('idle', function () {
   // eslint-disable-next-line no-undef

package/src/tests/index.test.js

@@ -17,10 +17,12 @@ describe('Test_Reports', function () {
       userData)
     await report.speedingReportToPDF(userData, data)
   }, 40000)
+
   it('converts madrid time', async () => {
     assert.equal(false, utils.isClientSide())
     console.log(utils.convertToLocaleString(new Date(), 'es-CL', 'Europe/Madrid'))
   })
+
   // eslint-disable-next-line no-undef
   it('Trip by device', async () => {
     const report = await getReports()

package/src/tests/zones.test.js

@@ -1,6 +1,5 @@
 const { getReports } = require('./index')
 const assert = require('assert')
-const ellca = require('./ellca.json')
 // eslint-disable-next-line no-undef
 describe('zones', function () {
   // eslint-disable-next-line no-undef
@@ -20,6 +19,7 @@ describe('zones', function () {
     console.log('result', result)
   }, 4000000)
 
+  // eslint-disable-next-line no-undef
   it('works with afriquia', async () => {
     const report = await getReports('moviflotte@gmail.com', 'moviflotte@gmail.com')
     const userData = await report.getUserData()

package/src/zone-report.js

@@ -75,7 +75,7 @@ async function createZoneReport (from, to, userData, traccar) {
       deviceCount, devices.length, sliceSize, deviceChunk, undefined)
 
     const route = filterPositions(data.route)
-    const alerts = getInAndOutEvents(slice, route, userData)
+    const alerts = await getInAndOutEvents(slice, route, userData)
 
     allData.devices.push(...await processDevices(from, to, devices, userData, { alerts, route }))
 
@@ -300,11 +300,11 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to) {
   return zoneInOutData
 }
 
-function getInAndOutEvents (devices, route, userData) {
+async function getInAndOutEvents (devices, route, userData) {
   const events = []
   const geofencesFeatures = userData.geofences.map(g => convertToFeature(g))
 
-  devices.forEach(d => {
+  await Promise.all(devices.map(async d => {
     const deviceRoute = route.filter(p => p.deviceId === d.id)
     const routePoints = deviceRoute.sort(sortPositions).map(p => convertPositionToFeature(p))
     const deviceEvents = []
@@ -336,7 +336,7 @@ function getInAndOutEvents (devices, route, userData) {
       })
     })
     events.push(...deviceEvents)
-  })
+  }))
   return events
 }