reverted changes in tanks controller

master
Varun 10 months ago
parent 9eec44b251
commit 1ed3061dfa

@ -2105,7 +2105,6 @@ else if (currentWaterLevel >= highWaterThreshold) {
this.publishMotorStopStatus(motorId, motorStopStatus);
for await (const tank of Tank.find({ "connections.inputConnections.motor_id": motorId })) {
const index = tank.connections.inputConnections.findIndex(connection => connection.motor_id === motorId);
const thresholdTime = moment().add(req.body.manual_threshold_time, 'minutes').toDate();
if (index !== -1) {
await Tank.updateOne(
{ customerId, "connections.inputConnections.motor_id": motorId },
@ -2114,43 +2113,20 @@ else if (currentWaterLevel >= highWaterThreshold) {
[`connections.inputConnections.${index}.manual_threshold_time`]: req.body.manual_threshold_time,
[`connections.inputConnections.${index}.threshold_type`]: "time",
[`connections.inputConnections.${index}.startTime`]: req.body.startTime,
[`connections.inputConnections.${index}.start_instance_id`]: start_instance_id,
[`connections.inputConnections.${index}.manual_stop_threshold_time`]: req.body.manual_stop_threshold_time,
[`connections.inputConnections.${index}.start_instance_id`]: start_instance_id
}
}
);
}
}
const thresholdTime = moment().add(req.body.manual_threshold_time, 'minutes').toDate();
const intervalId = setInterval(async () => {
const supplierTank = await Tank.findOne({ customerId, tankName: req.body.from, tankLocation: req.body.from_type.toLowerCase() });
const currentWaterLevel = parseInt(supplierTank.waterlevel, 10);
const currentWaterPercentage = (currentWaterLevel / parseInt(supplierTank.capacity.replace(/,/g, ''), 10)) * 100;
const receiverTank1 = await Tank.findOne({
customerId,
tankName: req.body.to,
tankLocation: req.body.to_type.toLowerCase()
});
// Ensure the tank exists
if (!receiverTank1) {
throw new Error('Receiver tank not found');
}
// Extract the manual_stop_threshold_time from the appropriate input connection
let stop_time = null;
if (receiverTank1.connections && receiverTank1.connections.inputConnections) {
const inputConnection = receiverTank1.connections.inputConnections.find(connection => connection.motor_id === req.body.motorId);
if (inputConnection && inputConnection.manual_stop_threshold_time) {
stop_time = inputConnection.manual_stop_threshold_time;
} else {
console.log('No matching input connection or manual_stop_threshold_time found');
}
}
if (new Date() >= stop_time || currentWaterPercentage <= lowWaterThreshold) {
if (new Date() >= thresholdTime || currentWaterPercentage <= lowWaterThreshold) {
console.log("motor stopping because it entered this condition")
await Tank.updateOne(
{ customerId, "connections.inputConnections.motor_id": motorId },

Loading…
Cancel
Save