fleetmap-reports 1.0.340 → 1.0.342

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.340",
+  "version": "1.0.342",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -28,6 +28,7 @@
   },
   "devDependencies": {
     "axios-debug-log": "^0.8.4",
+    "jest": "^27.5.0",
     "mocha": "^9.0.3",
     "webpack": "^5.24.3",
     "webpack-cli": "^4.5.0"

package/src/activity-report.js

@@ -9,7 +9,7 @@ const {getStyle} = require("./reportStyle")
 const {getUserPartner} = require("fleetmap-partners")
 const traccar = require("./util/traccar")
 const {isInsideTimetable, isPartialInsideTimetable} = require("./util/trips");
-const trips = require("./util/trips");
+const tripHelper = require("./util/trips");
 
 const fileName = 'ActivityReport'
 
@@ -85,16 +85,14 @@ async function createActivityReportByDevice(from, to, userData, traccarInstance)
     //Get report data from traccar
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-    let routeData = []
     let summaries = []
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
+    const {trips, route, summary}  = await traccar.getAllInOne(traccarInstance, from, to, devicesToProcess, userData.groupByDay && !userData.allWeek, true, false, !userData.groupByDay)
 
     if(userData.groupByDay) {
-        routeData = await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
-        console.log('trips:' + tripsData.length)
+        console.log('trips:' + trips.length)
 
-        if (tripsData.length > 0) {
-            trips.checkTripsKms(traccarInstance, from, to, devicesToProcess, {trips: tripsData, route: routeData})
+        if (trips.length) {
+            tripHelper.checkTripsKms(traccarInstance, from, to, devicesToProcess, {trips, route})
         }
 
         const dates = getDates(from, to)
@@ -109,14 +107,14 @@ async function createActivityReportByDevice(from, to, userData, traccarInstance)
             }
         }
     } else {
-        summaries = await traccar.getSummary(traccarInstance, from, to, devicesToProcess)
+        summaries = summary
     }
 
     console.log('Summary:' + summaries.length)
 
     //Process report data
-    if (summaries.length || tripsData.length) {
-        allData.devices = processDevices(from, to, devicesToProcess, {summaries: summaries, trips: tripsData, route: routeData}, userData)
+    if (summaries.length || trips.length) {
+        allData.devices = processDevices(from, to, devicesToProcess, {summaries: summaries, trips, route}, userData)
     }
 
     return allData

package/src/index.test.js

@@ -16,7 +16,7 @@ describe('Test_Reports', function() {
         assert.equal(device.alerts.length, 15)  // Total Alerts
         assert.equal(totalDistance, 19.605972526552154)  // Total Kms
         assert.equal(totalEventTime, 562000)  // Total Duration
-    }).timeout(20000)
+    }, 20000)
     it('Speeding by device with custom speed', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
@@ -34,7 +34,7 @@ describe('Test_Reports', function() {
         assert.equal(device.alerts.length, 24)  // Total Alerts
         assert.equal(totalDistance, 49.49653008204987)  // Total Kms
         assert.equal(totalEventTime, 1523000)  // Total Duration
-    }).timeout(20000)
+    }, 20000)
     it('Trip by device', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
@@ -47,7 +47,7 @@ describe('Test_Reports', function() {
         const device = data[0].devices.find(d => d.device.id===22326)
         assert.equal(device.trips.length, 7)  // Total Trips
         assert.equal(device.totalDistance, 339204.53999999166)  // Total Kms
-    }).timeout(20000)
+    }, 20000)
     it('Trip by device with time period ', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
@@ -75,7 +75,7 @@ describe('Test_Reports', function() {
         const device = data[0].devices.find(d => d.device.id===22326)
         assert.equal(device.trips.length, 4)  // Total Trips
         assert.equal(device.totalDistance, 265155.1099999994)  // Total Kms
-    }).timeout(20000)
+    },20000)
     it('Trip by device with time period 2', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
@@ -103,7 +103,7 @@ describe('Test_Reports', function() {
         const device = data[0].devices.find(d => d.device.id===22326)
         assert.equal(device.trips.length, 18)  // Total Trips
         assert.equal(device.totalDistance, 133505.6100000143)  // Total Kms
-    }).timeout(20000)
+    },20000)
     it('Location by device', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
@@ -115,7 +115,7 @@ describe('Test_Reports', function() {
         assert.equal(data.length, 1)
         const device = data[0].devices.find(d => d.device.id===22326)
         assert.equal(device.positions.length, 708)  // Total Positions
-    }).timeout(20000)
+    },20000)
     it('KmsReport by device', async () => {
         const reports = await getReports()
         const userData = await reports.getUserData()
@@ -125,7 +125,7 @@ describe('Test_Reports', function() {
         assert.equal(data.length, 1)
         const device = data[0].devices.find(d => d.device.id===22326)
         assert.equal(device.summary.distance, 1193284.3100000024)  // Total Kms
-    }).timeout(20000)
+    },20000)
     it('KmsReport byDevice groupByDay', async () => {
         const reports = await getReports()
         const userData = await reports.getUserData()
@@ -137,7 +137,7 @@ describe('Test_Reports', function() {
         const device = data[0].devices.find(d => d.device.id===22326)
         assert.equal(device.days.length, 10)  // Total Kms
         assert.equal(device.days[5].kms, 23183.010000005364)  // Total Kms
-    }).timeout(20000)
+    },20000)
     it('Idle by device', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
@@ -150,7 +150,7 @@ describe('Test_Reports', function() {
         const totalIdleTime = device.idleEvents.reduce((a, b) => a + b.idleTime, 0)
         assert.equal(device.idleEvents.length, 8)  // Total Alerts
         assert.equal(totalIdleTime, 1294000)  // Total Duration
-    }).timeout(20000)
+    },20000)
     it('Activity by device', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
@@ -162,7 +162,7 @@ describe('Test_Reports', function() {
         const device = data[0].devices.find(d => d.device.id===22326)
         assert.equal(device.summary[0].startOdometer, 122502742.59)
         assert.equal(device.summary[0].distance, 1386519.1300000101)
-    }).timeout(20000)
+    }, 20000)
     it('Activity byDevice groupByDay', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
@@ -174,7 +174,7 @@ describe('Test_Reports', function() {
         const device = data[0].devices.find(d => d.device.id===22326)
         assert.equal(device.summary[5].startOdometer, 122923290.95)
         assert.equal(device.summary[5].distance, 77020.37999999523)
-    }).timeout(40000)
+    }, 40000)
     it('test allinone', async() => {
         console.log('Start')
         const reports = await getReports()
@@ -188,5 +188,6 @@ describe('Test_Reports', function() {
             true,
             false)
         assert.equal(r.trips.length, 10)
-    }).timeout(20000)
+        assert.equal(r.stops.length, 11)
+    }, 20000)
 })

package/src/util/traccar.js

@@ -84,8 +84,8 @@ async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getS
     return {
         route: result.filter(t => t.route).map(r => r.route).flat(),
         trips: result.filter(t => t.trips).map(r => r.trips).flat(),
-        stops: result.filter(t => t.result).map(r => r.stops).flat(),
-        summary: result.filter(t => t.summay).map(r => r.summary).flat(),
+        stops: result.filter(t => t.stops).map(r => r.stops).flat(),
+        summary: result.filter(t => t.summary).map(r => r.summary).flat(),
     }
 }
 

package/src/here.test.js

@@ -1,25 +0,0 @@
-const here = require('./here')
-
-require('axios-debug-log')({
-    request: function (debug, config) {
-        console.log('Req headers:', config.headers.common)
-    },
-    response: function (debug, response) {
-        console.log(
-            'Response Headers:', response.headers,
-            'from', response.config.url
-        )
-    },
-    error: function (debug, error) {
-        // Read https://www.npmjs.com/package/axios#handling-errors for more info
-        console.error('Boom', error)
-    }
-})
-
-describe('here', async () => {
-    it('here', async () => {
-        console.log(process.env.HERE_API_KEY)
-        const rows = [{latitude:0, longitude:0, fixtime:new Date().toISOString(), speed:0, course:0}]
-        console.dir(await here.routeMatch(rows), {depth: null})
-    })
-})