Merge pull request #98 from doitintl/issu-97

Fixes #97

Author: avivl

dist/module.js

@@ -51223,6 +51223,8 @@ var _lodash = __webpack_require__(/*! lodash */ "lodash");
 
 var _lodash2 = _interopRequireDefault(_lodash);
 
+var _datasource = __webpack_require__(/*! ./datasource */ "./datasource.ts");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var BigQueryQuery =
@@ -51307,27 +51309,33 @@ function () {
   };
 
   BigQueryQuery.getUnixSecondsFromString = function (str) {
-    switch (str) {
-      case "1s":
-        return "1";
+    var res = _datasource.BigQueryDatasource._getShiftPeriod(str);
+
+    var groupPeriod = res[0];
+    var groupVal = res[1];
+    console.log(groupPeriod, groupVal);
 
-      case "1min":
-        return "60";
+    switch (groupPeriod) {
+      case "s":
+        return 1 * groupVal;
 
-      case "1h":
-        return "3600";
+      case "m":
+        return 60 * groupVal;
 
-      case "1d":
-        return "86400";
+      case "h":
+        return 3600 * groupVal;
 
-      case "1w":
-        return "604800";
+      case "d":
+        return groupVal * 86400;
 
-      case "1m":
-        return "2629743";
+      case "w":
+        return 604800 * groupVal;
 
-      case "1y":
-        return "31536000";
+      case "M":
+        return 2629743 * groupVal;
+
+      case "y":
+        return 31536000 * groupVal;
     }
 
     return "0";
@@ -51983,6 +51991,21 @@ function () {
     };
   };
 
+  BigQueryDatasource._getShiftPeriod = function (strInterval) {
+    var shift = strInterval.match(/\d+/)[0];
+    strInterval = strInterval.substr(shift.length, strInterval.length);
+
+    if (strInterval === "m") {
+      strInterval = "M";
+    }
+
+    if (strInterval === "min") {
+      strInterval = "m";
+    }
+
+    return [strInterval, shift];
+  };
+
   BigQueryDatasource._handleError = function (error) {
     if (error.cancelled === true) {
       return [];
@@ -52018,21 +52041,6 @@ function () {
     return copy;
   };
 
-  BigQueryDatasource._getShiftPeriod = function (strInterval) {
-    var shift = strInterval.match(/\d+/)[0];
-    strInterval = strInterval.substr(shift.length, strInterval.length);
-
-    if (strInterval === "m") {
-      strInterval = "M";
-    }
-
-    if (strInterval === "min") {
-      strInterval = "m";
-    }
-
-    return [strInterval, shift];
-  };
-
   BigQueryDatasource._setupTimeShiftQuery = function (query, options) {
     var index = query.format.indexOf("#");
     var copy = options.constructor();

dist/module.js.map

@@ -1,4 +1,5 @@
 import _ from "lodash";
+import { BigQueryDatasource } from './datasource';
 
 export default class BigQueryQuery {
   public static quoteLiteral(value) {
@@ -38,21 +39,25 @@ export default class BigQueryQuery {
     return res;
   }
   public static getUnixSecondsFromString(str) {
-    switch (str) {
-      case "1s":
-        return "1";
-      case "1min":
-        return "60";
-      case "1h":
-        return "3600";
-      case "1d":
-        return "86400";
-      case "1w":
-        return "604800";
-      case "1m":
-        return "2629743"
-      case "1y":
-        return "31536000";
+    const res = BigQueryDatasource._getShiftPeriod(str);
+    const groupPeriod = res[0];
+    const groupVal = res[1];
+    console.log(groupPeriod, groupVal )
+    switch (groupPeriod) {
+      case "s":
+        return 1 * groupVal;
+      case "m":
+        return 60 * groupVal;
+      case "h":
+        return 3600 * groupVal;
+      case "d":
+        return groupVal * 86400;
+      case "w":
+        return 604800 * groupVal;
+      case "M":
+        return 2629743 * groupVal;
+      case "y":
+        return 31536000 * groupVal;
     }
     return "0";
   }

src/bigquery_query.ts

@@ -34,6 +34,19 @@ export class BigQueryDatasource {
     };
   }
 
+  public static _getShiftPeriod(strInterval) {
+    const shift = strInterval.match(/\d+/)[0];
+    strInterval = strInterval.substr(shift.length, strInterval.length);
+    if (strInterval === "m") {
+      strInterval = "M";
+    }
+
+    if (strInterval === "min") {
+      strInterval = "m";
+    }
+    return [strInterval, shift];
+  }
+
   private static _handleError(error) {
     if (error.cancelled === true) {
       return [];
@@ -61,18 +74,6 @@ export class BigQueryDatasource {
     return copy;
   }
 
-  private static _getShiftPeriod(strInterval) {
-    const shift = strInterval.match(/\d+/)[0];
-    strInterval = strInterval.substr(shift.length, strInterval.length);
-    if (strInterval === "m") {
-      strInterval = "M";
-    }
-
-    if (strInterval === "min") {
-      strInterval = "m";
-    }
-    return [strInterval, shift];
-  }
   private static _setupTimeShiftQuery(query, options) {
     const index = query.format.indexOf("#");
     const copy = options.constructor();

src/datasource.ts

@@ -342,13 +342,13 @@ describe("BigQueryQuery", () => {
   });
 
   describe("getUnixSecondsFromString", () => {
-    expect(BigQueryQuery.getUnixSecondsFromString("1s")).toBe("1");
-    expect(BigQueryQuery.getUnixSecondsFromString("1min")).toBe("60");
-    expect(BigQueryQuery.getUnixSecondsFromString("1h")).toBe("3600");
-    expect(BigQueryQuery.getUnixSecondsFromString("1d")).toBe("86400");
-    expect(BigQueryQuery.getUnixSecondsFromString("1w")).toBe("604800");
-    expect(BigQueryQuery.getUnixSecondsFromString("1m")).toBe("2629743");
-    expect(BigQueryQuery.getUnixSecondsFromString("1y")).toBe("31536000");
+    expect(BigQueryQuery.getUnixSecondsFromString("5s")).toBe(5);
+    expect(BigQueryQuery.getUnixSecondsFromString("2min")).toBe(120);
+    expect(BigQueryQuery.getUnixSecondsFromString("1h")).toBe(3600);
+    expect(BigQueryQuery.getUnixSecondsFromString("1d")).toBe(86400);
+    expect(BigQueryQuery.getUnixSecondsFromString("1w")).toBe(604800);
+    expect(BigQueryQuery.getUnixSecondsFromString("1m")).toBe(2629743);
+    expect(BigQueryQuery.getUnixSecondsFromString("1y")).toBe(31536000);
     expect(BigQueryQuery.getUnixSecondsFromString("1z")).toBe("0");
   });