From 0d4d354855108dc9e9f48c90a0ae0069feaec6f8 Mon Sep 17 00:00:00 2001
From: Martin Donnelly <martind2000@gmail.com>
Date: Thu, 11 Aug 2016 15:37:41 +0100
Subject: [PATCH] Added PGSQL controller

---
 lib/mqtt/mqttClient.js | 10 +++++-----
 lib/server/db-save.js  |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/mqtt/mqttClient.js b/lib/mqtt/mqttClient.js
index c5063b2..fc39ec2 100644
--- a/lib/mqtt/mqttClient.js
+++ b/lib/mqtt/mqttClient.js
@@ -35,8 +35,10 @@ function insertEntry(obj) {
 
   var newObj = dataBuilder(obj);
 
+  newObj.rtype = 1;
+
   logger.debug('Inserting into couch...');
-  logger.info(util.inspect(newObj));
+ // logger.info(util.inspect(newObj));
   dbCouch.insert(newObj, function(err, body, header) {
     if (err) {
       logger.error('Error inserting into couch');
@@ -49,9 +51,7 @@ function insertEntry(obj) {
 var doInsertEntry = (obj) => {
   //   Logger.info('sendSocket: ' + JSON.stringify(obj));
 
-  var _rawObj = obj;
-  _rawObj.type = 1;
-  insertEntry(_rawObj);
+  insertEntry(obj);
 
   dbSave.addNewEvent(obj)
     .then(function(d) {
@@ -122,7 +122,7 @@ var mqttClient = function() {
       var json = JSON.parse(message.toString());
 
       json.topic = topic;
-      logger.debug(JSON.stringify(json));
+     // logger.debug(JSON.stringify(json));
 
       busEmitter.emit('saveData', json);
 
diff --git a/lib/server/db-save.js b/lib/server/db-save.js
index 64491e6..c128bc2 100644
--- a/lib/server/db-save.js
+++ b/lib/server/db-save.js
@@ -9,7 +9,7 @@ module.exports = function(db) {
 
   module.sqlInsertRawEvent = function(data) {
     let _data = data;
-
+    console.log('sqlInsertRawEvent');
     return new Promise(function(resolve, reject) {
       db.func('insert_raw',
         [_data.timestamp, _data.event])
@@ -25,7 +25,7 @@ module.exports = function(db) {
   module.sqlInsertDecoded = function(data) {
     let _data = data;
 
-    console.log('sqlInsertDecoded', data);
+    console.log('sqlInsertDecoded', _data.deviceid, _data.timestamp);
     return new Promise(function(resolve, reject) {
       db.func('insert_decoded',
         [_data.deviceid, _data.timestamp, _data.lux, _data.co2, _data.temp, _data.humidity, _data.sound])