diff --git a/lib/cartodb/api/api-router.js b/lib/cartodb/api/api-router.js index f5b40c9e..15469962 100644 --- a/lib/cartodb/api/api-router.js +++ b/lib/cartodb/api/api-router.js @@ -16,7 +16,7 @@ const AuthBackend = require('../backends/auth'); const UserLimitsApi = require('../backends/api/user_limits_api'); const OverviewsMetadataApi = require('../backends/api/overviews_metadata_api'); -const FilterStatsApi = require('../backends/api/filter_stats_api'); +const FilterStatsApi = require('../backends/filter-stats'); const TablesExtentApi = require('../backends/api/tables_extent_api'); const LayergroupAffectedTablesCache = require('../cache/layergroup_affected_tables'); @@ -124,7 +124,7 @@ module.exports = class ApiRouter { const pgQueryRunner = new PgQueryRunner(pgConnection); const overviewsMetadataApi = new OverviewsMetadataApi(pgQueryRunner); - const filterStatsApi = new FilterStatsApi(pgQueryRunner); + const filterStatsBackend = new FilterStatsApi(pgQueryRunner); const tablesExtentApi = new TablesExtentApi(pgQueryRunner); const mapConfigAdapter = new MapConfigAdapter( @@ -134,7 +134,7 @@ module.exports = class ApiRouter { new DataviewsWidgetsAdapter(), new AnalysisMapConfigAdapter(analysisBackend), new AggregationMapConfigAdapter(pgConnection), - new MapConfigOverviewsAdapter(overviewsMetadataApi, filterStatsApi), + new MapConfigOverviewsAdapter(overviewsMetadataApi, filterStatsBackend), new TurboCartoAdapter() ); diff --git a/lib/cartodb/backends/api/filter_stats_api.js b/lib/cartodb/backends/filter-stats.js similarity index 86% rename from lib/cartodb/backends/api/filter_stats_api.js rename to lib/cartodb/backends/filter-stats.js index 72fd970f..ba427405 100644 --- a/lib/cartodb/backends/api/filter_stats_api.js +++ b/lib/cartodb/backends/filter-stats.js @@ -1,12 +1,12 @@ var _ = require('underscore'); var step = require('step'); -var AnalysisFilter = require('../../models/filter/analysis'); +var AnalysisFilter = require('../models/filter/analysis'); -function FilterStatsApi(pgQueryRunner) { +function FilterStatsBackends(pgQueryRunner) { this.pgQueryRunner = pgQueryRunner; } -module.exports = FilterStatsApi; +module.exports = FilterStatsBackends; function getEstimatedRows(pgQueryRunner, username, query, callback) { pgQueryRunner.run(username, "EXPLAIN (FORMAT JSON)"+query, function(err, result_rows) { @@ -23,7 +23,7 @@ function getEstimatedRows(pgQueryRunner, username, query, callback) { }); } -FilterStatsApi.prototype.getFilterStats = function (username, unfiltered_query, filters, callback) { +FilterStatsBackends.prototype.getFilterStats = function (username, unfiltered_query, filters, callback) { var stats = {}; var self = this; step( diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js index 72c29593..a3133da2 100644 --- a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js +++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js @@ -2,9 +2,9 @@ var step = require('step'); var queue = require('queue-async'); var _ = require('underscore'); -function MapConfigOverviewsAdapter(overviewsMetadataApi, filterStatsApi) { +function MapConfigOverviewsAdapter(overviewsMetadataApi, filterStatsBackend) { this.overviewsMetadataApi = overviewsMetadataApi; - this.filterStatsApi = filterStatsApi; + this.filterStatsBackend = filterStatsBackend; } module.exports = MapConfigOverviewsAdapter; @@ -53,7 +53,7 @@ MapConfigOverviewsAdapter.prototype.getMapConfig = function(user, requestMapConf function collectStatsData(err, filters, unfiltered_query) { var next_step = this; if ( filters ) { - self.filterStatsApi.getFilterStats( + self.filterStatsBackend.getFilterStats( user, unfiltered_query, filters, function(err, stats) { diff --git a/test/integration/mapconfig_overviews_adapter.js b/test/integration/mapconfig_overviews_adapter.js index 79196e3b..288c2560 100644 --- a/test/integration/mapconfig_overviews_adapter.js +++ b/test/integration/mapconfig_overviews_adapter.js @@ -6,7 +6,7 @@ var cartodbRedis = require('cartodb-redis'); var PgConnection = require(__dirname + '/../../lib/cartodb/backends/pg_connection'); var PgQueryRunner = require('../../lib/cartodb/backends/pg_query_runner'); var OverviewsMetadataApi = require('../../lib/cartodb/backends/api/overviews_metadata_api'); -var FilterStatsApi = require('../../lib/cartodb/backends/api/filter_stats_api'); +var FilterStatsBackend = require('../../lib/cartodb/backends/filter-stats'); var MapConfigOverviewsAdapter = require('../../lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter'); var redisPool = new RedisPool(global.environment.redis); @@ -14,9 +14,9 @@ var metadataBackend = cartodbRedis({pool: redisPool}); var pgConnection = new PgConnection(metadataBackend); var pgQueryRunner = new PgQueryRunner(pgConnection); var overviewsMetadataApi = new OverviewsMetadataApi(pgQueryRunner); -var filterStatsApi = new FilterStatsApi(pgQueryRunner); +var filterStatsBackend = new FilterStatsBackend(pgQueryRunner); -var mapConfigOverviewsAdapter = new MapConfigOverviewsAdapter(overviewsMetadataApi, filterStatsApi); +var mapConfigOverviewsAdapter = new MapConfigOverviewsAdapter(overviewsMetadataApi, filterStatsBackend); describe('MapConfigOverviewsAdapter', function() {