diff --git a/src/controllers/departmentController.js b/src/controllers/departmentController.js index 886cdec5..3346f539 100644 --- a/src/controllers/departmentController.js +++ b/src/controllers/departmentController.js @@ -451,10 +451,14 @@ exports.addDepartment = async (request, reply) => { try { const { phone, + officeName, alternativeContactNumber, gender, personalEmail, city, + personal_city, + reportingManager_mobile_number, + reportingManager_email, firstName, lastName, departmentName, @@ -489,6 +493,10 @@ exports.addDepartment = async (request, reply) => { const department = new Deparments({ departmentId, alternativeContactNumber, + officeName, + reportingManager_mobile_number, + reportingManager_email, + personal_city, gender, city, firstName, @@ -647,7 +655,12 @@ exports.addDepartment = async (request, reply) => { address1, address2, pincode, - desginationName + desginationName, + personal_city, + reportingManager_mobile_number, + reportingManager_email, + officeName, + } = request.body; @@ -682,7 +695,10 @@ exports.addDepartment = async (request, reply) => { existing.lastName = lastName || existing.lastName; existing.departmentName = departmentName || existing.departmentName; existing.reportingManager = reportingManager || existing.reportingManager - + existing.personal_city = personal_city || existing.personal_city; + existing.reportingManager_mobile_number = reportingManager_mobile_number || existing.reportingManager_mobile_number; + existing.reportingManager_email = reportingManager_email || existing.reportingManager_email; + existing.officeName = officeName || existing.officeName await existing.save(); diff --git a/src/models/Department.js b/src/models/Department.js index e4a7f162..e823143b 100644 --- a/src/models/Department.js +++ b/src/models/Department.js @@ -76,10 +76,13 @@ const citySchema = new mongoose.Schema( const departmentsSchema = new mongoose.Schema( { departmentId:{type:String}, + officeName: { type: String }, desginationName: { type: String }, phone: { type: String, unique: true, trim: true }, alternativeContactNumber : { type: String }, reportingManager : { type: String }, + reportingManager_mobile_number : { type: String }, + reportingManager_email : { type: String }, location: [{ type : String}], firstName : { type: String }, gender: { type: String }, @@ -92,6 +95,7 @@ const citySchema = new mongoose.Schema( pincode: { type: String }, zone: { type: String }, city: { type: String }, + personal_city: { type: String }, state: String, country: String, services: { password: { bcrypt: String } }, diff --git a/src/routes/departmentRoute.js b/src/routes/departmentRoute.js index e2a2ce08..37cc5298 100644 --- a/src/routes/departmentRoute.js +++ b/src/routes/departmentRoute.js @@ -177,7 +177,7 @@ module.exports = function (fastify, opts, next) { schema: { tags: ["Department"], description: "This is for creating a new Team Member Account", - summary: "This is for creating a new Ream Member Account", + summary: "This is for creating a new Team Member Account", body: { type: "object", //required: ["phone", "username", "password", "role"], // Add role to required fields @@ -200,6 +200,10 @@ module.exports = function (fastify, opts, next) { lastName: { type: "string" }, reportingManager: { type: "string" }, email: { type: "string" }, + personal_city: { type: "string"}, + officeName: { type: "string"}, + reportingManager_mobile_number: { type: "string"}, + reportingManager_email: { type: "string"}, location: { type: "array", items: { type: "string" }, @@ -359,6 +363,10 @@ module.exports = function (fastify, opts, next) { departmentName: { type: "string" }, firstName: { type: "string" }, lastName: { type: "string" }, + personal_city: { type: "string"}, + officeName: { type: "string"}, + reportingManager_mobile_number: { type: "string"}, + reportingManager_email: { type: "string"}, }, }