Arminta
/
watermanagement-backend-prod
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
master^2
ashok 5 months ago
parent dcca586d66 95fb53ca1c
commit 0289d3a1e8
1 changed files with 179 additions and 41 deletions
Show Stats Download Patch File Download Diff File

220
src/controllers/installationController.js
Unescape View File

@ -3953,6 +3953,164 @@ exports.raiseATicketSlave = async (req, reply) => {
// }
// };
//final
// exports.getDisconnectedIssuesBySupportId = async (req, reply) => {
// try {
// const { supportId } = req.params;
// if (!supportId) {
// return reply.code(400).send({ error: "supportId is required" });
// }
// const supportRecord = await Support.findOne({ supportId }).lean();
// if (!supportRecord) {
// return reply.code(404).send({ message: "No support record found for this supportId" });
// }
// const allIssues = supportRecord.issues || [];
// const hardwareSet = new Set();
// for (const issue of allIssues) {
// if (issue.hardwareId) hardwareSet.add(issue.hardwareId);
// if (issue.masterHardwareId) hardwareSet.add(issue.masterHardwareId);
// }
// const hardwareIds = [...hardwareSet];
// const sensors = await Insensors.find({
// $or: [
// { hardwareId: { $in: hardwareIds } },
// { tankhardwareId: { $in: hardwareIds } }
// ]
// }).lean();
// const sensorMap = {};
// for (const sensor of sensors) {
// if (sensor.hardwareId) sensorMap[sensor.hardwareId] = sensor;
// if (sensor.tankhardwareId) sensorMap[sensor.tankhardwareId] = sensor;
// }
// let customerId = supportRecord.customerId;
// if (!customerId) {
// const firstSensor = sensors.find(sensor => sensor.customerId);
// if (firstSensor) {
// customerId = firstSensor.customerId;
// } else {
// return reply.code(404).send({ message: "Unable to determine customerId from support or sensors." });
// }
// }
// const orders = await Order.find({ customerId }).lean();
// const orderMap = {};
// for (const order of orders) {
// (order.master_connections || []).forEach(conn => {
// if (conn.hardwareId) {
// orderMap[conn.hardwareId] = {
// masterName: conn.master_name || null,
// location: conn.location || null
// };
// }
// });
// }
// const slaveOrderMap = {};
// for (const order of orders) {
// (order.tank_connections || []).forEach(conn => {
// if (conn.hardwareId) {
// slaveOrderMap[conn.hardwareId] = {
// location: conn.location || null,
// typeOfWater: conn.typeOfWater || null
// };
// }
// });
// }
// const masterMap = {};
// for (const issue of allIssues) {
// const masterId = issue.masterHardwareId || issue.hardwareId;
// const masterSensor = sensorMap[masterId];
// if (!masterSensor || masterSensor.type !== "master") continue;
// if (!masterMap[masterSensor.hardwareId]) {
// const enriched = orderMap[masterSensor.hardwareId] || {};
// masterMap[masterSensor.hardwareId] = {
// hardwareId: masterSensor.hardwareId,
// masterName: enriched.masterName || masterSensor.masterName || "",
// location: enriched.location || masterSensor.location || "",
// type: "master",
// connected_status: masterSensor.connected_status,
// gsm_last_check_time: masterSensor.gsm_last_check_time,
// gsm_last_disconnect_time: masterSensor.gsm_last_disconnect_time,
// connected_gsm_date: masterSensor.connected_gsm_date,
// connected_gsm_time: masterSensor.connected_gsm_time,
// connected_lora_date: masterSensor.connected_lora_date,
// connected_lora_time: masterSensor.connected_lora_time,
// support_gsm_last_check_time: masterSensor.support_gsm_last_check_time,
// support_lora_last_check_time: masterSensor.support_lora_last_check_time,
// team_member_support_gsm_last_check_time: masterSensor.team_member_support_gsm_last_check_time,
// team_member_support_lora_last_check_time: masterSensor.team_member_support_lora_last_check_time,
// connected_slave_count: 0,
// connected_slaves: []
// };
// }
// const master = masterMap[masterSensor.hardwareId];
// const connectedSlaves = await Insensors.find({
// connected_to: masterSensor.hardwareId,
// type: "slave"
// }).lean();
// const slaveSet = new Set(master.connected_slaves.map(s => s.hardwareId));
// for (const slave of connectedSlaves) {
// const slaveHardwareId = slave.tankhardwareId || slave.hardwareId;
// if (slaveSet.has(slaveHardwareId)) continue;
// slaveSet.add(slaveHardwareId);
// const tankInfo = await Tank.findOne({
// $or: [
// { hardwareId: slaveHardwareId },
// { tankhardwareId: slaveHardwareId }
// ]
// }).lean();
// const slaveOrderInfo = slaveOrderMap[slaveHardwareId] || {};
// const slaveEnriched = {
// hardwareId: slaveHardwareId,
// tankName: slave.tankName || (tankInfo?.tankName ?? ""),
// location: slave.location || tankInfo?.tankLocation || slaveOrderInfo.location || "",
// connected_status: slave.connected_status,
// connected_lora_time: slave.connected_lora_time,
// connected_lora_date: slave.connected_lora_date,
// lora_last_check_time: slave.lora_last_check_time,
// lora_last_disconnect_time: slave.lora_last_disconnect_time,
// connected_to: slave.connected_to,
// masterName: master.masterName,
// type: "slave",
// typeOfWater: slave.typeOfWater || tankInfo?.typeOfWater || slaveOrderInfo.typeOfWater || "",
// tankHeight: slave.tankHeight,
// support_lora_last_check_time: slave.support_lora_last_check_time,
// team_member_support_lora_last_check_time: slave.team_member_support_lora_last_check_time
// };
// master.connected_slaves.push(slaveEnriched);
// master.connected_slave_count++;
// }
// }
// return reply.send({
// status_code: 200,
// supportId,
// totalMasters: Object.keys(masterMap).length,
// disconnectedIssues: Object.values(masterMap)
// });
// } catch (error) {
// console.error("Error fetching disconnected issues:", error);
// return reply.code(500).send({ error: "Internal server error" });
// }
// };
exports.getDisconnectedIssuesBySupportId = async (req, reply) => {
try {
@ -3989,7 +4147,6 @@ exports.getDisconnectedIssuesBySupportId = async (req, reply) => {
if (sensor.tankhardwareId) sensorMap[sensor.tankhardwareId] = sensor;
}
// const customerId = supportRecord.customerId;
let customerId = supportRecord.customerId;
if (!customerId) {
const firstSensor = sensors.find(sensor => sensor.customerId);
@ -3999,8 +4156,9 @@ exports.getDisconnectedIssuesBySupportId = async (req, reply) => {
return reply.code(404).send({ message: "Unable to determine customerId from support or sensors." });
}
}
const orders = await Order.find({ customerId }).lean();
//console.log("orders",orders)
const orderMap = {};
for (const order of orders) {
(order.master_connections || []).forEach(conn => {
@ -4013,17 +4171,27 @@ exports.getDisconnectedIssuesBySupportId = async (req, reply) => {
});
}
const slaveOrderMap = {};
for (const order of orders) {
(order.tank_connections || []).forEach(conn => {
if (conn.hardwareId) {
slaveOrderMap[conn.hardwareId] = {
location: conn.location || null,
typeOfWater: conn.typeOfWater || null
};
}
});
}
const masterMap = {};
for (const issue of allIssues) {
const masterId = issue.masterHardwareId || issue.hardwareId;
const masterSensor = sensorMap[masterId];
if (!masterSensor || masterSensor.type !== "master") continue;
//console.log("masterSensor",masterSensor)
if (!masterMap[masterSensor.hardwareId]) {
const enriched = orderMap[masterSensor.hardwareId] || {};
// console.log("enriched",enriched)
masterMap[masterSensor.hardwareId] = {
hardwareId: masterSensor.hardwareId,
masterName: enriched.masterName || masterSensor.masterName || "",
@ -4052,40 +4220,12 @@ exports.getDisconnectedIssuesBySupportId = async (req, reply) => {
}).lean();
const slaveSet = new Set(master.connected_slaves.map(s => s.hardwareId));
console.log("slaveSet",slaveSet)
// for (const slave of connectedSlaves) {
// const slaveHardwareId = slave.tankhardwareId || slave.hardwareId;
// if (slaveSet.has(slaveHardwareId)) continue; // Skip duplicates
// slaveSet.add(slaveHardwareId);
// const slaveEnriched = {
// hardwareId: slaveHardwareId,
// tankName: slave.tankName || "",
// location: slave.location || "",
// connected_status: slave.connected_status,
// connected_lora_time: slave.connected_lora_time,
// connected_lora_date: slave.connected_lora_date,
// lora_last_check_time: slave.lora_last_check_time,
// lora_last_disconnect_time: slave.lora_last_disconnect_time,
// connected_to: slave.connected_to,
// masterName: master.masterName,
// type: "slave",
// typeOfWater: slave.typeOfWater || "",
// tankHeight: slave.tankHeight,
// support_lora_last_check_time: slave.support_lora_last_check_time,
// team_member_support_lora_last_check_time: slave.team_member_support_lora_last_check_time
// };
// master.connected_slaves.push(slaveEnriched);
// master.connected_slave_count++;
// }
for (const slave of connectedSlaves) {
const slaveHardwareId = slave.tankhardwareId || slave.hardwareId;
if (slaveSet.has(slaveHardwareId)) continue;
slaveSet.add(slaveHardwareId);
// Fetch tank data to fill missing location/typeOfWater
const tankInfo = await Tank.findOne({
$or: [
{ hardwareId: slaveHardwareId },
@ -4093,12 +4233,11 @@ exports.getDisconnectedIssuesBySupportId = async (req, reply) => {
]
}).lean();
console.log("tankInfo",tankInfo)
const slaveOrderInfo = slaveOrderMap[slaveHardwareId] || {};
const slaveEnriched = {
hardwareId: slaveHardwareId,
tankName: slave.tankName || (tankInfo?.tankName ?? ""),
location: slave.location || (tankInfo?.location ?? ""),
location: slave.location || tankInfo?.tankLocation || slaveOrderInfo.location || "",
connected_status: slave.connected_status,
connected_lora_time: slave.connected_lora_time,
connected_lora_date: slave.connected_lora_date,
@ -4107,23 +4246,22 @@ exports.getDisconnectedIssuesBySupportId = async (req, reply) => {
connected_to: slave.connected_to,
masterName: master.masterName,
type: "slave",
typeOfWater: slave.typeOfWater || (tankInfo?.typeOfWater ?? ""),
typeOfWater: slave.typeOfWater || tankInfo?.typeOfWater || slaveOrderInfo.typeOfWater || "",
tankHeight: slave.tankHeight,
support_lora_last_check_time: slave.support_lora_last_check_time,
team_member_support_lora_last_check_time: slave.team_member_support_lora_last_check_time
};
master.connected_slaves.push(slaveEnriched);
master.connected_slave_count++;
}
}
return reply.send({
status_code: 200,
supportId,
totalMasters: Object.keys(masterMap).length,
disconnectedIssues: Object.values(masterMap)
disconnectedIssues: Object.values(masterMap) // includes connected too
});
} catch (error) {

Write Preview
Loading…
Cancel
Save