From 6e507ff35dfdaa3a08822cfab3172336140be45a Mon Sep 17 00:00:00 2001 From: varun Date: Mon, 15 May 2023 05:53:02 -0400 Subject: [PATCH 1/4] made changes in tanks start and stop --- src/controllers/tanksController.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index 65431a46..5dff432e 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -360,6 +360,14 @@ exports.motorAction = async (req, reply) => { const receiver_capacity = parseInt(receiver_tank_info.capacity.replace(/,/g, ''), 10) // console.log(receiver_capacity,"0",receiver_tank_info.tankName) await Tank.findOneAndUpdate({customerId, tankName: receiver_tank,tankLocation:receiver_type}, { $set: { motor_status: "1" } }); + const sumpTank = await Tank.findOne({ customerId, tankName: receiver_tank, tankLocation: receiver_type }); + const connection = sumpTank.connections.inputConnections.find((conn) => conn.inputConnections === supplier_tank); + + if (connection) { + connection.motor_status = "1"; + await sumpTank.save(); + } + let receiver_waterlevel = parseInt(receiver_tank_info.waterlevel.replace(/,/g, ''), 10) // console.log(receiver_waterlevel,"1") @@ -376,6 +384,13 @@ exports.motorAction = async (req, reply) => { await Tank.findOneAndUpdate({customerId, tankName: receiver_tank,tankLocation:receiver_type}, { $set: { motor_status: "0" } }); clearInterval(intervals[receiver_tank]); // Clear the interval for this tank delete intervals[receiver_tank]; + const sumpTank = await Tank.findOne({ customerId, tankName: receiver_tank, tankLocation: receiver_type }); + const connection = sumpTank.connections.inputConnections.find((conn) => conn.inputConnections === supplier_tank); + + if (connection) { + connection.motor_status = "0"; + await sumpTank.save(); + } console.log("end for" + receiver_tank); } else { // Update water levels in database From b2a434ea26bad9d6ef02945dc9d8a43b60a10a8b Mon Sep 17 00:00:00 2001 From: varun Date: Mon, 15 May 2023 06:34:31 -0400 Subject: [PATCH 2/4] made changes in tanks start and stop --- src/models/tanks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/models/tanks.js b/src/models/tanks.js index 7ab93b34..acdbc553 100644 --- a/src/models/tanks.js +++ b/src/models/tanks.js @@ -23,7 +23,7 @@ const tanksSchema = new mongoose.Schema({ motor_status: { type: String, default: 0 }, connections: { source: { type: String}, - inputConnections: [{ inputConnections: String,input_type:String,motor_status:String }], + inputConnections: [{ inputConnections: String,input_type:String,motor_status:"0" }], outputConnections: [{ outputConnections: String,output_type:String }] } From 9c45c3c51133558e9fb51c04e7a83bc063871cd2 Mon Sep 17 00:00:00 2001 From: varun Date: Mon, 15 May 2023 06:37:01 -0400 Subject: [PATCH 3/4] made changes in tanks start and stop --- src/models/tanks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/models/tanks.js b/src/models/tanks.js index acdbc553..7ab93b34 100644 --- a/src/models/tanks.js +++ b/src/models/tanks.js @@ -23,7 +23,7 @@ const tanksSchema = new mongoose.Schema({ motor_status: { type: String, default: 0 }, connections: { source: { type: String}, - inputConnections: [{ inputConnections: String,input_type:String,motor_status:"0" }], + inputConnections: [{ inputConnections: String,input_type:String,motor_status:String }], outputConnections: [{ outputConnections: String,output_type:String }] } From c9f70cecf9e9e038d7ea193538ead404015add2a Mon Sep 17 00:00:00 2001 From: varun Date: Mon, 15 May 2023 07:18:46 -0400 Subject: [PATCH 4/4] made changes in tanks start and stop --- src/models/tanks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/models/tanks.js b/src/models/tanks.js index 7ab93b34..44c86290 100644 --- a/src/models/tanks.js +++ b/src/models/tanks.js @@ -23,7 +23,7 @@ const tanksSchema = new mongoose.Schema({ motor_status: { type: String, default: 0 }, connections: { source: { type: String}, - inputConnections: [{ inputConnections: String,input_type:String,motor_status:String }], + inputConnections: [{ inputConnections: String,input_type:String,motor_status: { type: String, default: "0" } }], outputConnections: [{ outputConnections: String,output_type:String }] }