diff --git a/src/handlers/userHandler.js b/src/handlers/userHandler.js index 90c155bb..776649a8 100644 --- a/src/handlers/userHandler.js +++ b/src/handlers/userHandler.js @@ -101,13 +101,13 @@ exports.verifyUser = async (req, reply) => { user.phone = usertobeInserted.phone; user.emails = usertobeInserted.emails; } - username = user.username; + phone = user.phone; userpass = req.body.password; // check if user exists in the system. If user exists , display message that - // username is not available + // phone number is not available - userExists = await User.findOne({ username: username }); + userExists = await User.findOne({ phone: phone }); if (userExists) { // return user exists message error = { @@ -115,9 +115,9 @@ exports.verifyUser = async (req, reply) => { error: true, code: 10001, message: - "10001 - Username " + - userExists.username + - " is not available. please use a different username", + "10001 - Phone " + + userExists.phone + + " is not available. please use a different phone number", }, }; req.body.regError = error; diff --git a/src/models/User.js b/src/models/User.js index c962df5e..38151b5f 100644 --- a/src/models/User.js +++ b/src/models/User.js @@ -33,7 +33,7 @@ const generateBookingId = async () => { const userSchema = new mongoose.Schema( { - username: { type: String, unique: true, trim: true }, + username: { type: String }, phone: { type: String, unique: true, trim: true }, address: String, customerId: String, diff --git a/src/routes/usersRoute.js b/src/routes/usersRoute.js index 96bf170b..d3b0ce94 100644 --- a/src/routes/usersRoute.js +++ b/src/routes/usersRoute.js @@ -131,7 +131,7 @@ module.exports = function (fastify, opts, next) { body: { type: "object", properties: { - username: { type: "string" }, + phone: { type: "string" }, password: { type: "string" }, emails: { type: "array", @@ -145,7 +145,7 @@ module.exports = function (fastify, opts, next) { }, firstName: { type: "string", default: null }, lastName: { type: "string", default: null }, - phone: { type: "string" }, + username: { type: "string" }, buildingName: { type: "string", default: null }, inchargeName: { type: "string", default: null }, address1: { type: "string", default: null },