fix: dateRange gets translated to incorrect value

Fixes #348

Author: paveltiunov

packages/cubejs-api-gateway/dateParser.js

@@ -2,6 +2,20 @@ const chrono = require('chrono-node');
 const moment = require('moment-timezone');
 const UserError = require('./UserError');
 
+const momentFromResult = (result, timezone) => {
+  const dateMoment = moment().tz(timezone);
+
+  dateMoment.set('year', result.get('year'));
+  dateMoment.set('month', result.get('month') - 1);
+  dateMoment.set('date', result.get('day'));
+  dateMoment.set('hour', result.get('hour'));
+  dateMoment.set('minute', result.get('minute'));
+  dateMoment.set('second', result.get('second'));
+  dateMoment.set('millisecond', result.get('millisecond'));
+
+  return dateMoment;
+};
+
 module.exports = (dateString, timezone) => {
   let momentRange;
   dateString = dateString.toLowerCase();
@@ -29,18 +43,37 @@ module.exports = (dateString, timezone) => {
       moment.tz(timezone).startOf('day').add(-1, 'day'),
       moment.tz(timezone).endOf('day').add(-1, 'day')
     ];
+  } else if (dateString.match(/^from (.*) to (.*)$/)) {
+    // eslint-disable-next-line no-unused-vars
+    const [all, from, to] = dateString.match(/^from (.*) to (.*)$/);
+    const fromResults = chrono.parse(from, moment().tz(timezone));
+    const toResults = chrono.parse(to, moment().tz(timezone));
+    if (!fromResults) {
+      throw new UserError(`Can't parse date: '${from}'`);
+    }
+    if (!toResults) {
+      throw new UserError(`Can't parse date: '${to}'`);
+    }
+    const exactGranularity = ['second', 'minute', 'hour'].find(g => dateString.indexOf(g) !== -1) || 'day';
+    momentRange = [
+      momentFromResult(fromResults[0].start, timezone),
+      momentFromResult(toResults[0].start, timezone)
+    ];
+    momentRange = [momentRange[0].startOf(exactGranularity), momentRange[1].endOf(exactGranularity)];
   } else {
-    const results = chrono.parse(dateString);
+    const results = chrono.parse(dateString, moment().tz(timezone));
     if (!results) {
       throw new UserError(`Can't parse date: '${dateString}'`);
     }
+    const exactGranularity = ['second', 'minute', 'hour'].find(g => dateString.indexOf(g) !== -1) || 'day';
     momentRange = results[0].end ? [
-      moment(results[0].start.moment()).tz(timezone).startOf('day'),
-      moment(results[0].end.moment()).tz(timezone).endOf('day')
+      momentFromResult(results[0].start, timezone),
+      momentFromResult(results[0].end, timezone)
     ] : [
-      moment(results[0].start.moment()).tz(timezone).startOf('day'),
-      moment(results[0].start.moment()).tz(timezone).endOf('day')
+      momentFromResult(results[0].start, timezone),
+      momentFromResult(results[0].start, timezone)
     ];
+    momentRange = [momentRange[0].startOf(exactGranularity), momentRange[1].endOf(exactGranularity)];
   }
   return momentRange.map(d => d.format(moment.HTML5_FMT.DATETIME_LOCAL_MS));
 };

packages/cubejs-api-gateway/dateParser.test.js

@@ -33,4 +33,19 @@ describe(`dateParser`, () => {
       ]
     );
   });
+
+  test(`from 23 hours ago to now`, () => {
+    expect(dateParser('from 23 hours ago to now', 'UTC')).toStrictEqual(
+      [
+        new Date((Math.floor(new Date().getTime() / (1000 * 60 * 60)) - 23) * (1000 * 60 * 60)).toISOString().replace('Z', ''),
+        new Date((Math.ceil(new Date().getTime() / (1000 * 60 * 60))) * (1000 * 60 * 60) - 1).toISOString().replace('Z', '')
+      ]
+    );
+  });
+
+  test(`from 7 days ago to now`, () => {
+    expect(dateParser('from 7 days ago to now', 'UTC')).toStrictEqual(
+      [dateParser('last 7 days', 'UTC')[0], dateParser('today', 'UTC')[1]]
+    );
+  });
 });