fleetmap-reports 1.0.912 → 1.0.916

package/package.json

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

package/src/tests/zones.test.js

@@ -45,18 +45,19 @@ describe('zones', function () {
 
   // eslint-disable-next-line no-undef
   it('works with casais zones in columns', async () => {
-    const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)
+    const report = await getReports('fleetmap.joao.penas2@gmail.com', 'penas46881')
     const userData = await report.getUserData()
     userData.zonesByColumn = true
-    userData.devices = userData.devices.filter(d => d.name === 'G-1101-E Clio')
-    userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ')
-    userData.onlyWithKmsOut = true
+    userData.devices = userData.devices.filter(d => d.id === 81202)
+    userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ' ||
+    g.name === 'baliza 2 - raio amarelo')
+    userData.onlyWithKmsOut = false
     const result = await report.zoneReport(
-      new Date(Date.UTC(2023, 0, 1, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 0, 31, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 6, 13, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 6, 13, 23, 59, 59, 0)),
       userData)
-    const first = result[0].devices[0].days[0]
+    const first = result[0].devices[0]
     console.log(first)
-    assert.equal(first.distanceOut, 35.52274536571346)
+    assert.equal(first.days[0].distanceOut, 28)
   }, 4000000)
 })

package/src/zone-report.js

@@ -261,8 +261,13 @@ function getAnyNextIn (outDate, alerts, deviceRoute) {
   const next = alerts
     .filter(a => a.type === 'geofenceEnter')
     .find(a => new Date(a.position.fixTime).getTime() > outDate)
-  return (next && next.position && new Date(next.position.fixTime).getTime()) ||
-      new Date(deviceRoute.slice(-1)[0].fixTime).getTime()
+
+  if (!alerts.filter(a => a.type === 'geofenceExit' &&
+      new Date(a.position.fixTime).getTime() > outDate &&
+      new Date(a.position.fixTime).getTime() < new Date(next.position.fixTime).getTime()).length) {
+    return (next && next.position && new Date(next.position.fixTime).getTime()) ||
+        new Date(deviceRoute.slice(-1)[0].fixTime).getTime()
+  }
 }
 
 function calculateDistanceIn (zoneInOutDayData, deviceRoute, dayRoute, fromByDay, toByDay, to, device) {
@@ -289,8 +294,8 @@ function calculateDistanceIn (zoneInOutDayData, deviceRoute, dayRoute, fromByDay
 
 function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, field, device) {
   if (zoneInOutDayData.length) {
-    let distanceOut = zoneInOutDayData.reduce((a, b) => a + (b[field] || 0), 0) -
-        (zoneInOutDayData[zoneInOutDayData.length - 1][field] || 0)
+    const dataInsideDay = zoneInOutDayData.filter(z => z.outTime && new Date(z.outTime.fixTime) < toByDay)
+    let distanceOut = dataInsideDay.reduce((a, b) => a + (b[field] || 0), 0)
 
     if (zoneInOutDayData[0].inTime && new Date(zoneInOutDayData[0].inTime.fixTime) > fromByDay) {
       // Add distanceOut before the first entry
@@ -302,6 +307,7 @@ function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, f
     }
 
     if (zoneInOutDayData[zoneInOutDayData.length - 1].outTime && new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) < toByDay) {
+      distanceOut = distanceOut - zoneInOutDayData[zoneInOutDayData.length - 1][field]
       const routeOut = dayRoute.filter(p =>
         new Date(p.fixTime) >= new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime).getTime() &&
           new Date(p.fixTime) < toByDay.getTime())