From 8748596b819ce48502eaf22dc558060c74188f77 Mon Sep 17 00:00:00 2001 From: Bhaskar Date: Thu, 10 Jul 2025 21:43:37 +0530 Subject: [PATCH 1/2] getmasterConnectedSlaveData product_status maintain --- src/controllers/installationController.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/controllers/installationController.js b/src/controllers/installationController.js index 2b20ad77..c313fdfd 100644 --- a/src/controllers/installationController.js +++ b/src/controllers/installationController.js @@ -1772,6 +1772,7 @@ exports.masterConnectedSlaveList = async (req, reply) => { ...master, isMaster: true, tankLocation: tankDetails?.tankLocation || null, + product_status: master.product_status || 'pending', typeOfWater: masterTypeOfWater, tankHeight: null, masterName: masterOrderInfo.masterName, @@ -1896,6 +1897,7 @@ return { ...slave, isMaster: false, hardwareId: finalHardwareId, + product_status: slave.product_status || 'pending', tankHeight: matchingTankData?.tankHeight ?? null, typeOfWater: masterTypeOfWater === 'bore' ? 'bore' : (slave.typeOfWater || null), height: slaveTankMeta?.height || null, From 5aa034e3493ffd1170648b45fa4c4f9292fc4542 Mon Sep 17 00:00:00 2001 From: Bhaskar Date: Thu, 10 Jul 2025 21:55:47 +0530 Subject: [PATCH 2/2] chnages --- src/controllers/installationController.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/controllers/installationController.js b/src/controllers/installationController.js index c313fdfd..4f9a5908 100644 --- a/src/controllers/installationController.js +++ b/src/controllers/installationController.js @@ -1700,6 +1700,7 @@ exports.masterConnectedSlaveList = async (req, reply) => { try { const { connectedTo, customerId } = req.params; + if (!connectedTo) { return reply.status(400).send({ success: false, message: "connectedTo is required" }); } @@ -1730,7 +1731,7 @@ exports.masterConnectedSlaveList = async (req, reply) => { ).lean(); const masterTypeOfWater = tankDetails?.typeOfWater || null; - + console.log("masterTypeOfWater",masterTypeOfWater) // Step 3: Get slave tanks connected to master and belonging to this customer const slaveTanks = await Insensors.find({ connected_to: connectedTo, type: 'slave', customerId }).lean(); const slaveCount = slaveTanks.length;