Merge pull request #253 from telefonicaid/bug/bothObjectIdAndIdStored

FIX Both object_id and id stored for attributes

CHANGES_NEXT_RELEASE

@@ -1 +1,2 @@
 - ADD Timeinstant value with local time (#251)
+- FIX Both object_id and id in attributes are stored, but only the id displayed (#250).

lib/plugins/attributeAlias.js

@@ -28,7 +28,7 @@ function extractSingleMapping(previous, current) {
 
     previous.direct[current.object_id] = current.name;
     previous.types[current.object_id] = current.type;
-    previous.inverse[current.name] = current.id;
+    previous.inverse[current.name] = current.object_id;
     return previous;
 }
 

lib/services/devices/deviceService.js

@@ -293,12 +293,14 @@ function registerDevice(deviceObj, callback) {
         defaults = [null, null, [], [], [], []];
 
     function setDefaultAttributeIds(attribute) {
-        if (!attribute.id && attribute.name) {
-            attribute.id = attribute.name;
+        /* jshint camelcase: false */
+
+        if (!attribute.object_id && attribute.name) {
+            attribute.object_id = attribute.name;
         }
 
-        if (!attribute.name && attribute.id) {
-            attribute.name = attribute.id;
+        if (!attribute.name && attribute.object_id) {
+            attribute.name = attribute.object_id;
         }
 
         return attribute;

lib/services/northBound/deviceProvisioningServer.js

@@ -124,7 +124,7 @@ function handleProvision(req, res, next) {
  */
 function attributeToProvisioningAPIFormat(attribute) {
     return {
-        object_id: attribute.id,
+        object_id: attribute.object_id,
         name: attribute.name,
         type: attribute.type
     };

test/unit/device-provisioning-api_test.js

@@ -179,12 +179,13 @@ describe('Device provisioning API: Provision devices', function() {
         });
 
         it('should store fill the device ID in case only the name is provided', function(done) {
+            /* jshint camelcase:false */
             request(options, function(error, response, body) {
                 response.statusCode.should.equal(201);
                 iotAgentLib.listDevices('smartGondor', '/gardens', function(error, results) {
-                    results.devices[0].lazy[0].id.should.equal('luminance');
-                    results.devices[0].commands[0].id.should.equal('commandAttr');
-                    results.devices[0].active[0].id.should.equal('attr_name');
+                    results.devices[0].lazy[0].object_id.should.equal('luminance');
+                    results.devices[0].commands[0].object_id.should.equal('commandAttr');
+                    results.devices[0].active[0].object_id.should.equal('attr_name');
                     done();
                 });
             });