fleetmap-reports 2.0.222 → 2.0.224

package/package.json

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

package/src/zone-report.js

@@ -22,11 +22,11 @@ const { checkGeofenceIn } = require('./util/geofence')
 const { parallel } = require('./util/parallel')
 const { getDataByDay } = require('./util/trips')
 const axios = require('axios').default
-const sliceSize = 5
+const sliceSize = 1
 const deviceChunk = 5
 const fileName = 'ZoneReport'
 
-async function process (traccar, from, to, slice, deviceCount, devices, reportRangeDays, userData) {
+exports.process = async (traccar, from, to, slice, deviceCount, devices, reportRangeDays, userData) => {
   const data = await traccarHelper.getAllInOne(
     traccar, from, to, slice, true, false, false, false,
     deviceCount, devices.length, sliceSize, reportRangeDays > 29 ? 1 : deviceChunk, undefined, false, true)
@@ -84,12 +84,23 @@ async function createZoneReport (from, to, userData, traccar) {
   const sliced = automaticReports.sliceArray(devices, sliceSize)
 
   let deviceCount = 0
-  for (const slice of sliced) {
-    const processed = await process(traccar, from, to, slice, deviceCount, devices, reportRangeDays, userData)
+  const url = `https://${process.env.SERVER_HOST}/pinmeapi/reports/zone-report-processing`
+
+  const promises = sliced.map(slice =>
+    traccar.axios.post(url, {
+      from,
+      to,
+      userData,
+      slice,
+      deviceCount: deviceCount++,
+      devices,
+      reportRangeDays
+    }).then(response => response.data)
+  )
+  const results = await Promise.all(promises)
+  results.forEach(processed => {
     allData.devices.push(...processed)
-
-    deviceCount = deviceCount + slice.length
-  }
+  })
 
   reportData.push(allData)