From 93bd2c9e509e69db8aa1f5b591057e6afa730aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Thu, 2 Nov 2017 10:43:22 +0100 Subject: [PATCH] Build afterLayergroupCreate middleware as an array of middlewares instead of preforming all them as one middleware --- lib/cartodb/controllers/map.js | 75 +++++++--------------------------- 1 file changed, 14 insertions(+), 61 deletions(-) diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js index 384678cb..7478ce49 100644 --- a/lib/cartodb/controllers/map.js +++ b/lib/cartodb/controllers/map.js @@ -299,72 +299,25 @@ function respond (req, res) { } MapController.prototype.afterLayergroupCreateBuilder = function (options = {}) { - const self = this; const { useTemplateHash = false, includeQuery = false } = options; - return function (req, res, callback) { - step( - function incrementMapViewCount () { - self.incrementMapViewCount(req, res, this); - }, - function augmentLayergroupData (err) { - assert.ifError(err); - self.augmentLayergroupData(req, res, this); - }, - function getAffectedTables (err) { - assert.ifError(err); - self.getAffectedTables(req, res, this); - }, - function setCacheChannel (err) { - assert.ifError(err); - self.setCacheChannel(req, res, this); - }, - function setLastUpdatedTime (err) { - assert.ifError(err); - self.setLastUpdatedTimeToLayergroup(req, res, this); - }, - function setCacheControl (err) { - assert.ifError(err); - self.setCacheControl(req, res, this); - }, - function setLayerStats (err) { - assert.ifError(err); - self.setLayerStats(req, res, this); - }, - function setLayergroupIdHeader (err) { - assert.ifError(err); - - const setLayergroupIdHeader = self.setLayergroupIdHeaderBuilder(useTemplateHash); - - setLayergroupIdHeader(req, res, this); - }, - function (err) { - assert.ifError(err); - self.setDataviewsAndWidgetsUrlsToLayergroupMetadata(req, res, this); - }, - function setAnalysesMetadataToLayergroup(err) { - assert.ifError(err); - - const setAnalysesMetadataToLayergroup = self.setAnalysesMetadataToLayergroupBuilder(includeQuery); - - setAnalysesMetadataToLayergroup(req, res, this); - }, - function setTurboCartoMetadataToLayergroup (err) { - assert.ifError(err); - self.setTurboCartoMetadataToLayergroup(req, res, this); - }, - function setSurrogateKeyHeader (err) { - assert.ifError(err); - self.setSurrogateKeyHeader(req, res, this); - }, - function finish(err) { - callback(err); - } - ); - }; + return [ + this.incrementMapViewCount.bind(this), + this.augmentLayergroupData.bind(this), + this.getAffectedTables.bind(this), + this.setCacheChannel.bind(this), + this.setLastUpdatedTimeToLayergroup.bind(this), + this.setCacheControl.bind(this), + this.setLayerStats.bind(this), + this.setLayergroupIdHeaderBuilder(useTemplateHash), + this.setDataviewsAndWidgetsUrlsToLayergroupMetadata.bind(this), + this.setAnalysesMetadataToLayergroupBuilder(includeQuery), + this.setTurboCartoMetadataToLayergroup.bind(this), + this.setSurrogateKeyHeader.bind(this) + ]; }; MapController.prototype.incrementMapViewCount = function (req, res, callback) {