fleetmap-reports 1.0.737 → 1.0.739

package/package.json

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

package/src/automaticReports.js

@@ -1,6 +1,10 @@
 const moment = require('moment')
 
-function sliceArray (longArray, size = 1) {
+const maxParallelRequests = 25
+function sliceArray (longArray, size) {
+  if (!size) {
+    size = (longArray.length / maxParallelRequests) + 1
+  }
   const arrayToSlice = longArray.slice()
 
   const arrayOfArrays = []

package/src/partnerReports/performance-report.js

@@ -1,7 +1,7 @@
 const automaticReports = require('../automaticReports')
 const traccarHelper = require('../util/traccar')
 const { getUncompletedTrip } = require('../util/trips')
-const { getEndTripMessage, getCanDriverStyleMessage, parseEndTripMessage, parseCanDriverStyleMessage } = require('../util/xpert')
+const { getEndTripMessages, getCanDriverStyleMessages, parseEndTripMessage, parseCanDriverStyleMessage } = require('../util/xpert')
 
 async function createPerformanceReport (from, to, userData, traccar) {
   const reportData = []
@@ -22,30 +22,25 @@ async function createPerformanceReport (from, to, userData, traccar) {
         deviceTrips.push(uncompletedTrip)
       }
 
-      deviceTrips.forEach(t => {
-        const endTripData = getEndTripMessage(t, deviceRoute)
-        const canDriverStyle = getCanDriverStyleMessage(t, deviceRoute)
-
-        t.endTripData = endTripData && parseEndTripMessage(endTripData.xpertString || endTripData)
-        t.canDriverStyle = canDriverStyle && parseCanDriverStyleMessage(canDriverStyle.xpertString || canDriverStyle)
-      })
+      const endTripData = getEndTripMessages(deviceRoute).map(m => parseEndTripMessage(m.xpertString || m))
+      const canDriverStyle = getCanDriverStyleMessages(deviceRoute).map(m => parseCanDriverStyleMessage(m.xpertString || m))
 
       const deviceData = {
         device: d.name,
-        drivingTime: deviceTrips.reduce((a, b) => a + (b.endTripData ? b.endTripData.totalTimeDriving : 0), 0),
-        idleTime: deviceTrips.reduce((a, b) => a + (b.endTripData ? b.endTripData.totalTimeInIdle : 0), 0),
-        drivingConsumption: deviceTrips.reduce((a, b) => a + (b.endTripData ? b.endTripData.totalFuelConsumptionDriving : 0), 0),
-        idleConsumption: deviceTrips.reduce((a, b) => a + (b.endTripData ? b.endTripData.totalFuelConsumptionInIdle : 0), 0),
-        drivingDistance: deviceTrips.reduce((a, b) => a + (b.endTripData ? b.endTripData.totalDistanceTravelled : 0), 0),
-        cruiseControlTime: deviceTrips.reduce((a, b) => a + (b.endTripData ? b.endTripData.totalTimeWithCruiseControl : 0), 0),
-        cruiseControlConsumption: deviceTrips.reduce((a, b) => a + (b.endTripData ? b.endTripData.totalFuelConsumptionWithCruiseControl : 0), 0),
-        cruiseControlDistance: deviceTrips.reduce((a, b) => a + (b.endTripData ? b.endTripData.totalDistanceTravelledWithCruiseControl : 0), 0),
-        economicTime: deviceTrips.reduce((a, b) => a + (b.canDriverStyle ? b.canDriverStyle.totalTimeInEcoRange : 0), 0),
-        economicConsumption: deviceTrips.reduce((a, b) => a + (b.canDriverStyle ? b.canDriverStyle.totalFuelConsumptionInEcoRange : 0), 0),
-        economicDistance: deviceTrips.reduce((a, b) => a + (b.canDriverStyle ? b.canDriverStyle.totalDistanceInEcoRange : 0), 0),
-        highEngineRPM: deviceTrips.reduce((a, b) => a + (b.canDriverStyle ? b.canDriverStyle.totalTimeWithHighRpmAndTorque : 0), 0),
-        hardBreaking: deviceTrips.reduce((a, b) => a + (b.canDriverStyle ? b.canDriverStyle.totalNumberOfHarshBrakes : 0), 0),
-        hardAcceleration: deviceTrips.reduce((a, b) => a + (b.canDriverStyle ? b.canDriverStyle.totalNumberOfHarshAccelerations : 0), 0)
+        drivingTime: endTripData.reduce((a, b) => a + b.totalTimeDriving, 0),
+        idleTime: endTripData.reduce((a, b) => a + b.totalTimeInIdle, 0),
+        drivingConsumption: endTripData.reduce((a, b) => a + b.totalFuelConsumptionDriving, 0),
+        idleConsumption: endTripData.reduce((a, b) => a + b.totalFuelConsumptionInIdle, 0),
+        drivingDistance: endTripData.reduce((a, b) => a + b.totalDistanceTravelled, 0),
+        cruiseControlTime: endTripData.reduce((a, b) => a + b.totalTimeWithCruiseControl, 0),
+        cruiseControlConsumption: endTripData.reduce((a, b) => a + b.totalFuelConsumptionWithCruiseControl, 0),
+        cruiseControlDistance: endTripData.reduce((a, b) => a + b.totalDistanceTravelledWithCruiseControl, 0),
+        economicTime: canDriverStyle.reduce((a, b) => a + b.totalTimeInEcoRange, 0),
+        economicConsumption: canDriverStyle.reduce((a, b) => a + b.totalFuelConsumptionInEcoRange, 0),
+        economicDistance: canDriverStyle.reduce((a, b) => a + b.totalDistanceInEcoRange, 0),
+        highEngineRPM: canDriverStyle.reduce((a, b) => a + b.totalTimeWithHighRpmAndTorque, 0),
+        hardBreaking: canDriverStyle.reduce((a, b) => a + b.totalNumberOfHarshBrakes, 0),
+        hardAcceleration: canDriverStyle.reduce((a, b) => a + b.totalNumberOfHarshAccelerations, 0)
       }
       reportData.push(deviceData)
     })

package/src/tests/performance.test.js

@@ -2,7 +2,6 @@ const { getReports } = require('./index')
 const { createPerformanceReport } = require('../partnerReports/performance-report')
 // eslint-disable-next-line no-undef
 describe('performance', function () {
-  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('performance report', async () => {
     const report = await getReports()

package/src/tests/zones.test.js

@@ -2,7 +2,6 @@ const { getReports } = require('./index')
 const assert = require('assert')
 // eslint-disable-next-line no-undef
 describe('zones', function () {
-  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('works with ellca', async () => {
     const report = await getReports()
@@ -48,25 +47,4 @@ describe('zones', function () {
     assert.equal(first.inTime.fixTime, '2023-01-03T21:23:24.000+0000')
     assert.equal(first.outTime.fixTime, '2023-01-07T12:22:53.000+0000')
   }, 4000000)
-
-  // eslint-disable-next-line no-undef
-  it('works with casais 2', async () => {
-    const report = await getReports('mario.andre.moreira@casais.gi', 'Casais.23')
-    const userData = await report.getUserData()
-    userData.groupByDay = true
-    userData.devices = userData.devices.filter(d => d.name === 'G-2542-F Fiat Tipo')
-    userData.geofences = userData.geofences.filter(g => g.name === 'baliza raio verde ')
-    assert.equal(userData.geofences.length > 0, true)
-    assert.equal(userData.devices.length > 0, true)
-    const result = await report.zoneReport(
-      new Date(2023, 1, 27, 0, 0, 0, 0),
-      new Date(2023, 1, 27, 23, 59, 59, 0),
-      userData)
-    assert.equal(result[0].devices[0].geofences.length, 1)
-    assert.equal(result[0].devices[0].geofences[0].days.length, 1)
-    const first = result[0].devices[0].geofences[0].days[0]
-    assert.equal(first.firstIn, '2023-02-27T21:53:16.000+0000')
-    assert.equal(first.distanceIn, 93.03917199839687)
-    assert.equal(first.distanceOut, 819.6685737216337)
-  }, 4000000)
 })

package/src/util/xpert.js

@@ -42,23 +42,21 @@ function parseCanDriverStyleMessage (xpertMessage) {
   }
 }
 
-function getEndTripMessage (trip, route) {
-  const p = route.find(p => new Date(p.fixTime).getTime() > new Date(trip.endTime).getTime() &&
-        p.attributes.xpert &&
+function getEndTripMessages (route) {
+  const positions = route.filter(p => p.attributes.xpert &&
         (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '3') : p.attributes.xpert.split(';').find(m => m.startsWith('3'))))
 
-  return p && (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '3') : p.attributes.xpert.split(';').find(m => m.startsWith('3')))
+  return positions.map(p => (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '3') : p.attributes.xpert.split(';').find(m => m.startsWith('3'))))
 }
 
-function getCanDriverStyleMessage (trip, route) {
-  const p = route.find(p => new Date(p.fixTime).getTime() > new Date(trip.endTime).getTime() &&
-      p.attributes.xpert &&
+function getCanDriverStyleMessages (route) {
+  const positions = route.filter(p => p.attributes.xpert &&
       (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '4') : p.attributes.xpert.split(';').find(m => m.startsWith('4'))))
 
-  return p && (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '4') : p.attributes.xpert.split(';').find(m => m.startsWith('4')))
+  return positions.map(p => (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '4') : p.attributes.xpert.split(';').find(m => m.startsWith('4'))))
 }
 
 exports.parseEndTripMessage = parseEndTripMessage
-exports.getEndTripMessage = getEndTripMessage
+exports.getEndTripMessages = getEndTripMessages
 exports.parseCanDriverStyleMessage = parseCanDriverStyleMessage
-exports.getCanDriverStyleMessage = getCanDriverStyleMessage
+exports.getCanDriverStyleMessages = getCanDriverStyleMessages