fleetmap-reports 1.0.686 → 1.0.688

package/package.json

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

package/src/fueldrop-report.js

@@ -1,6 +1,7 @@
 const automaticReports = require('./automaticReports')
 const { devicesToProcess } = require('./util/device')
 const { getTranslations } = require('./util/utils')
+const traccarHelper = require('./util/traccar')
 
 function calculateFuelDrop (position, positions) {
   const index = positions.indexOf(position)
@@ -21,48 +22,43 @@ function calculateFuelDrop (position, positions) {
 async function createFuelDropReport (from, to, userData, traccar) {
   console.log('Create FuelDropReport')
 
-  const reportData = []
-
   const allData = {
     devices: [],
     from,
     to
   }
 
+  const reportData = []
+  reportData.push(allData)
+
   const devices = devicesToProcess(userData)
 
-  const arrayOfArrays = automaticReports.sliceArray(devices)
+  const arrayOfArrays = automaticReports.sliceArray(devices, 50)
   let data = []
-  const types = ['deviceFuelDrop']
 
+  const types = ['deviceFuelDrop']
   for (const a of arrayOfArrays) {
     const response = await traccar.reports.reportsEventsGet(from, to, a.map(d => d.id), null, types)
     data = data.concat(response.data)
   }
-
   console.log('FuelDrop Alerts:' + data.length)
-
-  if (data.length === 0) {
-    return reportData
-  }
   allData.totalDevices = 0
   allData.totalFuelDrops = 0
   allData.totalFuelDropLiters = 0
 
   for (const d of devices) {
     const alerts = data.filter(t => t.deviceId === d.id)
-
     if (alerts.length > 0) {
-      const response = await traccar.reports.reportsRouteGet(from, to, [d.id])
-      const positions = response.data
+      const allInOne = await traccarHelper.getAllInOne(traccar, from, to, [d], true, false, false, false, 1, devices.length)
+      const route = allInOne.route.filter(t => t.deviceId === d.id)
 
       for (const a of alerts) {
         a.fuelDropLiters = 0
         if (a.positionId > 0) {
-          const position = positions.find(p => p.id === a.positionId)
+          const position = route.find(p => p.id === a.positionId)
           if (position) {
             a.position = position
-            const diff = calculateFuelDrop(position, positions)
+            const diff = calculateFuelDrop(position, route)
             a.fuelDropLiters = Math.round(diff * d.attributes.fuel_tank_capacity / 100)
           }
         }
@@ -76,16 +72,10 @@ async function createFuelDropReport (from, to, userData, traccar) {
           device: d,
           alerts: filteredAlerts
         })
-
-        allData.totalDevices = allData.totalDevices + 1
-        allData.totalFuelDrops = allData.totalFuelDrops + filteredAlerts.length
-        allData.totalFuelDropLiters = allData.totalFuelDropLiters + filteredAlerts.reduce((a, b) => a + b.fuelDropLiters, 0)
       }
     }
   }
 
-  reportData.push(allData)
-
   return reportData
 }
 

package/src/tests/fuel.test.js

@@ -5,6 +5,7 @@ const assert = require('assert')
 const deviceId = 122575
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
+  this.timeout(5000000)
   it('Trip by device', async () => {
     console.log('trip by device')
     const report = await getReports()

package/src/util/traccar.js

@@ -79,7 +79,7 @@ async function getAllInOne (
   sliceSize = 5,
   devicesPerRequest = 1,
   counter = undefined) {
-  let url = `/reports/allinone?from=${from.toISOString()}&to=${to.toISOString()}`
+  let url = `/reports/5120/allinone?from=${from.toISOString()}&to=${to.toISOString()}`
   if (getRoutes) url += '&type=route'
   if (getTrips) url += '&type=trips'
   if (getStops) url += '&type=stops'