fleetmap-reports 2.0.276 → 2.0.278

package/package.json

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

package/src/location-report.js

@@ -62,7 +62,7 @@ async function createLocationReportByDriver (from, to, userData, traccar) {
   return { drivers: results.flat() }
 }
 
-async function _getDriverRoute (traccar, from, to, slice, deviceCount, devices, userData) {
+async function _getDriverRoute (traccar, from, to, slice, deviceCount, devices, userData, retry = 3) {
   const url = `https://${process.env.SERVER_HOST}/pinmeapi/process-report/get-driver-route`
   return traccar.axios.post(url, {
     from,
@@ -73,17 +73,13 @@ async function _getDriverRoute (traccar, from, to, slice, deviceCount, devices,
     userData
   }, { timeout: 1000 * 60 * 5 })
     .catch((e) => {
-      console.error('moving on', e)
-      return traccar.axios.post(url, {
-        from,
-        to,
-        slice,
-        deviceCount,
-        devices,
-        userData
-      }).then(d => d.data)
+      if (--retry) {
+        return _getDriverRoute(traccar, from, to, slice, deviceCount, devices, userData, retry)
+      } else {
+        console.error('giving up', slice[0].id, 'after 3 retries', e.message)
+      }
     })
-    .then(d => d && d.data)
+    .then(r => (r && r.data) || [])
 }
 
 async function getDriverRoute (traccar, from, to, slice, deviceCount, devices, userData) {

package/src/tests/positions.test.js

@@ -33,7 +33,7 @@ describe('test positions', function () {
         new Date(Date.UTC(2025, 0, 31, 23, 59, 59, 0)),
         userData)
       assert.equal(data.length, 1)
-      const driver = data[0].drivers.find(d => d.driver.id === 14020)
+      const driver = data[0].drivers.find(d => d.name.startsWith('ERICA'))
       console.log(driver.positions)
       assert.equal(driver.positions.length, 85) // Total Positions
     } catch (e) {