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

src/controllers/tanksController.js

@@ -7851,4 +7851,75 @@ exports.compareMeasuredHeight = async (req, reply) => {
     console.error("Error in compareMeasuredHeight:", err);
     reply.status(500).send({ message: err.message });
   }
-};
+};
+
+
+
+
+//const ExcelJS = require('exceljs');
+//const IotData = require('../models/IotData'); // adjust the path
+
+// async function generateAndSaveTankExcel() {
+//   const startDate = "2025-06-03T00:00:00.000Z";
+//   const endDate = new Date().toISOString();
+
+//   const getFilteredData = async (hardwareId) => {
+//     const query = {
+//       hardwareId,
+//       date: {
+//         $gte: startDate,
+//         $lte: endDate,
+//       },
+//     };
+
+//     console.log(`Fetching data for hardwareId: ${hardwareId}`);
+//     const results = await IotData.find(query).sort({ date: 1 });
+
+//     console.log(`Found ${results.length} records for hardwareId ${hardwareId}`);
+
+//     const data = [];
+
+//     for (const entry of results) {
+//       if (!entry.tanks || !Array.isArray(entry.tanks)) continue;
+
+//       for (const tank of entry.tanks) {
+//         if (tank.tankhardwareId === 'tank-1' || tank.tankhardwareId === 'tank-2') {
+//           data.push({
+//             hardwareId: entry.hardwareId,
+//             tankhardwareId: tank.tankhardwareId,
+//             tankHeight: tank.tankHeight,
+//             date: tank.date.split('T')[0], // safe because it's a string
+//             time: tank.time,
+//           });
+//         }
+//       }
+//     }
+
+//     console.log(`Filtered ${data.length} tank records for hardwareId ${hardwareId}`);
+//     return data;
+//   };
+
+//   const data140924 = await getFilteredData("140924");
+//   const data150924 = await getFilteredData("150924");
+
+//   const workbook = new ExcelJS.Workbook();
+//   const worksheet = workbook.addWorksheet("Tank Data");
+
+//   worksheet.columns = [
+//     { header: "Hardware ID", key: "hardwareId", width: 15 },
+//     { header: "Tank ID", key: "tankhardwareId", width: 15 },
+//     { header: "Tank Height", key: "tankHeight", width: 15 },
+//     { header: "Date", key: "date", width: 15 },
+//     { header: "Time", key: "time", width: 15 },
+//   ];
+
+//   const allData = [...data140924, ...data150924];
+
+//   allData.forEach(row => worksheet.addRow(row));
+
+//   await workbook.xlsx.writeFile("tank_data.xlsx");
+//   console.log("✅ Excel file saved as tank_data.xlsx with rows:", allData.length);
+// }
+
+
+// generateAndSaveTankExcel();

src/handlers/supplierHandler.js

@@ -1,6 +1,7 @@
 //Get the data models
 const { Supplier, DeliveryBoy, profilePictureSupplier } = require("../models/supplier");
 const { FriendRequest } = require("../models/supplier");
+const { Tanker,Tankerbooking } = require("../models/tankers");
 const { ProfilePicture, User } = require("../models/User");
 const supplierController = require("../controllers/supplierController");
 const customJwtAuth = require("../customAuthJwt");
@@ -938,44 +939,104 @@ exports.getCurrentSupplier = async (req, reply) => {
 //   }
 // };
 
+exports.getSuppliers = async (req, reply) => {
+  const customerId = req.params.customerId;
 
+  const {
+    type_of_water,
+    capacity: requestedCapacityStr,
+    quantity: requestedQuantityStr,
+    date
+  } = req.body;
+
+  const parseCapacity = (value) => parseFloat((value || "0").toString().replace(/,/g, ""));
+  
+  const requestedCapacity = parseCapacity(requestedCapacityStr);
+  const requestedQuantity = parseInt(requestedQuantityStr || "0");
+  const totalRequiredCapacity = requestedCapacity * requestedQuantity;
 
-exports.getSuppliers = async (req, reply) => {
-  const limit = parseInt(req.query.limit) || 100;
-  const page = parseInt(req.query.page) || 1;
-  const startindex = (page - 1) * limit;
-  const customerId = req.params.customerId; // Assuming you have already authenticated the user and stored their ID in the request object
   try {
-    const friendRequests = await FriendRequest.find({ customerId });
+    const tankerBookings = await Tankerbooking.find({ date });
-    const supplierIdsToExclude = friendRequests.map(
+    const bookedTankerSet = new Set(
-      (request) => request.supplierId
+      tankerBookings.map(booking => `${booking.supplierId}_${booking.tankerName}`)
     );
-    const suppliers = await Supplier.find({ supplierId: { $nin: supplierIdsToExclude } })
-      .limit(limit)
-      .skip(startindex)
-      .exec();
 
-    const supplierIds = suppliers.map((supplier) => supplier.supplierId);
+    // 1️⃣ Only filter typeofwater first
-    const profilePictures = await profilePictureSupplier.find({
+    let tankers = await Tanker.find({ typeofwater: type_of_water });
-      supplierId: { $in: supplierIds },
-    }).exec();
 
-    const data = suppliers.map((supplier) => {
+    // 2️⃣ Exclude booked tankers
-      const profilePicture = profilePictures.find(
+    tankers = tankers.filter(tanker => {
-        (picture) => picture.supplierId === supplier.supplierId
+      const key = `${tanker.supplierId}_${tanker.tankerName}`;
+      return !bookedTankerSet.has(key);
+    });
+
+    // 3️⃣ Group by supplierId
+    const supplierTankerMap = {};
+    for (let tanker of tankers) {
+      if (!supplierTankerMap[tanker.supplierId]) {
+        supplierTankerMap[tanker.supplierId] = [];
+      }
+      supplierTankerMap[tanker.supplierId].push(tanker);
+    }
+
+    // 4️⃣ Aggregate supplier capacities
+    const qualifiedSuppliers = [];
+    for (let [supplierId, supplierTankers] of Object.entries(supplierTankerMap)) {
+      const totalAvailableCapacity = supplierTankers.reduce(
+        (sum, t) => sum + parseCapacity(t.capacity),
+        0
       );
-      return {
+
-        ...supplier.toObject(),
+      if (totalAvailableCapacity >= totalRequiredCapacity) {
-        picture: profilePicture ? profilePicture.picture : null,
+        qualifiedSuppliers.push({ supplierId, tankers: supplierTankers });
+      }
+    }
+
+    const connected_suppliers = [];
+    const non_connected_suppliers = [];
+
+    for (let supplierObj of qualifiedSuppliers) {
+      const supplierData = await Supplier.findOne({ supplierId: supplierObj.supplierId });
+
+      const responseData = {
+        supplier: supplierData,
+        tankers: supplierObj.tankers
       };
+
+      // 🔥 The correct friend request check:
+      const friendRequest = await FriendRequest.findOne({
+        customerId: customerId,
+        supplierId: supplierObj.supplierId
+      });
+
+      if (friendRequest && friendRequest.status === "accepted") {
+        connected_suppliers.push(responseData);
+      } else {
+        non_connected_suppliers.push(responseData);
+      }
+    }
+
+    reply.send({
+      status_code: 200,
+      connected_suppliers,
+      non_connected_suppliers
     });
 
-    reply.send({ status_code: 200, data, count: data.length });
   } catch (err) {
-    throw boom.boomify(err);
+    console.error(err);
+    reply.send({
+      status_code: 500,
+      message: "Something went wrong",
+      error: err.message
+    });
   }
 };
 
+
+
+
+
+
 // Get single user by ID
 exports.getSingleSupplier = async (req, reply) => {
   try {

src/routes/supplierRoute.js

@@ -8,7 +8,7 @@ const { profilePictureSupplier } = require("../models/supplier");
 
 module.exports = function (fastify, opts, next) {
 
-  fastify.get("/api/suppliers/:customerId", {
+  fastify.post("/api/suppliersforbooking/:customerId", {
     schema: {
       tags: ["Supplier-Data"],
       description: "This is for Get All Suppliers",
@@ -22,6 +22,16 @@ module.exports = function (fastify, opts, next) {
           },
         },
       },
+       body: {
+            type: "object",
+           
+            properties: {
+              type_of_water: { type: "string" },
+              capacity: { type: "string" },
+              quantity: { type: "string" },
+              date: { type: "string" },
+            },
+          },
     
       security: [
         {