dtable-statistic 4.2.1 → 4.3.0

package/es/calculator/compare-bar-calculator.js

@@ -1,11 +1,3 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import dayjs from 'dayjs';
 import { filter2SqlCondition, TableUtils } from 'dtable-store';
 import BaseCalculator from './base-calculator';
@@ -13,286 +5,197 @@ import { getSqlGroup, getSqlOrder } from '../utils/sql-utils';
 import StatUtils from '../utils/stat-utils';
 import { getSummaryColumnMethod, getSummaryResult } from '../utils/common-utils';
 import { DTABLE_DB_SUMMARY_METHOD, SUMMARY_TYPE } from '../constants';
-var CompareBarCalculator = /*#__PURE__*/function (_BaseCalculator) {
-  _inherits(CompareBarCalculator, _BaseCalculator);
-  var _super = _createSuper(CompareBarCalculator);
-  function CompareBarCalculator(_ref) {
-    var value = _ref.value,
-      statisticThreadManager = _ref.statisticThreadManager,
-      username = _ref.username,
-      userId = _ref.userId;
-    _classCallCheck(this, CompareBarCalculator);
-    return _super.call(this, {
-      value: value,
-      statisticThreadManager: statisticThreadManager,
-      username: username,
-      userId: userId
+class CompareBarCalculator extends BaseCalculator {
+  constructor(_ref) {
+    let {
+      value,
+      statisticThreadManager,
+      username,
+      userId
+    } = _ref;
+    super({
+      value,
+      statisticThreadManager,
+      username,
+      userId
     });
   }
-  _createClass(CompareBarCalculator, [{
-    key: "isValidChart",
-    value: function isValidChart(chart) {
-      if (!this.validateBaseConfigs(chart)) {
-        return false;
-      }
-      var table_id = chart.table_id,
-        x_axis_column_key = chart.x_axis_column_key,
-        summary_column_key = chart.summary_column_key,
-        y_axis_column_key = chart.y_axis_column_key,
-        x_axis_date_range_start = chart.x_axis_date_range_start,
-        x_axis_date_range_end = chart.x_axis_date_range_end,
-        x_axis_compared_date_range_start = chart.x_axis_compared_date_range_start,
-        x_axis_compared_date_range_end = chart.x_axis_compared_date_range_end;
-      var table = this.getTableById(table_id);
-      if (!TableUtils.getTableColumnByKey(table, x_axis_column_key)) return false;
-      var summaryColumnKey = summary_column_key || y_axis_column_key;
-      if (summaryColumnKey && !TableUtils.getTableColumnByKey(table, summaryColumnKey)) return false;
-      if (!x_axis_date_range_start || !x_axis_date_range_end || !x_axis_compared_date_range_start || !x_axis_compared_date_range_end) {
-        return false;
-      }
-      if (x_axis_date_range_start > x_axis_date_range_end || x_axis_compared_date_range_start > x_axis_compared_date_range_end) {
-        return false;
-      }
-      return true;
+  isValidChart(chart) {
+    if (!this.validateBaseConfigs(chart)) {
+      return false;
+    }
+    const {
+      table_id,
+      x_axis_column_key,
+      summary_column_key,
+      y_axis_column_key,
+      x_axis_date_range_start,
+      x_axis_date_range_end,
+      x_axis_compared_date_range_start,
+      x_axis_compared_date_range_end
+    } = chart;
+    const table = this.getTableById(table_id);
+    if (!TableUtils.getTableColumnByKey(table, x_axis_column_key)) return false;
+    const summaryColumnKey = summary_column_key || y_axis_column_key;
+    if (summaryColumnKey && !TableUtils.getTableColumnByKey(table, summaryColumnKey)) return false;
+    if (!x_axis_date_range_start || !x_axis_date_range_end || !x_axis_compared_date_range_start || !x_axis_compared_date_range_end) {
+      return false;
+    }
+    if (x_axis_date_range_start > x_axis_date_range_end || x_axis_compared_date_range_start > x_axis_compared_date_range_end) {
+      return false;
+    }
+    return true;
+  }
+  async calculate(chart) {
+    if (!this.isValidChart(chart)) return [];
+    if (this.isCalcByQueryDB(chart)) {
+      return await this.queryDb(chart);
+    }
+    return await this.calculateWithWorker(chart);
+  }
+  async queryDb(chart) {
+    const {
+      table_id,
+      view_id,
+      x_axis_column_key,
+      x_axis_date_granularity,
+      y_axis_summary_type,
+      y_axis_summary_method,
+      y_axis_column_key,
+      x_axis_date_range_start,
+      x_axis_date_range_end,
+      x_axis_compared_date_range_start,
+      x_axis_compared_date_range_end,
+      display_increase
+    } = chart;
+    const selectedTable = this.getTableById(table_id);
+    const selectedView = this.getViewById(view_id, selectedTable);
+    const selectedColumn = TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
+    const isAdvanced = y_axis_summary_type === SUMMARY_TYPE.ADVANCED;
+    const method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[y_axis_summary_method] : DTABLE_DB_SUMMARY_METHOD.Count;
+    let sqlString = '';
+    let groupName = getSqlGroup('day', selectedColumn);
+    const sqlOrder = getSqlOrder(null, groupName);
+    let summaryColumnName = "".concat(selectedColumn.name);
+    let selectedSummaryColumn = {};
+    if (isAdvanced) {
+      selectedSummaryColumn = TableUtils.getTableColumnByKey(selectedTable, y_axis_column_key);
+      if (!selectedSummaryColumn) return [];
+      summaryColumnName = "".concat(selectedSummaryColumn.name);
     }
-  }, {
-    key: "calculate",
-    value: function () {
-      var _calculate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(chart) {
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                if (this.isValidChart(chart)) {
-                  _context.next = 2;
-                  break;
-                }
-                return _context.abrupt("return", []);
-              case 2:
-                if (!this.isCalcByQueryDB(chart)) {
-                  _context.next = 6;
-                  break;
-                }
-                _context.next = 5;
-                return this.queryDb(chart);
-              case 5:
-                return _context.abrupt("return", _context.sent);
-              case 6:
-                _context.next = 8;
-                return this.calculateWithWorker(chart);
-              case 8:
-                return _context.abrupt("return", _context.sent);
-              case 9:
-              case "end":
-                return _context.stop();
+    const summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
+    let sqlCondition = filter2SqlCondition(selectedTable, selectedView);
+    sqlCondition = this.getStatItemSqlCondition(chart, sqlCondition, "`".concat(selectedColumn.name, "`"));
+    sqlString = "select ".concat(groupName, ", ").concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by ").concat(groupName, " ").concat(sqlOrder, " limit 5000");
+    const result = await this.sqlQuery(sqlString);
+    const groupName1 = "".concat(x_axis_date_range_start, " - ").concat(x_axis_date_range_end);
+    const groupName2 = "".concat(x_axis_compared_date_range_start, " - ").concat(x_axis_compared_date_range_end);
+    if (result.status === 200 && result.data.success) {
+      const dateRangeResult = new Map();
+      let dateComparedResult = new Map();
+      const valueKey = isAdvanced ? "".concat(method, "(").concat(summaryColumnName, ")") : "".concat(method, "(").concat(selectedColumn.name, ")");
+      result.data.results.forEach(item => {
+        const name = item[groupName];
+        const label = StatUtils.getGroupLabel(name, item, selectedColumn, x_axis_date_granularity, '', this.value);
+        const value = item[valueKey];
+        if (name >= x_axis_date_range_start && name <= x_axis_date_range_end) {
+          const currentValue = dateRangeResult.get(label);
+          if (!currentValue) {
+            if (isAdvanced) {
+              dateRangeResult.set(label, [value]);
+            } else {
+              dateRangeResult.set(label, value);
+            }
+          } else {
+            if (isAdvanced) {
+              currentValue.push(value);
+            } else {
+              dateRangeResult.set(label, value + currentValue);
             }
           }
-        }, _callee, this);
-      }));
-      function calculate(_x) {
-        return _calculate.apply(this, arguments);
-      }
-      return calculate;
-    }()
-  }, {
-    key: "queryDb",
-    value: function () {
-      var _queryDb = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(chart) {
-        var _this = this;
-        var table_id, view_id, x_axis_column_key, x_axis_date_granularity, y_axis_summary_type, y_axis_summary_method, y_axis_column_key, x_axis_date_range_start, x_axis_date_range_end, x_axis_compared_date_range_start, x_axis_compared_date_range_end, display_increase, selectedTable, selectedView, selectedColumn, isAdvanced, method, sqlString, groupName, sqlOrder, summaryColumnName, selectedSummaryColumn, summaryColumnMethod, sqlCondition, result, groupName1, groupName2, dateRangeResult, dateComparedResult, valueKey, comparedResult, rangeResult, data, _iterator, _step, item, value, formatted_value, index, _iterator2, _step2, _item, dateRangeItem, _value, _formatted_value, newItem, value1, increaseValue;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                table_id = chart.table_id, view_id = chart.view_id, x_axis_column_key = chart.x_axis_column_key, x_axis_date_granularity = chart.x_axis_date_granularity, y_axis_summary_type = chart.y_axis_summary_type, y_axis_summary_method = chart.y_axis_summary_method, y_axis_column_key = chart.y_axis_column_key, x_axis_date_range_start = chart.x_axis_date_range_start, x_axis_date_range_end = chart.x_axis_date_range_end, x_axis_compared_date_range_start = chart.x_axis_compared_date_range_start, x_axis_compared_date_range_end = chart.x_axis_compared_date_range_end, display_increase = chart.display_increase;
-                selectedTable = this.getTableById(table_id);
-                selectedView = this.getViewById(view_id, selectedTable);
-                selectedColumn = TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
-                isAdvanced = y_axis_summary_type === SUMMARY_TYPE.ADVANCED;
-                method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[y_axis_summary_method] : DTABLE_DB_SUMMARY_METHOD.Count;
-                sqlString = '';
-                groupName = getSqlGroup('day', selectedColumn);
-                sqlOrder = getSqlOrder(null, groupName);
-                summaryColumnName = "".concat(selectedColumn.name);
-                selectedSummaryColumn = {};
-                if (!isAdvanced) {
-                  _context2.next = 16;
-                  break;
-                }
-                selectedSummaryColumn = TableUtils.getTableColumnByKey(selectedTable, y_axis_column_key);
-                if (selectedSummaryColumn) {
-                  _context2.next = 15;
-                  break;
-                }
-                return _context2.abrupt("return", []);
-              case 15:
-                summaryColumnName = "".concat(selectedSummaryColumn.name);
-              case 16:
-                summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
-                sqlCondition = filter2SqlCondition(selectedTable, selectedView);
-                sqlCondition = this.getStatItemSqlCondition(chart, sqlCondition, "`".concat(selectedColumn.name, "`"));
-                sqlString = "select ".concat(groupName, ", ").concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by ").concat(groupName, " ").concat(sqlOrder, " limit 5000");
-                _context2.next = 22;
-                return this.sqlQuery(sqlString);
-              case 22:
-                result = _context2.sent;
-                groupName1 = "".concat(x_axis_date_range_start, " - ").concat(x_axis_date_range_end);
-                groupName2 = "".concat(x_axis_compared_date_range_start, " - ").concat(x_axis_compared_date_range_end);
-                if (!(result.status === 200 && result.data.success)) {
-                  _context2.next = 63;
-                  break;
-                }
-                dateRangeResult = new Map();
-                dateComparedResult = new Map();
-                valueKey = isAdvanced ? "".concat(method, "(").concat(summaryColumnName, ")") : "".concat(method, "(").concat(selectedColumn.name, ")");
-                result.data.results.forEach(function (item) {
-                  var name = item[groupName];
-                  var label = StatUtils.getGroupLabel(name, item, selectedColumn, x_axis_date_granularity, '', _this.value);
-                  var value = item[valueKey];
-                  if (name >= x_axis_date_range_start && name <= x_axis_date_range_end) {
-                    var currentValue = dateRangeResult.get(label);
-                    if (!currentValue) {
-                      if (isAdvanced) {
-                        dateRangeResult.set(label, [value]);
-                      } else {
-                        dateRangeResult.set(label, value);
-                      }
-                    } else {
-                      if (isAdvanced) {
-                        currentValue.push(value);
-                      } else {
-                        dateRangeResult.set(label, value + currentValue);
-                      }
-                    }
-                  } else if (name >= x_axis_compared_date_range_start && name <= x_axis_compared_date_range_end) {
-                    var _currentValue = dateComparedResult.get(label);
-                    if (!_currentValue) {
-                      if (isAdvanced) {
-                        dateComparedResult.set(label, [value]);
-                      } else {
-                        dateComparedResult.set(label, value);
-                      }
-                    } else {
-                      if (isAdvanced) {
-                        dateComparedResult.push(value);
-                      } else {
-                        dateComparedResult.set(label, value + _currentValue);
-                      }
-                    }
-                  }
-                });
-                comparedResult = [];
-                rangeResult = [];
-                data = selectedSummaryColumn.data || {};
-                _iterator = _createForOfIteratorHelper(dateRangeResult);
-                try {
-                  for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                    item = _step.value;
-                    value = item[1];
-                    formatted_value = value;
-                    if (isAdvanced) {
-                      value = getSummaryResult(item[1], y_axis_summary_method, data.precision);
-                      formatted_value = StatUtils.getFormattedValue(value, selectedSummaryColumn, y_axis_summary_method);
-                    }
-                    rangeResult.push({
-                      name: item[0],
-                      group_name: groupName1,
-                      raw_name: item[0],
-                      value: value,
-                      formatted_value: formatted_value
-                    });
-                  }
-                } catch (err) {
-                  _iterator.e(err);
-                } finally {
-                  _iterator.f();
-                }
-                index = 0;
-                _iterator2 = _createForOfIteratorHelper(dateComparedResult);
-                _context2.prev = 37;
-                _iterator2.s();
-              case 39:
-                if ((_step2 = _iterator2.n()).done) {
-                  _context2.next = 53;
-                  break;
-                }
-                _item = _step2.value;
-                dateRangeItem = rangeResult[index];
-                if (dateRangeItem) {
-                  _context2.next = 44;
-                  break;
-                }
-                return _context2.abrupt("break", 53);
-              case 44:
-                _value = _item[1];
-                _formatted_value = _value;
-                if (isAdvanced) {
-                  _value = getSummaryResult(_item[1], y_axis_summary_method, data.precision);
-                  _formatted_value = StatUtils.getFormattedValue(_value, selectedSummaryColumn, y_axis_summary_method);
-                }
-                newItem = {
-                  name: dateRangeItem.name,
-                  group_name: groupName2,
-                  raw_name: _item[0],
-                  value: _value,
-                  formatted_value: _formatted_value
-                };
-                if (display_increase) {
-                  value1 = dateRangeItem.value;
-                  increaseValue = Number(((value1 - _value) / _value).toFixed(2));
-                  if (!_value) {
-                    increaseValue = 1;
-                  }
-                  newItem.increase_value = increaseValue;
-                }
-                comparedResult.push(newItem);
-                index++;
-              case 51:
-                _context2.next = 39;
-                break;
-              case 53:
-                _context2.next = 58;
-                break;
-              case 55:
-                _context2.prev = 55;
-                _context2.t0 = _context2["catch"](37);
-                _iterator2.e(_context2.t0);
-              case 58:
-                _context2.prev = 58;
-                _iterator2.f();
-                return _context2.finish(58);
-              case 61:
-                if (comparedResult.length > rangeResult.length) {
-                  comparedResult = comparedResult.slice(0, rangeResult.length);
-                }
-                return _context2.abrupt("return", [].concat(_toConsumableArray(comparedResult), rangeResult));
-              case 63:
-                return _context2.abrupt("return", []);
-              case 64:
-              case "end":
-                return _context2.stop();
+        } else if (name >= x_axis_compared_date_range_start && name <= x_axis_compared_date_range_end) {
+          const currentValue = dateComparedResult.get(label);
+          if (!currentValue) {
+            if (isAdvanced) {
+              dateComparedResult.set(label, [value]);
+            } else {
+              dateComparedResult.set(label, value);
             }
+          } else {
+            if (isAdvanced) {
+              dateComparedResult.push(value);
+            } else {
+              dateComparedResult.set(label, value + currentValue);
+            }
+          }
+        }
+      });
+      let comparedResult = [];
+      let rangeResult = [];
+      const data = selectedSummaryColumn.data || {};
+      for (let item of dateRangeResult) {
+        let value = item[1];
+        let formatted_value = value;
+        if (isAdvanced) {
+          value = getSummaryResult(item[1], y_axis_summary_method, data.precision);
+          formatted_value = StatUtils.getFormattedValue(value, selectedSummaryColumn, y_axis_summary_method);
+        }
+        rangeResult.push({
+          name: item[0],
+          group_name: groupName1,
+          raw_name: item[0],
+          value,
+          formatted_value
+        });
+      }
+      let index = 0;
+      for (let item of dateComparedResult) {
+        let dateRangeItem = rangeResult[index];
+        if (!dateRangeItem) {
+          break;
+        }
+        let value = item[1];
+        let formatted_value = value;
+        if (isAdvanced) {
+          value = getSummaryResult(item[1], y_axis_summary_method, data.precision);
+          formatted_value = StatUtils.getFormattedValue(value, selectedSummaryColumn, y_axis_summary_method);
+        }
+        const newItem = {
+          name: dateRangeItem.name,
+          group_name: groupName2,
+          raw_name: item[0],
+          value,
+          formatted_value
+        };
+        if (display_increase) {
+          const value1 = dateRangeItem.value;
+          let increaseValue = Number(((value1 - value) / value).toFixed(2));
+          if (!value) {
+            increaseValue = 1;
           }
-        }, _callee2, this, [[37, 55, 58, 61]]);
-      }));
-      function queryDb(_x2) {
-        return _queryDb.apply(this, arguments);
+          newItem.increase_value = increaseValue;
+        }
+        comparedResult.push(newItem);
+        index++;
+      }
+      if (comparedResult.length > rangeResult.length) {
+        comparedResult = comparedResult.slice(0, rangeResult.length);
       }
-      return queryDb;
-    }()
-  }, {
-    key: "getStatItemSqlCondition",
-    value: function getStatItemSqlCondition(chart, sqlCondition, name) {
-      var x_axis_date_range_start = chart.x_axis_date_range_start,
-        x_axis_date_range_end = chart.x_axis_date_range_end,
-        x_axis_compared_date_range_start = chart.x_axis_compared_date_range_start,
-        x_axis_compared_date_range_end = chart.x_axis_compared_date_range_end;
-      var newSqlCondition = sqlCondition.length === 0 ? 'where ' : sqlCondition + ' AND';
-      var formattedXAxisDateRangeEnd = dayjs(x_axis_date_range_end).add(1, 'days').format('YYYY-MM-DD');
-      var formattedXAxisComparedDateRangeEnd = dayjs(x_axis_compared_date_range_end).add(1, 'days').format('YYYY-MM-DD');
-      return newSqlCondition + " ((".concat(name, " >= '").concat(x_axis_date_range_start, "' AND ").concat(name, " < '").concat(formattedXAxisDateRangeEnd, "') Or (").concat(name, " >= '").concat(x_axis_compared_date_range_start, "' AND ").concat(name, " < '").concat(formattedXAxisComparedDateRangeEnd, "'))");
+      return [...comparedResult, ...rangeResult];
     }
-  }]);
-  return CompareBarCalculator;
-}(BaseCalculator);
+    return [];
+  }
+  getStatItemSqlCondition(chart, sqlCondition, name) {
+    const {
+      x_axis_date_range_start,
+      x_axis_date_range_end,
+      x_axis_compared_date_range_start,
+      x_axis_compared_date_range_end
+    } = chart;
+    const newSqlCondition = sqlCondition.length === 0 ? 'where ' : sqlCondition + ' AND';
+    const formattedXAxisDateRangeEnd = dayjs(x_axis_date_range_end).add(1, 'days').format('YYYY-MM-DD');
+    const formattedXAxisComparedDateRangeEnd = dayjs(x_axis_compared_date_range_end).add(1, 'days').format('YYYY-MM-DD');
+    return newSqlCondition + " ((".concat(name, " >= '").concat(x_axis_date_range_start, "' AND ").concat(name, " < '").concat(formattedXAxisDateRangeEnd, "') Or (").concat(name, " >= '").concat(x_axis_compared_date_range_start, "' AND ").concat(name, " < '").concat(formattedXAxisComparedDateRangeEnd, "'))");
+  }
+}
 export default CompareBarCalculator;