From a0e05ce743d168068172b6aa6fd77361dc968117 Mon Sep 17 00:00:00 2001
From: Bhaskar <bhaskarakishore@armintasolutions.com>
Date: Thu, 22 May 2025 14:27:43 +0530
Subject: [PATCH] assigned details from the fetch issues by category

---
 src/controllers/installationController.js | 35 ++++++++++++++---------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/controllers/installationController.js b/src/controllers/installationController.js
index bd25c917..b84e70b3 100644
--- a/src/controllers/installationController.js
+++ b/src/controllers/installationController.js
@@ -5099,19 +5099,25 @@ exports.particularCategory = async (req, reply) => {
         connected_status: "disconnected"
       }).lean();
 
-      const slaveDetails = slaves.map(slave => ({
-        hardwareId: slave.hardwareId,
-        tankName: slave.tankName || "",
-        location: slave.tankLocation || "",
-        connected_status: slave.connected_status,
-        lora_last_disconnect_time: slave.lora_last_disconnect_time || null,
-        connected_to: slave.connected_to || "",
-        masterName: orderMap[master.hardwareId]?.masterName || "",
-        type: "slave",
-        typeOfWater: slave.typeOfWater || "",
-        support_lora_last_check_time: null,
-        category // category included for each slave
-      }));
+      const slaveDetails = slaves.map(slave => {
+        const slaveIssue = issues.find(i => i.hardwareId === slave.hardwareId);
+        return {
+          hardwareId: slave.hardwareId,
+          tankName: slave.tankName || "",
+          location: slave.tankLocation || "",
+          connected_status: slave.connected_status,
+          lora_last_disconnect_time: slave.lora_last_disconnect_time || null,
+          connected_to: slave.connected_to || "",
+          masterName: orderMap[master.hardwareId]?.masterName || "",
+          type: "slave",
+          typeOfWater: slave.typeOfWater || "",
+          support_lora_last_check_time: null,
+          category,
+          assignedTo: slaveIssue?.assignedTo || null // <-- Include assigned details here
+        };
+      });
+
+      const masterIssue = issues.find(i => i.hardwareId === master.hardwareId);
 
       disconnectedIssues.push({
         hardwareId: master.hardwareId,
@@ -5123,7 +5129,8 @@ exports.particularCategory = async (req, reply) => {
         support_gsm_last_check_time: null,
         connected_slave_count: slaveDetails.length,
         connected_slaves: slaveDetails,
-        category // category included for master
+        category,
+        assignedTo: masterIssue?.assignedTo || null // <-- Include assigned details here
       });
     }