Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chart: Fix timezone issues #2203

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Chart: Fix timezone issues #2203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions server/lib/device/device.getDeviceFeaturesAggregates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ async function getDeviceFeaturesAggregates(selector, intervalInMinutes, maxState

const isBinary = ['binary', 'push'].includes(deviceFeature.type);

const now = new Date();
const intervalDate = new Date(now.getTime() - intervalInMinutes * 60 * 1000);
// Get the interval date, and offset in UTC
const intervalDate = new Date(Date.now() - intervalInMinutes * 60 * 1000);
intervalDate.setMinutes(intervalDate.getMinutes() - intervalDate.getTimezoneOffset());

let values;

Expand Down
29 changes: 29 additions & 0 deletions server/test/lib/device/device.getDeviceFeaturesAggregates.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,21 @@ const EventEmitter = require('events');
const { expect, assert } = require('chai');
const sinon = require('sinon');
const { fake } = require('sinon');
const dayjs = require('dayjs');
const utc = require('dayjs/plugin/utc');
const timezone = require('dayjs/plugin/timezone');

const db = require('../../../models');
const Device = require('../../../lib/device');
const Job = require('../../../lib/job');

const event = new EventEmitter();
const job = new Job(event);

// Extend Day.js with plugins
dayjs.extend(utc);
dayjs.extend(timezone);

const insertStates = async (intervalInMinutes) => {
const deviceFeatureStateToInsert = [];
const now = new Date();
Expand Down Expand Up @@ -95,6 +103,27 @@ describe('Device.getDeviceFeaturesAggregates non binary feature', function Descr
expect(device).to.have.property('name');
expect(deviceFeature).to.have.property('name');
});
it('should test timezone behavior', async () => {
// Create current date in Toronto timezone, 30 minutes ago
const torontoDate = dayjs()
.tz('America/Toronto')
.subtract(30, 'minute')
.toDate();

await db.duckDbInsertState('ca91dfdf-55b2-4cf8-a58b-99c0fbf6f5e4', 1, torontoDate);
const variable = {
getValue: fake.resolves(null),
};
const stateManager = {
get: fake.returns({
id: 'ca91dfdf-55b2-4cf8-a58b-99c0fbf6f5e4',
name: 'my-feature',
}),
};
const deviceInstance = new Device(event, {}, stateManager, {}, {}, variable, job);
const { values } = await deviceInstance.getDeviceFeaturesAggregates('test-device-feature', 60, 100);
expect(values).to.have.lengthOf(1);
});
it('should return last day states', async () => {
await insertStates(48 * 60);
const variable = {
Expand Down
Loading