deviceType.getById & deviceType.getByType

api/core/devicetype/deviceType.getById.js

@@ -0,0 +1,5 @@
+var queries = require('./deviceType.queries.js');
+
+module.exports = function(device){
+    return gladys.utils.sqlUnique(queries.getById, [device.id]);
+}

api/core/devicetype/deviceType.getByType.js

@@ -0,0 +1,5 @@
+var queries = require('./deviceType.queries.js');
+
+module.exports = function(device){
+    return gladys.utils.sql(queries.getByType, [device.type]);
+}

api/core/devicetype/deviceType.queries.js

@@ -55,5 +55,38 @@ module.exports = {
   `,
   getByDeviceAndIdentifier: 'SELECT id FROM devicetype WHERE device = ? AND identifier = ?;',
   delete : 'DELETE FROM devicetype WHERE id = ?;',
-  deleteDeviceStates: 'DELETE FROM devicestate WHERE devicetype = ?;'
+  deleteDeviceStates: 'DELETE FROM devicestate WHERE devicetype = ?;',
+  getById: `
+    SELECT dt.*, ds3.datetime as lastChanged, ds3.value AS lastValue, ds3.id AS lastValueId
+      FROM device d
+      JOIN devicetype dt ON (d.id = dt.device)
+      LEFT JOIN (
+        SELECT ds.devicetype, MAX(id) as id
+        FROM devicestate ds 
+        INNER JOIN (
+          SELECT devicetype, MAX(datetime) as datetime FROM devicestate GROUP BY devicetype
+        ) as dsJoin
+        WHERE dsJoin.devicetype = ds.devicetype AND dsJoin.datetime = ds.datetime
+        GROUP by ds.devicetype
+    ) as deviceStateJoin ON (deviceStateJoin.devicetype = dt.id)
+      LEFT JOIN devicestate ds3 ON deviceStateJoin.id = ds3.id
+      WHERE dt.id = ?;
+  `, 
+  getByType: `
+    SELECT dt.*, ds3.datetime as lastChanged, ds3.value AS lastValue, ds3.id AS lastValueId
+      FROM device d
+      JOIN devicetype dt ON (d.id = dt.device)
+      LEFT JOIN (
+        SELECT ds.devicetype, MAX(id) as id
+        FROM devicestate ds 
+        INNER JOIN (
+          SELECT devicetype, MAX(datetime) as datetime FROM devicestate GROUP BY devicetype
+        ) as dsJoin
+        WHERE dsJoin.devicetype = ds.devicetype AND dsJoin.datetime = ds.datetime
+        GROUP by ds.devicetype
+    ) as deviceStateJoin ON (deviceStateJoin.devicetype = dt.id)
+      LEFT JOIN devicestate ds3 ON deviceStateJoin.id = ds3.id
+      WHERE dt.type = ?;
+  `, 
+
 };

api/core/devicetype/index.js

@@ -7,4 +7,6 @@ module.exports.save = require('./deviceType.save.js');
 module.exports.getAll = require('./deviceType.getAll.js');
 module.exports.getByRoom = require('./deviceType.getByRoom.js');
 module.exports.getByDevice = require('./deviceType.getByDevice.js');
-module.exports.getByIdentifier = require('./deviceType.getByIdentifier.js');
+module.exports.getByIdentifier = require('./deviceType.getByIdentifier.js');
+module.exports.getByType = require('./deviceType.getByType.js');
+module.exports.getById = require('./deviceType.getById.js');

test/unit/api/core/devicetype/deviceType.getById.test.js

@@ -0,0 +1,26 @@
+var should = require('should');
+var validateDeviceType = require('../../validator/deviceTypeValidator.js');
+
+describe('DeviceType', function() {
+
+  describe('getById', function() {
+
+    it('should return a deviceType by his id', function (done) {
+
+        var device = {
+          id : 1
+        };
+
+        gladys.deviceType.getById(device)
+          .then(function(type){
+            type.should.be.instanceOf(Object);
+            validateDeviceType(type);
+            done();
+          })
+          .catch(done);
+
+    });
+
+  });
+
+});

test/unit/api/core/devicetype/deviceType.getByType.test.js

@@ -0,0 +1,27 @@
+var should = require('should');
+var validateDeviceType = require('../../validator/deviceTypeValidator.js');
+
+describe('DeviceType', function() {
+
+  describe('getByType', function() {
+
+    it('should return a list of deviceType by type', function (done) {
+
+        var device = {
+          type: 'binary'
+        };
+
+        gladys.deviceType.getByType(device)
+          .then(function(types){
+            validateDeviceType(types);
+            types.forEach(function(type){
+              type.type.should.equal(device.type);
+            });
+            done();
+          }).catch(done);
+
+    });
+
+  });
+
+});

test/unit/api/validator/deviceTypeValidator.js

@@ -17,4 +17,4 @@ function validateDeviceType(deviceType) {
 	deviceType.should.have.property('min');
     deviceType.should.have.property('max');
     deviceType.should.have.property('device');
-}
+}