fleetmap-reports 1.0.924 → 1.0.925

package/package.json

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

package/src/util/utils.js

@@ -226,14 +226,25 @@ function weekDaySelected (date, weekDays) {
 
 async function executeServerSide (type, allData, sliced, from, to, userData, totalDevices) {
   let deviceCount = 0
-  console.log(`PROGRESS_PERC:${1 / totalDevices * 100}`)
-  await Promise.all(sliced.map(async devices => {
-    const url = `https://${process.env.SERVER_HOST}/reports/${type}`
-    const data = await axios.post(url, { from, to, userData: { ...userData, devices } }, { withCredentials: true }).then(d => d.data)
-    allData.devices.push(...(data[0].devices))
-    deviceCount = deviceCount + devices.length
-    console.log(`PROGRESS_PERC:${deviceCount / totalDevices * 100}`)
-  }))
+  console.log('PROGRESS_PERC:1')
+  const maxRequests = 4
+  for (let i=0; i < sliced.length; i+=maxRequests) {
+    const _sliced = sliced.slice(i, i+maxRequests)
+    await Promise.all(_sliced.map(async devices => {
+      const url = `https://${process.env.SERVER_HOST}/reports/${type}`
+      const data = await axios.post(url, {
+        from,
+        to,
+        userData: {
+          ...userData,
+          devices
+        }
+      }, { withCredentials: true }).then(d => d.data)
+      allData.devices.push(...(data[0].devices))
+      deviceCount = deviceCount + devices.length
+      console.log(`PROGRESS_PERC:${deviceCount / totalDevices * 100}`)
+    }))
+  }
 }
 
 exports.executeServerSide = executeServerSide