From ba7006a2b33bad285ee8d37400a5a15ee506e7de Mon Sep 17 00:00:00 2001 From: Bhaskara Kishore Date: Tue, 25 Apr 2023 11:22:47 +0530 Subject: [PATCH] fcmId added --- src/controllers/supplierController.js | 7 +++++-- src/controllers/supplierOrderController.js | 3 ++- src/controllers/userController.js | 4 +++- src/index.js | 1 + src/models/User.js | 1 + src/models/supplier.js | 2 ++ src/routes/supplierOrdersRoutes.js | 4 +++- src/routes/supplierRoute.js | 3 ++- src/routes/usersRoute.js | 3 ++- 9 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/controllers/supplierController.js b/src/controllers/supplierController.js index e9eba7be..0e82023f 100644 --- a/src/controllers/supplierController.js +++ b/src/controllers/supplierController.js @@ -104,7 +104,8 @@ exports.loginDeliveryBoy = async (req) => { zip: req.body.zip, }, latitude: req.body.latitude, - longitude: req.body.longitude + longitude: req.body.longitude, + fcmId : req.body.fcmId }; var supplier = new Supplier(s_data); @@ -129,6 +130,7 @@ exports.loginDeliveryBoy = async (req) => { supplier.alternativeContactNumber = suppliertobeInserted.alternativeContactNumber; supplier.latitude = suppliertobeInserted.latitude; supplier.longitude = suppliertobeInserted.longitude; + supplier.fcmId = suppliertobeInserted.fcmId } @@ -165,7 +167,8 @@ exports.loginDeliveryBoy = async (req) => { ], profile: insertedSupplier.profile, latitude: insertedSupplier.latitude, - longitude: insertedSupplier.longitude + longitude: insertedSupplier.longitude, + fcmId : insertedSupplier.fcmId }, status_code: 200, }; diff --git a/src/controllers/supplierOrderController.js b/src/controllers/supplierOrderController.js index 4312f68b..e7d77c18 100644 --- a/src/controllers/supplierOrderController.js +++ b/src/controllers/supplierOrderController.js @@ -75,7 +75,7 @@ exports.orderNow = async (req, reply) => { status:req.body.status, longitude: req.body.longitude, latitude:req.body.latitude, - + fcmId: req.body.fcmId }; var agent_mobile = req.body.phone @@ -104,6 +104,7 @@ exports.orderNow = async (req, reply) => { agent.status = usertobeInserted.status agent.longitude = usertobeInserted.longitude agent.latitude = usertobeInserted.latitude + agent.fcmId = usertobeInserted.fcmId } } diff --git a/src/controllers/userController.js b/src/controllers/userController.js index 9216f40f..aa772fb8 100644 --- a/src/controllers/userController.js +++ b/src/controllers/userController.js @@ -193,6 +193,7 @@ exports.addUser = async (req, reply) => { }, longitude: req.body.longitude, latitude:req.body.latitude, + fcmId: req.body.fcmId }; @@ -218,7 +219,7 @@ exports.addUser = async (req, reply) => { user.customerId = usertobeInserted.customer_id; user.latitude = usertobeInserted.latitude; user.longitude = usertobeInserted.longitude - + user.fcmId = usertobeInserted.fcmId } console.log("---------checkurl ecnoded string-----------------------"); @@ -258,6 +259,7 @@ exports.addUser = async (req, reply) => { profile: insertedUser.profile, longitude: insertedUser.longitude, latitude:insertedUser.latitude, + fcmId: insertedUser.fcmId }, status_code: 200, }; diff --git a/src/index.js b/src/index.js index 0af4d460..af05969f 100644 --- a/src/index.js +++ b/src/index.js @@ -225,6 +225,7 @@ fastify.post("/api/login", { latitude: loginObject.user.latitude, longitude: loginObject.user.longitude, type: loginObject.user.profile.role, + fcmId: loginObject.user.fcmId, typeasobj: stringToJsonObject, }, }); diff --git a/src/models/User.js b/src/models/User.js index 8373d39a..338a7a17 100644 --- a/src/models/User.js +++ b/src/models/User.js @@ -95,6 +95,7 @@ const userSchema = new mongoose.Schema( latitude: {type: Number}, isActive: Boolean, tenantId: ObjectId, + fcmId: { type: String, default: null }, createdAt: { type: Date, default: function () { diff --git a/src/models/supplier.js b/src/models/supplier.js index f0210cf4..a5099f0b 100644 --- a/src/models/supplier.js +++ b/src/models/supplier.js @@ -67,6 +67,7 @@ const supplierSchema = new mongoose.Schema( latitude: {type: Number}, isActive: Boolean, tenantId: ObjectId, + fcmId: { type: String, default: null }, createdAt: { type: Date, default: function () { @@ -127,6 +128,7 @@ const supplierSchema = new mongoose.Schema( status: { type: String, default: "Inactive" }, longitude: { type : Number}, latitude: {type: Number}, + fcmId: { type: String, default: null }, }); diff --git a/src/routes/supplierOrdersRoutes.js b/src/routes/supplierOrdersRoutes.js index d6fe961c..029906a8 100644 --- a/src/routes/supplierOrdersRoutes.js +++ b/src/routes/supplierOrdersRoutes.js @@ -87,7 +87,9 @@ module.exports = function (fastify, opts, next) { zip: { type: "string", default: null }, status: { type: "string" }, latitude: { type: 'number' }, - longitude: { type: 'number'} + longitude: { type: 'number'}, + fcmId: { type: "string", default: null }, + }, }, diff --git a/src/routes/supplierRoute.js b/src/routes/supplierRoute.js index ce466b71..9e19caf4 100644 --- a/src/routes/supplierRoute.js +++ b/src/routes/supplierRoute.js @@ -279,7 +279,8 @@ module.exports = function (fastify, opts, next) { zip: { type: "string", default: null }, country: { type: "string", default: null }, latitude: { type: 'number' }, - longitude: { type: 'number'} + longitude: { type: 'number'}, + fcmId: { type: "string", default: null }, }, }, security: [ diff --git a/src/routes/usersRoute.js b/src/routes/usersRoute.js index 47f15688..b5a33830 100644 --- a/src/routes/usersRoute.js +++ b/src/routes/usersRoute.js @@ -156,7 +156,8 @@ module.exports = function (fastify, opts, next) { country: { type: "string", default: null }, notes: { type: "string", default: null }, latitude: { type: 'number' }, - longitude: { type: 'number'} + longitude: { type: 'number'}, + fcmId: { type: "string", default: null }, }, }, security: [