Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend

src/controllers/tanksController.js

@@ -5881,97 +5881,106 @@ exports.getBlockData = async (req, reply) => {
 //     }
 //   }
 // });
-
 const mqtt = require('mqtt');
-const client = mqtt.connect('mqtt://35.207.198.4:1883'); // Connect to MQTT broker
+
+// Connect to MQTT broker
+const client = mqtt.connect('mqtt://35.207.198.4:1883');
+
+
 
 client.on('connect', () => {
   console.log('Connected to MQTT broker');
-  client.subscribe('water/iot-data', (err) => {
+  client.subscribe('water/iot-data/+', (err) => {
     if (err) {
       console.error('Error subscribing to topic:', err);
     } else {
-      console.log('Subscribed to water/iot-data topic');
+      console.log('Subscribed to all IoT devices under water/iot-data/#');
     }
   });
 });
 
-
 client.on('message', async (topic, message) => {
   console.log(`Message received on topic ${topic}:`, message.toString());
 
-  if (topic === 'water/iot-data') {
   try {
+    const topicParts = topic.split('/'); // ['water', 'iot-data', '140924']
+    const hw_Id = topicParts[2]; // Extract hardwareId from topic
+
+    if (!hw_Id) {
+      console.error('Invalid topic format: Missing hw_Id');
+      return;
+    }
+
     const data = JSON.parse(message.toString());
-      const { hw_Id, Motor_status, tanks } = data.objects; // Updated variable names according to new format
+    const { Motor_status, tanks } = data.objects;
+
+    console.log(`Processing data for hardwareId: ${hw_Id}`);
 
     // Get the current date and time in the required format
-      const currentDate = new Date();
+    const currentTime = moment().tz('Asia/Kolkata');
-      const date = currentDate.toISOString(); // ISO string for date
+    const date = currentTime.format('YYYY-MM-DD'); // Adjust format if needed
-      const time = currentDate.toLocaleTimeString('en-IN', { hour12: false, timeZone: 'Asia/Kolkata' }); // Time in 'HH:MM:SS'
+    const time = currentTime.format('HH:mm:ss');
 
-      // Create array of tank documents with current date and time
+    // Create tank documents
     const tankDocuments = tanks.map(tank => ({
-        tankhardwareId: tank.Id, // Updated to match the new format
+      tankhardwareId: tank.Id,
-        tankHeight: tank.level,   // Updated to match the new format
+      tankHeight: tank.level,
       date,
-        time
+      time,
     }));
 
-      
+    // Save IoT data
-
-      // Save IoT data for the received tanks
     const iotTankData = new IotData({
-        hardwareId: hw_Id,       // Updated variable name
+      hardwareId: hw_Id,
       Motor_status,
       tanks: tankDocuments,
       date,
-        time
+      time,
     });
     await iotTankData.save();
 
     // Delete excess records (keep only the latest three records)
     const recordsToKeep = 3;
-      const recordsToDelete = await IotData.find({ hardwareId: hw_Id }) // Updated variable name
+    const recordsToDelete = await IotData.find({ hardwareId: hw_Id })
       .sort({ date: -1, time: -1 })
       .skip(recordsToKeep);
 
-      for (const record of recordsToDelete) {
+    await Promise.all(recordsToDelete.map(record => record.remove()));
-        await record.remove();
-      }
 
-      // Process each tank to update water level and connections
+    // Process tanks and update water level
     for (const tank of tanks) {
-        const { Id: tankhardwareId, level: tankHeight } = tank; // Updated to match the new format
+      const { Id: tankhardwareId, level: tankHeight } = tank;
-        // Find the corresponding tank in the Tank schema using hardwareId and tankhardwareId
+      const existingTank = await Tank.findOne({ hardwareId: hw_Id, tankhardwareId });
-        const existingTank = await Tank.findOne({ hardwareId: hw_Id, tankhardwareId }); // Updated variable name
       if (!existingTank) continue;
 
       const customerId = existingTank.customerId;
       const tank_name = existingTank.tankName;
 
-        // Calculate water level using tank height and capacity
+      // Convert height and calculate water level
-        const tankHeightInCm = (parseInt(existingTank.height.replace(/,/g, ''), 10)) * 30.48; // Convert height to cm
+      const tankHeightInCm = parseInt(existingTank.height.replace(/,/g, ''), 10) * 30.48;
-        const tank_height = parseInt(tankHeightInCm.toFixed(0), 10);
+      const tank_height = Math.round(tankHeightInCm);
       const waterLevelHeight = tank_height - tankHeight;
       const waterCapacityPerCm = parseInt(existingTank.waterCapacityPerCm.replace(/,/g, ''), 10);
+      const waterLevel = Math.max(0, waterLevelHeight * waterCapacityPerCm);
 
-        const waterLevel = parseInt(waterLevelHeight * waterCapacityPerCm, 10); // Calculated water level
+      console.log(`${tankHeight} - Processed in MQTT subscriber`);
 
-        // Update water level in the existing tank
+      if (tankHeight > 0) {
-        console.log(tankHeight,"this is located in tank controllers at iot-data mqtt sub ")
-        if (tankHeight>0 && waterLevel >= 0) {
         existingTank.waterlevel = waterLevel;
         await existingTank.save();
 
-          // Update linked tanks (input/output connections)
         for (const outputConnection of existingTank.connections.outputConnections) {
-            const linkedTank = await Tank.findOne({ customerId, tankName: outputConnection.outputConnections, tankLocation: outputConnection.output_type });
+          const linkedTank = await Tank.findOne({ 
+            customerId, 
+            tankName: outputConnection.outputConnections, 
+            tankLocation: outputConnection.output_type 
+          });
+
           if (linkedTank) {
             for (const inputConnection of linkedTank.connections.inputConnections) {
               if (inputConnection.inputConnections === tank_name) {
-                  inputConnection.water_level = waterLevel; // Update water level for linked tank
+                inputConnection.water_level = waterLevel;
-                  await linkedTank.save(); // Save updated linked tank
+                await linkedTank.save();
               }
             }
           }
@@ -5980,45 +5989,40 @@ client.on('message', async (topic, message) => {
     }
 
     // Update motor status
-      const status = Motor_status;
+    const motorTank = await Tank.findOne({ "connections.inputConnections.motor_id": hw_Id });
-      const motorTank = await Tank.findOne({ "connections.inputConnections.motor_id": hw_Id }); // Updated variable name
-
     if (!motorTank) {
-        console.log('Motor not found for the specified motor_id');
+      console.log(`Motor not found for motor_id: ${hw_Id}`);
       return;
     }
 
-      // Find the inputConnection for the motor and update motor status
+    const inputConnection = motorTank.connections.inputConnections.find(conn => conn.motor_id === hw_Id);
-      const inputConnection = motorTank.connections.inputConnections.find(conn => conn.motor_id === hw_Id); // Updated variable name
     if (inputConnection) {
-        inputConnection.motor_status = status; // Update motor status
+      inputConnection.motor_status = Motor_status;
-        if (inputConnection.motor_stop_status === "1" && status === 2 && inputConnection.motor_on_type !== "forced_manual") {
+
-          const currentTime = moment().tz('Asia/Kolkata').format('DD-MMM-YYYY - HH:mm'); 
+      if (inputConnection.motor_stop_status === "1" && Motor_status === 2 && inputConnection.motor_on_type !== "forced_manual") {
         inputConnection.motor_stop_status = "2";
         inputConnection.motor_on_type = "forced_manual";
-          inputConnection.startTime = currentTime;
+        inputConnection.startTime = currentTime.format('DD-MMM-YYYY - HH:mm');
       }
 
-        if (inputConnection.motor_stop_status === "2" && status === 1) {
+      if (inputConnection.motor_stop_status === "2" && Motor_status === 1) {
-          const currentTime = moment().tz('Asia/Kolkata').format('DD-MMM-YYYY - HH:mm'); 
         inputConnection.motor_stop_status = "1";
-          inputConnection.motor_on_type = "manual";
+        inputConnection.stopTime = currentTime.format('DD-MMM-YYYY - HH:mm');
-          inputConnection.stopTime = currentTime;
       }
 
-        await motorTank.save(); // Save the updated tank
+      await motorTank.save();
     }
 
-      console.log('Data processed successfully for hardwareId:', hw_Id); // Updated variable name
+    console.log(`Processed successfully for hardwareId: ${hw_Id}`);
-
   } catch (err) {
     console.error('Error processing message:', err.message);
   }
-  }
 });
 
 
 
+
+
 const sendMotorNotifications = async () => {
   // console.log("🔄 Checking for motor notifications...");