Merge pull request #932 from CartoDB/fix-layergroupid-date

Fix layergroupid date

lib/cartodb/controllers/map.js

@@ -422,7 +422,7 @@ function setLastUpdatedTimeToLayergroup () {
         const { mapConfigProvider, analysesResults } = res.locals;
         const layergroup = res.body;
 
-        mapConfigProvider.getAffectedTables((err, affectedTables) => {
+        mapConfigProvider.createAffectedTables((err, affectedTables) => {
             if (err) {
                 return next(err);
             }

lib/cartodb/controllers/named_maps.js

@@ -248,7 +248,7 @@ function getStaticImageOptions ({ tablesExtentApi }) {
 
         res.locals.imageOpts = DEFAULT_ZOOM_CENTER;
 
-        mapConfigProvider.getAffectedTables((err, affectedTables) => {
+        mapConfigProvider.createAffectedTables((err, affectedTables) => {
             if (err) {
                 return next();
             }

lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js

@@ -58,7 +58,7 @@ CreateLayergroupMapConfigProvider.prototype.filter = MapStoreMapConfigProvider.p
 
 CreateLayergroupMapConfigProvider.prototype.createKey = MapStoreMapConfigProvider.prototype.createKey;
 
-CreateLayergroupMapConfigProvider.prototype.getAffectedTables = function (callback) {
+CreateLayergroupMapConfigProvider.prototype.createAffectedTables = function (callback) {
     this.getMapConfig((err, mapConfig) => {
         if (err) {
             return callback(err);
@@ -67,11 +67,6 @@ CreateLayergroupMapConfigProvider.prototype.getAffectedTables = function (callba
         const { dbname } = this.params;
         const token = mapConfig.id();
 
-        if (this.affectedTablesCache.hasAffectedTables(dbname, token)) {
-            const affectedTables = this.affectedTablesCache.get(dbname, token);
-            return callback(null, affectedTables);
-        }
-
         const queries = [];
 
         this.mapConfig.getLayers().forEach(layer => {
@@ -106,3 +101,21 @@ CreateLayergroupMapConfigProvider.prototype.getAffectedTables = function (callba
         });
     });
 };
+
+CreateLayergroupMapConfigProvider.prototype.getAffectedTables = function (callback) {
+    this.getMapConfig((err, mapConfig) => {
+        if (err) {
+            return callback(err);
+        }
+
+        const { dbname } = this.params;
+        const token = mapConfig.id();
+
+        if (this.affectedTablesCache.hasAffectedTables(dbname, token)) {
+            const affectedTables = this.affectedTablesCache.get(dbname, token);
+            return callback(null, affectedTables);
+        }
+
+        return this.createAffectedTables(callback);
+    });
+};

lib/cartodb/models/mapconfig/provider/map-store-provider.js

@@ -89,7 +89,7 @@ MapStoreMapConfigProvider.prototype.createKey = function(base) {
     return (base) ? baseKeyTpl(tplValues) : rendererKeyTpl(tplValues);
 };
 
-MapStoreMapConfigProvider.prototype.getAffectedTables = function(callback) {
+MapStoreMapConfigProvider.prototype.createAffectedTables = function(callback) {
     this.getMapConfig((err, mapConfig) => {
         if (err) {
             return callback(err);
@@ -98,12 +98,6 @@ MapStoreMapConfigProvider.prototype.getAffectedTables = function(callback) {
         const { dbname } = this.params;
         const token = mapConfig.id();
 
-        if (this.affectedTablesCache.hasAffectedTables(dbname, token)) {
-            const affectedTables = this.affectedTablesCache.get(dbname, token);
-
-            return callback(null, affectedTables);
-        }
-
         const queries = [];
 
         mapConfig.getLayers().forEach(layer => {
@@ -138,3 +132,21 @@ MapStoreMapConfigProvider.prototype.getAffectedTables = function(callback) {
         });
     });
 };
+
+MapStoreMapConfigProvider.prototype.getAffectedTables = function (callback) {
+    this.getMapConfig((err, mapConfig) => {
+        if (err) {
+            return callback(err);
+        }
+
+        const { dbname } = this.params;
+        const token = mapConfig.id();
+
+        if (this.affectedTablesCache.hasAffectedTables(dbname, token)) {
+            const affectedTables = this.affectedTablesCache.get(dbname, token);
+            return callback(null, affectedTables);
+        }
+
+        return this.createAffectedTables(callback);
+    });
+};

lib/cartodb/models/mapconfig/provider/named-map-provider.js

@@ -262,7 +262,7 @@ NamedMapMapConfigProvider.prototype.getTemplateName = function() {
     return this.templateName;
 };
 
-NamedMapMapConfigProvider.prototype.getAffectedTables = function(callback) {
+NamedMapMapConfigProvider.prototype.createAffectedTables = function(callback) {
     this.getMapConfig((err, mapConfig) => {
         if (err) {
             return callback(err);
@@ -271,11 +271,6 @@ NamedMapMapConfigProvider.prototype.getAffectedTables = function(callback) {
         const { dbname } = this.rendererParams;
         const token = mapConfig.id();
 
-        if (this.affectedTablesCache.hasAffectedTables(dbname, token)) {
-            const affectedTables = this.affectedTablesCache.get(dbname, token);
-            return callback(null, affectedTables);
-        }
-
         const queries = [];
 
         mapConfig.getLayers().forEach(layer => {
@@ -310,3 +305,21 @@ NamedMapMapConfigProvider.prototype.getAffectedTables = function(callback) {
         });
     });
 };
+
+NamedMapMapConfigProvider.prototype.getAffectedTables = function (callback) {
+    this.getMapConfig((err, mapConfig) => {
+        if (err) {
+            return callback(err);
+        }
+
+        const { dbname } = this.params;
+        const token = mapConfig.id();
+
+        if (this.affectedTablesCache.hasAffectedTables(dbname, token)) {
+            const affectedTables = this.affectedTablesCache.get(dbname, token);
+            return callback(null, affectedTables);
+        }
+
+        return this.createAffectedTables(callback);
+    });
+};