fleetmap-reports 1.0.420 → 1.0.423

package/package.json

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

package/src/index.test.js

@@ -52,6 +52,21 @@ describe('Test_Reports', function () {
     assert.equal(device.trips[1].endPOIName, undefined)
     assert.equal(device.totalDistance, 339204.53999999166) // Total Kms
   }, 20000)
+  it('Trip without addresses', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+
+    const data = await report.tripReport(new Date(2022, 4, 27, 0, 0, 0, 0),
+      new Date(2022, 4, 27, 23, 59, 59, 0),
+      userData)
+
+    assert.equal(data.length, 1)
+    const device = data[0].devices.find(d => d.device.id === 25808)
+    assert.equal(device.trips.length, 11) // Total Trips
+    console.log(device.trips[0])
+    assert.equal(device.trips[0].endAddress, 'Rua Cláudio Manoel 184-314;Vera Cruz;Vera Cruz;96880-000;BR\n')
+    assert.equal(device.trips[1].endPOIName, undefined)
+  }, 20000)
   // eslint-disable-next-line no-undef
   it('Trip 2 by device', async () => {
     const report = await getReports()

package/src/trip-report.js

@@ -59,7 +59,7 @@ async function createTripReportByDevice (from, to, userData, traccar) {
         trips: tripsData,
         stops: stopsData,
         route: routeData
-      }, userData))
+      }, userData, traccar))
     }
     deviceCount = deviceCount + slice.length
   }
@@ -121,7 +121,7 @@ async function createTripReportByDriver (from, to, userData, traccar) {
   return { drivers: processDrivers(from, to, userData, { trips: tripsData, route: routeData }) }
 }
 
-function processDevices (from, to, devices, data, userData) {
+function processDevices (from, to, devices, data, userData, traccar) {
   const devicesResult = []
 
   devices.forEach(d => {
@@ -157,6 +157,10 @@ function processDevices (from, to, devices, data, userData) {
         trip.stopDuration = 0
         trip.stopEngineHours = 0
       }
+      if (trip.endAddress === null) {
+        traccar.axios.get(`/server/geocode?latitude=${trip.latitude}&longitude=${trip.longitude}`)
+          .then(d => { trip.endAddress = d.data })
+      }
     })
 
     if (trips.length > 0) {