fleetmap-reports 1.0.762 → 1.0.764

package/package.json

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

package/src/tests/performance.test.js

@@ -2,15 +2,14 @@ const { getReports } = require('./index')
 const { createPerformanceReport } = require('../partnerReports/performance-report')
 // eslint-disable-next-line no-undef
 describe('performance', function () {
-  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('performance report', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
-    userData.devices = userData.devices.filter(d => d.id === 128270)
+    userData.devices = userData.devices.filter(d => d.attributes.xpert)
     const data = await createPerformanceReport(
-      new Date(Date.UTC(2023, 5, 29, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 5, 30, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 5, 10, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 5, 20, 23, 59, 59, 0)),
       userData,
       report.traccar)
     console.log(data)

package/src/tests/zones.test.js

@@ -2,7 +2,6 @@ const { getReports } = require('./index')
 const assert = require('assert')
 // eslint-disable-next-line no-undef
 describe('zones', function () {
-  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('works with ellca', async () => {
     const report = await getReports()
@@ -55,50 +54,14 @@ describe('zones', function () {
     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 raio verde ')
+    userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ')
+    userData.onlyWithKmsOut = true
     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)),
       userData)
     const first = result[0].devices[0].days[0]
     console.log(first)
-    assert.equal(first.distanceOut, 0.0009407267222226043)
-  }, 4000000)
-
-  // eslint-disable-next-line no-undef
-  it('works with casais 2', async () => {
-    const report = await getReports('mario.andre.moreira@casais.gi', 'Casais.23')
-    const userData = await report.getUserData()
-    userData.groupByDay = true
-    userData.devices = userData.devices.filter(d => d.name === 'G-2542-F Fiat Tipo')
-    userData.geofences = userData.geofences.filter(g => g.name === 'baliza raio verde ')
-    assert.equal(userData.geofences.length > 0, true)
-    assert.equal(userData.devices.length > 0, true)
-    const result = await report.zoneReport(
-      new Date(2023, 1, 27, 0, 0, 0, 0),
-      new Date(2023, 1, 27, 23, 59, 59, 0),
-      userData)
-    assert.equal(result[0].devices[0].geofences.length, 1)
-    assert.equal(result[0].devices[0].geofences[0].days.length, 1)
-    const first = result[0].devices[0].geofences[0].days[0]
-    assert.equal(first.firstIn, '2023-02-27T21:53:16.000+0000')
-    assert.equal(first.distanceIn, 93.03917199839687)
-    assert.equal(first.distanceOut, 819.6685737216337)
-  }, 4000000)
-
-  it('works with casais 3', async () => {
-    const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)
-    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 raio verde ' || g.name === 'baliza raio amarelo ')
-    const result = await report.zoneReport(
-        new Date(Date.UTC(2023, 0, 29, 0, 0, 0, 0)),
-        new Date(Date.UTC(2023, 0, 31, 23, 59, 59, 0)),
-        userData)
-    const first = result[0].devices[0].geofences[0]
-    console.log(first)
-    assert.equal(first.name, 'baliza raio verde ')
-    assert.equal(first.distanceIn, '1069.343491503579')
+    assert.equal(first.distanceOut, 35.52274536571346)
   }, 4000000)
 })

package/src/zone-report.js

@@ -131,7 +131,7 @@ async function processDevices (from, to, devices, userData, data) {
         geofencesData.push({
           geofenceId: geofence.id,
           geofenceName: geofence.name,
-          days: dataByDay
+          days: userData.onlyWithKmsOut ? dataByDay.filter(d => d.distanceOut) : dataByDay
         })
       }
 
@@ -147,19 +147,22 @@ async function processDevices (from, to, devices, userData, data) {
           const distanceOut = calculateDistanceOut(zoneInOutDayData, deviceRoute, fromByDay, toByDay, 'distanceOutAny')
 
           const geofences = geofencesData.map(g => {
+            const day = g.days.find(day => day.date === date)
             return {
               geofenceId: g.geofenceId,
               geofenceName: g.geofenceName,
-              distanceIn: g.days.find(day => day.date === date).distanceIn
+              distanceIn: day && day.distanceIn
             }
           })
 
-          if (distanceOut || geofences.filter(g => g.distanceIn).length) {
-            groupByDay.push({
-              date,
-              geofences,
-              distanceOut
-            })
+          if (distanceOut > 0.01 || geofences.filter(g => g.distanceIn > 0.01).length) {
+            if (!userData.onlyWithKmsOut || distanceOut) {
+              groupByDay.push({
+                date,
+                geofences,
+                distanceOut
+              })
+            }
           }
         }
 
@@ -187,7 +190,7 @@ async function processDevices (from, to, devices, userData, data) {
           device: d,
           from,
           to,
-          geofences: zoneInOutData
+          geofences: userData.onlyWithKmsOut ? zoneInOutData.filter(a => a.distanceOut) : zoneInOutData
         })
       }
     }