fleetmap-reports 2.0.264 → 2.0.266

package/package.json

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

package/src/location-report.js

@@ -41,25 +41,45 @@ async function createLocationReport (from, to, userData, traccar) {
   return reportData
 }
 
+async function _process (traccar, from, to, slice, deviceCount, devices, userData) {
+  const url = `https://${process.env.SERVER_HOST}/pinmeapi/process-report/get-driver-route'`
+  return traccar.axios.post(url, {
+    from,
+    to,
+    slice,
+    deviceCount,
+    devices,
+    userData
+  }).then(d => d.data)
+}
+
+async function process (traccar, from, to, slice, deviceCount, devices, userData) {
+  const allInOne = await traccarHelper.getAllInOne(
+    traccar, from, to, slice, true, false, false, false,
+    deviceCount,
+    devices.length,
+    5,
+    1,
+    undefined,
+    false,
+    true
+  )
+  await processDrivers(from, to, userData, allInOne)
+}
+
 async function createLocationReportByDriver (from, to, userData, traccar) {
   // server side only
   const url = `http://${process.env.TRACCAR_HOST}/api/devices`
   const devices = await traccar.axios.get(url).then(d => d.data)
   console.log(devices.length)
 
-  if (!devices.length) {
-    // Empty report
-    return { drivers: [] }
-  }
-
-  const sliced = automaticReports.sliceArray(devices, 3)
-  const driversResult = []
+  if (!devices.length) { return { drivers: [] } }
 
-  for (const slice of sliced) {
-    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false)
-    await processDrivers(from, to, userData, allInOne, driversResult)
-  }
-  return { drivers: driversResult }
+  const sliced = automaticReports.sliceArray(devices, 1)
+  const deviceCount = 0
+  const promises = sliced.map(slice => _process(traccar, from, to, slice, deviceCount, devices, userData))
+  const result = await Promise.all(promises)
+  return { drivers: result.flat() }
 }
 
 async function createLocationReportByGroup (from, to, userData, traccar) {
@@ -166,7 +186,8 @@ function processDevices (from, to, devices, data) {
   return devicesResult
 }
 
-async function processDrivers (from, to, userData, data, driversResult) {
+async function processDrivers (from, to, userData, data) {
+  const result = []
   for (const d of userData.drivers) {
     const { route } = await getDriverData(d, data, userData)
     if (route.length > 0) {
@@ -186,10 +207,10 @@ async function processDrivers (from, to, userData, data, driversResult) {
         positions: route
       }
       console.log('pushing', route.length, 'for', d.name)
-      driversResult.push(driverData)
+      result.push(driverData)
     }
   }
-  console.log(driversResult)
+  return result
 }
 
 async function exportLocationReportToPDF (userData, reportData) {
@@ -472,3 +493,4 @@ exports.create = createLocationReport
 exports.exportToPDF = exportLocationReportToPDF
 exports.exportToExcel = exportLocationReportToExcel
 exports.getDigitalPortValue = getDigitalPortValue
+exports.process = process

package/src/util/route.js

@@ -50,7 +50,8 @@ function cleanPosition (p) {
     longitude: p.longitude,
     deviceId: p.deviceId,
     speed: p.speed,
-    valid: p.valid
+    valid: p.valid,
+    attributes: { driverUniqueId: p.attributes.driverUniqueId }
   }
 }