more work!

Web-Server/routes/Location.js

@@ -0,0 +1,71 @@
+const { sequelize } = require("../../Database/mySql.js");
+const { locationModel } = require("../../Database/model/locationModel.js");
+const {
+	addLocation,
+	getLocation,
+	getLocationById,
+	updateLocation,
+	deleteLocation,
+} = require("../functions/APIDatabase.js");
+
+const express = require("express");
+const router = express.Router();
+
+//get location
+router.get("/", async (req, res, next) => {
+	try {
+		const location = await getLocation();
+		res.json(location);
+	} catch (error) {
+		console.error(error);
+		next(error);
+	}
+});
+
+//add location
+router.post("/new", async (req, res, next) => {
+	try {
+		const { name, added_by, description } = req.body;
+		await addLocation(name, added_by, description);
+	} catch (error) {
+		console.error(error);
+		next(error);
+	}
+});
+
+//update location
+router.put("/update", async (req, res, next) => {
+	try {
+		const { id, name, added_by, description } = req.body;
+		await updateLocation(id, name, added_by, description);
+	} catch (error) {
+		console.error(error);
+		next(error);
+	}
+});
+
+//delete location
+router.delete("/delete", async (req, res, next) => {
+	try {
+		const { id } = req.body;
+		await deleteLocation(id);
+	} catch (error) {
+		console.error(error);
+		next(error);
+	}
+});
+
+//get location by id
+router.get("/:id", async (req, res, next) => {
+	try {
+		//get params
+		const { id } = req.params;
+		const location = await getLocationById(id);
+		res.json(location);
+	} catch (error) {
+		console.error(error);
+		next(error);
+	}
+});
+
+module.exports = router;

Web-Server/routes/Sensor.js

@@ -0,0 +1,64 @@
+const { sequelize } = require("../../Database/mySql.js");
+const { sensorModel } = require("../../Database/model/sensorModel.js");
+const {
+	getSensor,
+	addSensor,
+	updateSensor,
+    deleteSensor,
+    getSensorById
+} = require("../functions/APIDatabase.js");
+
+const express = require("express");
+const router = express.Router();
+
+router.get("/", async (req, res, next) => {
+	try {
+		const sensor = await getSensor();
+		res.json(sensor);
+	} catch (error) {
+		console.error(error);
+		next(error);
+	}
+});
+
+router.post("/new", async (req, res, next) => {
+	try {
+		const { sensortype, added_by, description, location } = req.body;
+		await addSensor(sensortype, added_by, description, location);
+	} catch (error) {
+		console.error(error);
+		next(error);
+	}
+});
+
+router.put("/update", async (req, res, next) => {
+	try {
+		const { id, sensortype, added_by, description, location } = req.body;
+		await updateSensor(id, sensortype, added_by, description, location);
+	} catch (error) {
+		console.error(error);
+		next(error);
+	}
+});
+
+router.delete("/delete", async (req, res, next) => {
+    try {
+        const { id } = req.body;
+        await deleteSensor(id);
+    } catch (error) {
+        console.error(error);
+        next(error);
+    }
+});
+
+router.get("/:id", async (req, res, next) => {
+    try {
+        const sensor = await getSensorById(req.params.id);
+        res.json(sensor);
+    } catch (error) {
+        console.error(error);
+        next(error);
+    }
+});
+
+module.exports = router;

Web-Server/routes/addLocation.js

@@ -1,19 +0,0 @@
-const { sequelize }  = require("../../Database/mySql.js");
-const { locatioModel } = require("../../Database/model/locationModel.js"); 
-const { addLocation } = require("../functions/APIDatabase.js");
-
-const express = require('express');
-const router = express.Router();
-
-router.post('/', async (req, res) => {
-    try {
-        const {name , added_by , description } = req.body;
-        await addLocation(name, added_by, description);
-
-    } catch (error) {
-        console.error(error);
-    }
-  });
-  
-  // Export the router
-  module.exports = router;

Web-Server/routes/api_route.js

@@ -18,11 +18,10 @@ module.exports = router;
 const router = require('express').Router();
 
 //location route
-router.use('/location', require('./getLocation'));
-router.use('/add-location', require('./addLocation'));
-router.use('/update-location', require('./updateLocation'));
-router.use('/delete-location', require('./deleteLocation'));
-router.use('/', require('./getLocationId'));
+router.use('/location', require('./Location'));
+
+//sensor route
+router.use('/sensor', require('./Sensor'))
 
 
 
@@ -31,4 +30,7 @@ router.use('/test' , require('./test'));
 router.use('/latest-data', require('./latest-data'));
 router.use('/:month', require('./monthlyData'));
 
+
+
+
 module.exports = router;

Web-Server/routes/deleteLocation.js

@@ -1,19 +0,0 @@
-const { sequelize }  = require("../../Database/mySql.js");
-const { locatioModel } = require("../../Database/model/locationModel.js"); 
-const { deleteLocation } = require("../functions/APIDatabase.js");
-
-const express = require('express');
-const router = express.Router();
-
-router.delete('/', async (req, res) => {
-    try {
-        const {id} = req.body;
-        await deleteLocation(id);
-
-    } catch (error) {
-        console.error(error);
-    }
-  });
-  
-  // Export the router
-  module.exports = router;

Web-Server/routes/getLocation.js

@@ -1,18 +0,0 @@
-const { sequelize }  = require("../../Database/mySql.js");
-const { locatioModel } = require("../../Database/model/locationModel.js"); 
-const { getLocation } = require("../functions/APIDatabase.js");
-
-const express = require('express');
-const router = express.Router();
-
-router.get('/', async (req, res) => {
-    try {
-        const location = await getLocation();
-        res.json(location);
-    } catch (error) {
-        console.error(error);
-    }
-  });
-  
-  // Export the router
-  module.exports = router;

Web-Server/routes/getLocationId.js

@@ -1,20 +0,0 @@
-const { sequelize }  = require("../../Database/mySql.js");
-const { locatioModel } = require("../../Database/model/locationModel.js"); 
-const { getLocationById } = require("../functions/APIDatabase.js");
-
-const express = require('express');
-const router = express.Router();
-
-router.get('/:id', async (req, res) => {
-    try {
-        //get params
-        const { id } = req.params;
-        const location = await getLocationById(id);
-        res.json(location);
-    } catch (error) {
-        console.error(error);
-    }
-  });
-  
-  // Export the router
-  module.exports = router;

Web-Server/routes/test.js

@@ -5,23 +5,6 @@ const { getallData } = require("../functions/APIDatabase.js");
 const express = require('express');
 const router = express.Router();
 
-/*
-async function getallData() {
-  try {
-    sequelize.sync();
-    const allData = await IoTModel.findAll({
-        attributes: ['id', 'psiData', 'humidityData', 'o3Data', 'no2Data', 'so2Data', 'coData', 'temperatureData', 'windspeedData', 'currentTime', 'regionData' , 'createdAt' , 'updatedAt'],
-    });
-    return allData;
-    }
-    catch(error) {
-        console.error(error);
-        return null;
-
-    }
-}
-*/
-
 router.get('/', async (req, res) => {
   try {
     const data = await getallData();

Web-Server/routes/updateLocation.js

@@ -1,19 +0,0 @@
-const { sequelize }  = require("../../Database/mySql.js");
-const { locatioModel } = require("../../Database/model/locationModel.js"); 
-const { updateLocation } = require("../functions/APIDatabase.js");
-
-const express = require('express');
-const router = express.Router();
-
-router.put('/', async (req, res) => {
-    try {
-        const {id , name , added_by , description } = req.body;
-        await updateLocation(id , name, added_by , description);
-
-    } catch (error) {
-        console.error(error);
-    }
-  });
-  
-  // Export the router
-  module.exports = router;