Merge pull request #2 from JayWll/settings

Adding settings table with flags to control alerts

nodeapp/app.js

@@ -17,6 +17,35 @@ app.get('/newreading', (req, res) => {
 
   db.Readings.create({ timestamp: new Date(), reading: req.query.v });
   res.status(200).send('Reading received: ' + req.query.v).end();
+
+  // Fetch all settings
+  db.Settings.findAll().then((result) => {
+    // Reset low moisture flag if it's set, and the reading is greater than high-trigger
+    if (result.find(o => o.dataValues.key === 'low').dataValues.value !== '0' && req.query.v >= parseInt(result.find(o => o.dataValues.key === 'high-trigger').dataValues.value)) {
+      // Update low to false
+      db.Settings.update({ value: false }, { where: { key: 'low' } })
+      // Update alert to false
+      db.Settings.update({ value: false }, { where: { key: 'alert' } })
+    }
+
+    // Set the low moisture flag if it's not set, and the value is less than low-trigger
+    if (result.find(o => o.dataValues.key === 'low').dataValues.value === '0' && req.query.v <= parseInt(result.find(o => o.dataValues.key === 'low-trigger').dataValues.value)) {
+      // Update low to true
+      db.Settings.update({ value: new Date().toISOString() }, { where: { key: 'low' } })
+    }
+
+    // If the low moisture flag is set but an alert has not yet been sent, determine if an alert is necessarry
+    if (result.find(o => o.dataValues.key === 'low').dataValues.value !== '0' && result.find(o => o.dataValues.key === 'alert').dataValues.value === '0') {
+      const lowtriggered = new Date().getTime() - new Date(result.find(o => o.dataValues.key === 'low').dataValues.value).getTime()
+      const fivedays = 5 * 24 * 60 * 60 * 1000
+
+      // If the first low reading was more than 5 days ago, send an alert
+      if (lowtriggered > fivedays) {
+        console.log('More than 5 days!') // NEED TO REPLACE THIS WITH ALERT BEING SENT
+        db.Settings.update({ value: new Date().toISOString() }, { where: { key: 'alert' } })
+      }
+    }
+  })
 });
 
 // Handle requests for /getdata by returning a JSON object of data for the relevant time period

nodeapp/db/db.js

@@ -1,4 +1,4 @@
-const Sequelize = require('sequelize');
+const Sequelize = require('sequelize')
 const Op = Sequelize.Op
 
 // Setup database, using credentials set in .env
@@ -6,7 +6,7 @@ const sequelize = new Sequelize('database', process.env.DB_USER, process.env.DB_
   dialect: 'sqlite',
   logging: false,
   storage: '.data/database.sqlite'
-});
+})
 
 // Define 'readings' table structure
 const Readings = sequelize.define('readings', {
@@ -16,6 +16,17 @@ const Readings = sequelize.define('readings', {
   reading: {
     type: Sequelize.INTEGER
   }
-});
+})
 
-module.exports = {Op, Readings}
+// Define 'settings' table structure
+const Settings = sequelize.define('settings', {
+  key: {
+    type: Sequelize.STRING,
+    unique: true
+  },
+  value: {
+    type: Sequelize.STRING
+  }
+})
+
+module.exports = {Op, Readings, Settings}

nodeapp/utils/import.js

@@ -19,6 +19,9 @@ request({
 
   console.log(response.body.length + ' items retrieved')
 
+  // Sync the database table
+  await db.Settings.sync()
+
   // Remove existing database items
   await db.Readings.destroy({truncate: true})
 

nodeapp/utils/init-settings.js

@@ -0,0 +1,14 @@
+const db = require('../db/db')
+const path = require('path')
+require('dotenv').config({path: path.join(__dirname, '../../.env')})
+
+db.Settings.sync().then(() => {
+  // Remove all previous settings
+  db.Settings.destroy({truncate: true})
+
+  // Create settings
+  db.Settings.create({ key: 'low-trigger', value: 100 })
+  db.Settings.create({ key: 'high-trigger', value: 900 })
+  db.Settings.create({ key: 'low', value: false })
+  db.Settings.create({ key: 'alert', value: false })
+})