Arminta
/
watermanagement-backend-prod
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes in connections

Browse Source
master
varun 1 year ago
parent 13769846bd
commit 950345f7dd
3 changed files with 201 additions and 203 deletions
Show Stats Download Patch File Download Diff File

58
src/controllers/createConnectionController.js
Unescape View File

@ -535,48 +535,45 @@ exports.createConnections = async (req, body) => {
tankInfo.connections.outputConnections = usertobeInserted.outputConnections.map(connection => { tankInfo.connections.outputConnections = usertobeInserted.outputConnections.map(connection => {
return { return {
outputConnections: connection.outputConnections, outputConnections: connection.outputConnections,
output_type: connection.output_type, output_type: connection.output_type,
motor_id: connection.motor_id || null, motor_id: connection.motor_id || null,
motor_status: connection.motor_status || "0", motor_status: connection.motor_status || "0",
motor_stop_status: connection.motor_stop_status || "1", motor_stop_status: connection.motor_stop_status || "1",
outputismotor: connection.hasOwnProperty("outputismotor") ? connection.outputismotor : false, outputismotor: connection.hasOwnProperty("outputismotor") ? connection.outputismotor : false,
capacity: connection.capacity || null, capacity: connection.capacity || null,
water_level: connection.water_level || null water_level: connection.water_level || null
}; };
}); });
} }
const tank_connections = await tankInfo.save(); const tank_connections = await tankInfo.save();
const connection_data_check = tank_connections.connections.inputConnections;
const sump_names = connection_data_check.map(d => d.inputConnections);
console.log(sump_names);
const connection_data = usertobeInserted.outputConnections; const connection_data = usertobeInserted.outputConnections;
console.log(connection_data, "connection_data");
for (const data of connection_data) { for (const data of connection_data) {
if (data['output_type'] === "overhead") { if (data['output_type'] === "overhead") {
const tankName = data['outputConnections']; const tankName = data['outputConnections'];
if (sump_names.includes(tankname)) { // Check if the current tank is already included in the inputConnections of any other tanks
console.log(`${tankname} exists in ${sump_names}`); const tanksWithCurrentTankAsInput = await Tank.find({ 'connections.inputConnections.inputConnections': tankname });
} else {
const tankConnections = await Tank.findOneAndUpdate( // If the current tank is not in the inputConnections of any other tank, add it
{ customerId: customerId.toString(), tankName: tankName }, if (tanksWithCurrentTankAsInput.length === 0) {
{ // Loop through each tank to add the current tank as an inputConnection
$addToSet: { for (const tank of tanksWithCurrentTankAsInput) {
'connections.inputConnections': { await Tank.findOneAndUpdate(
$each: [{ inputConnections: tankname, input_type: 'sump', inputismotor: data.outputismotor || false }], { customerId: customerId.toString(), tankName: tank.tankName },
}, {
// 'connections.outputConnections': { $addToSet: {
// $each: [{ outputConnections: tankname, output_type: 'overhead'}], 'connections.inputConnections': {
// }, inputConnections: tankname,
input_type: 'sump',
inputismotor: data.outputismotor || false
}
}
}, },
}, { new: true }
{ new: true } );
); }
console.log("tankConnections", tankConnections.connections.inputConnections);
console.log("tankConnections", tankConnections.connections.outputConnections);
} }
} }
} }
@ -590,6 +587,7 @@ exports.createConnections = async (req, body) => {
// exports.createConnections = async (req, body) => { // exports.createConnections = async (req, body) => {
// try { // try {
// const customerId = req.params.customerId; // const customerId = req.params.customerId;

352
src/controllers/tanksController.js
Unescape View File

@ -1252,218 +1252,218 @@ exports.calculateCapacity = async (req, reply) => {
exports.IotDevice = async (req, reply) => { // exports.IotDevice = async (req, reply) => {
try { // try {
const { hardwareId, mode, tanks } = req.body; // const { hardwareId, mode, tanks } = req.body;
// create a new tank document with the current date and time // // create a new tank document with the current date and time
const currentDate = new Date(); // const currentDate = new Date();
const date = currentDate.toISOString(); // save the date as an ISO string // const date = currentDate.toISOString(); // save the date as an ISO string
const time = currentDate.toLocaleTimeString('en-IN', { hour12: false, timeZone: 'Asia/Kolkata' }); // const time = currentDate.toLocaleTimeString('en-IN', { hour12: false, timeZone: 'Asia/Kolkata' });
// Create an array of tank documents // // Create an array of tank documents
const tankDocuments = tanks.map(tank => ({ // const tankDocuments = tanks.map(tank => ({
tankhardwareId: tank.tankhardwareId, // tankhardwareId: tank.tankhardwareId,
tankHeight: tank.tankHeight, // tankHeight: tank.tankHeight,
maxLevel: tank.maxLevel, // maxLevel: tank.maxLevel,
minLevel: tank.minLevel, // minLevel: tank.minLevel,
date: date, // date: date,
time: time // time: time
})); // }));
// create a new IotData document with the provided data // // create a new IotData document with the provided data
const ottank = new IotData({ hardwareId, mode, tanks: tankDocuments, date, time }); // const ottank = new IotData({ hardwareId, mode, tanks: tankDocuments, date, time });
// save the document to MongoDB // // save the document to MongoDB
await ottank.save(); // await ottank.save();
// Delete excess records (keep only the latest three records) // // Delete excess records (keep only the latest three records)
const recordsToKeep = 3; // const recordsToKeep = 3;
const recordsToDelete = await IotData.find({ hardwareId }) // const recordsToDelete = await IotData.find({ hardwareId })
.sort({ date: -1, time: -1 }) // .sort({ date: -1, time: -1 })
.skip(recordsToKeep); // .skip(recordsToKeep);
for (const record of recordsToDelete) { // for (const record of recordsToDelete) {
await record.remove(); // await record.remove();
} // }
// Update waterlevel in tanksSchema for each tank
for (const tank of tanks) {
const { tankhardwareId, tankHeight } = tank;
// Find the corresponding tank in tanksSchema
const existingTank = await Tank.findOne({ hardwareId, tankhardwareId });
if (existingTank) {
// Update the waterlevel using the tankHeight value
const tank_height1 = (parseInt(existingTank.height.replace(/,/g, ''), 10)) * 30.48; // // Update waterlevel in tanksSchema for each tank
console.log(tank_height1, 25); // for (const tank of tanks) {
// const { tankhardwareId, tankHeight } = tank;
// The value of tank_height1 is a number, not a string, so you cannot use replace on it. // // Find the corresponding tank in tanksSchema
// If you want to format it with commas, you can create a function to add commas to a number. // const existingTank = await Tank.findOne({ hardwareId, tankhardwareId });
function numberWithCommas(x) {
return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
// Now you can use the function to format the tank_height1 value with commas.
const formatted_tank_height1 = numberWithCommas(tank_height1);
console.log(formatted_tank_height1, 25);
const tank_height = parseInt(formatted_tank_height1.replace(/,/g, ''), 10); // if (existingTank) {
console.log(tank_height); // // Update the waterlevel using the tankHeight value
// console.log(tank_height,1)
const water_level_height = tank_height - tankHeight
console.log(water_level_height,2)
const waterCapacityPerCm = parseInt(existingTank.waterCapacityPerCm.replace(/,/g, ''), 10) // const tank_height1 = (parseInt(existingTank.height.replace(/,/g, ''), 10)) * 30.48;
console.log(waterCapacityPerCm,3) // console.log(tank_height1, 25);
const water_level = water_level_height * waterCapacityPerCm;
console.log(water_level, 4);
// Function to add commas to a number // // The value of tank_height1 is a number, not a string, so you cannot use replace on it.
function numberWithCommas(x) { // // If you want to format it with commas, you can create a function to add commas to a number.
return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); // function numberWithCommas(x) {
} // return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
// }
const formatted_water_level = numberWithCommas(water_level); // // Now you can use the function to format the tank_height1 value with commas.
console.log(formatted_water_level, 4); // const formatted_tank_height1 = numberWithCommas(tank_height1);
// console.log(formatted_tank_height1, 25);
existingTank.waterlevel = parseInt(formatted_water_level.replace(/,/g, ''), 10); // const tank_height = parseInt(formatted_tank_height1.replace(/,/g, ''), 10);
console.log(existingTank.waterlevel); // console.log(tank_height);
// // console.log(tank_height,1)
// const water_level_height = tank_height - tankHeight
// console.log(water_level_height,2)
// const waterCapacityPerCm = parseInt(existingTank.waterCapacityPerCm.replace(/,/g, ''), 10)
// console.log(waterCapacityPerCm,3)
// const water_level = water_level_height * waterCapacityPerCm;
// console.log(water_level, 4);
// // Function to add commas to a number
// function numberWithCommas(x) {
// return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
// }
// Save the updated tank document // const formatted_water_level = numberWithCommas(water_level);
await existingTank.save(); // console.log(formatted_water_level, 4);
}
}
// Send the latest three documents // existingTank.waterlevel = parseInt(formatted_water_level.replace(/,/g, ''), 10);
const latestOttanks = await IotData.find({ hardwareId }) // console.log(existingTank.waterlevel);
.sort({ date: -1, time: -1 });
reply.code(200).send({ latestOttanks });
} catch (err) {
// send an error response
reply.code(500).send({ error: err.message });
}
};
// exports.IotDevice2 = async (req, reply) => {
// try {
// const { hardwareId, mode, tanks } = req.body;
// // create a new tank document with the current date and time // // Save the updated tank document
// const currentDate = new Date(); // await existingTank.save();
// const date = currentDate.toISOString(); // save the date as an ISO string // }
// const time = currentDate.toLocaleTimeString('en-IN', { hour12: false, timeZone: 'Asia/Kolkata' }); // }
// // Create an array of tank documents
// const tankDocuments = tanks.map(tank => ({
// tankhardwareId: tank.tankhardwareId,
// tankHeight: tank.tankHeight,
// maxLevel: tank.maxLevel,
// minLevel: tank.minLevel,
// date: date,
// time: time
// }));
// // create a new IotData document with the provided data
// const ottank = new IotData({ hardwareId, mode, tanks: tankDocuments, date, time });
// // save the document to MongoDB // // Send the latest three documents
// await ottank.save(); // const latestOttanks = await IotData.find({ hardwareId })
// .sort({ date: -1, time: -1 });
// // Delete excess records (keep only the latest three records) // reply.code(200).send({ latestOttanks });
// const recordsToKeep = 3; // } catch (err) {
// const recordsToDelete = await IotData.find({ hardwareId }) // // send an error response
// .sort({ date: -1, time: -1 }) // reply.code(500).send({ error: err.message });
// .skip(recordsToKeep); // }
// };
// for (const record of recordsToDelete) { exports.IotDevice = async (req, reply) => {
// await record.remove(); try {
// } const { hardwareId, mode, tanks } = req.body;
// create a new tank document with the current date and time
const currentDate = new Date();
const date = currentDate.toISOString(); // save the date as an ISO string
const time = currentDate.toLocaleTimeString('en-IN', { hour12: false, timeZone: 'Asia/Kolkata' });
// Create an array of tank documents
const tankDocuments = tanks.map(tank => ({
tankhardwareId: tank.tankhardwareId,
tankHeight: tank.tankHeight,
maxLevel: tank.maxLevel,
minLevel: tank.minLevel,
date: date,
time: time
}));
// create a new IotData document with the provided data
const ottank = new IotData({ hardwareId, mode, tanks: tankDocuments, date, time });
// save the document to MongoDB
await ottank.save();
// Delete excess records (keep only the latest three records)
const recordsToKeep = 3;
const recordsToDelete = await IotData.find({ hardwareId })
.sort({ date: -1, time: -1 })
.skip(recordsToKeep);
for (const record of recordsToDelete) {
await record.remove();
}
// // Update waterlevel in tanksSchema for each tank // Update waterlevel in tanksSchema for each tank
// for (const tank of tanks) { for (const tank of tanks) {
// const { tankhardwareId, tankHeight } = tank; const { tankhardwareId, tankHeight } = tank;
// // Find the corresponding tank in tanksSchema // Find the corresponding tank in tanksSchema
// const existingTank = await Tank.findOne({ hardwareId, tankhardwareId }); const existingTank = await Tank.findOne({ hardwareId, tankhardwareId });
// if (existingTank) { if (existingTank) {
// // Update the waterlevel using the tankHeight value // Update the waterlevel using the tankHeight value
// const tank_height1 = (parseInt(existingTank.height.replace(/,/g, ''), 10)) * 30.48; const tank_height1 = (parseInt(existingTank.height.replace(/,/g, ''), 10)) * 30.48;
// console.log(tank_height1, 25); console.log(tank_height1, 25);
// // The value of tank_height1 is a number, not a string, so you cannot use replace on it. // The value of tank_height1 is a number, not a string, so you cannot use replace on it.
// // If you want to format it with commas, you can create a function to add commas to a number. // If you want to format it with commas, you can create a function to add commas to a number.
// function numberWithCommas(x) { function numberWithCommas(x) {
// return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
// } }
// // Now you can use the function to format the tank_height1 value with commas. // Now you can use the function to format the tank_height1 value with commas.
// const formatted_tank_height1 = numberWithCommas(tank_height1); const formatted_tank_height1 = numberWithCommas(tank_height1);
// console.log(formatted_tank_height1, 25); console.log(formatted_tank_height1, 25);
// const tank_height = parseInt(formatted_tank_height1.replace(/,/g, ''), 10); const tank_height = parseInt(formatted_tank_height1.replace(/,/g, ''), 10);
// console.log(tank_height); console.log(tank_height);
// // console.log(tank_height,1) // console.log(tank_height,1)
// const water_level_height = tank_height - tankHeight const water_level_height = tank_height - tankHeight
// console.log(water_level_height,2) console.log(water_level_height,2)
// const waterCapacityPerCm = parseInt(existingTank.waterCapacityPerCm.replace(/,/g, ''), 10) const waterCapacityPerCm = parseInt(existingTank.waterCapacityPerCm.replace(/,/g, ''), 10)
// console.log(waterCapacityPerCm,3) console.log(waterCapacityPerCm,3)
// const water_level = water_level_height * waterCapacityPerCm; const water_level = water_level_height * waterCapacityPerCm;
// console.log(water_level, 4); console.log(water_level, 4);
// // Function to add commas to a number // Function to add commas to a number
// function numberWithCommas(x) { function numberWithCommas(x) {
// return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
// } }
// const formatted_water_level = numberWithCommas(water_level); const formatted_water_level = numberWithCommas(water_level);
// console.log(formatted_water_level, 4); console.log(formatted_water_level, 4);
// existingTank.waterlevel = parseInt(formatted_water_level.replace(/,/g, ''), 10); existingTank.waterlevel = parseInt(formatted_water_level.replace(/,/g, ''), 10);
// console.log(existingTank.waterlevel); console.log(existingTank.waterlevel);
// // Save the updated tank document // Save the updated tank document
// await existingTank.save(); await existingTank.save();
// for (const outputConnection of existingTank.connections.outputConnections) { for (const outputConnection of existingTank.connections.outputConnections) {
// const linkedTank = await Tank.findOne({ customerId: customerId, tankName: outputConnection.outputConnections, tankLocation: outputConnection.output_type }); const linkedTank = await Tank.findOne({ customerId: customerId, tankName: outputConnection.outputConnections, tankLocation: outputConnection.output_type });
// if (linkedTank) { if (linkedTank) {
// // linkedTank.waterlevel = existingTank.waterlevel; // linkedTank.waterlevel = existingTank.waterlevel;
// //await linkedTank.save(); //await linkedTank.save();
// // Update water level of tanks linked through input connections of the linked tank // Update water level of tanks linked through input connections of the linked tank
// for (const inputConnection of linkedTank.connections.inputConnections) { for (const inputConnection of linkedTank.connections.inputConnections) {
// if (inputConnection.inputConnections === tank_name) { if (inputConnection.inputConnections === tank_name) {
// inputConnection.water_level = water_level.toString(); inputConnection.water_level = water_level.toString();
// await linkedTank.save(); await linkedTank.save();
// } }
// } }
// } }
// } }
// } }
// } }
// // Send the latest three documents // Send the latest three documents
// const latestOttanks = await IotData.find({ hardwareId }) const latestOttanks = await IotData.find({ hardwareId })
// .sort({ date: -1, time: -1 }); .sort({ date: -1, time: -1 });
// reply.code(200).send({ latestOttanks }); reply.code(200).send({ latestOttanks });
// } catch (err) { } catch (err) {
// // send an error response // send an error response
// reply.code(500).send({ error: err.message }); reply.code(500).send({ error: err.message });
// } }
// }; };
// exports.IotDevice1 = async (req, reply) => { // exports.IotDevice1 = async (req, reply) => {

2
src/routes/createConnectionsRoute.js
Unescape View File

@ -158,7 +158,7 @@ module.exports = function (fastify, opts, next) {
}, },
], ],
}, },
preHandler: fastify.auth([fastify.authenticate]), //preHandler: fastify.auth([fastify.authenticate]),
handler: createConnectionController.createConnections, handler: createConnectionController.createConnections,
}); });

Write Preview
Loading…
Cancel
Save