round2

consumerWebsite/database/model/apiKeyModel.js

@@ -2,8 +2,6 @@
 const { Sequelize, DataTypes, Op } = require("sequelize");
 const { sequelize } = require("../mySql");
 const { userModel } = require("./userModel");
-const { generateUUID } = require("../../functions/generateUUID.js");
-const { hash, compareHash } = require("../../functions/bcrypt.js");
 
 //sequelize.sync();
 const apikeyModel = sequelize.define(

consumerWebsite/database/model/apiLogModel.js

@@ -1,6 +1,6 @@
 "use strict";
 const { Sequelize, DataTypes } = require("sequelize");
-const { sequelize } = require("../mySQL");
+const { sequelize } = require("../mySql");
 
 //sequelize.sync();
 const api_log_Model = sequelize.define(
@@ -68,4 +68,6 @@ const api_log_Model = sequelize.define(
 	}
 );
 
+api_log_Model.sync()
+
 module.exports = { api_log_Model };

consumerWebsite/database/model/locationModel.js

@@ -1,6 +1,6 @@
 "use strict";
 const { Sequelize, DataTypes } = require("sequelize");
-const { sequelize } = require("../mySQL");
+const { sequelize } = require("../mySql");
 const { isAlphaNumericwithSpaces } = require('../../functions/validateData')
 
 //sequelize.sync();
@@ -72,59 +72,6 @@ const locationModel = sequelize.define(
 	}
 );
 
-async function getLocation() {
-	const location = await locationModel.findAll();
-	return location;
-}
+locationModel.sync();
 
-async function addLocation(name, added_by, description) {
-	const location = await locationModel.create({
-		name: name,
-		added_by: added_by,
-		description: description,
-	});
-}
-
-async function updateLocation(id, name, added_by, description) {
-	const location = await locationModel.update(
-		{
-			name: name,
-			added_by: added_by,
-			description: description,
-		},
-		{
-			where: {
-				id: id,
-			},
-		}
-	);
-}
-
-async function deleteLocation(id) {
-	//delete by id
-	const location = await locationModel.destroy({
-		where: {
-			id: id,
-		},
-	});
-}
-
-async function getLocationById(id) {
-	const location = await locationModel.findAll({
-		where: {
-			id: id,
-		},
-	});
-	return location;
-}
-
-
-
-module.exports = {
-	locationModel,
-	getLocation,
-	addLocation,
-	updateLocation,
-	deleteLocation,
-	getLocationById,
-};
+module.exports = { locationModel };

consumerWebsite/database/model/sensorDataModel.js

@@ -1,6 +1,6 @@
 "use strict";
 const { Sequelize, DataTypes } = require("sequelize");
-const { sequelize } = require("../mySQL");
+const { sequelize } = require("../mySql");
 const { locationModel } = require("./locationModel");
 const { sensorModel } = require("./sensorModel");
 const { isJson } = require('../../functions/validateData');
@@ -74,4 +74,6 @@ const sensorDataModel = sequelize.define(
 	}
 );
 
+sensorDataModel.sync()
+
 module.exports = { sensorDataModel };

consumerWebsite/database/model/sensorModel.js

@@ -1,6 +1,6 @@
 "use strict";
 const { Sequelize, DataTypes } = require("sequelize");
-const { sequelize } = require("../mySQL");
+const { sequelize } = require("../mySql");
 const { locationModel } = require("./locationModel");
 const {
 	isAlphaNumericwithSpaces,
@@ -107,4 +107,6 @@ const sensorModel = sequelize.define(
 	}
 );
 
+sensorModel.sync()
+
 module.exports = { sensorModel };

consumerWebsite/database/model/userModel.js

@@ -112,4 +112,6 @@ const userModel = sequelize.define(
 	}
 );
 
+userModel.sync()
+
 module.exports = { userModel };