fleetmap-reports 2.0.366 → 2.0.367

package/package.json

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

package/src/fuel-consumption-report.js

@@ -35,65 +35,85 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
     return reportData
   }
 
-  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, true, false)
-  const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
-  const summary = await getSummaryByDay(dates, userData, traccar, devices, true, from, to)
+  const daysByDevice = new Map()
+
+  // Process the period in chunks of whole calendar days (computed once up front, then grouped) so
+  // we never hold more than ~a week of raw GPS positions for the whole device set in memory at
+  // once - a single busy device can have tens of thousands of positions over a month. Chunking the
+  // already-computed dates list, rather than re-deriving dates per raw millisecond sub-range, avoids
+  // any risk of a boundary day being counted twice (or dropped) due to getDates' timezone rounding.
+  const allDates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
+  const dateGroups = automaticReports.sliceArray(allDates, 7)
+
+  for (let chunkIndex = 0; chunkIndex < dateGroups.length; chunkIndex++) {
+    const dates = dateGroups[chunkIndex]
+    const chunkFrom = chunkIndex === 0 ? from : dates[0]
+    const chunkTo = chunkIndex === dateGroups.length - 1 ? to : dateGroups[chunkIndex + 1][0]
+
+    const allInOne = await traccarHelper.getAllInOne(traccar, chunkFrom, chunkTo, devices, true, true, true, false)
+    const summary = await getSummaryByDay(dates, userData, traccar, devices, true, chunkFrom, chunkTo)
+
+    const fuelServicesData = []
+    if (devices.some(d => d.attributes.odooId)) {
+      fuelServicesData.push(...(await odoo.getOdooFuelServices(traccar, chunkFrom, chunkTo)))
+    }
 
-  const fuelServicesData = []
-  if (devices.some(d => d.attributes.odooId)) {
-    fuelServicesData.push(...(await odoo.getOdooFuelServices(traccar, from, to)))
-  }
+    if (allInOne.trips.length > 0) {
+      for (const d of devices) {
+        const stops = allInOne.stops.filter(t => t.deviceId === d.id)
+        const trips = allInOne.trips.filter(t => t.deviceId === d.id)
+        const route = allInOne.route.filter(r => r.deviceId === d.id)
+        const deviceFuelServices = fuelServicesData.filter(f => Number.parseInt(d.attributes.odooId) === f.vehicle_id[0])
+
+        if (trips.length > 0) {
+          const refuelingPositions = await refuelingReport.calculateRefuelingPositions(userData, d, { route, trips, fuelServices: deviceFuelServices })
+          const days = daysByDevice.get(d.id) || []
+          for (const date of dates) {
+            const { tripsByDay, stopsByDay, routeByDay, refuelingPositionsByDay } = await getDataByDay(d, date, { trips, stops, route, refuelingPositions }, userData, traccar)
+            const summaryByDay = summary.find(a => a.date === date).summary
+            const summaryByDevice = summaryByDay.find(a => a.deviceId === d.id)
+
+            const firstStopIndex = !stopsByDay.length || !tripsByDay.length ? 0 : (new Date(tripsByDay[0].startTime) < new Date(stopsByDay[0].startTime) ? 0 : 1)
+            const distance = summaryByDevice.distance
+
+            const hasFuelSensor = 'fuel_low_threshold' in d.attributes &&
+                'fuel_high_threshold' in d.attributes &&
+                d.attributes.fuel_tank_capacity
+
+            const spentFuel = hasFuelSensor ?
+                tripsByDay.length > 0 ? calculateTotalFuelFromSensor(tripsByDay, stopsByDay, route, d, firstStopIndex) : 0
+                : calculateConsumption(d, { trips: tripsByDay, stops: stopsByDay, route: routeByDay, summary: summaryByDevice })
+
+            const dataRow = {
+              date,
+              distance,
+              spentFuel,
+              avgConsumption: getCanAvgConsumption(distance, spentFuel),
+              startOdometer: summaryByDevice.startOdometer,
+              endOdometer: summaryByDevice.endOdometer,
+              duration: tripsByDay.reduce((a, b) => a + b.duration, 0),
+              refueling: (refuelingPositionsByDay && refuelingPositionsByDay.length > 0) ? refuelingPositionsByDay.reduce((a, b) => a + b.diff, 0) : 0
+            }
+
+            days.push(dataRow)
+          }
+          daysByDevice.set(d.id, days)
+        }
+      }
+    }
 
-  if (allInOne.trips.length === 0) {
-    return reportData
+    console.log('LOADING_MESSAGE:' + (devices[0] && devices[0].name))
+    console.log(`PROGRESS_PERC:${(chunkIndex + 1) / dateGroups.length * 100}`)
   }
 
   for (const d of devices) {
-    const stops = allInOne.stops.filter(t => t.deviceId === d.id)
-    const trips = allInOne.trips.filter(t => t.deviceId === d.id)
-    const route = allInOne.route.filter(r => r.deviceId === d.id)
-    const deviceFuelServices = fuelServicesData.filter(f => Number.parseInt(d.attributes.odooId) === f.vehicle_id[0])
-
-    if (trips.length > 0) {
-      const refuelingPositions = await refuelingReport.calculateRefuelingPositions(userData, d, { route, trips, fuelServices: deviceFuelServices })
-      const days = []
-      for (const date of dates) {
-        const { tripsByDay, stopsByDay, routeByDay, refuelingPositionsByDay } = await getDataByDay(d, date, { trips, stops, route, refuelingPositions }, userData, traccar)
-        const summaryByDay = summary.find(a => a.date === date).summary
-        const summaryByDevice = summaryByDay.find(a => a.deviceId === d.id)
-
-        const firstStopIndex = !stopsByDay.length || !tripsByDay.length ? 0 : (new Date(tripsByDay[0].startTime) < new Date(stopsByDay[0].startTime) ? 0 : 1)
-        const distance = summaryByDevice.distance
-
-        const hasFuelSensor = 'fuel_low_threshold' in d.attributes &&
-            'fuel_high_threshold' in d.attributes &&
-            d.attributes.fuel_tank_capacity
-
-        const spentFuel = hasFuelSensor ?
-            tripsByDay.length > 0 ? calculateTotalFuelFromSensor(tripsByDay, stopsByDay, route, d, firstStopIndex) : 0
-            : calculateConsumption(d, { trips: tripsByDay, stops: stopsByDay, route: routeByDay, summary: summaryByDevice })
-
-        const dataRow = {
-          date,
-          distance,
-          spentFuel,
-          avgConsumption: getCanAvgConsumption(distance, spentFuel),
-          startOdometer: summaryByDevice.startOdometer,
-          endOdometer: summaryByDevice.endOdometer,
-          duration: tripsByDay.reduce((a, b) => a + b.duration, 0),
-          refueling: (refuelingPositionsByDay && refuelingPositionsByDay.length > 0) ? refuelingPositionsByDay.reduce((a, b) => a + b.diff, 0) : 0
-        }
-
-        days.push(dataRow)
-      }
-
-      if (days.length > 0) {
-        allData.devices.push({
-          device: d,
-          days
-        })
-        allData.totalDevices = allData.totalDevices + 1
-      }
+    const days = daysByDevice.get(d.id)
+    if (days && days.length > 0) {
+      allData.devices.push({
+        device: d,
+        days
+      })
+      allData.totalDevices = allData.totalDevices + 1
     }
   }
 

package/src/partnerReports/driverranking-report.js

@@ -3,7 +3,7 @@ const traccarHelper = require('../util/traccar')
 const { getDriverData, devicesByDriver } = require('../util/driver')
 const { getCanDriverStyleMessages, parseCanDriverStyleMessage } = require('../util/xpert')
 const { calculateRPMSections } = require('./performance-report')
-const { getTranslations, isClientSide, convertToLocaleString, convertMS, getServerHost } = require('../util/utils')
+const { getTranslations, isClientSide, convertToLocaleString, convertMS, getServerHost, splitDateRange } = require('../util/utils')
 const jsPDF = require('jspdf')
 const { headerFromUser, addTable } = require('../util/pdfDocument')
 const { getStyle } = require('../reportStyle')
@@ -58,20 +58,6 @@ function toGrade (score) {
   return grades.find(g => score >= g.min).grade
 }
 
-// Splits [from, to] into consecutive sub-ranges of at most chunkDays each
-function splitDateRange (from, to, chunkDays) {
-  const chunkMs = chunkDays * 24 * 60 * 60 * 1000
-  const end = new Date(to).getTime()
-  const chunks = []
-  let chunkStart = new Date(from).getTime()
-  while (chunkStart < end) {
-    const chunkEnd = Math.min(chunkStart + chunkMs, end)
-    chunks.push({ from: new Date(chunkStart), to: new Date(chunkEnd) })
-    chunkStart = chunkEnd
-  }
-  return chunks.length ? chunks : [{ from: new Date(from), to: new Date(to) }]
-}
-
 async function create (from, to, userData, traccar) {
   const reportData = {
     drivers: []

package/src/util/utils.js

@@ -110,6 +110,25 @@ function convertToFeature (geofence) {
   }
 }
 
+// Splits [from, to] into consecutive sub-ranges of at most chunkDays each, so callers can process a
+// long period in bounded-size pieces instead of holding the whole thing (e.g. a month of GPS
+// positions) in memory at once.
+function splitDateRange (from, to, chunkDays) {
+  const chunkMs = chunkDays * 24 * 60 * 60 * 1000
+  const end = new Date(to).getTime()
+  const chunks = []
+  let chunkStart = new Date(from).getTime()
+  while (chunkStart < end) {
+    const chunkEnd = Math.min(chunkStart + chunkMs, end)
+    const isLastChunk = chunkEnd >= end
+    // Pull the boundary back by 1ms on every chunk but the last, so callers that round to whole
+    // calendar days (e.g. getDates) don't count the boundary day in both adjacent chunks.
+    chunks.push({ from: new Date(chunkStart), to: new Date(isLastChunk ? chunkEnd : chunkEnd - 1) })
+    chunkStart = chunkEnd
+  }
+  return chunks.length ? chunks : [{ from: new Date(from), to: new Date(to) }]
+}
+
 function getDates (startDate, endDate, timezone) {
   const dates = []
   let currentDate = new Date(startDate.getFullYear(), startDate.getMonth(), startDate.getDate(), 12, 0, 0, 0)
@@ -307,6 +326,7 @@ exports.getImgFromUrl = getImgFromUrl
 exports.convertMS = convertMS
 exports.coordsDistance = coordsDistance
 exports.getDates = getDates
+exports.splitDateRange = splitDateRange
 exports.convertToLocaleString = convertToLocaleString
 exports.convertToLocaleDateString = convertToLocaleDateString
 exports.convertToLocaleTimeString = convertToLocaleTimeString