diff --git a/src/app.js b/src/app.js old mode 100644 new mode 100755 index d44f170..c14c481 --- a/src/app.js +++ b/src/app.js @@ -1,22 +1,14 @@ -const express = require('express'); -const dotenv = require('dotenv'); -const temperature = require('./temperature/temperature.controller'); -const cron = require('node-cron'); - - -dotenv.config(); -const app = express(); -const port = process.env.PORT - -cron.schedule("40 * * * * *", () => { -console.log("Running Job"); -console.log("-------------------"); -const {board} = require('./arduino/register'); +const express = require('express') +const dotenv = require('dotenv') +const temperature = require('./temperature/temperature.controller') +const {start } = require('./arduino/register') + +dotenv.config() +const app = express() +const port = process.env.PORT || 8080 + +app.use('/temperature', temperature) +app.listen(port, () => { + console.log(`server started at http://localhost:${port}`) + start() }) - - -app.use('/temperature',temperature); -app.listen( port, () => { - console.log( `server started at http://localhost:${ port }`); -}); - diff --git a/src/temperature/temperature.controller.js b/src/temperature/temperature.controller.js old mode 100644 new mode 100755 index 0a50bfa..7dea7b8 --- a/src/temperature/temperature.controller.js +++ b/src/temperature/temperature.controller.js @@ -1,43 +1,38 @@ -const express = require('express'); -const {database} = require('./temperature.service'); +const express = require('express') +const { database } = require('./temperature.service') -temperature = express.Router(); +temperature = express.Router() -temperature.get('/hour-Avg/:day/:month/:year/:hours', ( req, res ) => { - - var query = `SELECT avg(celsius) FROM log where log.day = '${req.params.day}' +temperature.get('/hour-Avg/:day/:month/:year/:hours', (req, res) => { + var query = `SELECT avg(celsius) FROM log where log.day = '${req.params.day}' and log.month = '${req.params.month}' and log.year = '${req.params.year}' and log.hours = '${req.params.hours}'; );` - database.get(query, (err,row) =>{ - if(err) { - res.status(400).json({"error":err.message}); - return; - } - res.json({ - "temperature":row - }); - }); -}); - -temperature.get('/day-Avg/:day/:month/:year', ( req, res ) => { - var query = `SELECT avg(celsius) FROM log where log.day = '${req.params.day}' + database.get(query, (err, row) => { + if (err) { + res.status(400).json({ error: err.message }) + return + } + res.json({ + temperature: row, + }) + }) +}) + +temperature.get('/day-Avg/:day/:month/:year', (req, res) => { + var query = `SELECT avg(celsius) FROM log where log.day = '${req.params.day}' and log.month = '${req.params.month}' and log.year = '${req.params.year}'; );` - database.get(query, (err,row) =>{ - if(err) { - res.status(400).json({"error":err.message}); - return; - } - res.json({ - "temperature":row - }); - }); -}); - -module.exports = temperature; - - - - + database.get(query, (err, row) => { + if (err) { + res.status(400).json({ error: err.message }) + return + } + res.json({ + temperature: row, + }) + }) +}) + +module.exports = temperature diff --git a/src/temperature/temperature.service.js b/src/temperature/temperature.service.js old mode 100644 new mode 100755 index 042f48a..1b75ba7 --- a/src/temperature/temperature.service.js +++ b/src/temperature/temperature.service.js @@ -1,15 +1,15 @@ -const sqlite3 = require('sqlite3').verbose(); - - - let database = new sqlite3.Database('./src/database/temperatureDB.db', sqlite3.OPEN_READWRITE, (err) => { - if (err) { - console.error(err.message); - }else{ - console.log('connessione al database temperatureDB'); +const sqlite3 = require('sqlite3').verbose() + +let database = new sqlite3.Database( + './src/database/temperatureDB.db', + sqlite3.OPEN_READWRITE, + (err) => { + if (err) { + console.error(err.message) + } else { + console.log('connessione al database temperatureDB') } -}); - -module.exports = {database}; - - + } +) +module.exports = { database }