diff --git a/src/controllers/storeController.js b/src/controllers/storeController.js index 680c7f1c..8e3a068f 100644 --- a/src/controllers/storeController.js +++ b/src/controllers/storeController.js @@ -2334,37 +2334,41 @@ exports.getOrdersByInstallationId = async (req, reply) => { const { installationId } = req.params; if (!installationId) { - return reply.status(400).send({ error: "storeId is required" }); + return reply.status(400).send({ error: "installationId is required" }); } - // Fetch orders with the matching storeId const orders = await Order.find({ installationId }); if (!orders.length) { return reply.send({ status_code: 200, - message: "No orders found for this store", + message: "No orders found for this installationId", data: [], }); } - // Fetch customer details & allocated sensors for each order const ordersWithDetails = await Promise.all( orders.map(async (order) => { - // Fetch customer details const customer = await User.findOne({ customerId: order.customerId }).lean(); - // Fetch allocated sensors for this customer + console.log("Fetching allocated sensors for:", { + storeId: order.storeId, + customerId: order.customerId, + status: "blocked", + }); + const allocatedSensors = await Insensors.find({ - installationId, - customerId: order.customerId, // Match only sensors allocated to this customer - status: "blocked", // Only fetch sensors that are allocated (blocked) + storeId: order.storeId, + customerId: order.customerId, + status: "blocked", }).lean(); + console.log("✅ Found Sensors:", allocatedSensors); + return { ...order.toObject(), - customer: customer || null, // Include customer details or null if not found - allocated_sensors: allocatedSensors, // List of allocated sensors + customer: customer || null, + allocated_sensors: allocatedSensors, // Now it should return the correct sensors }; }) ); @@ -2375,11 +2379,12 @@ exports.getOrdersByInstallationId = async (req, reply) => { data: ordersWithDetails, }); } catch (err) { - console.error("Error fetching orders:", err); + console.error("❌ Error fetching orders:", err); return reply.status(500).send({ error: "Internal server error" }); } }; + exports.getallocatedsensorstouser= async (req, reply) => { try { const { customerId } = req.params;