refactring & config object

src/db/database.js

@@ -1,3 +1,6 @@
+const env = process.env.NODE_ENV || 'development';
+const config = require(__dirname + '/../../config/config.json')[env];
+
 
 const Sequelize = require("sequelize");
 const mongoose = require('mongoose');
@@ -14,7 +17,7 @@ let DevicesSchema = new Schema({
 });
 
 
-var sqlz = new Sequelize('iot', 'iot', '!iot_popovi',{dialect: 'mysql', logging: false});
+var sqlz = new Sequelize(config.database, config.username, config.password,{dialect: config.dialect, logging: false});
 var Device = sqlz.define('device', {
   id: { type: Sequelize.INTEGER, autoIncrement: true, primaryKey: true },
   name: Sequelize.STRING,

src/db/devicemessages.js

@@ -1,11 +1,21 @@
 //devicemessages
-var mysql      = require('mysql');
+var mysql = require('mysql');
+
+
+// const fs = require('fs');
+// const path = require('path');
+// const Sequelize = require('sequelize');
+// const basename = path.basename(__filename);
+const env = process.env.NODE_ENV || 'development';
+const config = require(__dirname + '/../../config/config.json')[env];
+
+
 var pool  = mysql.createPool({
   connectionLimit : 20,
-  host     : 'localhost',
-  user     : 'iot',
-  password : '!iot_popovi',
-  database : 'iot'
+  host     : config.host,
+  user     : config.username,
+  password : config.password,
+  database : config.database
 });
 // var con = mysql.createConnection({
 //   host     : 'localhost',
@@ -40,8 +50,8 @@ exports.findByName = function(fieldName, days, cb) {
 
 exports.insert = function(device_id, field_name, value, cb){
     var params = [device_id, field_name,value];
-    let sql = `INSERT INTO devicemessages(device_id,field_name,field_value,timestamp,createdAt,updatedAt )
-    VALUES (?,?,?,NOW(),NOW(),NOW());`;
+    let sql = `INSERT INTO devicemessages(device_id,field_name,field_value,timestamp)
+    VALUES (?,?,?,NOW());`;
     pool.getConnection(function(err, con) {
       if (err) throw err; // not connected!
       con.query(sql,params,(err, r) => {

src/devices/ir.js

@@ -11,6 +11,7 @@ function GetDht() {
     var result;
     (async () => {
       try {
+        //http://192.168.0.58/json?view=sensorupdate
         var url='http://'+'192.168.1.143'+'/cm?cmnd=status%2010&user=admin&password=vlado555';
         request(url, { json: true }, (err, res, body) => {
           if (err) { return console.log("Problem getting  current conditions: " + err);  }

src/setup_const.js

@@ -1,15 +1,9 @@
-var GardenIP = '192.168.0.18';
-var AcIP = '192.168.1.143';
-var HouseDhtIP = '192.168.1.126';
-var HomeControllerMQTT = '192.168.0.10'; //GW02
-var localPath = "/n";
-
 module.exports = {
-    GardenIP:  '192.168.0.18',
+    GardenIP:  '192.168.0.58',
      AcIP : '192.168.1.143',
  HouseDhtIP : '192.168.1.126',
- HomeControllerMQTT : '192.168.0.10',
- localPath : "/n",
+ HomeControllerMQTT : '192.168.0.10',//GW02
+ localPath : "",
     foo: function () {
       // whatever
     },