fleetmap-reports 2.0.223 → 2.0.225

package/package.json

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

package/src/tests/index.js

@@ -10,6 +10,7 @@ const traccarConfig = {
 }
 const axios = require('axios').create({ ...traccarConfig.baseOptions, baseURL: traccarConfig.basePath })
 process.env.TRACCAR_API_REPORTS = 'https://ltqgfyvcklxzaonv7h4rlmghai0rszop.lambda-url.us-east-1.on.aws/api'
+process.env.SERVER_HOST = 'api.pinme.io'
 const getReports = async (email, password) => {
   try {
     email = email || process.env.email

package/src/zone-report.js

@@ -22,7 +22,7 @@ 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'
 
@@ -84,12 +84,26 @@ async function createZoneReport (from, to, userData, traccar) {
   const sliced = automaticReports.sliceArray(devices, sliceSize)
 
   let deviceCount = 0
-  for (const slice of sliced) {
-    const url = `https://${process.env.SERVER_HOST}/pinmeapi/reports/zone-report-processing`
-    const processed = await traccar.axios.post(url, { from, to, userData, slice, deviceCount, devices, reportRangeDays }).then(d => d.data)
+  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 => {
+      console.log(url, 'done')
+      return response.data
+    }).catch(e => console.error(e.message, e.response?.data))
+  )
+  const results = await Promise.all(promises)
+  results.forEach(processed => {
     allData.devices.push(...processed)
-    deviceCount = deviceCount + slice.length
-  }
+  })
 
   reportData.push(allData)