From 7b7bee2901a7dfbf42a9a9d482d7c65fc6160df7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Mart=C3=ADn?= <oleurud@gmail.com>
Date: Wed, 1 Aug 2018 15:43:45 +0200
Subject: [PATCH] improve naming

---
 lib/cartodb/backends/template_maps.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/lib/cartodb/backends/template_maps.js b/lib/cartodb/backends/template_maps.js
index 8bec7c36..d6ab6c46 100644
--- a/lib/cartodb/backends/template_maps.js
+++ b/lib/cartodb/backends/template_maps.js
@@ -305,26 +305,22 @@ TemplateMaps.prototype.updTemplate = function(owner, tpl_id, template, callback)
         return callback(invalidError);
     }
 
-    var templateName = template.name;
-
-    if (tpl_id !== templateName) {
-        return callback(new Error("Cannot update name of a map template ('" + tpl_id + "' != '" + templateName + "')"));
+    if (tpl_id !== template.name) {
+        return callback(new Error("Cannot update name of a map template ('" + tpl_id + "' != '" + template.name + "')"));
     }
 
     var userTemplatesKey = this.key_usr_tpl({ owner });
-    var previousTemplate = null;
 
-    this._redisCmd('HGET', [userTemplatesKey, tpl_id], (err, _currentTemplate) => {
+    this._redisCmd('HGET', [userTemplatesKey, tpl_id], (err, beforeUpdateTemplate) => {
         if (err) {
             return callback(err);
         }
 
-        if (!_currentTemplate) {
+        if (!beforeUpdateTemplate) {
             return callback(new Error(`Template '${tpl_id}' of user '${owner}' does not exist`));
         }
 
-        previousTemplate = _currentTemplate;
-        this._redisCmd('HSET', [userTemplatesKey, templateName, JSON.stringify(template)], (err, didSetNewField) => {
+        this._redisCmd('HSET', [userTemplatesKey, template.name, JSON.stringify(template)], (err, didSetNewField) => {
             if (err) {
                 return callback(err);
             }
@@ -333,8 +329,8 @@ TemplateMaps.prototype.updTemplate = function(owner, tpl_id, template, callback)
                 debug('New template created on update operation');
             }
 
-            if (this.fingerPrint(JSON.parse(previousTemplate)) !== this.fingerPrint(template)) {
-                this.emit('update', owner, templateName, template);
+            if (this.fingerPrint(JSON.parse(beforeUpdateTemplate)) !== this.fingerPrint(template)) {
+                this.emit('update', owner, template.name, template);
             }
 
             return callback(err, template);