wmantly/mp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6 from Newtbot/Dev-branch

Browse Source 
more routes!
This commit is contained in:
noot 2024-01-07 04:22:35 +08:00 committed by GitHub
commit 2641b7ad24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 357 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

201
Web-Server/functions/APIDatabase.js
View File

@ -2,8 +2,17 @@ const { sequelize } = require("../../Database/mySql.js");
const { locationModel } = require("../../Database/model/locationModel.js");
const { sensorModel } = require("../../Database/model/sensorModel.js");
const { sensorDataModel } = require("../../Database/model/sensorDataModel.js");
var moment = require("moment");
//helper function to convert month name to month number
//https://stackoverflow.com/questions/13566552/easiest-way-to-convert-month-name-to-month-number-in-js-jan-01
function getMonthFromString(mon) {
var d = Date.parse(mon + "1, 2012");
if (!isNaN(d)) {
return new Date(d).getMonth() + 1;
}
return -1;
}
async function getLocation() {
const location = await locationModel.findAll();
return location;
@ -15,7 +24,6 @@ async function addLocation(name, added_by, description) {
added_by: added_by,
description: description,
});
}
async function updateLocation(id, name, added_by, description) {
@ -52,16 +60,18 @@ async function getLocationById(id) {
}
async function getSensor() {
try {
const sensor = await sensorModel.findAll();
return sensor;
} catch (error) {
console.error(error);
}
}
async function addSensor(sensorname, added_by, mac_address , description, location) {
try {
async function addSensor(
sensorname,
added_by,
mac_address,
description,
location
) {
const sensor = await sensorModel.create({
name: sensorname,
added_by: added_by,
@ -69,14 +79,16 @@ async function addSensor(sensorname, added_by, mac_address , description, locati
description: description,
location: location,
});
} catch (error) {
console.error(error);
}
}
async function updateSensor(id, sensorname, added_by, mac_address ,description, location) {
try {
//update by id
async function updateSensor(
id,
sensorname,
added_by,
mac_address,
description,
location
) {
const sensor = await sensorModel.update(
{
name: sensorname,
@ -84,7 +96,6 @@ async function updateSensor(id, sensorname, added_by, mac_address ,description,
mac_address: mac_address,
description: description,
location: location,
},
{
where: {
@ -92,68 +103,43 @@ async function updateSensor(id, sensorname, added_by, mac_address ,description,
},
}
);
} catch (error) {
console.error(error);
}
}
async function deleteSensor(id) {
try {
//delete by id
const sensor = await sensorModel.destroy({
where: {
id: id,
},
});
} catch (error) {
console.error(error);
}
}
async function getSensorById(id) {
try {
const sensor = await sensorModel.findAll({
where: {
id: id,
},
});
return sensor;
} catch (error) {
console.error(error);
}
}
async function getSensorData() {
try {
const sensorData = await sensorDataModel.findAll();
return sensorData;
} catch (error) {
console.error(error);
}
}
async function addSensorData(id , id_sensor , id_location , sensordata){
try{
console.log(typeof sensordata);
console.log(sensordata);
if (!sensordata){
console.log("Sensor Data is null");
}
async function addSensorData(id, id_sensor, id_location, sensordata) {
const sensorData = await sensorDataModel.create({
id: id,
sensorid: id_sensor,
locationid: id_location,
measurement: sensordata,
});
}catch(error){
console.error(error);
}
}
async function updateSensorData(id, id_sensor, id_location, sensordata) {
try {
const sensorData = await sensorDataModel.update(
{
ensorid: id_sensor,
@ -166,61 +152,131 @@ async function updateSensorData(id, id_sensor, id_location, sensordata) {
},
}
);
} catch (error) {
console.error(error);
}
}
async function deleteSensorData(id) {
try {
const sensorData = await sensorDataModel.destroy({
where: {
id: id,
},
});
} catch (error) {
console.error(error);
}
}
async function getSensorDataById(id) {
try {
const sensorData = await sensorDataModel.findAll({
where: {
id: id,
},
});
return sensorData;
} catch (error) {
console.error(error);
}
}
async function getallData() {
try {
const allData = await IoTModel.findAll();
return allData;
} catch (error) {
console.error(error);
async function getData(query) {
let ormQuery = {};
if (query.limit !== undefined && query.order !== undefined)
ormQuery = {
limit: parseInt(query.limit),
//console.log(sentence.toUpperCase());
order: [["createdAt", query.order.toUpperCase()]],
...ormQuery,
};
else if (query.sensorid !== undefined) {
ormQuery = {
where: {
sensorid: query.sensorid,
},
...ormQuery,
};
} else if (query.locationid !== undefined) {
ormQuery = {
where: {
locationid: query.locationid,
},
...ormQuery,
};
} else if (query.year !== undefined) {
ormQuery = {
where: sequelize.where(
sequelize.fn("YEAR", sequelize.col("createdAt")),
query.year
),
...ormQuery,
};
} else if (query.month !== undefined) {
console.log(typeof query.month);
const validMonths = [
"1",
"2",
"3",
"4",
"5",
"6",
"7",
"8",
"9",
"10",
"11",
"12",
];
if (validMonths.includes(query.month)) {
ormQuery = {
where: sequelize.where(
sequelize.fn("MONTH", sequelize.col("createdAt")),
query.month
),
...ormQuery,
};
} else {
query.month = getMonthFromString(query.month);
ormQuery = {
where: sequelize.where(
sequelize.fn("MONTH", sequelize.col("createdAt")),
query.month
),
...ormQuery,
};
}
//weekly
} else if (query.week !== undefined) {
ormQuery = {
where: sequelize.where(
sequelize.fn("WEEK", sequelize.col("createdAt")),
query.week
),
...ormQuery,
};
}
}
async function getLatestData() {
try {
const latestData = await IoTModel.findAll({
limit: 1,
order: [["createdAt", "DESC"]],
});
return latestData;
} catch (error) {
console.error(error);
}
//daily data
//hourly data
//get data by year by specific sensor
//get by month by specific sensor
//get by week by specific sensor
//get by daily by specific sensor
//get by hourly by specific sensor
//get data by year by specific location
//get by month by specific location
//get by week by specific location
//get by daily by specific location
//get by hourly by specific location
//get specific data like psi or wtv
return await sensorDataModel.findAll(ormQuery);
}
module.exports = {
getallData,
getLatestData,
getLocation,
addLocation,
updateLocation,
@ -236,4 +292,5 @@ module.exports = {
updateSensorData,
deleteSensorData,
getSensorDataById,
getData,
};

37
Web-Server/routes/SensorData.js
View File

@ -6,6 +6,7 @@ const {
updateSensorData,
deleteSensorData,
getSensorDataById,
getData,
} = require("../functions/apiDatabase.js");
@ -56,6 +57,42 @@ router.delete("/delete", async (req, res, next) => {
}
});
router.get("/data", async (req, res, next) => {
try {
let query = {
//can be desc or asc
order: req.query.order,
// number of data to be returned
limit: req.query.limit,
//can be sensorid, locationid
sensorid: req.query.sensorid,
//can be sensorid, locationid
locationid: req.query.locationid,
//yearly
year: req.query.year,
//monthly
month: req.query.month,
//weekly
week: req.query.week,
};
const data = await getData(query);
res.status(200).json(data);
} catch (error) {
console.error(error);
next(error);
}
});
router.get("/:id", async (req, res, next) => {
try {
const sensor = await getSensorDataById(req.params.id);

128
api.MD
View File

@ -15,14 +15,14 @@ name allowed: shld contain alphanumeric only
//put
curl localhost/api/v0/location/update -X PUT -H "Content-Type: application/json" -d '{"id": "2" , "name": "test", "added_by": "noot", "description": "test12344444444"}'
status: 200
"message": "Location 13 updated"
status: 200
"message": "Location 13 updated"
//delete
curl localhost/api/v0/location/delete -X DELETE -H "Content-Type: application/json" -d '{"id": "6" }'
status: 200
{
"message": "Location 13 deleted"
"message": "Location 13 deleted"
}
//sensor
@ -50,41 +50,39 @@ sensor name : shld contain alphanumeric only and be unique
//delete
curl localhost/api/v0/sensor/delete -X DELETE -H "Content-Type: application/json" -d '{"id": "2" }'
{
"message": "sensor 13 deleted"
"message": "sensor 13 deleted"
}
//sensor data
curl http://localhost/api/v0/sensor-data/
//sensor data by id
curl http://localhost/api/v0/sensor-data/1
//post
curl localhost/api/v0/sensor-data/new -H "Content-Type: application/json" -X POST -d '{"id_sensor": "1" , "id_location": "11" , "sensordata": {
"psi": "34",
"humidity": "11%",
"o3": "326ppm",
"no2": "445ppm",
"so2": "511ppm",
"co": "16ppm",
"temperature": "25C",
"windspeed": "2km/h",
"time": "2023-12-21 14:24:44",
"region": "east"
"psi": "34",
"humidity": "11%",
"o3": "326ppm",
"no2": "445ppm",
"so2": "511ppm",
"co": "16ppm",
"temperature": "25C",
"windspeed": "2km/h",
"time": "2023-12-21 14:24:44",
"region": "east"
}}'
//put
curl localhost/api/v0/sensor-data/update -H "Content-Type: application/json" -X PUT -d '{"id": "1", "id_sensor": "1" , "id_location": "3" , "sensordata": {
"psi": "500",
"humidity": "11%",
"o3": "326ppm",
"no2": "445ppm",
"so2": "511ppm",
"co": "16ppm",
"temperature": "25C",
"windspeed": "2km/h",
"psi": "500",
"humidity": "11%",
"o3": "326ppm",
"no2": "445ppm",
"so2": "511ppm",
"co": "16ppm",
"temperature": "25C",
"windspeed": "2km/h",
}}'
//delete
@ -97,19 +95,71 @@ curl localhost/api/seed/v0/seed/new -H "Content-Type: application/json" -X POST
//seed
curl localhost/api/seed/v0/seedSensorData/new -H "Content-Type: application/json" -X POST -d '{
"startDate": "2023-01-01T16:00:00.000Z",
"endDate": "2023-02-01T16:00:00.000Z",
"interval": "15",
"sensorid": ["1", "2" , "3" , "4" , "5" , "6"],
"locationid": ["1", "2" , "3" , "4" , "5" , "6"],
"seedData": {
"psi": "30",
"humidity": "15%",
"o3": "50ppm",
"no2": "45ppm",
"so2": "30ppm",
"co": "16ppm",
"temperature": "30C",
"windspeed": "4km/h"
}
"startDate": "2023-01-01T16:00:00.000Z",
"endDate": "2023-02-01T16:00:00.000Z",
"interval": "15",
"sensorid": ["1", "2" , "3" , "4" , "5" , "6"],
"locationid": ["1", "2" , "3" , "4" , "5" , "6"],
"seedData": {
"psi": "30",
"humidity": "15%",
"o3": "50ppm",
"no2": "45ppm",
"so2": "30ppm",
"co": "16ppm",
"temperature": "30C",
"windspeed": "4km/h"
}
}'
//latest or last data
curl http://localhost/api/v0/sensor-data/data?order=DESC&limit=2
order= ASC OR DESC
limit = 1 or whatever
//sort by sensor id
curl http://localhost/api/v0/sensor-data/data?sensorid=1
//sort by location id
curl http://localhost/api/v0/sensor-data/data?locationid=1
//get data by year
curl http://localhost/api/v0/sensor-data/data?year=2023
year = 2023 or wtv
//get by month
curl http://localhost/api/v0/sensor-data/data?month=1
month = 1 or jan
//get by week
curl http://localhost/api/v0/sensor-data/data?week=1
//get by daily
//get by hourly
//get data by year by specific sensor
//get by month by specific sensor
//get by week by specific sensor
//get by daily by specific sensor
//get by hourly by specific sensor
//get data by year by specific location
//get by month by specific location
//get by week by specific location
//get by daily by specific location
//get by hourly by specific location
//get specific data