Merge pull request #9 from jamesbarnett91/log-realtime-usage

Log realtime usage

1 files changed, 6 insertions, 1 deletions

diff --git a/routes/ws.js b/routes/ws.js
index 08b0a18..1599721 100644
--- a/routes/ws.js
+++ b/routes/ws.js
@@ -4,6 +4,7 @@ const router = express.Router();
 const deviceManager = require('../services/device-manager');
 const dataFetcher = require('../services/data-fetcher');
 const dataBroadcaster = require('../services/data-broadcaster');
+const dataLogger = require('../services/data-logger.js');
 
 router.ws('/', function(ws, req) {
 
@@ -15,11 +16,15 @@ router.ws('/', function(ws, req) {
     if(message.requestType === 'getCachedData') {
       let deviceId = message.deviceId;
       let cachedData = dataFetcher.getCachedData(deviceId);
-
+      
       ws.send(dataBroadcaster.generatePayload('realtimeUsage', deviceId, cachedData.realtimeUsage));
       ws.send(dataBroadcaster.generatePayload('dailyUsage', deviceId, cachedData.dailyUsage));
       ws.send(dataBroadcaster.generatePayload('monthlyUsage', deviceId, cachedData.monthlyUsage));
       ws.send(dataBroadcaster.generatePayload('powerState', deviceId, cachedData.powerState));
+      dataLogger.getLogEntriesForDevice(deviceId, (loggedData) => {
+        ws.send(dataBroadcaster.generatePayload('loggedData', deviceId, loggedData));
+      });
+      
     }
   });