cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not validate aggregation missing columns. It will fail afterwards in map validation

Browse Source
This commit is contained in:
Daniel García Aubert 2017-12-13 19:24:17 +01:00
parent 98e8d745b1
commit 52d1cd47db
2 changed files with 1 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/cartodb/models/aggregation/aggregation-map-config.js
View File

@ -1,15 +1,8 @@
const MapConfig = require('windshaft').model.MapConfig;
const MISSING_AGGREGATION_COLUMNS = 'Missing columns in the aggregation. The map-config defines cartocss expressions,'+
' interactivity fields or attributes that are not present in the aggregation';
module.exports = class AggregationMapConfig extends MapConfig {
constructor (config, datasource) {
super(config, datasource);
if (this._hasAggregationMissingColumns()) {
throw new Error(MISSING_AGGREGATION_COLUMNS);
}
}
isAggregationMapConfig () {
@ -38,52 +31,4 @@ module.exports = class AggregationMapConfig extends MapConfig {
return aggregation !== undefined && (typeof aggregation === 'object' || typeof aggregation === 'boolean');
}
validateAggregation () {
if (this._hasAggregationMissingColumns()) {
throw new Error(MISSING_AGGREGATION_COLUMNS);
}
}
_hasAggregationMissingColumns () {
const layers = this.getLayers();
if (!this.isAggregationMapConfig()) {
return false;
}
for (let index = 0; index < layers.length; index++) {
const aggregationColumns = this._getAggregationColumnsByLayer(index);
const layerColumns = this.getColumnsByLayer(index);
if (layerColumns.length === 0) {
continue;
}
if (aggregationColumns.length !== layerColumns.length) {
return true;
}
const missingColumns = this._getMissingColumns(aggregationColumns, layerColumns);
if (missingColumns.length > 0) {
return true;
}
}
return false;
}
_getMissingColumns (aggregationColumns, layerColumns) {
return aggregationColumns.filter(column => !layerColumns.includes(column));
}
_getAggregationColumnsByLayer (index) {
const { aggregation } = this.getLayer(index).options;
const hasAggregationColumns = aggregation !== undefined &&
typeof aggregation !== 'boolean' &&
typeof aggregation.columns === 'object';
return hasAggregationColumns ? Object.keys(aggregation.columns) : [];
}
};

11
lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
View File

@ -18,16 +18,7 @@ module.exports = class AggregationMapConfigAdapter {
return callback(new Error(invalidAggregationParamValueErrorMessage({ value: params.aggregation })));
}
let mapConfig;
try {
mapConfig = new AggregationMapConfig(requestMapConfig);
} catch (error) {
error.http_status = 400;
error.type = 'mapconfig';
return callback(error);
}
const mapConfig = new AggregationMapConfig(requestMapConfig);
if (!this._shouldAdapt(mapConfig, params)) {
return callback(null, requestMapConfig);