From b2eeb3e2703589b5eb5c3063a7874d196913237c Mon Sep 17 00:00:00 2001 From: JayWll Date: Sat, 25 Apr 2020 15:31:49 -0600 Subject: [PATCH] Bug fix for alert functionality --- nodeapp/src/alert.js | 5 ++--- nodeapp/src/db.js | 12 ++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/nodeapp/src/alert.js b/nodeapp/src/alert.js index ce63f51..e55424e 100644 --- a/nodeapp/src/alert.js +++ b/nodeapp/src/alert.js @@ -4,7 +4,7 @@ require('dotenv').config({path: path.join(__dirname, '../../.env')}) const alert = (type) => { console.log('Alert triggered for type: ' + type) - const tweet = false + var tweet = false switch(type) { // Water is needed @@ -42,8 +42,7 @@ const alert = (type) => { }) // Post tweet - //msg.post('statuses/update', { status: tweet[Math.floor(Math.random() * tweet.length)] }) - console.log(tweet[Math.floor(Math.random() * tweet.length)]) + msg.post('statuses/update', { status: tweet[Math.floor(Math.random() * tweet.length)] }) } module.exports = alert diff --git a/nodeapp/src/db.js b/nodeapp/src/db.js index 3d17f42..7b54517 100644 --- a/nodeapp/src/db.js +++ b/nodeapp/src/db.js @@ -1,6 +1,6 @@ const Sequelize = require('sequelize') const Op = Sequelize.Op -const alert = require('./alert') +const message = require('./alert') // Setup database, using credentials set in .env const sequelize = new Sequelize('database', process.env.DB_USER, process.env.DB_PASS, { @@ -24,14 +24,14 @@ const Readings = sequelize.define('readings', { Settings.findAll().then((result) => { const lowtrigger = parseInt(result.find(o => o.dataValues.key === 'low-trigger').dataValues.value) const hightrigger = parseInt(result.find(o => o.dataValues.key === 'high-trigger').dataValues.value) - const low = result.find(o => o.dataValues.key === 'low-trigger').dataValues.value + const low = result.find(o => o.dataValues.key === 'low').dataValues.value const alert = result.find(o => o.dataValues.key === 'low-trigger').dataValues.value // Reset low moisture flag if it's set, and the reading is greater than high-trigger if (low !== '0' && data.reading >= hightrigger) { // Send alert that water was received - alert('gotwater') + message('gotwater') // Update low to false Settings.update({ value: false }, { where: { key: 'low' } }) @@ -54,12 +54,12 @@ const Readings = sequelize.define('readings', { // If the first low reading was more than 4 days ago, send an alert if (lowtriggered > fourdays) { // Send alert that water is needed - alert('needwater') + message('needwater') // Flag that an alert has been sent Settings.update({ value: new Date().toISOString() }, { where: { key: 'alert' } }) - } else console.log('Low for less than 4 days') - } else console.log('No message needed') + } + } }) } }