From 014b14b5619e8eeda5177663edd2fedff5f057ac Mon Sep 17 00:00:00 2001 From: varun Date: Thu, 16 Feb 2023 02:00:06 -0500 Subject: [PATCH] made changes in tanks controllers --- src/controllers/tankersController.js | 2 +- src/controllers/tanksController.js | 2 +- src/index.js | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/controllers/tankersController.js b/src/controllers/tankersController.js index dbdf91f8..22b9b4a1 100644 --- a/src/controllers/tankersController.js +++ b/src/controllers/tankersController.js @@ -114,7 +114,7 @@ exports.tankerBooking = async (req, reply) => { var booking_id = await Tankerbooking.findOne({ bookingid: bookingId}) if(booking_id){ - await generateBookingId() + b_id= await generateBookingId() } else { diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index ba2cedd7..40796ed1 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -153,7 +153,7 @@ exports.updateTanklevels = async (req, reply) => { //console.log(Number) setInterval(async function () { // const randomNumber = Math.floor(Math.random() * capacity) - //const randomNumber = Math.floor(Math.random() * (5500 - 1000) + 1000); + //const randomNumber = Math.floor(Math.random() * (5500 - 1000) + 1000);E // console.log(randomNumber) //console.log(Number) const randomNumber = Math.floor(Number/1.5) diff --git a/src/index.js b/src/index.js index 2fd5d413..b2f612c8 100644 --- a/src/index.js +++ b/src/index.js @@ -1,4 +1,6 @@ const userController = require("./controllers/userController"); +const { User,Counter, generateBookingId,resetCounter,generateCustomerId,ProfilePicture} = require('./models/User') + const tanksController = require("./controllers/tanksController"); const tankersController = require("./controllers/tankersController.js"); const createConnectionController = require("./controllers/createConnectionController"); @@ -206,6 +208,8 @@ fastify.post("/api/login", { var arr = loginObject.user.profile.role; var arrayToString = JSON.stringify(Object.assign({}, arr)); // convert array to string var stringToJsonObject = JSON.parse(arrayToString); // convert string to json object + var c_id = loginObject.user.customerId + var profilePicture = await ProfilePicture.findOne({ customerId:c_id}); // console.log({ // username: loginObject.user.username, @@ -219,6 +223,7 @@ fastify.post("/api/login", { error: false, apiversion: fastify.config.APIVERSION, access_token: token, + picture:profilePicture.picture, email: loginObject.user.emails, phone: loginObject.user.phone, customerId: loginObject.user.customerId,