Beautify core and models

GladysAssistant · Mar 2, 2016 · b8d12e7 · b8d12e7
1 parent 70001fe
commit b8d12e7
Show file tree

Hide file tree

Showing 86 changed files with 1,705 additions and 1,791 deletions.
diff --git a/api/core/alarm/alarm.cancel.js b/api/core/alarm/alarm.cancel.js
@@ -1,14 +1,16 @@
 var Promise = require('bluebird');
 var shared = require('./alarm.shared.js');
 
-module.exports = function cancel(alarm){
-    if(shared.tabAlarmScheduled.hasOwnProperty(alarm.id)){
+module.exports = function cancel(alarm) {
+    if (shared.tabAlarmScheduled.hasOwnProperty(alarm.id)) {
         sails.log.info(`Cancelling alarm ID n° ${alarm.id}`);
-
-        return gladys.scheduler.delete({index: shared.tabAlarmScheduled[alarm.id]})
-                     .then(function(){
-                         return Promise.resolve(alarm);
-                     });
+
+        return gladys.scheduler.delete({
+                index: shared.tabAlarmScheduled[alarm.id]
+            })
+            .then(function() {
+                return Promise.resolve(alarm);
+            });
     }
     return Promise.resolve(alarm);
-};
+};
diff --git a/api/core/alarm/alarm.create.js b/api/core/alarm/alarm.create.js
@@ -1,21 +1,20 @@
+module.exports = function create(alarm) {
 
-module.exports = function create (alarm) {
-
-    if(!alarm || (!alarm.dayofweek && !alarm.datetime) || (alarm.dayofweek && !alarm.time)){
+    if (!alarm || (!alarm.dayofweek && !alarm.datetime) || (alarm.dayofweek && !alarm.time)) {
         return Promise.reject(new Error('Wrong parameters, missing arguments.'));
     }
-    
+
     // create alarm in db
     return Alarm.create(alarm)
-         .then(function(alarm){
+        .then(function(alarm) {
 
             // if alarm is in the future and active, we schedule the alarm
-            if(alarm.active && (new Date(alarm.datetime) > new Date() || alarm.dayofweek !== -1)){
+            if (alarm.active && (new Date(alarm.datetime) > new Date() || alarm.dayofweek !== -1)) {
 
                 // schedule the alarm with gladys.schedule
-                return gladys.alarm.schedule(alarm); 
-			} else {
+                return gladys.alarm.schedule(alarm);
+            } else {
                 return Promise.resolve(alarm);
             }
-         });
-};
+        });
+};
diff --git a/api/core/alarm/alarm.delete.js b/api/core/alarm/alarm.delete.js
@@ -1,16 +1,16 @@
 var queries = require('./alarm.queries.js');
 
-module.exports = function(alarm){
-    
-    if(!alarm.id){
+module.exports = function(alarm) {
+
+    if (!alarm.id) {
         return Promise.reject(new Error('You should provide an id to delete an alarm'));
     }
-    
+
     // deleting alarm from database
     return gladys.utils.sql(queries.deleteAlarm, [alarm.id])
-          .then(function(alarm){
-              
-             // cancelling alarm
-             return gladys.alarm.cancel(alarm);
-          });
-};
+        .then(function(alarm) {
+
+            // cancelling alarm
+            return gladys.alarm.cancel(alarm);
+        });
+};
diff --git a/api/core/alarm/alarm.init.js b/api/core/alarm/alarm.init.js
@@ -4,13 +4,13 @@ var getAlarmsPromise = Promise.promisify(Alarm.query);
 
 module.exports = function() {
 
-  // get all alarms in database
-  return getAlarmsPromise(queries.getAlarms, [])
-              .then(function(alarms){
-                  
-                   // foreach alarm, we program it via gladys.alarm.schedule
-                   return Promise.map(alarms, function(alarm){
-                       return gladys.alarm.schedule(alarm);
-                   });
-              });
-};
+    // get all alarms in database
+    return getAlarmsPromise(queries.getAlarms, [])
+        .then(function(alarms) {
+
+            // foreach alarm, we program it via gladys.alarm.schedule
+            return Promise.map(alarms, function(alarm) {
+                return gladys.alarm.schedule(alarm);
+            });
+        });
+};
diff --git a/api/core/alarm/alarm.queries.js b/api/core/alarm/alarm.queries.js
@@ -1,10 +1,9 @@
-
 module.exports = {
-    
-  getAlarms:  `SELECT * FROM alarm
+
+    getAlarms: `SELECT * FROM alarm
                 WHERE active = 1
 		        AND ((dayofweek = -1 AND datetime > SYSDATE()) OR dayofweek <> -1 )`,
-
-  deleteAlarm: `DELETE FROM alarm WHERE id = ?`
 
-};
+    deleteAlarm: `DELETE FROM alarm WHERE id = ?`
+
+};
diff --git a/api/core/alarm/alarm.schedule.js b/api/core/alarm/alarm.schedule.js
@@ -1,28 +1,28 @@
 var shared = require('./alarm.shared.js');
 
-module.exports = function schedule(alarm){
+module.exports = function schedule(alarm) {
     var rule;
-    
+
     // if the alarm is reccuring 
-    if(alarm.dayofweek === -1){
+    if (alarm.dayofweek === -1) {
         rule = new Date(alarm.datetime);
-    }else{
+    } else {
         rule = {
-            hour: parseInt(alarm.time.slice(0,2)), 
-            minute: parseInt(alarm.time.slice(3)), 
+            hour: parseInt(alarm.time.slice(0, 2)),
+            minute: parseInt(alarm.time.slice(3)),
             dayOfWeek: alarm.dayofweek
         };
     }
-    
+
     var options = {
-      rule: rule,
-      eventName: 'alarmRing',
-      value: alarm.id  
+        rule: rule,
+        eventName: 'alarmRing',
+        value: alarm.id
     };
-    
+
     return gladys.scheduler.create(options)
-                 .then(function(index){
-                     shared.tabAlarmScheduled[alarm.id] = index;
-                     return Promise.resolve(alarm); 
-                 });
-};
+        .then(function(index) {
+            shared.tabAlarmScheduled[alarm.id] = index;
+            return Promise.resolve(alarm);
+        });
+};
diff --git a/api/core/alarm/alarm.shared.js b/api/core/alarm/alarm.shared.js
@@ -1,5 +1,4 @@
-
 // we saved here scheduled alarm to cancel them in the future
 module.exports = {
     tabAlarmScheduled: {}
-};
+};
diff --git a/api/core/alarm/alarm.update.js b/api/core/alarm/alarm.update.js
@@ -1,18 +1,18 @@
+// update an alarm
+module.exports = function(params) {
+    return Alarm.update({
+            id: params.id
+        }, params.alarm)
+        .then(function(alarms) {
 
+            if (alarms.length === 0) {
+                return Promise.reject(new Error('Alarm not found'));
+            }
 
-// update an alarm
-module.exports = function (params){
-    return Alarm.update({id:params.id}, params.alarm)
-                .then(function(alarms){
-
-                    if(alarms.length === 0){
-                        return Promise.reject(new Error('Alarm not found'));
-                    }
-
-                    if(!alarms[0].active){
-                        return gladys.alarm.cancel(alarms[0]);
-                    } else {
-                        return Promise.resolve(alarms[0]);
-                    }
-                });
-};
+            if (!alarms[0].active) {
+                return gladys.alarm.cancel(alarms[0]);
+            } else {
+                return Promise.resolve(alarms[0]);
+            }
+        });
+};
diff --git a/api/core/alarm/index.js b/api/core/alarm/index.js
@@ -1,9 +1,7 @@
-
-
 module.exports.cancel = require('./alarm.cancel.js');
 module.exports.create = require('./alarm.create.js');
 module.exports.delete = require('./alarm.delete.js');
 module.exports.init = require('./alarm.init.js');
 module.exports.update = require('./alarm.update.js');
 
-module.exports.schedule = require('./alarm.schedule.js');
+module.exports.schedule = require('./alarm.schedule.js');
diff --git a/api/core/device/device.addTypes.js b/api/core/device/device.addTypes.js
@@ -3,8 +3,8 @@ module.exports = addTypes;
 var Promise = require('bluebird');
 var createDeviceType = Promise.promisify(DeviceType.create);
 
-function addTypes(types){
-    return Promise.map(types, function(type){
+function addTypes(types) {
+    return Promise.map(types, function(type) {
         return createDeviceType(type);
     });
-}
+}
diff --git a/api/core/device/device.create.js b/api/core/device/device.create.js
@@ -5,25 +5,25 @@ var Promise = require('bluebird');
 /**
  * Create a Device and its DeviceType.
  */
-function create (param) {
-    
+function create(param) {
+
     // first, we create the device
     return Device.create(param.device)
-        .then(function(device){
-            
+        .then(function(device) {
+
             // we create all the types
-            return Promise.map(param.types, function(type){
+            return Promise.map(param.types, function(type) {
                 type.device = device.id;
                 return DeviceType.create(type);
             })
-            
+
             // we return the results
-            .then(function(types){
-               var result = {
-                   device: device,
-                   types: types
-               };
-               return Promise.resolve(result);
+            .then(function(types) {
+                var result = {
+                    device: device,
+                    types: types
+                };
+                return Promise.resolve(result);
             });
         });
-}
+}
diff --git a/api/core/device/device.delete.js b/api/core/device/device.delete.js
@@ -2,14 +2,16 @@ module.exports = destroy;
 
 var Promise = require('bluebird');
 
-function destroy (options) {
-    return Device.destroy({id: options.id})
-        .then(function(devices){
-
-           if(devices.length === 0){
-               return Promise.reject(new Error('Device not found'));
-           } 
-
-           return Promise.resolve(devices[0]);
+function destroy(options)  {
+    return Device.destroy({
+            id: options.id
+        })
+        .then(function(devices) {
+
+            if (devices.length === 0) {
+                return Promise.reject(new Error('Device not found'));
+            }
+
+            return Promise.resolve(devices[0]);
         });
-}
+}
diff --git a/api/core/device/device.exec.js b/api/core/device/device.exec.js
@@ -7,29 +7,32 @@ var queries = require('./device.queries.js');
  * Set a new state for a device by executing 
  * the related service.
  */
-function set (param) {
-    
+function set(param) {
+
     return gladys.utils.sql(queries.getDeviceType, [param.devicetype])
-      .then(function(types){  
-
-        if (types.length === 0) {
-            return Promise.reject(new Error('DeviceType not found'));
-        }
-
-        if(param.value < types[0].min || param.value > types[0].max){
-            return Promise.reject(new Error('Incorrect value'));
-        }
-
-        if (typeof global[types[0].service].exec !== "function"){
-            return Promise.reject(new Error(`${types[0].service} does not exist or does not have an exec function`));
-        }
-
-        // calling service method
-        return global[types[0].service].exec({type: types[0], state:param})
-            .then(function(){
-
-                // creating DeviceState
-                return DeviceState.create(param);
-            });     
-    });
-}
+        .then(function(types) {
+
+            if (types.length === 0) {
+                return Promise.reject(new Error('DeviceType not found'));
+            }
+
+            if (param.value < types[0].min || param.value > types[0].max) {
+                return Promise.reject(new Error('Incorrect value'));
+            }
+
+            if (typeof global[types[0].service].exec !== "function") {
+                return Promise.reject(new Error(`${types[0].service} does not exist or does not have an exec function`));
+            }
+
+            // calling service method
+            return global[types[0].service].exec({
+                    type: types[0],
+                    state: param
+                })
+                .then(function() {
+
+                    // creating DeviceState
+                    return DeviceState.create(param);
+                });
+        });
+}
diff --git a/api/core/device/device.get.js b/api/core/device/device.get.js
@@ -2,12 +2,12 @@ module.exports = get;
 
 var queries = require('./device.queries.js');
 
-function get (options) {
-    
-  // default params
-  options = options || {};
-  options.skip = parseInt(options.skip) || 0;
-  options.take = parseInt(options.take) || 50;
-    
-  return gladys.utils.sql(queries.get, [options.take, options.skip]);
-}
+function get(options) {
+
+    // default params
+    options = options || {};
+    options.skip = parseInt(options.skip) || 0;
+    options.take = parseInt(options.take) || 50;
+
+    return gladys.utils.sql(queries.get, [options.take, options.skip]);
+}