fleetmap-reports 1.0.732 → 1.0.734

package/package.json

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

package/src/tests/zones.test.js

@@ -2,6 +2,7 @@ const { getReports } = require('./index')
 const assert = require('assert')
 // eslint-disable-next-line no-undef
 describe('zones', function () {
+  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('works with ellca', async () => {
     const report = await getReports()
@@ -21,7 +22,7 @@ describe('zones', function () {
 
   // eslint-disable-next-line no-undef
   it('works with afriquia', async () => {
-    const report = await getReports('moviflotte@gmail.com', 'moviflotte@gmail.com')
+    const report = await getReports(process.env.USER_AFRIQUIA, process.env.PASS_AFRIQUIA)
     const userData = await report.getUserData()
     console.log(userData.devices.length)
     console.log(userData.geofences)
@@ -34,7 +35,7 @@ describe('zones', function () {
 
   // eslint-disable-next-line no-undef
   it('works with casais', async () => {
-    const report = await getReports('mario.andre.moreira@casais.gi', 'Casais.23')
+    const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)
     const userData = await report.getUserData()
     userData.devices = userData.devices.filter(d => d.name === 'G-1101-E Clio')
     userData.geofences = userData.geofences.filter(g => g.name === 'baliza raio verde ')
@@ -58,13 +59,12 @@ describe('zones', function () {
     assert.equal(userData.geofences.length > 0, true)
     assert.equal(userData.devices.length > 0, true)
     const result = await report.zoneReport(
-      new Date(Date.UTC(2023, 1, 27, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 1, 27, 23, 59, 59, 0)),
+      new Date(2023, 1, 27, 0, 0, 0, 0),
+      new Date(2023, 1, 27, 23, 59, 59, 0),
       userData)
     assert.equal(result[0].devices[0].geofences.length, 1)
     assert.equal(result[0].devices[0].geofences[0].days.length, 1)
     const first = result[0].devices[0].geofences[0].days[0]
-    console.log(first)
     assert.equal(first.firstIn, '2023-02-27T21:53:16.000+0000')
     assert.equal(first.distanceIn, 93.03917199839687)
     assert.equal(first.distanceOut, 819.6685737216337)

package/src/util/utils.js

@@ -106,9 +106,13 @@ function convertToFeature (geofence) {
   }
 }
 
-function getDates (startDate, endDate) {
+function getDates (startDate, endDate, timezone) {
   const dates = []
   let currentDate = new Date(startDate.getFullYear(), startDate.getMonth(), startDate.getDate(), 12, 0, 0, 0)
+  if (!isClientSide() && timezone) {
+    const startDateUserTimezone = convertFromUTC(startDate, timezone)
+    currentDate = new Date(startDateUserTimezone.getFullYear(), startDateUserTimezone.getMonth(), startDateUserTimezone.getDate(), 12, 0, 0, 0)
+  }
   const addDays = function (days) {
     const date = new Date(this.valueOf())
     date.setDate(date.getDate() + days)

package/src/zone-report.js

@@ -99,7 +99,7 @@ async function processDevices (from, to, devices, userData, data) {
     const zoneInOutData = analyseAlerts(alerts, deviceRoute, userData, from, to).filter(d => !userData.onlyWithStop || d.stopped)
 
     if (userData.groupByDay) {
-      const dates = getDates(from, to)
+      const dates = getDates(from, to, userData.user.attributes.timezone)
 
       const geofencesData = []
       for (const geofence of userData.geofences) {