Skip to content

Commit

Permalink
[UPDATE] code formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Luca Brandimarti committed May 25, 2020
1 parent 3ad087b commit 5344e83
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 69 deletions.
34 changes: 13 additions & 21 deletions src/app.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -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 }`);
});

65 changes: 30 additions & 35 deletions src/temperature/temperature.controller.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -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
26 changes: 13 additions & 13 deletions src/temperature/temperature.service.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -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 }

0 comments on commit 5344e83

Please sign in to comment.