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

src/controllers/installationController.js

@@ -1232,64 +1232,52 @@ exports.masterConnectedSlaveList = async (req, reply) => {
   try {
     const { connectedTo } = req.params;
 
-    // Step 1: Find all slave tanks where connected_to matches
+    // Step 1: Get master device details
-    const slaveTanks = await Insensors.find({ connected_to: connectedTo }).lean();
+    const master = await Insensors.findOne({ hardwareId: connectedTo, type: 'master' }).lean();
-    console.log(slaveTanks, "slaveTanks");
+    if (!master) {
-
-    if (!slaveTanks || slaveTanks.length === 0) {
       return reply.status(404).send({
         success: false,
-        message: "No tanks found for the given connected_to value"
+        message: "Master device not found"
       });
     }
 
-    // Step 2: Fetch `tankLocation` and `typeOfWater` from the Tank schema (for master device display)
+    // Step 2: Get tank metadata for master
-    const tankDetails = await Tank.findOne(
+    const tankDetails = await Tank.findOne({ hardwareId: connectedTo }, { tankLocation: 1, typeOfWater: 1 }).lean();
-      { hardwareId: connectedTo },
-      { tankLocation: 1, typeOfWater: 1 }
-    );
 
-    if (!tankDetails) {
+    // Step 3: Get slave tanks connected to master
-      return reply.status(404).send({
+    const slaveTanks = await Insensors.find({ connected_to: connectedTo, type: 'slave' }).lean();
-        success: false,
-        message: "Tank details not found for the given connectedTo"
-      });
-    }
-
-    // Step 3: Count the number of connected slaves
     const slaveCount = slaveTanks.length;
 
-    // Step 4: Fetch latest IotData for the master to extract tankHeight for each slave
+    // Step 4: Get latest IotData for master
     const latestIotData = await IotData.findOne({ hardwareId: connectedTo }).sort({ date: -1 }).lean();
 
-    // Step 5: Prepare processed response for each tank
+    // Step 5: Prepare master object for response
+    const masterResponse = {
+      ...master,
+      isMaster: true,
+      tankLocation: tankDetails?.tankLocation || null,
+      typeOfWater: tankDetails?.typeOfWater || null,
+      tankHeight: null // Master doesn't have individual tankHeight
+    };
+
+    // Step 6: Process each slave
     const processedSlaves = slaveTanks.map(slave => {
-      if (slave.type === 'slave') {
+      const matchingTankData = latestIotData?.tanks?.find(t => t.tankhardwareId === slave.hardwareId);
-        // Find matching tank data for this slave in IotData
-        const matchingTankData = latestIotData?.tanks?.find(tank => tank.tankhardwareId === slave.hardwareId);
 
       return {
         ...slave,
-          tankHeight: matchingTankData?.tankHeight ?? null // Add tankHeight if found
+        isMaster: false,
+        tankHeight: matchingTankData?.tankHeight ?? null
       };
-      } else {
-        // Remove unnecessary fields for master type
-        const {
-          tankName,
-          tankLocation,
-          typeOfWater,
-          ...rest
-        } = slave;
-        return rest;
-      }
     });
 
+    // Step 7: Combine master and slaves into one array
+    const combinedData = [masterResponse, ...processedSlaves];
+
     return reply.send({
       success: true,
-      tankLocation: tankDetails.tankLocation,
-      typeOfWater: tankDetails.typeOfWater,
       connectedSlaveCount: slaveCount,
-      data: processedSlaves
+      data: combinedData
     });
 
   } catch (error) {
@@ -1302,6 +1290,81 @@ exports.masterConnectedSlaveList = async (req, reply) => {
 };
 
 
+// exports.masterConnectedSlaveList = async (req, reply) => {
+//   try {
+//     const { connectedTo } = req.params;
+
+//     // Step 1: Find all slave tanks where connected_to matches
+//     const slaveTanks = await Insensors.find({ connected_to: connectedTo }).lean();
+//     console.log(slaveTanks, "slaveTanks");
+
+//     if (!slaveTanks || slaveTanks.length === 0) {
+//       return reply.status(404).send({
+//         success: false,
+//         message: "No tanks found for the given connected_to value"
+//       });
+//     }
+
+//     // Step 2: Fetch `tankLocation` and `typeOfWater` from the Tank schema (for master device display)
+//     const tankDetails = await Tank.findOne(
+//       { hardwareId: connectedTo },
+//       { tankLocation: 1, typeOfWater: 1 }
+//     );
+
+//     if (!tankDetails) {
+//       return reply.status(404).send({
+//         success: false,
+//         message: "Tank details not found for the given connectedTo"
+//       });
+//     }
+
+//     // Step 3: Count the number of connected slaves
+//     const slaveCount = slaveTanks.length;
+
+//     // Step 4: Fetch latest IotData for the master to extract tankHeight for each slave
+//     const latestIotData = await IotData.findOne({ hardwareId: connectedTo }).sort({ date: -1 }).lean();
+
+//     // Step 5: Prepare processed response for each tank
+//     const processedSlaves = slaveTanks.map(slave => {
+//       if (slave.type === 'slave') {
+//         // Find matching tank data for this slave in IotData
+//         const matchingTankData = latestIotData?.tanks?.find(tank => tank.tankhardwareId === slave.hardwareId);
+
+//         return {
+//           ...slave,
+//           tankHeight: matchingTankData?.tankHeight ?? null // Add tankHeight if found
+//         };
+//       } else {
+//         // Remove unnecessary fields for master type
+//         const {
+//           tankName,
+//           tankLocation,
+//           typeOfWater,
+//           ...rest
+//         } = slave;
+//         return rest;
+//       }
+//     });
+
+//     return reply.send({
+//       success: true,
+//       tankLocation: tankDetails.tankLocation,
+//       typeOfWater: tankDetails.typeOfWater,
+//       connectedSlaveCount: slaveCount,
+//       data: processedSlaves
+//     });
+
+//   } catch (error) {
+//     console.error("Error fetching master connected slave data:", error);
+//     return reply.status(500).send({
+//       success: false,
+//       message: "Internal Server Error"
+//     });
+//   }
+// };
+
+
+
 // exports.masterConnectedSlaveList = async (req, reply) => {
 //   try {
 //     const { connectedTo } = req.params;