[-] Technical - Use true timezone data ('Europe/Paris') instead of offset. (#282)

Author: SteveBunlon

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Change Log
 
 ## [Unreleased]
+### Changed
+- Technical - Use true timezone data ('Europe/Paris') instead of offset.
 
 ## RELEASE 5.5.0 - 2020-01-02
 ### Added

package.json

@@ -30,6 +30,7 @@
     "http-errors": "1.7.2",
     "lodash": "4.17.13",
     "moment": "2.24.0",
+    "moment-timezone": "0.5.27",
     "semver": "5.6.0"
   },
   "devDependencies": {
@@ -64,4 +65,4 @@
   "pre-commit": [
     "pre-commit"
   ]
-}
+}

src/services/line-stat-getter.js

@@ -2,13 +2,16 @@
 import _ from 'lodash';
 import P from 'bluebird';
 import moment from 'moment';
+// NOTICE: moment-timezone extends moment itself,
+//         Importing it will automatically add functions to moment.
+import 'moment-timezone';
 import Interface from 'forest-express';
 import QueryBuilder from './query-builder';
 import utils from '../utils/schema';
 
 function LineStatFinder(model, params, opts) {
   const schema = Interface.Schemas.schemas[utils.getModelName(model)];
-  const timezone = (-parseInt(params.timezone, 10)).toString();
+  const timezone = -parseInt(moment().tz(params.timezone).format('Z'), 10);
   const timezoneOffset = timezone * 60 * 60 * 1000;
   const queryBuilder = new QueryBuilder(model, params, opts);
 

test/tests/services/query-builder.test.js

@@ -96,7 +96,7 @@ describe('service > query-builder', () => {
     describe('on basic field', () => {
       it('should add the join correctly', () => {
         expect.assertions(1);
-        const queryBuilder = new QueryBuilder(TreeModel, { timezone: '+02:00' }, options);
+        const queryBuilder = new QueryBuilder(TreeModel, { timezone: 'Europe/Paris' }, options);
         const field = {
           field: 'owner',
           displayName: 'owner',
@@ -120,7 +120,7 @@ describe('service > query-builder', () => {
     describe('on virtual field', () => {
       it('the join should be ignored', () => {
         expect.assertions(1);
-        const queryBuilder = new QueryBuilder(TreeModel, { timezone: '+02:00' }, options);
+        const queryBuilder = new QueryBuilder(TreeModel, { timezone: 'Europe/Paris' }, options);
         const field = {
           field: 'owner',
           displayName: 'owner',
@@ -137,7 +137,7 @@ describe('service > query-builder', () => {
     describe('on a field with integration', () => {
       it('the join should be ignored', () => {
         expect.assertions(1);
-        const queryBuilder = new QueryBuilder(TreeModel, { timezone: '+02:00' }, options);
+        const queryBuilder = new QueryBuilder(TreeModel, { timezone: 'Europe/Paris' }, options);
         const field = {
           field: 'owner',
           displayName: 'owner',

test/tests/services/resources-getter.test.js

@@ -146,7 +146,7 @@ describe('service > resources-getter', () => {
         },
         page: { number: '1', size: '30' },
         search: 'gift',
-        timezone: '+02:00',
+        timezone: 'Europe/Paris',
       };
 
       const result = await new ResourcesGetter(OrderModel, options, parameters).perform();
@@ -158,7 +158,7 @@ describe('service > resources-getter', () => {
       expect.assertions(1);
       const parameters = {
         search: 'gift',
-        timezone: '+02:00',
+        timezone: 'Europe/Paris',
       };
 
       const count = await new ResourcesGetter(OrderModel, options, parameters).count();
@@ -175,7 +175,7 @@ describe('service > resources-getter', () => {
         },
         page: { number: '1', size: '30' },
         filters: JSON.stringify({ field: 'giftMessage', operator: 'starts_with', value: 'Here' }),
-        timezone: '+02:00',
+        timezone: 'Europe/Paris',
       };
 
       const result = await new ResourcesGetter(OrderModel, options, parameters).perform();
@@ -199,7 +199,7 @@ describe('service > resources-getter', () => {
             { field: 'amount', operator: 'greater_than', value: '1000' },
           ],
         }),
-        timezone: '+02:00',
+        timezone: 'Europe/Paris',
       };
 
       const result = await new ResourcesGetter(OrderModel, options, parameters).perform();
@@ -217,7 +217,7 @@ describe('service > resources-getter', () => {
             },
             page: { number: '1', size: '30' },
             filters: JSON.stringify({ field: 'orderer:name', operator: 'contains', value: 'Cohle' }),
-            timezone: '+02:00',
+            timezone: 'Europe/Paris',
           };
 
 
@@ -242,7 +242,7 @@ describe('service > resources-getter', () => {
                 { field: 'orderer:name', operator: 'ends_with', value: 'Gardner' },
               ],
             }),
-            timezone: '+02:00',
+            timezone: 'Europe/Paris',
           };
 
           const result = await new ResourcesGetter(OrderModel, options, parameters).perform();
@@ -265,7 +265,7 @@ describe('service > resources-getter', () => {
                 { field: 'receiver:name', operator: 'ends_with', value: 'Gardner' },
               ],
             }),
-            timezone: '+02:00',
+            timezone: 'Europe/Paris',
           };
 
           const result = await new ResourcesGetter(OrderModel, options, parameters).perform();
@@ -301,7 +301,7 @@ describe('service > resources-getter', () => {
                 },
               ],
             }),
-            timezone: '+02:00',
+            timezone: 'Europe/Paris',
           };
 
           const result = await new ResourcesGetter(OrderModel, options, parameters).perform();
@@ -319,7 +319,7 @@ describe('service > resources-getter', () => {
           fields: { films: 'description' },
           page: { number: '1', size: '15' },
           searchExtended: '0',
-          timezone: '+01:00',
+          timezone: 'Europe/Paris',
         };
 
         const [result] = await new ResourcesGetter(FilmModel, options, parameters).perform();
@@ -338,7 +338,7 @@ describe('service > resources-getter', () => {
           fields: { films: 'title' },
           page: { number: '1', size: '15' },
           searchExtended: '0',
-          timezone: '+01:00',
+          timezone: 'Europe/Paris',
         };
 
         const [result] = await new ResourcesGetter(FilmModel, options, parameters).perform();

yarn.lock

@@ -4188,6 +4188,13 @@ [email protected]:
   dependencies:
     moment ">= 2.9.0"
 
+[email protected]:
+  version "0.5.27"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.27.tgz#73adec8139b6fe30452e78f210f27b1f346b8877"
+  integrity sha512-EIKQs7h5sAsjhPCqN6ggx6cEbs94GK050254TIJySD1bzoM5JTYDwAU1IoVOeTOL6Gm27kYJ51/uuvq1kIlrbw==
+  dependencies:
+    moment ">= 2.9.0"
+
 [email protected], "moment@>= 2.9.0":
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
@@ -5322,7 +5329,7 @@ set-value@^0.4.3:
     is-plain-object "^2.0.1"
     to-object-path "^0.3.0"
 
-set-value@^2.0.1:
+set-value@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
   integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==