From c7639331b46401afbc1e1beb6853a18aebeb612b Mon Sep 17 00:00:00 2001
From: varun <varun@armintasolutions.com>
Date: Mon, 24 Apr 2023 03:44:29 -0400
Subject: [PATCH] This is for integrating hardwareId with tank along with
 hardwareId type and company

---
 src/controllers/admincontroller.js         | 4 ++--
 src/controllers/supplierOrderController.js | 2 ++
 src/models/tanks.js                        | 2 ++
 src/routes/adminRoute.js                   | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/controllers/admincontroller.js b/src/controllers/admincontroller.js
index 2066f17f..529178cc 100644
--- a/src/controllers/admincontroller.js
+++ b/src/controllers/admincontroller.js
@@ -74,8 +74,8 @@ exports.adminSignUp = async (request, reply) => {
 
   exports.integratingHardwareidToTank =  async (request, reply) => {
     try {
-        const { customerId, tankName,tankLocation,hardwareId } = request.body
-       const tank =  await Tank.findOneAndUpdate({customerId, tankName:tankName ,tankLocation:tankLocation.toLowerCase()}, { $set: { hardwareId: hardwareId } });
+        const { customerId, tankName,tankLocation,hardwareId,hardwareId_company,hardwareId_type } = request.body
+       const tank =  await Tank.findOneAndUpdate({customerId, tankName:tankName ,tankLocation:tankLocation.toLowerCase()}, { $set: { hardwareId: hardwareId,hardwareId_company:hardwareId_company,hardwareId_type:hardwareId_type } });
         reply.send({ status_code: 200, message:`${hardwareId} set to ${tankName}` }); 
 
       } catch (err) {
diff --git a/src/controllers/supplierOrderController.js b/src/controllers/supplierOrderController.js
index 71225bb8..4312f68b 100644
--- a/src/controllers/supplierOrderController.js
+++ b/src/controllers/supplierOrderController.js
@@ -210,6 +210,8 @@ exports.deliveryboystartandstop = async (req, reply) => {
     const receiver_tank = bookingdata.tankName
    // console.log(receiver_tank,"5")
     const receiver_tank_info = await Tank.findOne({ customerId ,tankName:receiver_tank,tankLocation:"sump"});
+    
+
    // console.log(receiver_tank_info,"1")
     
     const receiver_capacity =  parseInt((receiver_tank_info.capacity).replace(/,/g, ''), 10)
diff --git a/src/models/tanks.js b/src/models/tanks.js
index d27b4777..0eb3a490 100644
--- a/src/models/tanks.js
+++ b/src/models/tanks.js
@@ -11,6 +11,8 @@ const code = Math.floor(100000 + Math.random() * 900000);
 const RoleSchema = new Schema({ name: String });
 const tanksSchema = new mongoose.Schema({
     hardwareId: { type: String },
+    hardwareId_type: { type: String },
+    hardwareId_company: { type: String },
     customerId: { type: String, default: null },
     tankName: { type: String, default: null },
     blockName: { type: String, default: null },
diff --git a/src/routes/adminRoute.js b/src/routes/adminRoute.js
index 5976ec5f..cbf3eff6 100644
--- a/src/routes/adminRoute.js
+++ b/src/routes/adminRoute.js
@@ -56,6 +56,8 @@ fastify.post("/api/integratingHardwareidToTank", {
       type: "object",
       
       properties: {
+        hardwareId_company:{ type: "string" },
+        hardwareId_type:{ type: "string" },
         customerId: { type: "string" },
         tankName: { type: "string" },
         tankLocation: { type: "string" },