From e9f88a78d5c8e3cf42981c53757f72cd065a71f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Wed, 1 Aug 2018 15:28:15 +0200 Subject: [PATCH] remove step 4 --- lib/cartodb/backends/template_maps.js | 29 ++++++++++----------------- 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/lib/cartodb/backends/template_maps.js b/lib/cartodb/backends/template_maps.js index cf62a8cb..b31e5fb5 100644 --- a/lib/cartodb/backends/template_maps.js +++ b/lib/cartodb/backends/template_maps.js @@ -318,26 +318,19 @@ TemplateMaps.prototype.updTemplate = function(owner, tpl_id, template, callback) var previousTemplate = null; - step( - function getExistingTemplate() { - self._redisCmd('HGET', [ userTemplatesKey, tpl_id ], this); - }, - function updateTemplate(err, _currentTemplate) { - assert.ifError(err); - if (!_currentTemplate) { - throw new Error("Template '" + tpl_id + "' of user '" + owner + "' does not exist"); - } - previousTemplate = _currentTemplate; - self._redisCmd('HSET', [ userTemplatesKey, templateName, JSON.stringify(template) ], this); - }, - function handleTemplateUpdate(err, didSetNewField) { + + self._redisCmd('HGET', [ userTemplatesKey, tpl_id ], (err, _currentTemplate) => { + assert.ifError(err); + if (!_currentTemplate) { + throw new Error("Template '" + tpl_id + "' of user '" + owner + "' does not exist"); + } + previousTemplate = _currentTemplate; + self._redisCmd('HSET', [ userTemplatesKey, templateName, JSON.stringify(template) ], (err, didSetNewField) => { assert.ifError(err); if (didSetNewField) { debug('New template created on update operation'); } - return true; - }, - function finish(err) { + if (!err) { if (self.fingerPrint(JSON.parse(previousTemplate)) !== self.fingerPrint(template)) { self.emit('update', owner, templateName, template); @@ -345,8 +338,8 @@ TemplateMaps.prototype.updTemplate = function(owner, tpl_id, template, callback) } callback(err, template); - } - ); + }); + }); }; // List user templates