fleetmap-reports 1.0.699 → 1.0.701

package/package.json

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

package/src/tests/zones.test.js

@@ -1,5 +1,8 @@
 const { getReports } = require('./index')
+const assert = require('assert')
+// eslint-disable-next-line no-undef
 describe('zones', function () {
+  // eslint-disable-next-line no-undef
   it('works with ellca', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
@@ -16,16 +19,19 @@ describe('zones', function () {
     console.log('result', result)
   }, 4000000)
 
-  it('works with afriquia', async () => {
-    const report = await getReports('moviflotte@gmail.com', 'moviflotte@gmail.com')
+  // eslint-disable-next-line no-undef
+  it('works with casais', async () => {
+    const report = await getReports('mario.andre.moreira@casais.gi', 'Casais.23')
     const userData = await report.getUserData()
-    console.log(userData.devices.length)
-    console.log(userData.devices.map(d => d.id))
-    console.log(userData.geofences)
+    userData.devices = userData.devices.filter(d => d.name === 'G-1101-E Clio')
+    userData.geofences = userData.geofences.filter(g => g.name === 'baliza raio verde ')
     const result = await report.zoneReport(
-      new Date(Date.UTC(2023, 5, 11, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 5, 11, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 0, 1, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 0, 31, 23, 59, 59, 0)),
       userData)
-    console.log('result', result)
+    const first = result[0].devices[0].geofences[0]
+    console.log(first)
+    assert.equal(first.inTime.fixTime, '2023-01-03T21:23:24.000+0000')
+    assert.equal(first.outTime.fixTime, '2023-01-07T12:22:53.000+0000')
   }, 4000000)
 })

package/src/util/utils.js

@@ -245,4 +245,4 @@ exports.calculateDistance = (positions) => {
     }, 0) || 0
 }
 
-exports.sortPositions = (a, b) => new Date(a).getTime() - new Date(b).getTime()
+exports.sortPositions = (a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime()

package/src/zone-report.js

@@ -15,7 +15,7 @@ const axios = require('axios')
 const { processServerSide } = require('./util')
 const { filterPositions } = require('./util/route')
 const { checkGeofenceIn } = require('./util/geofence')
-const sliceSize = 400
+const sliceSize = 100
 const deviceChunk = 5
 const fileName = 'ZoneReport'
 
@@ -29,7 +29,17 @@ async function createZoneReport (from, to, userData, traccar) {
 
   if (processServerSide(userData)) {
     const url = `https://${process.env.SERVER_HOST}/reports/zone-report`
-    return axios.post(url, { from, to, userData }, { withCredentials: true }).then(d => d.data)
+    const sliced = automaticReports.sliceArray(devices, sliceSize)
+    const promises = []
+    for (const slice of sliced) {
+      promises.push(axios.post(url, { from, to, userData: { ...userData, devices: slice } }, { withCredentials: true })
+        .then(d => d.data)
+        .then(data => allData.devices.push(...(data[0].devices)))
+      )
+    }
+    await Promise.all(promises)
+    reportData.push(allData)
+    return reportData
   }
   const types = ['geofenceEnter', 'geofenceExit']
 
@@ -315,7 +325,7 @@ function getInAndOutEvents (devices, route, userData) {
           if (!checkGeofenceIn(p, g)) {
             deviceEvents.push(createEvent('geofenceExit', d.id, p, g))
           } else {
-            previous.inside[id] = true
+            p.inside[id] = true
           }
         } else {
           if (checkGeofenceIn(p, g)) {