Merge pull request #21 from Newtbot/Dev-branch

migrated database folder to my own folders

IoT-sensor/Database/mySQL.js

@@ -15,7 +15,7 @@ const sequelize = new Sequelize(
     attributeBehavior: 'escape',
     dialectOptions: {
       ssl: {
-         ca: fs.readFileSync(path.resolve(__dirname, '../../cert/DigiCertGlobalRootCA.crt.pem')),
+         ca: fs.readFileSync(path.resolve(__dirname, '../cert/DigiCertGlobalRootCA.crt.pem')),
       },
 
     },

IoT-sensor/modules/mqtt.js

@@ -1,7 +1,7 @@
 const mqtt = require('mqtt');
 const fs = require('fs');
 const path = require('path')
-require('dotenv').config({ path: path.resolve(__dirname, '../../.env') })
+require('dotenv').config({ path: path.resolve(__dirname, '../.env') })
 
 const brokerUrl = 'mqtt://mqtt.teeseng.uk';
 const options = {
@@ -9,8 +9,8 @@ const options = {
   username: process.env.MQTT_USER, 
   password: process.env.MQTT_PASS, 
   protocol: 'mqtts', 
-    key: fs.readFileSync(path.resolve(__dirname, '../../cert/privkey.pem')),
-    cert: fs.readFileSync(path.resolve(__dirname, '../../cert/cert.pem')), 
+    key: fs.readFileSync(path.resolve(__dirname, '../cert/privkey.pem')),
+    cert: fs.readFileSync(path.resolve(__dirname, '../cert/cert.pem')), 
 
 };
 

Web-Server/Database/model/locationModel.js

@@ -1,7 +1,7 @@
 "use strict";
 const { Sequelize, DataTypes } = require("sequelize");
 const { sequelize } = require("../mySQL");
-const { isAlphaNumericwithSpaces } = require('../../Web-Server/functions/validateData')
+const { isAlphaNumericwithSpaces } = require('../../functions/validateData')
 
 //sequelize.sync();
 const locationModel = sequelize.define(

Web-Server/Database/model/sensorDataModel.js

@@ -3,7 +3,7 @@ const { Sequelize, DataTypes } = require("sequelize");
 const { sequelize } = require("../mySQL");
 const { locationModel } = require("./locationModel");
 const { sensorModel } = require("./sensorModel");
-const { isJson } = require("../../Web-Server/functions/validateData");
+const { isJson } = require('../../functions/validateData');
 
 sequelize.sync();
 const sensorDataModel = sequelize.define(

Web-Server/Database/model/sensorModel.js

@@ -6,7 +6,7 @@ const {
 	isAlphaNumericwithSpaces,
 	isAlphaNumericWithSpacesAndDash,
 	isMacAddress,
-} = require("../../Web-Server/functions/validateData");
+} = require('../../functions/validateData');
 
 //sequelize.sync();
 const sensorModel = sequelize.define(

Web-Server/Database/mySQL.js

@@ -1,6 +1,6 @@
 const dotenv = require("dotenv");
 const path = require('path')
-require('dotenv').config({ path: path.resolve(__dirname, '../.env') })
+require('dotenv').config({ path: path.resolve(__dirname, '../../.env') })
 const Sequelize = require("sequelize");
 const fs = require('fs');
 const { escape } = require("querystring");

Web-Server/functions/APIDatabase.js

@@ -1,7 +1,7 @@
-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");
+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");
 const { Op, Sequelize } = require("sequelize");
 
 //helper function to convert month name to month number

Web-Server/functions/Database.js

@@ -1,6 +1,6 @@
-const { sequelize }  = require("../../Database/mySql.js");
-const { api_log_Model } = require("../../Database/model/apiLogModel.js"); 
-const { sensorDataModel } = require("../../Database/model/sensorDataModel.js");
+const { sequelize }  = require("../Database/mySql.js");
+const { api_log_Model } = require("../Database/model/apiLogModel.js"); 
+const { sensorDataModel } = require("../Database/model/sensorDataModel.js");
 
 async function insertLogData(log){
     try{

Web-Server/routes/Location.js

@@ -1,5 +1,3 @@
-const { sequelize } = require("../../Database/mySql.js");
-const { locationModel } = require("../../Database/model/locationModel.js");
 const {
 	addLocation,
 	getLocation,

Web-Server/routes/SeedLocationAndSensor.js

@@ -1,6 +1,6 @@
-const { sequelize } = require("../../Database/mySql.js");
-const { locationModel } = require("../../Database/model/locationModel.js");
-const { sensorModel } = require("../../Database/model/sensorModel.js");
+const { sequelize } = require("../Database/mySql.js");
+const { locationModel } = require("../Database/model/locationModel.js");
+const { sensorModel } = require("../Database/model/sensorModel.js");
 
 const express = require("express");
 const router = express.Router();

Web-Server/routes/SeedsensorData.js

@@ -1,7 +1,7 @@
-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");
+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");
 
 const express = require("express");
 const router = express.Router();

Web-Server/routes/Sensor.js

@@ -1,5 +1,3 @@
-const { sequelize } = require("../../Database/mySql.js");
-const { sensorModel } = require("../../Database/model/sensorModel.js");
 const {
 	getSensor,
 	addSensor,

Web-Server/routes/SensorData.js

@@ -1,5 +1,3 @@
-const { sequelize } = require("../../Database/mySql.js");
-const { sensorDataModel } = require("../../Database/model/sensorDataModel.js");
 const {
 	getSensorData,
 	addSensorData,