fleetmap-reports 2.0.360 → 2.0.362

package/package.json

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

package/src/partnerReports/driverranking-report.js

@@ -65,17 +65,31 @@ async function create (from, to, userData, traccar) {
   userData.geofences = []
   userData.roadSpeedLimits = true
 
+  let deviceIdsByDriver
   if (!userData.requestToRunServerSide) {
-    const { devices, drivers } = await devicesByDriver(traccar, from, to, userData.drivers, userData.devices)
-    userData.devices = devices
-    userData.drivers = drivers
+    const result = await devicesByDriver(traccar, from, to, userData.drivers, userData.devices)
+    userData.devices = result.devices
+    userData.drivers = result.drivers
+    deviceIdsByDriver = result.deviceIdsByDriver
   }
 
   if (isClientSide() && (userData.drivers.length > 50 || ((new Date(to).getTime() - new Date(from).getTime()) > (1000 * 60 * 60 * 24 * 15)))) {
     const sliced = automaticReports.sliceArray(userData.drivers, 5)
     userData.requestToRunServerSide = true
     userData.byDriver = true
-    const allDriversData = await executeServerSide('driverranking-report', sliced, from, to, userData, userData.drivers.length, traccar, 5)
+    // Narrow the devices sent per-slice to just the ones those drivers actually used, so a single
+    // server invocation doesn't have to hold the whole fleet's route data in memory at once (was
+    // causing Runtime.OutOfMemory on large fleets).
+    const allDriversData = await executeServerSide('driverranking-report', sliced, from, to, userData, userData.drivers.length, traccar, 5, (driversSlice) => {
+      const deviceIds = new Set()
+      driversSlice.forEach(d => {
+        const ids = deviceIdsByDriver.get(d.uniqueId)
+        if (ids) {
+          ids.forEach(id => deviceIds.add(id))
+        }
+      })
+      return { devices: userData.devices.filter(device => deviceIds.has(device.id)) }
+    })
 
     allDriversData.sort((a, b) => b.overallScore - a.overallScore)
     allDriversData.forEach((d, index) => { d.rank = index + 1 })

package/src/util/driver.js

@@ -12,7 +12,16 @@ async function devicesByDriver (traccarInstance, from, to, drivers, devices) {
   const deviceIdsToProcess = new Set(eventsData.map(e => e.deviceId))
   const devicesToProcess = devices.filter(d => deviceIdsToProcess.has(d.id))
 
-  return { devices: devicesToProcess, drivers: driversToProcess }
+  const deviceIdsByDriver = new Map()
+  eventsData.forEach(e => {
+    const driverUniqueId = e.attributes.driverUniqueId
+    if (!deviceIdsByDriver.has(driverUniqueId)) {
+      deviceIdsByDriver.set(driverUniqueId, new Set())
+    }
+    deviceIdsByDriver.get(driverUniqueId).add(e.deviceId)
+  })
+
+  return { devices: devicesToProcess, drivers: driversToProcess, deviceIdsByDriver }
 }
 
 async function reportByDriver (devices, traccar, from, to, userData, processor, allInOneData = { route: true, trips: true, stops: true, summary: false }) {

package/src/util/utils.js

@@ -250,7 +250,7 @@ function weekDaySelected (date, weekDays) {
     (date.getDay() === 6 && weekDays.saturday))
 }
 
-async function executeServerSide (type, sliced, from, to, userData, totalItems, traccar, maxRequests = 10) {
+async function executeServerSide (type, sliced, from, to, userData, totalItems, traccar, maxRequests = 10, getExtraUserData) {
   let itemsCount = 0
   console.log('PROGRESS_PERC:1')
   const cookie = await axios.get('/pinmeapi/cookie/get', { withCredentials: true }).then(d => d.data)
@@ -267,7 +267,8 @@ async function executeServerSide (type, sliced, from, to, userData, totalItems,
             ? {
                 ...userData,
                 drivers: items,
-                geofences: []
+                geofences: [],
+                ...(getExtraUserData ? getExtraUserData(items) : {})
               }
             : {
                 ...userData,
@@ -293,9 +294,9 @@ async function executeServerSide (type, sliced, from, to, userData, totalItems,
   }
 
   if (userData.byDriver) {
-    reportData.sort((a, b) => (a.driver.name > b.driver.name) ? 1 : -1)
+    reportData.sort((a, b) => (((a.driver && a.driver.name) || a.name || '') > ((b.driver && b.driver.name) || b.name || '')) ? 1 : -1)
   } else {
-    reportData.sort((a, b) => (a.device.name > b.device.name) ? 1 : -1)
+    reportData.sort((a, b) => (((a.device && a.device.name) || a.name || '') > ((b.device && b.device.name) || b.name || '')) ? 1 : -1)
   }
 
   return reportData