fleetmap-reports 1.0.641 → 1.0.643

package/package.json

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

package/src/partnerReports/afriquia.js

@@ -11,24 +11,16 @@ function calculateFirstStopTime (stopTime, from, time) {
 }
 
 async function createActivityReport (from, to, userData, traccarInstance) {
-  console.log(process.env.AFRIQUIA_NOT_AUTH_GROUP_ID, process.env.AFRIQUIA_AUTH_GROUP_ID )
-
-  const notAuthGroup = userData.groups.find(g => g.id === process.env.AFRIQUIA_NOT_AUTH_GROUP_ID)
-  const authGroup = userData.groups.find(g => g.id === process.env.AFRIQUIA_AUTH_GROUP_ID)
-
   const unauthorizedGeofences = []
   const authorizedGeofences = []
-  if (notAuthGroup) {
-    const geofenceIds = (await traccarInstance.geofences.geofencesGet(undefined, undefined, undefined, notAuthGroup.id, undefined, undefined).then(r => r.data)).map(g => g.id)
-    unauthorizedGeofences.push(...(userData.geofences.filter(g => geofenceIds.includes(g.id))))
-    console.log('unauthorizedGeofences', unauthorizedGeofences)
-  }
-
-  if (authGroup) {
-    const geofenceIds = (await traccarInstance.geofences.geofencesGet(undefined, undefined, undefined, authGroup.id, undefined, undefined).then(r => r.data)).map(g => g.id)
-    authorizedGeofences.push(...(userData.geofences.filter(g => geofenceIds.includes(g.id))))
-    console.log('authorizedGeofences', unauthorizedGeofences)
-  }
+
+  const notAuthGeofenceIds = (await traccarInstance.geofences.geofencesGet(undefined, undefined, undefined, Number(process.env.AFRIQUIA_NOT_AUTH_GROUP_ID), undefined, undefined).then(r => r.data)).map(g => g.id)
+  unauthorizedGeofences.push(...(userData.geofences.filter(g => notAuthGeofenceIds.includes(g.id))))
+  console.log('unauthorizedGeofences', unauthorizedGeofences)
+
+  const authGeofenceIds = (await traccarInstance.geofences.geofencesGet(undefined, undefined, undefined, Number(process.env.AFRIQUIA_AUTH_GROUP_ID), undefined, undefined).then(r => r.data)).map(g => g.id)
+  authorizedGeofences.push(...(userData.geofences.filter(g => authGeofenceIds.includes(g.id))))
+  console.log('authorizedGeofences', authorizedGeofences)
 
   const allInOne = await traccar.getAllInOne(traccarInstance, from, to, userData.devices, true, true, true, false)
 
@@ -39,12 +31,25 @@ async function createActivityReport (from, to, userData, traccarInstance) {
     const stops = allInOne.stops.filter(s => s.deviceId === d.id)
     const group = userData.groups.find(g => g.id === d.groupId)
 
-    const unauthorizedStops = stops.filter(s =>
-      unauthorizedGeofences.find(g => insideGeofence({ latitude: s.latitude, longitude: s.longitude }, g))
-    )
-    const authorizedStops = stops.filter(s =>
-      authorizedGeofences.find(g => insideGeofence({ latitude: s.latitude, longitude: s.longitude }, g))
-    )
+    let unauthorizedStops = 0
+    let authorizedStops = 0
+    let otherStops = 0
+
+    stops.forEach(s => {
+      const unauthorized = unauthorizedGeofences.find(g => insideGeofence({ latitude: s.latitude, longitude: s.longitude }, g))
+
+      if (unauthorized) {
+        unauthorizedStops = unauthorizedStops + 1
+      } else {
+        const authorized = authorizedGeofences.find(g => insideGeofence({ latitude: s.latitude, longitude: s.longitude }, g))
+
+        if (authorized) {
+          authorizedStops = authorizedStops + 1
+        } else {
+          otherStops = otherStops + 1
+        }
+      }
+    })
 
     const idleEvents = getIdleEvents(route)
 
@@ -94,9 +99,9 @@ async function createActivityReport (from, to, userData, traccarInstance) {
       totalIdleEvents: idleEvents.length,
       minIdleEvent: idleTimeArray.length > 0 ? Math.min(...idleTimeArray) : 0,
       maxIdleEvent: idleTimeArray.length > 0 ? Math.max(...idleTimeArray) : 0,
-      otherStops: stops.length - unauthorizedStops.length - authorizedStops.length,
-      authorizedStops: authorizedStops.length,
-      unauthorizedStops: unauthorizedStops.length,
+      otherStops,
+      authorizedStops,
+      unauthorizedStops,
       authorizedStopsTime: unauthorizedStops.reduce((a, b) => a + (b.duration > b.engineHours ? (b.duration - b.engineHours) : 0), 0),
       averageSpeed: totalDistance > 0 ? ((trips.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / totalDistance) : 0,
       maxSpeed: trips.reduce((a, b) => {