Merge pull request #53 from janantala/develop

Remove old device registration on the new registration
telefonicaid · May 7, 2015 · 6e870bc · 6e870bc
2 parents 3075dac + 1c00674
commit 6e870bc
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 49 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -4,3 +4,4 @@
 - Fix MongoDB did not recover information at starting (#38).
 - Fix command line break when executing command before starting the server (#47).
 - FIX Client handler after connection update (#51)
+- FIX Remove old device registration on the new registration (#52)
diff --git a/lib/services/server/inMemoryDeviceRegistry.js b/lib/services/server/inMemoryDeviceRegistry.js
@@ -29,15 +29,25 @@ var registry = {},
     _ = require('underscore');
 
 /**
- * Inserts the given object in the registry. The generated ID is returned through the callback.
+ * Gets the device that has the device name passed as a parameter (should be unique) or return a DeviceNotFound error
+ * in case none exist.
  *
- * @param {Object} object       Object to insert into the registry.
+ * @param {String} deviceName       Name of the device to retrieve.
  */
-function register(object, callback) {
-    var id = idCounter++;
-    registry[id] = object;
-    registry[id].id = id;
-    callback(null, id);
+function getByName(deviceName, callback) {
+    var result;
+
+    for(var key in registry) {
+        if (registry[key] && registry[key].name === deviceName) {
+            result = registry[key];
+        }
+    }
+
+    if (result) {
+        callback(null, result);
+    } else {
+        callback(new errors.DeviceNotFound(deviceName));
+    }
 }
 
 /**
@@ -58,6 +68,33 @@ function unregister(id, callback) {
     }
 }
 
+/**
+ * Inserts the given object in the registry and removes the old registration.
+ * The generated ID is returned through the callback.
+ *
+ * @param {Object} object       Object to insert into the registry.
+ */
+function register(object, callback) {
+
+    function save(cb) {
+        var id = idCounter++;
+        registry[id] = object;
+        registry[id].id = id;
+        return cb(null, id);
+    }
+
+    getByName(object.name, function(error, result){
+        if (!error && result) {
+            unregister(result.id, function(err){
+                return save(callback);
+            });
+        }
+        else {
+            return save(callback);
+        }
+    });
+}
+
 /**
  * Remove all the objects from the registry.
  */
@@ -110,28 +147,6 @@ function list(callback) {
     callback(null, result);
 }
 
-/**
- * Gets the device that has the device name passed as a parameter (should be unique) or return a DeviceNotFound error
- * in case none exist.
- *
- * @param {String} deviceName       Name of the device to retrieve.
- */
-function getByName(deviceName, callback) {
-    var result;
-
-    for(var key in registry) {
-        if (registry[key] && registry[key].name === deviceName) {
-            result = registry[key];
-        }
-    }
-
-    if (result) {
-        callback(null, result);
-    } else {
-        callback(new errors.DeviceNotFound(deviceName));
-    }
-}
-
 /**
  * Initializes the device registry based on the parameter found in the configuration. For this in memory registry this
  * function doesn't do anything.
@@ -149,4 +164,4 @@ exports.update = update;
 exports.clean = clean;
 exports.list = list;
 exports.getByName = getByName;
-exports.init = init;
+exports.init = init;
diff --git a/lib/services/server/mongodbDeviceRegistry.js b/lib/services/server/mongodbDeviceRegistry.js
@@ -88,7 +88,26 @@ function getByName(deviceName, callback) {
 }
 
 /**
- * Inserts the given object in the registry. The generated ID is returned through the callback.
+ * Removes the object identified by this id from the registry. The removed object is passed as the first callback
+ * parameter.
+ *
+ * @param {Integer} id          Identifier of the object to be removed.
+ */
+function unregister(id, callback) {
+    Device.model.findOneAndRemove({ id: id }, function(error, device) {
+        if (error) {
+            callback(errors.InternalDbError(error));
+        } else if (device) {
+            callback(null, device.toObject());
+        } else {
+            callback(new errors.DeviceNotFound(id));
+        }
+    });
+}
+
+/**
+ * Inserts the given object in the registry and removes the old registration.
+ * The generated ID is returned through the callback.
  *
  * @param {Object} object       Object to insert into the registry.
  */
@@ -114,23 +133,14 @@ function register(object, callback) {
         deviceObj.save(innerCb);
     }
 
-    mongoStore(saveDeviceHandler);
-}
-
-/**
- * Removes the object identified by this id from the registry. The removed object is passed as the first callback
- * parameter.
- *
- * @param {Integer} id          Identifier of the object to be removed.
- */
-function unregister(id, callback) {
-    Device.model.findOneAndRemove({ id: id }, function(error, device) {
-        if (error) {
-            callback(errors.InternalDbError(error));
-        } else if (device) {
-            callback(null, device.toObject());
-        } else {
-            callback(new errors.DeviceNotFound(id));
+    getByName(object.name, function(error, result){
+        if (!error && result) {
+            unregister(result.id, function(err){
+                return mongoStore(saveDeviceHandler);
+            });
+        }
+        else {
+            return mongoStore(saveDeviceHandler);
         }
     });
 }
@@ -198,4 +208,4 @@ exports.update = update;
 exports.clean = clean;
 exports.list = list;
 exports.getByName = getByName;
-exports.init = init;
+exports.init = init;