Merge pull request #246 from telefonicaid/bug/objectIdInsteadOfIdInDefaultIDs

FIX Object IDs in get provisioned device

Author: Alvaro Vega Garcia

CHANGES_NEXT_RELEASE

@@ -0,0 +1 @@
+- Getting the information of a provisioned device returns an spurious 'id' attribute in attribute descriptions (#245).

lib/services/northBound/deviceProvisioningServer.js

@@ -116,6 +116,20 @@ function handleProvision(req, res, next) {
     async.map(extractDevices(), provisionSingleDevice, handleProvisioningFinish);
 }
 
+/**
+ * Translate an attribute from the internal representaiton format to the one required by the Provisioning API.
+ *
+ * @param {Object} attribute                        Attribute in internal representation format.
+ * @return {{object_id: *, name: *, type: *}}      Attribute in Device Provisioning API format.
+ */
+function attributeToProvisioningAPIFormat(attribute) {
+    return {
+        object_id: attribute.id,
+        name: attribute.name,
+        type: attribute.type
+    };
+}
+
 /**
  * Translate between the inner model format to the external Device Provisioning API one.
  *
@@ -131,8 +145,8 @@ function toProvisioningAPIFormat(device) {
         entity_name: device.name,
         entity_type: device.type,
         timezone: device.timezone,
-        attributes: device.active,
-        lazy: device.lazy,
+        attributes: device.active.map(attributeToProvisioningAPIFormat),
+        lazy: device.lazy.map(attributeToProvisioningAPIFormat),
         static_attributes: device.staticAttributes,
         internal_attributes: device.internalAttributes,
         protocol: device.protocol

test/unit/listProvisionedDevices-test.js

@@ -184,6 +184,23 @@ describe('Device provisioning API: List provisioned devices', function() {
                 done();
             });
         });
+
+        it('should return the appropriate attribute fields', function(done) {
+            request(options, function(error, response, body) {
+                /* jshint camelcase:false */
+
+                var parsedBody;
+
+                should.not.exist(error);
+
+                parsedBody = JSON.parse(body);
+                should.exist(parsedBody.attributes[0].object_id);
+                parsedBody.attributes[0].object_id.should.equal('attr_name');
+                parsedBody.attributes[0].name.should.equal('attr_name');
+                parsedBody.attributes[0].type.should.equal('string');
+                done();
+            });
+        });
     });
     describe('When a request for an unexistent device arrives', function() {
         var options = {