From fd875c41c7abaea17b9ef9b7b3d380f9f4e05c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Mart=C3=ADn?= <oleurud@gmail.com>
Date: Wed, 1 Aug 2018 12:20:01 +0200
Subject: [PATCH] remove step 2

---
 lib/cartodb/backends/template_maps.js | 38 +++++++++++----------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/lib/cartodb/backends/template_maps.js b/lib/cartodb/backends/template_maps.js
index 87d2f055..4175eba1 100644
--- a/lib/cartodb/backends/template_maps.js
+++ b/lib/cartodb/backends/template_maps.js
@@ -201,13 +201,11 @@ TemplateMaps.prototype.addTemplate = function(owner, template, callback) {
     var userTemplatesKey = this.key_usr_tpl({ owner:owner });
     var limit = this._userTemplateLimit();
 
-    function checkLimit() {
-        if ( ! limit ) {
-            return 0;
-        }
-        self._redisCmd('HLEN', [ userTemplatesKey ], this);
-    },
-    function installTemplateIfDoesNotExist(err, numberOfTemplates) {
+    if ( ! limit ) {
+        return 0;
+    }
+
+    self._redisCmd('HLEN', [ userTemplatesKey ], (err, numberOfTemplates) => {
         assert.ifError(err);
         if ( limit && numberOfTemplates >= limit ) {
             var limitReachedError = new Error("User '" + owner + "' reached limit on number of templates (" +
@@ -215,23 +213,19 @@ TemplateMaps.prototype.addTemplate = function(owner, template, callback) {
             limitReachedError.http_status = 409;
             throw limitReachedError;
         }
-        self._redisCmd('HSETNX', [ userTemplatesKey, templateName, JSON.stringify(template) ], this);
-    },
-    function validateInstallation(err, wasSet) {
-        assert.ifError(err);
-        if ( ! wasSet ) {
-            throw new Error("Template '" + templateName + "' of user '" + owner + "' already exists");
-        }
+        self._redisCmd('HSETNX', [ userTemplatesKey, templateName, JSON.stringify(template) ], (err, wasSet) => {
+            assert.ifError(err);
+            if ( ! wasSet ) {
+                throw new Error("Template '" + templateName + "' of user '" + owner + "' already exists");
+            }
 
-        return true;
-    },
-    function finish(err) {
-        if (!err) {
-            self.emit('add', owner, templateName, template);
-        }
+            if (!err) {
+                self.emit('add', owner, templateName, template);
+            }
 
-        callback(err, templateName, template);
-    }
+            callback(err, templateName, template);
+        });
+    });
 };
 
 // Delete a template