From e94bf2af2ec1aebb55a8ba14e4beef381204ae07 Mon Sep 17 00:00:00 2001 From: varun Date: Thu, 9 May 2024 07:24:50 -0400 Subject: [PATCH 1/2] database change --- src/config/config.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/config.js b/src/config/config.js index 5afdd88a..e165c6a9 100644 --- a/src/config/config.js +++ b/src/config/config.js @@ -21,8 +21,8 @@ var termination = chalk.bold.magenta; // TODO // Need to read database url from a environment variable. // const databaseURL = "mongodb://armintatankdbuser:armintatank1@35.207.198.4:27017/arminta-tank-db; -//const databaseURLNew = "mongodb://35.207.198.4:27017/arminta-tank-db"; -const databaseURLNew = "mongodb://35.200.129.165:27017/health-care-db"; +const databaseURLNew = "mongodb://35.207.198.4:27017/arminta-tank-db"; +//const databaseURLNew = "mongodb://35.200.129.165:27017/health-care-db"; // const databaseURLNew = "mongodb://127.0.0.1:27017/arminta-tank-db"; // Next line not used , or no need to pass default db in the mongo connection url. @@ -33,8 +33,8 @@ const defaultDatabase = "arminta-tank-db"; async function dbConnection() { try { - // db.connect(databaseURLNew, { user: "armintatankdbuser", pass: "armintatank1" , useUnifiedTopology: true, }); - db.connect(databaseURLNew, { user: "healthcaredbuser01", pass: "healthcare01" , useUnifiedTopology: true, }); + db.connect(databaseURLNew, { user: "armintatankdbuser", pass: "armintatank1" , useUnifiedTopology: true, }); + //db.connect(databaseURLNew, { user: "healthcaredbuser01", pass: "healthcare01" , useUnifiedTopology: true, }); // db.connect(databaseURLNew) db.connection.on("connected", function () { From 3eecb3d02fdfc6c96b3ed7abd7013dcc6313553b Mon Sep 17 00:00:00 2001 From: varun Date: Thu, 9 May 2024 07:31:05 -0400 Subject: [PATCH 2/2] changes --- src/controllers/tanksController.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index 0110fa94..c122ddfb 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -1175,6 +1175,10 @@ exports.calculateCapacity = async (req, reply) => { // reply.code(500).send({ error: err.message }); // } // }; + + + + exports.IotDevice = async (req, reply) => { try { const { hardwareId, mode, tanks } = req.body; @@ -1222,7 +1226,8 @@ exports.IotDevice = async (req, reply) => { const tank_height = parseInt(existingTank.height.replace(/,/g, ''), 10) * 30.48; const water_level_height = tank_height - tankHeight; const waterCapacityPerCm = parseInt(existingTank.waterCapacityPerCm.replace(/,/g, ''), 10); - const water_level = water_level_height * waterCapacityPerCm; + let water_level = water_level_height * waterCapacityPerCm; + water_level = Math.round(water_level); // Round to nearest whole number existingTank.waterlevel = water_level.toString(); // Convert to string as per schema definition // Save the updated tank document @@ -1259,6 +1264,8 @@ exports.IotDevice = async (req, reply) => { } }; + + // exports.getIotD = async(req, reply) => { // try { // await IotData.find({hardwareId: req.query.hardwareId})