From 9d97d8f89bc570b1232c0dd8450f489b39023e18 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sat, 31 Oct 2015 14:28:11 +0100
Subject: core/web: o Adding last_timestamp o Showing last_value and
 last_timestamp for each property.

---
 src/Diller.js    | 12 +++++++-----
 src/DillerDao.js |  9 ++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/Diller.js b/src/Diller.js
index edb501d..46dc8e2 100644
--- a/src/Diller.js
+++ b/src/Diller.js
@@ -3,14 +3,14 @@ var _ = require('lodash');
 function Diller(config, pg, dao) {
   var log = config.log();
 
-  function newValue(dao, device, property, value) {
+  function newValue(dao, device, property, timestamp, value) {
     log.info('new value for device ' + device.key + '/' + property.key + ' = ' + value, {
       deviceId: device.id,
       propertyId: property.id,
       value: value
     });
 
-    return dao.insertValue(property.id, value)
+    return dao.insertValue(property.id, timestamp, value)
       .then(function (res) {
         // ignore the result
         updateAggregates(property.id, res.timestamp);
@@ -18,13 +18,13 @@ function Diller(config, pg, dao) {
       });
   }
 
-  function newName(dao, device, property, name) {
+  function newName(dao, device, property, timestamp, name) {
     log.info('New name for property ', device.key + '/' + property.key + '.name = ' + name);
 
     return dao.updatePropertyName(property.id, name);
   }
 
-  function newDescription(dao, device, property, description) {
+  function newDescription(dao, device, property, timestamp, description) {
     log.info('New description for property ', device.key + '/' + property.key + '.description = ' + description);
 
     return dao.updatePropertyDescription(property.id, description);
@@ -56,6 +56,8 @@ function Diller(config, pg, dao) {
 
   //noinspection JSUnusedLocalSymbols
   function onMessage(topic, message, payload) {
+    var timestamp = new Date();
+
     var parts = topic.split(/\//);
 
     log.info('Processing message to ' + topic);
@@ -108,7 +110,7 @@ function Diller(config, pg, dao) {
       })
       .then(function (data) {
         // log.info('data.device', data.device, 'data.property', data.property);
-        return f(dao, data.device, data.property, message.toString());
+        return f(dao, data.device, data.property, timestamp, message.toString());
       })
       .then(function (res) {
         log.warn('success', res);
diff --git a/src/DillerDao.js b/src/DillerDao.js
index a47f181..fa27aa1 100644
--- a/src/DillerDao.js
+++ b/src/DillerDao.js
@@ -3,7 +3,7 @@ var _ = require('lodash');
 function DillerDao(tx) {
 
   var deviceColumns = 'id, created_timestamp, key, name, description';
-  var propertyColumns = 'id, device, key, created_timestamp';
+  var propertyColumns = 'id, created_timestamp, device, key, last_value, last_timestamp';
   var valueColumns = 'property, timestamp, value_text, value_numeric';
 
   // -------------------------------------------------------------------------------------------------------------------
@@ -85,11 +85,14 @@ function DillerDao(tx) {
     return tx.manyOrNone('SELECT timestamp, coalesce(value_numeric::text, value_text) AS value FROM value WHERE property=$1 ORDER BY timestamp DESC LIMIT $2', [propertyId, limit]);
   }
 
-  function insertValue(propertyId, value) {
+  function insertValue(propertyId, timestamp, value) {
     var value_numeric = parseFloat(value) || undefined,
       value_text = value_numeric ? null : value;
 
-    return tx.one('INSERT INTO value(property, timestamp, value_text, value_numeric) VALUES($1, CURRENT_TIMESTAMP, $2, $3::NUMERIC) RETURNING timestamp', [propertyId, value_text, value_numeric]);
+    return tx.none('UPDATE device_property SET last_value = $2, last_timestamp = $3 WHERE id = $1', [propertyId, value, timestamp])
+      .then(function () {
+        return tx.one('INSERT INTO value(property, timestamp, value_text, value_numeric) VALUES($1, $2, $3, $4::NUMERIC) RETURNING timestamp', [propertyId, timestamp, value_text, value_numeric]);
+      });
   }
 
   function updateHourAggregatesForProperty(propertyId, timestamp) {
-- 
cgit v1.2.3