masterConnectedSlaveList in installation

src/controllers/installationController.js

@@ -1228,124 +1228,68 @@ exports.createMasterSlaveData = 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;
 
-//     // Step 1: Get master details
+//     // Step 1: Find all slave tanks where connected_to matches
-//     const master = await Insensors.findOne({ hardwareId: connectedTo, type: 'master' }).lean();
+//     const slaveTanks = await Insensors.find({ connected_to: connectedTo }).lean();
-//     if (!master) {
+//     console.log(slaveTanks, "slaveTanks");
+
+//     if (!slaveTanks || slaveTanks.length === 0) {
 //       return reply.status(404).send({
 //         success: false,
-//         message: "Master device not found"
+//         message: "No tanks found for the given connected_to value"
 //       });
 //     }
 
-//     // Step 2: Get slave tanks connected to master
+//     // Step 2: Fetch `tankLocation` and `typeOfWater` from the Tank schema (for master device display)
-//     const slaveTanks = await Insensors.find({ connected_to: connectedTo, type: 'slave' }).lean();
+//     const tankDetails = await Tank.findOne(
-//     const slaveCount = slaveTanks.length;
+//       { hardwareId: connectedTo },
+//       { tankLocation: 1, typeOfWater: 1 }
+//     );
 
-//     // Step 3: Get Tank metadata for master
+//     if (!tankDetails) {
-//     const tankDetails = await Tank.findOne({ hardwareId: connectedTo }, { tankLocation: 1, typeOfWater: 1 }).lean();
+//       return reply.status(404).send({
+//         success: false,
+//         message: "Tank details not found for the given connectedTo"
+//       });
+//     }
 
-//     // Step 4: Get latest IotData for master
+//     // 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: Process slaves
+//     // 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
+//           tankHeight: matchingTankData?.tankHeight ?? null // Add tankHeight if found
 //         };
+//       } else {
+//         // Remove unnecessary fields for master type
+//         const {
+//           tankName,
+//           tankLocation,
+//           typeOfWater,
+//           ...rest
+//         } = slave;
+//         return rest;
+//       }
 //     });
 
-//     // Step 6: Prepare full master object
-//     const masterResponse = {
-//       ...master,
-//       tankLocation: tankDetails?.tankLocation || null,
-//       typeOfWater: tankDetails?.typeOfWater || null
-//     };
-
 //     return reply.send({
 //       success: true,
-//       master: masterResponse,
+//       tankLocation: tankDetails.tankLocation,
+//       typeOfWater: tankDetails.typeOfWater,
 //       connectedSlaveCount: slaveCount,
-//       slaves: processedSlaves
+//       data: processedSlaves
 //     });
 
 //   } catch (error) {
@@ -1359,6 +1303,63 @@ exports.masterConnectedSlaveList = async (req, reply) => {
 
 
 
+exports.masterConnectedSlaveList = async (req, reply) => {
+  try {
+    const { connectedTo } = req.params;
+
+    // Step 1: Get master details
+    const master = await Insensors.findOne({ hardwareId: connectedTo, type: 'master' }).lean();
+    if (!master) {
+      return reply.status(404).send({
+        success: false,
+        message: "Master device not found"
+      });
+    }
+
+    // Step 2: Get slave tanks connected to master
+    const slaveTanks = await Insensors.find({ connected_to: connectedTo, type: 'slave' }).lean();
+    const slaveCount = slaveTanks.length;
+
+    // Step 3: Get Tank metadata for master
+    const tankDetails = await Tank.findOne({ hardwareId: connectedTo }, { tankLocation: 1, typeOfWater: 1 }).lean();
+
+    // Step 4: Get latest IotData for master
+    const latestIotData = await IotData.findOne({ hardwareId: connectedTo }).sort({ date: -1 }).lean();
+
+    // Step 5: Process slaves
+    const processedSlaves = slaveTanks.map(slave => {
+      const matchingTankData = latestIotData?.tanks?.find(tank => tank.tankhardwareId === slave.hardwareId);
+      return {
+        ...slave,
+        tankHeight: matchingTankData?.tankHeight ?? null
+      };
+    });
+
+    // Step 6: Prepare full master object
+    const masterResponse = {
+      ...master,
+      tankLocation: tankDetails?.tankLocation || null,
+      typeOfWater: tankDetails?.typeOfWater || null
+    };
+
+    return reply.send({
+      success: true,
+      master: masterResponse,
+      connectedSlaveCount: slaveCount,
+      slaves: processedSlaves
+    });
+
+  } catch (error) {
+    console.error("Error fetching master connected slave data:", error);
+    return reply.status(500).send({
+      success: false,
+      message: "Internal Server Error"
+    });
+  }
+};
+
+
+
 exports.mastrerList = async (req, reply) => {
   try {
     const { customerId, installationId } = req.params;