fleetmap-reports 2.0.260 → 2.0.262

package/package.json

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

package/src/location-report.js

@@ -52,9 +52,14 @@ async function createLocationReportByDriver (from, to, userData, traccar) {
     return { drivers: [] }
   }
 
-  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, false, false, false)
+  const sliced = automaticReports.sliceArray(devices, 4)
+  const driversResult = []
 
-  return { drivers: await processDrivers(from, to, userData, allInOne) }
+  for (const slice of sliced) {
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false)
+    await processDrivers(from, to, userData, allInOne, driversResult)
+  }
+  return { drivers: driversResult }
 }
 
 async function createLocationReportByGroup (from, to, userData, traccar) {
@@ -161,8 +166,7 @@ function processDevices (from, to, devices, data) {
   return devicesResult
 }
 
-async function processDrivers (from, to, userData, data) {
-  const driversResult = []
+async function processDrivers (from, to, userData, data, driversResult) {
   for (const d of userData.drivers) {
     const { route } = await getDriverData(d, data, userData)
     if (route.length > 0) {
@@ -185,8 +189,6 @@ async function processDrivers (from, to, userData, data) {
     }
   }
   console.log(driversResult)
-
-  return driversResult
 }
 
 async function exportLocationReportToPDF (userData, reportData) {

package/src/tests/index.js

@@ -3,17 +3,18 @@ const { isClientSide } = require('../util/utils')
 const { newDomains } = require('fleetmap-partners')
 const serverHost = isClientSide() && newDomains.includes(window.location.hostname) ? window.location.hostname : 'api.pinme.io'
 const traccarConfig = {
-  basePath: `https://${serverHost}/api`,
-  baseOptions: {
-    withCredentials: true
-  }
+  basePath: `https://${serverHost}/api`
 }
-const axios = require('axios').create({ ...traccarConfig.baseOptions, baseURL: traccarConfig.basePath })
 process.env.TRACCAR_API_REPORTS = 'https://ltqgfyvcklxzaonv7h4rlmghai0rszop.lambda-url.us-east-1.on.aws/api'
 process.env.SERVER_HOST = 'api.pinme.io'
-const getReports = async (email, password) => {
+const getReports = async () => {
   try {
-    axios.defaults.headers.common.cookie = process.env.COOKIE
+    const axios = require('axios').create({
+      ...traccarConfig.baseOptions,
+      baseURL: traccarConfig.basePath,
+      headers: { cookie: process.env.COOKIE }
+    })
+
     return new Index(traccarConfig, axios)
   } catch (e) {
     console.error(e)

package/src/tests/positions.test.js

@@ -24,16 +24,20 @@ describe('test positions', function () {
   // eslint-disable-next-line no-undef
   it('works by driver', async () => {
     const report = await getReports()
-    const userData = await report.getUserData()
-    userData.byDriver = true
-    const data = await report.locationReport(
-      new Date(Date.UTC(2021, 11, 6, 0, 0, 0, 0)),
-      new Date(Date.UTC(2021, 11, 9, 23, 59, 59, 0)),
-      userData)
-    assert.equal(data.length, 1)
-    const driver = data[0].drivers.find(d => d.driver.id === 14020)
-    console.log(driver.positions)
-    assert.equal(driver.positions.length, 85) // Total Positions
+    try {
+      const userData = await report.getUserData()
+      userData.byDriver = true
+      const data = await report.locationReport(
+          new Date(Date.UTC(2021, 11, 6, 0, 0, 0, 0)),
+          new Date(Date.UTC(2021, 11, 9, 23, 59, 59, 0)),
+          userData)
+      assert.equal(data.length, 1)
+      const driver = data[0].drivers.find(d => d.driver.id === 14020)
+      console.log(driver.positions)
+      assert.equal(driver.positions.length, 85) // Total Positions
+    } catch (e) {
+      console.error(e)
+    }
   }, 20000)
   // eslint-disable-next-line no-undef
   it('works with sensores', async () => {