From bbad48ee90d55edf9a2bc37b5a858bf39d38aa37 Mon Sep 17 00:00:00 2001 From: JayWll Date: Mon, 13 Apr 2020 11:04:27 -0600 Subject: [PATCH] Added handlers to set flags when a new reading is received - Reset the 'low' and 'alert' flags if the reading is greater than high-trigger - Set the 'low' flag if it isn't set, and the reading is less than low-trigger - Send an alert and set the 'alert' flag if the 'low' flag is more than 5 days old --- nodeapp/app.js | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/nodeapp/app.js b/nodeapp/app.js index a8c273f..b031ce5 100644 --- a/nodeapp/app.js +++ b/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