fleetmap-reports 1.0.963 → 1.0.965

package/package.json

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

package/src/partnerReports/dailyuse-report.js

@@ -1,67 +1,80 @@
 const traccarHelper = require('../util/traccar')
 const { isInsideTimetable } = require('../util/trips')
 const { convertFromUTCDate } = require('../util/utils')
+const automaticReports = require('../automaticReports')
 
 async function createDailyUseReport (from, to, userData, traccar) {
   const reportData = []
 
   const devices = userData.devices
 
-  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, false, true, true, true)
+  const sliced = automaticReports.sliceArray(devices, 5)
+  let deviceCount = 0
+  for (const slice of sliced) {
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, false, true, true, true, deviceCount, devices.length)
 
-  for (const d of devices) {
-    const group = userData.groups.find(g => g.id === d.groupId)
+    slice.forEach(d => {
+      reportData.push(processDeviceData(allInOne, d, userData))
+    })
 
-    const deviceTrips = allInOne.trips.filter(t => t.deviceId === d.id)
-    const deviceStops = allInOne.stops.filter(t => t.deviceId === d.id)
+    deviceCount = deviceCount + slice.length
+  }
 
-    userData.weekDays = {
-      sunday: true,
-      monday: true,
-      tuesday: true,
-      wednesday: true,
-      thursday: true,
-      friday: true,
-      saturday: true
-    }
-    userData.dayHours = {
-      startTime: '00:00',
-      endTime: '12:00'
-    }
+  return reportData
+}
 
-    const morningTrips = deviceTrips.filter(t => isInsideTimetable(t, userData))
-    const morningStart = morningTrips.length && convertFromUTCDate(new Date(morningTrips[0].startTime), userData.user)
-    const morningEnd = morningTrips.length && convertFromUTCDate(new Date(morningTrips[morningTrips.length - 1].endTime), userData.user)
+function processDeviceData (allInOne, d, userData) {
+  const now = new Date()
+  const group = userData.groups.find(g => g.id === d.groupId)
 
-    userData.dayHours = {
-      startTime: '12:00',
-      endTime: '23:59'
-    }
+  const deviceTrips = allInOne.trips.filter(t => t.deviceId === d.id)
+  const deviceStops = allInOne.stops.filter(t => t.deviceId === d.id)
 
-    const afternoonTrips = deviceTrips.filter(t => isInsideTimetable(t, userData))
+  userData.weekDays = {
+    sunday: true,
+    monday: true,
+    tuesday: true,
+    wednesday: true,
+    thursday: true,
+    friday: true,
+    saturday: true
+  }
+  userData.dayHours = {
+    startTime: '00:00',
+    endTime: '12:00'
+  }
 
-    const afternoonStart = afternoonTrips.length && convertFromUTCDate(new Date(afternoonTrips[0].startTime), userData.user)
-    const afternoonEnd = afternoonTrips.length && convertFromUTCDate(new Date(afternoonTrips[afternoonTrips.length - 1].endTime), userData.user)
+  const morningTrips = deviceTrips.filter(t => isInsideTimetable(t, userData))
+  const morningStart = morningTrips.length && convertFromUTCDate(new Date(morningTrips[0].startTime), userData.user)
+  const morningEnd = morningTrips.length && convertFromUTCDate(new Date(morningTrips[morningTrips.length - 1].endTime), userData.user)
 
-    reportData.push({
-      device: d.name,
-      licensePlate: d.attributes.license_plate,
-      group: group ? group.name : '',
-      morningStart,
-      morningEnd,
-      morningTime: morningStart && morningEnd ? morningEnd.getTime() - morningStart.getTime() : 0,
-      lunch: morningEnd && afternoonStart ? afternoonStart.getTime() - morningEnd.getTime() : 0,
-      afternoonStart,
-      afternoonEnd,
-      afternoonTime: afternoonStart && afternoonEnd ? afternoonEnd.getTime() - afternoonStart.getTime() : 0,
-      totalTime: morningStart && afternoonEnd ? afternoonEnd.getTime() - morningStart.getTime() : 0,
-      totalDrivingTime: deviceTrips.reduce((a, b) => a + b.duration, 0),
-      totalStops: deviceStops.length,
-      totalDistance: deviceTrips.reduce((a, b) => a + b.distance, 0)
-    })
+  userData.dayHours = {
+    startTime: '12:00',
+    endTime: '23:59'
   }
 
-  return reportData
+  const afternoonTrips = deviceTrips.filter(t => isInsideTimetable(t, userData))
+
+  const afternoonStart = afternoonTrips.length && convertFromUTCDate(new Date(afternoonTrips[0].startTime), userData.user)
+  const afternoonEnd = afternoonTrips.length && convertFromUTCDate(new Date(afternoonTrips[afternoonTrips.length - 1].endTime), userData.user)
+
+  console.log('device took', new Date() - now, 'ms')
+  return {
+    device: d.name,
+    licensePlate: d.attributes.license_plate,
+    group: group ? group.name : '',
+    morningStart,
+    morningEnd,
+    morningTime: morningStart && morningEnd ? morningEnd.getTime() - morningStart.getTime() : 0,
+    lunch: morningEnd && afternoonStart ? afternoonStart.getTime() - morningEnd.getTime() : 0,
+    afternoonStart,
+    afternoonEnd,
+    afternoonTime: afternoonStart && afternoonEnd ? afternoonEnd.getTime() - afternoonStart.getTime() : 0,
+    totalTime: morningStart && afternoonEnd ? afternoonEnd.getTime() - morningStart.getTime() : 0,
+    totalDrivingTime: deviceTrips.reduce((a, b) => a + b.duration, 0),
+    totalStops: deviceStops.length,
+    totalDistance: deviceTrips.reduce((a, b) => a + b.distance, 0)
+  }
 }
 
 exports.createDailyUseReport = createDailyUseReport

package/src/speeding-report.js

@@ -320,8 +320,9 @@ exports.getRoadSpeedLimits = getRoadSpeedLimits
 
 async function invokeValhalla (route, i, chunk, country, threshold, results, retry = 3) {
   const slice = route.slice(i, i + chunk)
+  const position = slice.find(p => getCountry(p))
   try {
-    const url = `http://valhalla-${getCountry(slice[0]) || country}.pinme.io:8002/trace_attributes`
+    const url = `http://valhalla-${(position && getCountry(position)) || country}.pinme.io:8002/trace_attributes`
     console.log(url)
     const {
       // eslint-disable-next-line camelcase

package/src/tests/dailyuse.test.js

@@ -0,0 +1,19 @@
+const { getReports } = require('./index')
+const assert = require('assert')
+const { createDailyUseReport } = require('../partnerReports/dailyuse-report')
+
+describe('dailyuse', function () {
+  // eslint-disable-next-line no-undef
+  it('dailyuse report', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+
+    const data = await createDailyUseReport(
+      new Date(Date.UTC(2023, 10, 1, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 10, 6, 23, 59, 59, 0)),
+      userData,
+      report.traccar)
+    console.log(data)
+    assert.equal(data[0].consumption, 19.799999999999997)
+  }, 8000000)
+})

package/src/tests/index.js

@@ -16,7 +16,7 @@ axiosCookieJarSupport(axios)
 
 const getReports = async (email, password) => {
   try {
-    console.log('email / pass', process.env.email || email, process.env.password || password)
+    // console.log('email / pass', process.env.email || email, process.env.password || password)
     await new SessionApi(traccarConfig, null, axios).sessionPost(email || process.env.email, password || process.env.password)
     return new Index(traccarConfig, axios, cookieJar)
   } catch (e) {

package/src/util/fuel.js

@@ -12,6 +12,9 @@ function calculateFuelDiff (a, b, device, p) {
 }
 
 function fuelSignalInverter (device) {
+  if (!device.attributes.fuel_low_threshold || !device.attributes.fuel_high_threshold) {
+    return 1
+  }
   return device.attributes.fuel_low_threshold <= device.attributes.fuel_high_threshold ? 1 : -1
 }