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

src/controllers/tankersController.js

@@ -1,7 +1,7 @@
 const { Tanker, Tankerbooking,Bore,GovtPipeLine } = require('../models/tankers')
 const { User,Counter, generateBookingId,resetCounter,generateCustomerId } = require('../models/User')
 
-
+const { FriendRequest } = require('../models/supplier')
 //const User = require("../models/User");
 const boom = require("boom");
 
@@ -527,3 +527,28 @@ exports.status = async (req, reply) => {
   }
 };
 
+exports.connectionStatus = async (req, reply) => {
+  try {
+    // query the database to check if the customer and supplier are connected
+    const isConnected = await User.findOne({ customerId: req.query.customerId })
+      .populate('supplier', null, { supplierId: req.query.supplierId })
+      .exec()
+      .then(customer => customer.supplier !== null);
+
+      console.log("isconne..", isConnected)
+    
+      if (isConnected) {
+        // if customer and supplier are connected, return list of tankers
+        const tankers = await Tanker.find({ }).exec();
+        console.log("tankers..", tankers)
+        reply.send({ tankers });
+      } else {
+        // if customer and supplier are not connected, return error
+        reply.status(403).send({ error: 'Forbidden' });
+      }
+    //res.send({ tankers });
+  } catch (err) {
+    console.error(err);
+    reply.status(500).send({ error: 'Internal server error' });
+  }
+}

src/controllers/tanksController.js

@@ -6,7 +6,7 @@ const boom = require("boom");
 const fastify = require("fastify")({
   logger: true,
 });
-const tanksController = require("./tanksController")
+// const tanksController = require("./tanksController")
 
 
 

src/models/tankers.js

@@ -21,7 +21,11 @@ const tankersSchema = new mongoose.Schema({
     supplier_address: { type: String, default: null },
     supplier_name : { type: String, default: null },
 
-    status: { type: String}
+    price: {
+        type: [String], 
+        default: []
+      },
+    status: { type: String},
 
 });
 

src/routes/tankersRoute.js

@@ -53,6 +53,9 @@ module.exports = function (fastify, opts, next) {
                 },
              },
                 capacity: { type: "string"},
+                price: {type : "string"},
+                // status: {type: "string"}
+
              
 
             },
@@ -583,6 +586,29 @@ module.exports = function (fastify, opts, next) {
       });
 
 
+      fastify.route({
+        method: 'GET',
+        url: '/connection-status',
+        schema: {
+          tags: ["Supplier"],
+          description: "This is for Get Tank Data for status connected or not",
+          summary: "This is for to Get Tank Data for status connected or not",
+          querystring: {
+            type: 'object',
+            properties: {
+              customerId: { type: 'string' },
+              //supplierId: { type: 'string' }
+            },
+            required: ['customerId']
+          },
+          security: [
+            {
+              basicAuth: [],
+            },
+          ],
+        },
+        handler: tankersController.connectionStatus
+      });
       
       
     next();