From 7eb2d40b862559a14fa706b8acd400887aa04944 Mon Sep 17 00:00:00 2001 From: Bhaskara Kishore Date: Fri, 31 Mar 2023 11:30:31 +0530 Subject: [PATCH 1/3] DELETE api for bookingid --- src/controllers/tankersController.js | 14 ++++++++++++++ src/routes/tankersRoute.js | 29 ++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/src/controllers/tankersController.js b/src/controllers/tankersController.js index 21874994..8e11d574 100644 --- a/src/controllers/tankersController.js +++ b/src/controllers/tankersController.js @@ -634,3 +634,17 @@ exports.connectstatus = async (req, reply) => { + +//delete selected bookingid +exports.deleteBookingInfo = async (req, reply) => { + try { + var bookingid = req.params.bookingid; + + const booking = await Tankerbooking.findOneAndDelete({ bookingid:bookingid }); + + reply.send({ status_code: 200, data: booking}); + // return tank; + } catch (err) { + throw boom.boomify(err); + } +}; diff --git a/src/routes/tankersRoute.js b/src/routes/tankersRoute.js index 56239206..39d99c14 100644 --- a/src/routes/tankersRoute.js +++ b/src/routes/tankersRoute.js @@ -699,6 +699,35 @@ module.exports = function (fastify, opts, next) { }, handler: tankersController.getAllTankersaccepted, }); + + + + fastify.route({ + method: "PUT", + url: "/api/deleteBookingInfo/:bookingid", + schema: { + tags: ["Supplier-Order"], + summary: "This is for delete Booking Info", + params: { + required: ["bookingid"], + type: "object", + properties: { + bookingid: { + type: "string", + description: "bookingid", + }, + }, + }, + security: [ + { + basicAuth: [], + }, + ], + }, + preHandler: fastify.auth([fastify.authenticate]), + handler: tankersController.deleteBookingInfo, + }); + next(); } From 2b8d6902b79d6b4a3363cc6d4bafa5007b7692f8 Mon Sep 17 00:00:00 2001 From: Bhaskara Kishore Date: Fri, 31 Mar 2023 12:11:05 +0530 Subject: [PATCH 2/3] friendrequest accept and reject particual customer --- src/handlers/friendRequestHandler.js | 8 ++++---- src/routes/friendRequestRoute.js | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/handlers/friendRequestHandler.js b/src/handlers/friendRequestHandler.js index b0cb7621..53455c1a 100644 --- a/src/handlers/friendRequestHandler.js +++ b/src/handlers/friendRequestHandler.js @@ -60,10 +60,10 @@ exports.friendRequest = async (request, reply) => { exports.friendRequestAccept = async (request, reply) => { try { //const {friendRequestId} = request.body; - const {supplierId} = request.body; + const {supplierId,customerId} = request.body; // Update the friend request status to 'accepted' // const friendRequest = await FriendRequest.findByIdAndUpdate(friendRequestId, { status: 'accepted' }); - const friendRequest = await FriendRequest.findOneAndUpdate({supplierId}, { status: 'accepted' }); + const friendRequest = await FriendRequest.findOneAndUpdate({supplierId,customerId }, { status: 'accepted' }); console.log("friendRequest....---", friendRequest) @@ -82,10 +82,10 @@ exports.friendRequestAccept = async (request, reply) => { exports.friendRequestReject = async (request, reply) => { try { //const {friendRequestId} = request.body; - const {supplierId} = request.body; + const {supplierId, customerId} = request.body; // Update the friend request status to 'rejected' // const friendRequest = await FriendRequest.findByIdAndUpdate(friendRequestId, { status: 'rejected' }); - const friendRequest = await FriendRequest.findOneAndUpdate({supplierId}, { status: 'rejected' }); + const friendRequest = await FriendRequest.findOneAndUpdate({supplierId, customerId}, { status: 'rejected' }); console.log("friendRequest....---", friendRequest) diff --git a/src/routes/friendRequestRoute.js b/src/routes/friendRequestRoute.js index ec45ad4f..42df7b13 100644 --- a/src/routes/friendRequestRoute.js +++ b/src/routes/friendRequestRoute.js @@ -32,7 +32,7 @@ module.exports = function (fastify, opts, next) { fastify.route({ method: "PUT", - url: "/api/friend-request/:id/accept", + url: "/api/friend-request/:supplierId/accept", schema: { tags: ["Friend-Request"], description: "This is for supplier accept the friend request", @@ -40,7 +40,8 @@ module.exports = function (fastify, opts, next) { body: { type: "object", properties: { - supplierId: { type: "string" } + supplierId: { type: "string" }, + customerId: { type: "string" } }, }, @@ -54,7 +55,7 @@ module.exports = function (fastify, opts, next) { }); fastify.route({ method: "PUT", - url: "/api/friend-request/:id/reject", + url: "/api/friend-request/:supplierId/reject", schema: { tags: ["Friend-Request"], description: "This is for supplier reject the friend request", @@ -64,7 +65,7 @@ module.exports = function (fastify, opts, next) { type: "object", properties: { supplierId: { type: "string" }, - + customerId: { type: "string" } }, }, security: [ From 2b4f383b6a3329129a135d1feaf88d3b6733c5d3 Mon Sep 17 00:00:00 2001 From: Bhaskara Kishore Date: Fri, 31 Mar 2023 12:38:21 +0530 Subject: [PATCH 3/3] changes friend-request --- src/routes/friendRequestRoute.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/friendRequestRoute.js b/src/routes/friendRequestRoute.js index 42df7b13..997223c4 100644 --- a/src/routes/friendRequestRoute.js +++ b/src/routes/friendRequestRoute.js @@ -32,7 +32,7 @@ module.exports = function (fastify, opts, next) { fastify.route({ method: "PUT", - url: "/api/friend-request/:supplierId/accept", + url: "/api/friend-request/accept", schema: { tags: ["Friend-Request"], description: "This is for supplier accept the friend request", @@ -55,7 +55,7 @@ module.exports = function (fastify, opts, next) { }); fastify.route({ method: "PUT", - url: "/api/friend-request/:supplierId/reject", + url: "/api/friend-request/reject", schema: { tags: ["Friend-Request"], description: "This is for supplier reject the friend request",