fleetmap-reports 1.0.245 → 1.0.246

package/.idea/workspace.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="kms report with parallel requests">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="Kms Report - Calculate distance with traccar trips">
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/index.test.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.test.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/kms-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/kms-report.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/speeding-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/speeding-report.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/util/traccar.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/traccar.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -38,8 +37,8 @@
     <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
     <property name="vue.rearranger.settings.migration" value="true" />
   </component>
-  <component name="RunManager" selected="Mocha.speedingReport.test kmsReport by day">
-    <configuration name="report" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="Mocha.speedingReport.test speeding">
+    <configuration name="speedingReport" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
       <node-interpreter>project</node-interpreter>
       <node-options />
       <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
@@ -47,29 +46,34 @@
       <pass-parent-env>true</pass-parent-env>
       <ui>bdd</ui>
       <extra-mocha-options />
-      <test-kind>SUITE</test-kind>
+      <test-kind>TEST</test-kind>
       <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
       <test-names>
-        <name value="report" />
+        <name value="speedingReport" />
       </test-names>
       <method v="2" />
     </configuration>
-    <configuration name="speedingReport" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+    <configuration name="speedingReport.test kmsReport by day" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
       <node-interpreter>project</node-interpreter>
       <node-options />
       <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
       <working-directory>$PROJECT_DIR$</working-directory>
       <pass-parent-env>true</pass-parent-env>
+      <envs>
+        <env name="email" value="jppenas@gmail.com" />
+        <env name="password" value="penas46881" />
+      </envs>
       <ui>bdd</ui>
       <extra-mocha-options />
       <test-kind>TEST</test-kind>
       <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
       <test-names>
         <name value="speedingReport" />
+        <name value="test kmsReport by day" />
       </test-names>
       <method v="2" />
     </configuration>
-    <configuration name="speedingReport.test kmsReport by day" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+    <configuration name="speedingReport.test speeding" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
       <node-interpreter>project</node-interpreter>
       <node-options />
       <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
@@ -85,7 +89,7 @@
       <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
       <test-names>
         <name value="speedingReport" />
-        <name value="test kmsReport by day" />
+        <name value="test speeding" />
       </test-names>
       <method v="2" />
     </configuration>
@@ -125,19 +129,19 @@
       <method v="2" />
     </configuration>
     <list>
-      <item itemvalue="Mocha.report" />
       <item itemvalue="Mocha.speedingReport" />
       <item itemvalue="Mocha.test reports" />
       <item itemvalue="Mocha.test reports.test queue" />
       <item itemvalue="Mocha.speedingReport.test kmsReport by day" />
+      <item itemvalue="Mocha.speedingReport.test speeding" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Mocha.speedingReport.test speeding" />
         <item itemvalue="Mocha.speedingReport.test kmsReport by day" />
         <item itemvalue="Mocha.test reports" />
         <item itemvalue="Mocha.test reports.test queue" />
         <item itemvalue="Mocha.speedingReport" />
-        <item itemvalue="Mocha.report" />
       </list>
     </recent_temporary>
   </component>
@@ -172,7 +176,7 @@
       <workItem from="1637868513425" duration="1650000" />
       <workItem from="1637928687573" duration="37000" />
       <workItem from="1637931438656" duration="621000" />
-      <workItem from="1637952151523" duration="4408000" />
+      <workItem from="1637952151523" duration="9616000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -216,7 +220,14 @@
       <option name="project" value="LOCAL" />
       <updated>1637858604089</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="Kms Report - Calculate distance with traccar trips">
+      <created>1638179219255</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1638179219256</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -241,6 +252,7 @@
     <MESSAGE value="Kms report grouped by day" />
     <MESSAGE value="Fix pdf logo" />
     <MESSAGE value="kms report with parallel requests" />
-    <option name="LAST_COMMIT_MESSAGE" value="kms report with parallel requests" />
+    <MESSAGE value="Kms Report - Calculate distance with traccar trips" />
+    <option name="LAST_COMMIT_MESSAGE" value="Kms Report - Calculate distance with traccar trips" />
   </component>
 </project>

package/package.json

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

package/src/index.js

@@ -23,7 +23,7 @@ function Reports(config, axios) {
         return require('./speeding-report').createSpeedingReport(from, to, userData, this.traccar, roadSpeedLimits)
     }
 
-    this.speedingReportToPDF = async (userData, reportData) => {
+    this.speedingReportToPDF = (userData, reportData) => {
         return require('./speeding-report').exportSpeedingReportToPDF(userData, reportData)
     }
 

package/src/index.test.js

@@ -6,9 +6,12 @@ describe('speedingReport', function() {
         const report = await getReports()
         const userData = await report.getUserData()
 
-        await report.speedingReport(new Date(2021, 2, 30, 0, 0, 0, 0),
+        const reportData = await report.speedingReport(new Date(2021, 2, 30, 0, 0, 0, 0),
             new Date(2021, 2, 30, 23, 59, 59, 0),
             userData)
+
+        console.log(reportData)
+
     })
     it('test kmsReport by day', async () => {
         const reports = await getReports()

package/src/speeding-report.js

@@ -11,6 +11,7 @@ const drivers = require("./util/driver")
 const {distance, point} = require('turf')
 const here = require('./here')
 const {getUserPartner} = require("fleetmap-partners");
+const traccar = require("./util/traccar");
 
 let traccarInstance
 
@@ -64,7 +65,8 @@ async function createSpeedingReportByDevice(from, to, userData, roadSpeedLimits)
 
   withoutGroupDevices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-  const data = await getReportData(from, to, withoutGroupDevices)
+  const events = ['deviceOverspeed']
+  const data = await traccar.getEvents(traccarInstance, from, to, withoutGroupDevices, events)
 
   const allData = { devices: [] }
 
@@ -168,14 +170,17 @@ async function processDevices(from, to, devices, geofences, drivers, data, roadS
   return devicesResult
 }
 
-async function getEventsPosition(from, to, devices, geofences, drivers, data, roadSpeedLimits){
-  for (const d of devices) {
+async function getEventsPosition(from, to, devices, geofences, drivers, events, roadSpeedLimits){
+
+  const deviceIds = [...new Set(events.map(e => e.deviceId))]
+  console.log('deviceIds',deviceIds)
+  const routeData = await traccar.getRoute(traccarInstance, from, to, deviceIds.map(id => { return { id: id } } ))
 
-    let alerts = data.filter(t => t.deviceId === d.id)
+  for (const d of devices) {
+    let alerts = events.filter(t => t.deviceId === d.id)
 
     if (alerts.length > 0 || roadSpeedLimits) {
-      const response = await traccarInstance.reports.reportsRouteGet(from, to, [d.id])
-      const positions = response.data
+      const positions = routeData.filter(p => p.deviceId === d.id)
 
       if (roadSpeedLimits && positions.length) {
         try {
@@ -201,8 +206,8 @@ async function getEventsPosition(from, to, devices, geofences, drivers, data, ro
             }
             return acc
           })
-          data.push(...reduced)
-          alerts = data.filter(t => t.deviceId === d.id)
+          events.push(...reduced)
+          alerts = events.filter(t => t.deviceId === d.id)
         } catch (e) {
           console.error(e)
         }

package/src/util/traccar.js

@@ -1,5 +1,4 @@
 const automaticReports = require("../automaticReports");
-const moment = require('moment')
 
 async function getRoute(traccar, from, to, devices){
     const devicesToSlice = devices.slice()
@@ -28,5 +27,18 @@ async function getTrips(traccar, from, to, devices){
     return result.map(r => r.data).flat()
 }
 
+async function getEvents(traccar, from, to, devices, events){
+    const devicesToSlice = devices.slice()
+    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
+    let requests = []
+    for (const a of arrayOfArrays) {
+        const promise = traccar.reports.reportsEventsGet(from, to, a.map(d => d.id), null, events)
+        requests = requests.concat(promise)
+    }
+    const result = await Promise.all(requests)
+    return result.map(r => r.data).flat()
+}
+
 exports.getRoute = getRoute
 exports.getTrips = getTrips
+exports.getEvents = getEvents