From df639eb0b8b90404ddf02f70cd3db23308f05d8c Mon Sep 17 00:00:00 2001
From: varun <varun@armintasolutions.com>
Date: Mon, 20 Mar 2023 02:15:02 -0400
Subject: [PATCH 1/2] made changes in tanker

---
 src/controllers/tankersController.js | 7 ++++++-
 src/models/tankers.js                | 6 ++++++
 src/routes/tankersRoute.js           | 2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/controllers/tankersController.js b/src/controllers/tankersController.js
index 7a33bb23..1b8540aa 100644
--- a/src/controllers/tankersController.js
+++ b/src/controllers/tankersController.js
@@ -22,11 +22,14 @@ console.log(req.params);
     //console.log(loginObject.user.username)
     // const userInfo = await User.findOne({ username: username.toString() });
     // const updateData = req.body;
-
+    
 
     // console.log("This is the reply in the handler after the validations", reply);
     tankersData = {
       supplierId:supplierId,
+
+      supplier_name:req.body.username,
+      supplier_address : req.body.supplier_address,
       tankerName: req.body.tankerName,
       phoneNumber: req.body.phoneNumber,
       alternative_phoneNumber: req.body.alternative_phoneNumber,
@@ -48,6 +51,8 @@ console.log(req.params);
     if (checkFormEncoding.isUserFormUrlEncoded) {
       usertobeInserted = checkFormEncoding.tankers;
       console.log("thsi true url string");
+      tankers.supplier_name = usertobeInserted.supplier_name;
+      tankers.supplier_address = usertobeInserted.supplier_address;
       tankers.tankerName = usertobeInserted.tankerName;
       tankers.phoneNumber = usertobeInserted.phoneNumber;
       tankers.alternative_phoneNumber = usertobeInserted.alternative_phoneNumber;
diff --git a/src/models/tankers.js b/src/models/tankers.js
index 8af5ea87..4ed67417 100644
--- a/src/models/tankers.js
+++ b/src/models/tankers.js
@@ -17,6 +17,8 @@ const tankersSchema = new mongoose.Schema({
     alternative_phoneNumber: { type: String, default: null },
     typeofwater: [{ typeofwater: String}],
     capacity: [{ capacity: String}],
+    supplier_address: { type: String, default: null },
+    supplier_name : { type: String, default: null },
 
 });
 
@@ -34,6 +36,10 @@ const tankersbookingSchema = new mongoose.Schema({
     price: { type: String, default: "750" },
     payment_status :  { type: String, default: "due" },
     orderStatus: { type: String, default: "pending" },
+    delivery_agent : { type: String, default: "null" },
+    delivery_agent_mobile : { type: String, default: "null" },
+    delivery_agent_alternative_mobile : { type: String, default: "null" },
+    
     quantityDelivered: { type: String, default: null},
     amount_paid: { type: String, default: null },
     amount_due: { type: String, default: null },
diff --git a/src/routes/tankersRoute.js b/src/routes/tankersRoute.js
index 95fbbe7d..86cb3ef6 100644
--- a/src/routes/tankersRoute.js
+++ b/src/routes/tankersRoute.js
@@ -26,6 +26,8 @@ module.exports = function (fastify, opts, next) {
           body: {
             type: "object",
             properties: {
+                supplier_name: { type: "string" },
+                supplier_address:{ type: "string" },
                 tankerName: { type: "string" },
                 phoneNumber: { type: "string"},
                 alternative_phoneNumber: { type: "string"},

From 7ec394bc98bc98c5c50c64e3c9985f987aba4081 Mon Sep 17 00:00:00 2001
From: varun <varun@armintasolutions.com>
Date: Mon, 20 Mar 2023 03:22:05 -0400
Subject: [PATCH 2/2] made changes in tanker

---
 src/models/tankers.js      |  4 ++--
 src/routes/tankersRoute.js | 25 ++-----------------------
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/src/models/tankers.js b/src/models/tankers.js
index 4ed67417..bad820b5 100644
--- a/src/models/tankers.js
+++ b/src/models/tankers.js
@@ -15,8 +15,8 @@ const tankersSchema = new mongoose.Schema({
     tankerName: { type: String, default: null },
     phoneNumber: { type: String, default: null },
     alternative_phoneNumber: { type: String, default: null },
-    typeofwater: [{ typeofwater: String}],
-    capacity: [{ capacity: String}],
+    typeofwater: { typeofwater: String},
+    capacity: { capacity: String},
     supplier_address: { type: String, default: null },
     supplier_name : { type: String, default: null },
 
diff --git a/src/routes/tankersRoute.js b/src/routes/tankersRoute.js
index 86cb3ef6..53344e6b 100644
--- a/src/routes/tankersRoute.js
+++ b/src/routes/tankersRoute.js
@@ -31,30 +31,9 @@ module.exports = function (fastify, opts, next) {
                 tankerName: { type: "string" },
                 phoneNumber: { type: "string"},
                 alternative_phoneNumber: { type: "string"},
-                typeofwater: {
-                 type: "array",
-                  maxItems: 2500,
-                  items: {
-                      type: "object",
-                      properties: {
-                       typeofwater: { type: "string", default: null },
-                      },
-                 },
-              },
+                typeofwater:  { type: "string"},
+                capacity: { type: "string"},
 
-              capacity: {
-                type: "array",
-                maxItems: 2500,
-                items: {
-                    type: "object",
-                    properties: {
-                      capacity: { type: "string", default: null },
-                   },
-                },
-            },
-                
-          
-               
             },
           },
           security: [