fleetmap-reports 1.0.331 → 1.0.335

package/package.json

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

package/src/index.js

@@ -8,7 +8,7 @@ function Reports(config, axios) {
         groups: new GroupsApi(config, null, axios),
         drivers: new DriversApi(config, null, axios),
         geofences: new GeofencesApi(config, null, axios),
-        axios: axios || require('axios').create(config.baseOptions)
+        axios: axios || require('axios').create({...config.baseOptions, baseURL: config.basePath})
     }
     this.getUserData = async () => {
         return {

package/src/index.test.js

@@ -21,20 +21,16 @@ describe('speedingReport', function() {
     })
     it('test allinone', async() => {
         console.log('Start')
-
         const reports = await getReports()
-
-        const r = await require("./util/traccar").getAllInOne(reports.traccar,
-            new Date(2022, 1, 2),
-            new Date(2022, 1, 3),
-            [{"id":22327}],
+        const userData = await reports.getUserData()
+        const r = await require('./util/traccar').getAllInOne(reports.traccar,
+            new Date(2022, 1, 1),
+            new Date(2022, 1, 4),
+            userData.devices,
             false,
             true,
             true,
             false)
-
-        console.log(r)
-
-        console.log('End')
+        console.log('getAllInOne',r)
     })
 })

package/src/tests/index.js

@@ -1,5 +1,4 @@
 const {SessionApi} = require("traccar-api");
-const axios = require('axios')
 const axiosCookieJarSupport = require('axios-cookiejar-support').default;
 const tough = require('tough-cookie');
 const Index = require('../index');
@@ -11,6 +10,7 @@ const traccarConfig = {
         jar: cookieJar
     }
 }
+const axios = require('axios').create({...traccarConfig.baseOptions, baseURL: traccarConfig.basePath})
 
 axiosCookieJarSupport(axios)
 

package/src/trip-report.js

@@ -125,7 +125,7 @@ function processDevices(from, to, devices, data, userData) {
             && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
         const stops = data.stops.filter(s => s.deviceId === d.id)
 
-        console.log(trips)
+        console.log('LOADING_MESSAGE:' + d.name)
 
         addNearestPOIs(trips, userData)
 

package/src/util/traccar.js

@@ -67,7 +67,6 @@ async function getSummary(traccar, from, to, devices){
 }
 
 async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getStops, getSummary){
-
     let url = `/reports/allinone?&from=${from.toISOString()}&to=${to.toISOString()}`
     if(getRoutes)  url += `&type=route`
     if(getTrips)   url += `&type=trips`
@@ -75,35 +74,19 @@ async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getS
     if(getSummary) url += `&type=summary`
 
     const devicesToSlice = devices.slice()
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
-    let requests = []
-
-    for (const a of arrayOfArrays) {
-        let sliceUrl = url
-        for(const d of a){
-            sliceUrl += `&deviceId=${d.id}`
-        }
-        const promise = traccar.axios.get(sliceUrl)
-        requests = requests.concat(promise)
-    }
-
-    const resultList = await Promise.all(requests)
-
-    const result = {
-        route : [],
-        trips : [],
-        stops : [],
-        summary : []
-    }
-
-    for(const r of resultList){
-        if(getRoutes)  result.route   = result.route.concat(r.data.route)
-        if(getTrips)   result.trips   = result.trips.concat(r.data.trips)
-        if(getStops)   result.stops   = result.stops.concat(r.data.stops)
-        if(getSummary) result.summary = result.summary.concat(r.data.summary)
+    const sliced = automaticReports.sliceArray(devicesToSlice)
+    const requests = sliced.map(a =>
+        traccar.axios.get(url + '&' + a.map(d => `deviceId=${d.id}`).join('&')).then(r => r.data).then(x => {
+            console.log('LOADING_MESSAGE:' + a.map(d => d.name).join(', '))
+            return x
+        }))
+    const result = await Promise.all(requests)
+    return {
+        route: result.map(r => r.route),
+        trips: result.map(r => r.trips),
+        stops: result.map(r => r.stops),
+        summary: result.map(r => r.summary),
     }
-
-    return result
 }
 
 exports.getRoute = getRoute