From b06f001dbc3c855040a2de3fc7751424e6ff9bcf Mon Sep 17 00:00:00 2001 From: varun Date: Tue, 21 Mar 2023 07:47:21 -0400 Subject: [PATCH 01/10] made changes in tanker.js,tankercontrollers,tanker routes --- src/controllers/tankersController.js | 1 + src/models/tankers.js | 9 +++------ src/routes/tankersRoute.js | 1 - 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/controllers/tankersController.js b/src/controllers/tankersController.js index 43f7fc00..ba347767 100644 --- a/src/controllers/tankersController.js +++ b/src/controllers/tankersController.js @@ -12,6 +12,7 @@ const fastify = require("fastify")({ + exports.addTankers = async (req, reply) => { try { diff --git a/src/models/tankers.js b/src/models/tankers.js index 6c0b6c9f..46bf80a3 100644 --- a/src/models/tankers.js +++ b/src/models/tankers.js @@ -16,14 +16,11 @@ const tankersSchema = new mongoose.Schema({ phoneNumber: { type: String, default: null }, alternative_phoneNumber: { type: String, default: null }, typeofwater: [{ typeofwater: String}], - price:[{ typeofwater: String}], - capacity: { capacity: String}, + price:[{ price: String}], + capacity: { type: String}, supplier_address: { type: String, default: null }, supplier_name : { type: String, default: null }, - price: { - type: [String], - default: [] - }, + status: { type: String} }); diff --git a/src/routes/tankersRoute.js b/src/routes/tankersRoute.js index c0ca27db..a736c4ea 100644 --- a/src/routes/tankersRoute.js +++ b/src/routes/tankersRoute.js @@ -41,7 +41,6 @@ module.exports = function (fastify, opts, next) { }, }, }, - price: { type: "array", maxItems: 2500, From 81296fd723f7c2e73f5da43e748ee01d0e8fa40e Mon Sep 17 00:00:00 2001 From: varun Date: Tue, 21 Mar 2023 07:52:29 -0400 Subject: [PATCH 02/10] made changes in tanker.js,tankercontrollers,tanker routes --- src/routes/tankersRoute.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/routes/tankersRoute.js b/src/routes/tankersRoute.js index a736c4ea..427d04ec 100644 --- a/src/routes/tankersRoute.js +++ b/src/routes/tankersRoute.js @@ -48,6 +48,7 @@ module.exports = function (fastify, opts, next) { type: "object", properties: { price: { type: "string", default: null }, + }, }, }, From af0f91a51d02e9ba10a7e9dd6f73ee06b3b98708 Mon Sep 17 00:00:00 2001 From: varun Date: Tue, 21 Mar 2023 07:54:04 -0400 Subject: [PATCH 03/10] made changes in tanker.js,tankercontrollers,tanker routes --- src/routes/tankersRoute.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/tankersRoute.js b/src/routes/tankersRoute.js index 427d04ec..4ee7198b 100644 --- a/src/routes/tankersRoute.js +++ b/src/routes/tankersRoute.js @@ -48,12 +48,12 @@ module.exports = function (fastify, opts, next) { type: "object", properties: { price: { type: "string", default: null }, - + }, }, }, capacity: { type: "string"}, - price: {type : "string"}, + status: {type: "string"} }, From 19f847be0c55aadc3e4202c10cc98d5987d38c8a Mon Sep 17 00:00:00 2001 From: varun Date: Tue, 21 Mar 2023 07:57:51 -0400 Subject: [PATCH 04/10] made changes in tanker.js,tankercontrollers,tanker routes --- src/routes/tankersRoute.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/routes/tankersRoute.js b/src/routes/tankersRoute.js index 4ee7198b..f886a0a4 100644 --- a/src/routes/tankersRoute.js +++ b/src/routes/tankersRoute.js @@ -41,6 +41,7 @@ module.exports = function (fastify, opts, next) { }, }, }, + price: { type: "array", maxItems: 2500, From a12804ef33e097a56fd4f9554c78f4405550ff7c Mon Sep 17 00:00:00 2001 From: varun Date: Tue, 21 Mar 2023 08:01:24 -0400 Subject: [PATCH 05/10] made changes in tanker.js,tankercontrollers,tanker routes --- src/controllers/tankersController.js | 65 ++++++++++++++++++++++++ src/routes/tankersRoute.js | 76 +++++++++++++++++++++++++++- 2 files changed, 140 insertions(+), 1 deletion(-) diff --git a/src/controllers/tankersController.js b/src/controllers/tankersController.js index ba347767..757bbc8f 100644 --- a/src/controllers/tankersController.js +++ b/src/controllers/tankersController.js @@ -75,6 +75,71 @@ console.log(req.params); } }; + + + +exports.addTankers1 = async (req, reply) => { + try { + + //const username = req.params.username; + +console.log(req.params); + const supplierId = req.params.supplierId; + //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.supplier_name, + supplier_address : req.body.supplier_address, + tankerName: req.body.tankerName, + phoneNumber: req.body.phoneNumber, + alternative_phoneNumber: req.body.alternative_phoneNumber, + typeofwater: req.body.typeofwater, + capacity: req.body.capacity, + price: req.body.price, + status: req.body.status + }; + console.log(req.body.typeofwater,req.body.capacity) + + var tanker_Name = req.body.tankerName + var i_tank = await Tanker.findOne({ tankerName: tanker_Name,supplierId:supplierId}) + if(i_tank){ + throw new Error('tankername already exists'); + } + else { + + var tankers = new Tanker(tankersData); + + checkFormEncoding = isUserFormUrlEncoded(req); + 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; + tankers.capacity = usertobeInserted.capacity; + tankers.typeofwater = usertobeInserted.typeofwater; + tankers.price = usertobeInserted.price; + tankers.status = usertobeInserted.status; + } + } + const insertedTanker = await tankers.save(); + + return insertedTanker; + + + } catch (err) { + throw boom.boomify(err); + } +}; + //update selected tanker exports.updateTankersInfo = async (req, reply) => { diff --git a/src/routes/tankersRoute.js b/src/routes/tankersRoute.js index f886a0a4..6afcfa2d 100644 --- a/src/routes/tankersRoute.js +++ b/src/routes/tankersRoute.js @@ -41,7 +41,7 @@ module.exports = function (fastify, opts, next) { }, }, }, - + price: { type: "array", maxItems: 2500, @@ -569,6 +569,80 @@ module.exports = function (fastify, opts, next) { preHandler: fastify.auth([fastify.authenticate]), handler: tankersController.status, }); + + + + +module.exports = function (fastify, opts, next) { + + fastify.route({ + method: "POST", + url: "/api/addTankers5/:supplierId", + schema: { + tags: ["Supplier"], + description: "This is to cretae New Tanker", + summary: "This is to Create New Tanker.", + params: { + required: ["supplierId"], + type: "object", + properties: { + supplierId: { + type: "string", + description: "supplierId", + }, + }, + }, + body: { + type: "object", + properties: { + supplier_name: { type: "string" }, + supplier_address:{ type: "string" }, + tankerName: { type: "string" }, + phoneNumber: { type: "string"}, + alternative_phoneNumber: { type: "string"}, + typeofwater: { + type: "array", + maxItems: 2500, + items: { + type: "object", + properties: { + typeofwater: { type: "string", default: null }, + }, + }, + }, + + price: { + type: "array", + maxItems: 2500, + items: { + type: "object", + properties: { + price: { type: "string", default: null }, + + }, + }, + }, + capacity: { type: "string"}, + + status: {type: "string"} + + }, + }, + security: [ + { + basicAuth: [], + }, + ], + + }, + preHandler: fastify.auth([fastify.authenticate]), + handler: tankersController.addTankers1, + // onResponse: (request, reply) => { + // validationHandler.sendPhoneVerificationCode(request, reply); + // }, + //onResponse: validationHandler.sendPhoneVerificationCode, + }); + next(); } From 17b0b38719dfa752826e8cf93eaff6aa86b01191 Mon Sep 17 00:00:00 2001 From: varun Date: Tue, 21 Mar 2023 08:06:47 -0400 Subject: [PATCH 06/10] made changes in tanker.js,tankercontrollers,tanker routes --- src/routes/tankersRoute.js | 103 +++---------------------------------- 1 file changed, 6 insertions(+), 97 deletions(-) diff --git a/src/routes/tankersRoute.js b/src/routes/tankersRoute.js index 6afcfa2d..8ad0a899 100644 --- a/src/routes/tankersRoute.js +++ b/src/routes/tankersRoute.js @@ -41,7 +41,7 @@ module.exports = function (fastify, opts, next) { }, }, }, - + price: { type: "array", maxItems: 2500, @@ -49,13 +49,11 @@ module.exports = function (fastify, opts, next) { type: "object", properties: { price: { type: "string", default: null }, - }, }, }, capacity: { type: "string"}, - - status: {type: "string"} + }, }, @@ -545,106 +543,17 @@ module.exports = function (fastify, opts, next) { }, ], }, + // preHandler: [ + // fastify.auth([fastify.operatorAuthenticate]), + // validationHandler.validatePhoneFormat, + // ], preHandler: fastify.auth([fastify.authenticate]), handler: tankersController.updatePipelineInfo, }); - - fastify.get("/api/getTanks/status", { - schema: { - tags: ["Supplier"], - description: "This is for Get Tank Data for status connected", - summary: "This is for to Get Tank Data for status connected ", - querystring: { - status: {type: 'string'} - }, - security: [ - { - basicAuth: [], - }, - ], - }, - preHandler: fastify.auth([fastify.authenticate]), - handler: tankersController.status, - }); - - - - -module.exports = function (fastify, opts, next) { - - fastify.route({ - method: "POST", - url: "/api/addTankers5/:supplierId", - schema: { - tags: ["Supplier"], - description: "This is to cretae New Tanker", - summary: "This is to Create New Tanker.", - params: { - required: ["supplierId"], - type: "object", - properties: { - supplierId: { - type: "string", - description: "supplierId", - }, - }, - }, - body: { - type: "object", - properties: { - supplier_name: { type: "string" }, - supplier_address:{ type: "string" }, - tankerName: { type: "string" }, - phoneNumber: { type: "string"}, - alternative_phoneNumber: { type: "string"}, - typeofwater: { - type: "array", - maxItems: 2500, - items: { - type: "object", - properties: { - typeofwater: { type: "string", default: null }, - }, - }, - }, - - price: { - type: "array", - maxItems: 2500, - items: { - type: "object", - properties: { - price: { type: "string", default: null }, - - }, - }, - }, - capacity: { type: "string"}, - - status: {type: "string"} - - }, - }, - security: [ - { - basicAuth: [], - }, - ], - - }, - preHandler: fastify.auth([fastify.authenticate]), - handler: tankersController.addTankers1, - // onResponse: (request, reply) => { - // validationHandler.sendPhoneVerificationCode(request, reply); - // }, - //onResponse: validationHandler.sendPhoneVerificationCode, - }); - next(); } - From f49d0f0ed372f2033bf490bff28c1521e1777ed2 Mon Sep 17 00:00:00 2001 From: varun Date: Tue, 21 Mar 2023 08:10:32 -0400 Subject: [PATCH 07/10] made changes in tanker.js,tankercontrollers,tanker routes --- src/controllers/tankersController.js | 2 +- src/routes/tankersRoute.js | 31 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/controllers/tankersController.js b/src/controllers/tankersController.js index 757bbc8f..54c1c2c0 100644 --- a/src/controllers/tankersController.js +++ b/src/controllers/tankersController.js @@ -78,7 +78,7 @@ console.log(req.params); -exports.addTankers1 = async (req, reply) => { +exports.deleteTankerInfo1 = async (req, reply) => { try { //const username = req.params.username; diff --git a/src/routes/tankersRoute.js b/src/routes/tankersRoute.js index 8ad0a899..b4ca6de0 100644 --- a/src/routes/tankersRoute.js +++ b/src/routes/tankersRoute.js @@ -168,6 +168,7 @@ module.exports = function (fastify, opts, next) { }); + fastify.route({ @@ -552,6 +553,36 @@ module.exports = function (fastify, opts, next) { }); + fastify.route({ + method: "PUT", + url: "/api/deleteTanker1/:supplierId", + schema: { + tags: ["Supplier"], + summary: "This is to delete tanker", + params: { + required: ["supplierId"], + type: "object", + properties: { + supplierId: { + type: "string", + description: "supplierId", + }, + }, + }, + querystring: { + tankerName: {type: 'string'} + }, + security: [ + { + basicAuth: [], + }, + ], + }, + preHandler: fastify.auth([fastify.authenticate]), + handler: tankersController.deleteTankerInfo1, + }); + + next(); From 0f11d82f3692b53f67a15af4ad516bf0a1240d70 Mon Sep 17 00:00:00 2001 From: varun Date: Thu, 23 Mar 2023 02:18:28 -0400 Subject: [PATCH 08/10] mobile number verification --- src/controllers/userController.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/controllers/userController.js b/src/controllers/userController.js index 870d2bd4..f2b00277 100644 --- a/src/controllers/userController.js +++ b/src/controllers/userController.js @@ -398,8 +398,9 @@ exports.sendSms = async (request, reply) => { const apiKey = '2068323bea61494d315b'; const senderId = 'ARMNTA'; const mobile = request.body.mobileNumbers//'8341426949'; - const message = `Welcome to Arminta !!! your OTP is ${code} please use it for login.`//`Welcome to Arminta !!! your OTP is ${code} please use it for login.`; + const message = `Welcome to Arminta !!! your OTP is ${code} please use it for login.`//`Welcome to Arminta !!! your OTP is ${code} please use it for login.`; + await User.findOneAndUpdate({phone: mobile}, { $set: {'phoneVerificationCode': code } }) const apiUrl = `https://smslogin.co/v3/api.php?username=${username}&apikey=${apiKey}&senderid=${senderId}&mobile=${mobile}&message=${encodeURIComponent(message)}`; const options = { From 5c2261c239f952ddd0f35193b632850fbaf24de7 Mon Sep 17 00:00:00 2001 From: raj Date: Thu, 23 Mar 2023 06:35:13 +0000 Subject: [PATCH 09/10] Commit message --- .gitignore | 2 ++ src/controllers/tankscontroller.js | 0 2 files changed, 2 insertions(+) create mode 100644 .gitignore create mode 100644 src/controllers/tankscontroller.js diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..4e5ae94d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +src/api-docs/api.html +src/config/swagger.js diff --git a/src/controllers/tankscontroller.js b/src/controllers/tankscontroller.js new file mode 100644 index 00000000..e69de29b From 03c82fcc316e8747a78c2e5f96ead9a877c059c1 Mon Sep 17 00:00:00 2001 From: raj Date: Thu, 23 Mar 2023 08:41:53 +0000 Subject: [PATCH 10/10] Merge changes from remote master branch --- watermanagement-backend | 1 + 1 file changed, 1 insertion(+) create mode 160000 watermanagement-backend diff --git a/watermanagement-backend b/watermanagement-backend new file mode 160000 index 00000000..0f11d82f --- /dev/null +++ b/watermanagement-backend @@ -0,0 +1 @@ +Subproject commit 0f11d82f3692b53f67a15af4ad516bf0a1240d70