Extract method to check valid aggregation

2017-09-11 18:57:16 +02:00
parent fd9534797c
commit 09981c2560
1 changed files with 5 additions and 1 deletions
@@ -187,7 +187,7 @@ module.exports = class DateHistogram extends BaseHistogram {
    }

    _buildQuery (psql, override, callback) {
-        if (!DATE_AGGREGATIONS.hasOwnProperty(this._getAggregation(override))) {
+        if (!this.isValidAggregation(override)) {
            return callback(new Error('Invalid aggregation value. Valid ones: ' +
                Object.keys(DATE_AGGREGATIONS).join(', ')
            ));
@@ -221,6 +221,10 @@ module.exports = class DateHistogram extends BaseHistogram {
        return callback(null, histogramSql);
    }

+    _isValidAggregation (override) {
+        return DATE_AGGREGATIONS.hasOwnProperty(this._getAggregation(override));
+    }
+
    _getAutomaticAggregation (psql, callback) {
        const dateIntervalQuery = dateIntervalQueryTpl({
            query: this.query,