fleetmap-reports 2.0.382 → 2.0.383

package/package.json

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

package/src/fuel-consumption-report.js

@@ -12,6 +12,8 @@ const { calculateConsumption, calculateTotalFuelFromSensor, shouldUseFuelSensor
 const { getSummary } = require('./util/traccar')
 const { calculatePartialTrip } = require('./util/trips')
 
+const CHUNK_BOUNDARY_BUFFER_MS = 24 * 60 * 60 * 1000
+
 function getReportTimezone (userData) {
   const tz = userData.user.attributes.timezone || getUserPartner(userData.user).timezone
   try {
@@ -151,8 +153,20 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
 
   for (let chunkIndex = 0; chunkIndex < dateGroups.length; chunkIndex++) {
     const dates = dateGroups[chunkIndex]
-    const chunkFrom = chunkIndex === 0 ? from : getDayWindow(dates[0], timezone)[0]
-    const chunkTo = chunkIndex === dateGroups.length - 1 ? to : getDayWindow(dates[dates.length - 1], timezone)[1]
+    const chunkFromBase = chunkIndex === 0 ? from : getDayWindow(dates[0], timezone)[0]
+    const chunkToBase = chunkIndex === dateGroups.length - 1 ? to : getDayWindow(dates[dates.length - 1], timezone)[1]
+
+    // A trip in progress across a chunk boundary would otherwise come back from Traccar
+    // truncated to the request window, bypassing the day-boundary proration below (which
+    // only triggers when the trip's real end/start still extends past dayStart/dayEnd) -
+    // making a day's consumption depend on which chunk it happened to land in. Widening
+    // only the internal boundaries (never the report's actual from/to) by a day-long
+    // buffer ensures such a trip is always fetched whole here, so it goes through the same
+    // getReportDataByDay/calculatePartialTrip proration as any other cross-midnight trip.
+    // The date-by-date loop below still only processes this chunk's own `dates`, so no day
+    // is ever double-counted.
+    const chunkFrom = chunkIndex === 0 ? chunkFromBase : new Date(chunkFromBase.getTime() - CHUNK_BOUNDARY_BUFFER_MS)
+    const chunkTo = chunkIndex === dateGroups.length - 1 ? chunkToBase : new Date(chunkToBase.getTime() + CHUNK_BOUNDARY_BUFFER_MS)
 
     const allInOne = await traccarHelper.getAllInOne(traccar, chunkFrom, chunkTo, devices, true, true, true, false)
     const summary = await getReportSummaryByDay(dates, userData, traccar, devices, timezone, from, to, firstDate, lastDate)